From 2047d624cb51da295238712c4370dc55b3365a50 Mon Sep 17 00:00:00 2001 From: jihaipeng <3204568531@qq.com> Date: Sat, 12 Jul 2025 17:13:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api => api/controller}/UserController.java | 6 +-- .../com/lottery/{ => api}/mapper/IPrizeMapper.java | 2 +- .../com/lottery/{ => api}/mapper/IUserMapper.java | 4 +- .../lottery/{ => api}/service/IPrizeService.java | 2 +- .../lottery/{ => api}/service/IUserService.java | 2 +- .../{ => api}/service/Impl/PrizeServiceImpl.java | 6 +-- .../{ => api}/service/Impl/UserServiceImpl.java | 12 ++---- .../java/com/lottery/controller/admin/Test.java | 44 ---------------------- .../src/main/resources/application.yml | 2 +- .../src/main/resources/mapper/prizeMapper.xml | 2 +- .../src/main/resources/mapper/userMapper.xml | 2 +- 11 files changed, 16 insertions(+), 68 deletions(-) rename lottery-system/lottery-service/src/main/java/com/lottery/{controller/api => api/controller}/UserController.java (93%) rename lottery-system/lottery-service/src/main/java/com/lottery/{ => api}/mapper/IPrizeMapper.java (95%) rename lottery-system/lottery-service/src/main/java/com/lottery/{ => api}/mapper/IUserMapper.java (77%) rename lottery-system/lottery-service/src/main/java/com/lottery/{ => api}/service/IPrizeService.java (88%) rename lottery-system/lottery-service/src/main/java/com/lottery/{ => api}/service/IUserService.java (92%) rename lottery-system/lottery-service/src/main/java/com/lottery/{ => api}/service/Impl/PrizeServiceImpl.java (87%) rename lottery-system/lottery-service/src/main/java/com/lottery/{ => api}/service/Impl/UserServiceImpl.java (77%) delete mode 100644 lottery-system/lottery-service/src/main/java/com/lottery/controller/admin/Test.java diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/controller/api/UserController.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/UserController.java similarity index 93% rename from lottery-system/lottery-service/src/main/java/com/lottery/controller/api/UserController.java rename to lottery-system/lottery-service/src/main/java/com/lottery/api/controller/UserController.java index 3bd9c53..37b9f9f 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/controller/api/UserController.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/controller/UserController.java @@ -1,14 +1,12 @@ -package com.lottery.controller.api; +package com.lottery.api.controller; -import ch.qos.logback.classic.spi.EventArgUtil; import com.lottery.dto.UserLoginDto; import com.lottery.entity.User; import com.lottery.exception.Accountexception; -import com.lottery.service.IUserService; +import com.lottery.api.service.IUserService; import com.lottery.utils.JwtUtil; import com.lottery.vo.UserLoginVo; import com.lottery.vo.UserVo; -import org.aspectj.weaver.patterns.IToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/mapper/IPrizeMapper.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IPrizeMapper.java similarity index 95% rename from lottery-system/lottery-service/src/main/java/com/lottery/mapper/IPrizeMapper.java rename to lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IPrizeMapper.java index b947add..a7325a4 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/mapper/IPrizeMapper.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IPrizeMapper.java @@ -1,4 +1,4 @@ -package com.lottery.mapper; +package com.lottery.api.mapper; import com.lottery.dto.Prize; import org.apache.ibatis.annotations.Insert; diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/mapper/IUserMapper.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IUserMapper.java similarity index 77% rename from lottery-system/lottery-service/src/main/java/com/lottery/mapper/IUserMapper.java rename to lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IUserMapper.java index 79a93b7..737eac1 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/mapper/IUserMapper.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/IUserMapper.java @@ -1,4 +1,4 @@ -package com.lottery.mapper; +package com.lottery.api.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lottery.entity.User; @@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Select; public interface IUserMapper extends BaseMapper { - @Select("select id, username, password, status from user where username = #{username}") + @Select("select id, username, password from user where username = #{username}") User getByUsername(String username); } \ No newline at end of file diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/service/IPrizeService.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IPrizeService.java similarity index 88% rename from lottery-system/lottery-service/src/main/java/com/lottery/service/IPrizeService.java rename to lottery-system/lottery-service/src/main/java/com/lottery/api/service/IPrizeService.java index 909a30c..80e7078 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/service/IPrizeService.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IPrizeService.java @@ -1,4 +1,4 @@ -package com.lottery.service; +package com.lottery.api.service; import com.lottery.dto.Prize; diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/service/IUserService.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IUserService.java similarity index 92% rename from lottery-system/lottery-service/src/main/java/com/lottery/service/IUserService.java rename to lottery-system/lottery-service/src/main/java/com/lottery/api/service/IUserService.java index 6eff631..c5536d5 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/service/IUserService.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IUserService.java @@ -1,4 +1,4 @@ -package com.lottery.service; +package com.lottery.api.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lottery.dto.UserLoginDto; diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/service/Impl/PrizeServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/PrizeServiceImpl.java similarity index 87% rename from lottery-system/lottery-service/src/main/java/com/lottery/service/Impl/PrizeServiceImpl.java rename to lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/PrizeServiceImpl.java index 912f15b..177ec20 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/service/Impl/PrizeServiceImpl.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/PrizeServiceImpl.java @@ -1,8 +1,8 @@ -package com.lottery.service.Impl; +package com.lottery.api.service.Impl; import com.lottery.dto.Prize; -import com.lottery.mapper.IPrizeMapper; -import com.lottery.service.IPrizeService; +import com.lottery.api.mapper.IPrizeMapper; +import com.lottery.api.service.IPrizeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/service/Impl/UserServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserServiceImpl.java similarity index 77% rename from lottery-system/lottery-service/src/main/java/com/lottery/service/Impl/UserServiceImpl.java rename to lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserServiceImpl.java index b8688b1..4122065 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/service/Impl/UserServiceImpl.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserServiceImpl.java @@ -1,20 +1,14 @@ -package com.lottery.service.Impl; +package com.lottery.api.service.Impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.lottery.dto.Prize; import com.lottery.dto.UserLoginDto; import com.lottery.entity.User; import com.lottery.exception.Accountexception; -import com.lottery.mapper.IPrizeMapper; -import com.lottery.mapper.IUserMapper; -import com.lottery.service.IUserService; -import com.lottery.vo.UserVo; +import com.lottery.api.mapper.IUserMapper; +import com.lottery.api.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.ParameterResolutionDelegate; import org.springframework.stereotype.Service; -import java.util.List; - /** * @program: lottery-system * @ClassName UserServiceImpl diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/controller/admin/Test.java b/lottery-system/lottery-service/src/main/java/com/lottery/controller/admin/Test.java deleted file mode 100644 index 6188ad4..0000000 --- a/lottery-system/lottery-service/src/main/java/com/lottery/controller/admin/Test.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.lottery.controller.admin; - -import com.lottery.dto.Prize; -import com.lottery.service.IPrizeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @program: lottery-system - * @ClassName Test - * @description: - * @author:jihaipeng - * @create: 2025−07-10 15:19 - * @Version 1.0 - **/ - -@RestController -@RequestMapping("/test") -public class Test { - @Autowired - private IPrizeService prizeService; - - - /** -// * //添加礼物到数据到数据库 - * @param prize - * @return - */ - @PostMapping("/add") - public boolean addPrize(){ - Prize prize = new Prize(); - return prizeService.add(prize); - } - - -} diff --git a/lottery-system/lottery-service/src/main/resources/application.yml b/lottery-system/lottery-service/src/main/resources/application.yml index ca5467b..a41ffb8 100644 --- a/lottery-system/lottery-service/src/main/resources/application.yml +++ b/lottery-system/lottery-service/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: datasource: url: jdbc:mysql://localhost:3306/lottery_system?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai username: root - password: 123456 + password: root driver-class-name: com.mysql.cj.jdbc.Driver hikari: pool-name: LotteryHikariCP diff --git a/lottery-system/lottery-service/src/main/resources/mapper/prizeMapper.xml b/lottery-system/lottery-service/src/main/resources/mapper/prizeMapper.xml index bc24676..6ee25ff 100644 --- a/lottery-system/lottery-service/src/main/resources/mapper/prizeMapper.xml +++ b/lottery-system/lottery-service/src/main/resources/mapper/prizeMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/lottery-system/lottery-service/src/main/resources/mapper/userMapper.xml b/lottery-system/lottery-service/src/main/resources/mapper/userMapper.xml index 99066b5..330003e 100644 --- a/lottery-system/lottery-service/src/main/resources/mapper/userMapper.xml +++ b/lottery-system/lottery-service/src/main/resources/mapper/userMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file