diff --git a/.gitignore b/.gitignore index 549e00a..b6a95e7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ target/ !**/src/main/**/target/ !**/src/test/**/target/ + ### STS ### .apt_generated .classpath diff --git a/log/logs/webapps/debug.log b/log/logs/webapps/debug.log new file mode 100644 index 0000000..e69de29 diff --git a/log/logs/webapps/error.log b/log/logs/webapps/error.log new file mode 100644 index 0000000..e69de29 diff --git a/log/logs/webapps/info.log b/log/logs/webapps/info.log new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml index 6d5ea98..6526af0 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,11 @@ 3.5.11 + + org.springframework.boot + spring-boot-starter-logging + + diff --git a/src/main/java/com/water/watersys/WaterSysApplication.java b/src/main/java/com/water/watersys/WaterSysApplication.java index 2d70ae9..4a28cec 100644 --- a/src/main/java/com/water/watersys/WaterSysApplication.java +++ b/src/main/java/com/water/watersys/WaterSysApplication.java @@ -3,9 +3,9 @@ package com.water.watersys; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; + @SpringBootApplication public class WaterSysApplication { - public static void main(String[] args) { SpringApplication.run(WaterSysApplication.class, args); } diff --git a/src/main/java/com/water/watersys/components/GlobalExceptionHandler.java b/src/main/java/com/water/watersys/components/GlobalExceptionHandler.java index e505b76..9f98538 100644 --- a/src/main/java/com/water/watersys/components/GlobalExceptionHandler.java +++ b/src/main/java/com/water/watersys/components/GlobalExceptionHandler.java @@ -21,7 +21,6 @@ public class GlobalExceptionHandler { @ExceptionHandler public SaResult notLoginException(NotLoginException e){ - System.out.println(e.getMessage()); e.printStackTrace(); return SaResult.error(e.getMessage()); } diff --git a/src/main/java/com/water/watersys/controller/LoginController.java b/src/main/java/com/water/watersys/controller/LoginController.java index f80685c..4e6e07d 100644 --- a/src/main/java/com/water/watersys/controller/LoginController.java +++ b/src/main/java/com/water/watersys/controller/LoginController.java @@ -9,6 +9,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @RestController @CrossOrigin @@ -17,10 +19,13 @@ public class LoginController { @Resource private UserSysService userSysService; + static Logger logger= LoggerFactory.getLogger(LoginController.class); @Operation(summary = "登录", description = "登录") @PostMapping("/login") public Result login(@RequestBody LoginDto loginDto) { Integer id = userSysService.login(loginDto); + logger.info("id:{}",id); + logger.info("loginDto:{}",loginDto); if (id != 0) { StpUtil.login(id); return Result.success(StpUtil.getTokenValue()); @@ -41,6 +46,7 @@ public class LoginController { @PostMapping("/register") public Result register(@RequestBody UserSys userSys) { int index = userSysService.register(userSys); + logger.info("注册信息:{}",userSys); if (index > 0) { return Result.success(index); }else { diff --git a/src/main/java/com/water/watersys/controller/UserController.java b/src/main/java/com/water/watersys/controller/UserController.java index 9c0c8c7..fe550b0 100644 --- a/src/main/java/com/water/watersys/controller/UserController.java +++ b/src/main/java/com/water/watersys/controller/UserController.java @@ -3,12 +3,16 @@ package com.water.watersys.controller; import cn.dev33.satoken.stp.StpUtil; import com.water.watersys.components.Result; import com.water.watersys.model.dto.ChangePassword; +import com.water.watersys.model.dto.ChangeUserInfo; import com.water.watersys.model.vo.UserOv; import com.water.watersys.service.UserSysService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + @RestController @CrossOrigin @@ -17,12 +21,15 @@ public class UserController { @Resource private UserSysService userSysService; + static Logger logger= LoggerFactory.getLogger(UserController.class); + @Operation(summary = "获取用户信息", description = "获取用户信息") @GetMapping("/user") public Result user() { Object loginId = StpUtil.getLoginId(); UserOv userOv = userSysService.getUser((String) loginId); + logger.info("用户信息获取={}", userOv); if (userOv != null) { return Result.success(userOv); }else { @@ -35,6 +42,7 @@ public class UserController { public Result changePassword(@RequestBody ChangePassword changePassword) { String loginId = (String) StpUtil.getLoginId(); Integer id = userSysService.changePassword(changePassword,loginId); + logger.info("修改密码={}", id); if (id != 0) { return Result.success(); }else { @@ -54,5 +62,18 @@ public class UserController { } } + @Operation(summary = "修改用户信息", description = "修改用户信息") + @PutMapping("/changeUserInfo") + public Result changeUserInfo(ChangeUserInfo changeUserInfo) { + String loginId = (String) StpUtil.getLoginId(); + Integer id = userSysService.changeUserInfo(changeUserInfo,loginId); + if (id != 0) { + return Result.success(); + }else { + return Result.createFail(); + } + } + + } diff --git a/src/main/java/com/water/watersys/mapper/UserSysMapper.java b/src/main/java/com/water/watersys/mapper/UserSysMapper.java index 48c516e..5764ab3 100644 --- a/src/main/java/com/water/watersys/mapper/UserSysMapper.java +++ b/src/main/java/com/water/watersys/mapper/UserSysMapper.java @@ -2,6 +2,7 @@ package com.water.watersys.mapper; import com.water.watersys.model.domain.UserSys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.water.watersys.model.dto.ChangeUserInfo; import com.water.watersys.model.vo.UserOv; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -20,6 +21,9 @@ public interface UserSysMapper extends BaseMapper { @Update("UPDATE user_sys SET password = #{newPassword} WHERE id = #{id}") Integer changePassword(Integer id, String newPassword); + + @Update("UPDATE user_sys SET address = #{address},phone = #{phone},username = #{username} WHERE id = #{loginId}") + Integer changeUserInfo(ChangeUserInfo changeUserInfo, String loginId); } diff --git a/src/main/java/com/water/watersys/model/dto/ChangeUserInfo.java b/src/main/java/com/water/watersys/model/dto/ChangeUserInfo.java new file mode 100644 index 0000000..bccb4e5 --- /dev/null +++ b/src/main/java/com/water/watersys/model/dto/ChangeUserInfo.java @@ -0,0 +1,10 @@ +package com.water.watersys.model.dto; + +import lombok.Data; + +@Data +public class ChangeUserInfo { + private String address; + private String phone; + private String username; +} diff --git a/src/main/java/com/water/watersys/service/UserSysService.java b/src/main/java/com/water/watersys/service/UserSysService.java index 6435d79..0918bdf 100644 --- a/src/main/java/com/water/watersys/service/UserSysService.java +++ b/src/main/java/com/water/watersys/service/UserSysService.java @@ -3,6 +3,7 @@ package com.water.watersys.service; import com.water.watersys.model.domain.UserSys; import com.baomidou.mybatisplus.extension.service.IService; import com.water.watersys.model.dto.ChangePassword; +import com.water.watersys.model.dto.ChangeUserInfo; import com.water.watersys.model.dto.LoginDto; import com.water.watersys.model.vo.UserOv; import org.springframework.stereotype.Service; @@ -24,4 +25,6 @@ public interface UserSysService extends IService { Integer changePassword(ChangePassword changePassword, String loginId); Integer changeUserStatus(Integer status, String loginId); + + Integer changeUserInfo(ChangeUserInfo changeUserInfo, String loginId); } diff --git a/src/main/java/com/water/watersys/service/impl/UserSysServiceImpl.java b/src/main/java/com/water/watersys/service/impl/UserSysServiceImpl.java index f3c5357..261fea5 100644 --- a/src/main/java/com/water/watersys/service/impl/UserSysServiceImpl.java +++ b/src/main/java/com/water/watersys/service/impl/UserSysServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.water.watersys.model.domain.UserSys; import com.water.watersys.mapper.UserSysMapper; import com.water.watersys.model.dto.ChangePassword; +import com.water.watersys.model.dto.ChangeUserInfo; import com.water.watersys.model.dto.LoginDto; import com.water.watersys.model.vo.UserOv; import com.water.watersys.service.UserSysService; @@ -77,6 +78,11 @@ public class UserSysServiceImpl extends ServiceImpl return userSysMapper.update(null, lambdaUpdateWrapper); } + @Override + public Integer changeUserInfo(ChangeUserInfo changeUserInfo, String loginId) { + return userSysMapper.changeUserInfo(changeUserInfo,loginId); + } + } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 66e52e5..69aa2e7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -36,3 +36,6 @@ springdoc: url: /v3/api-docs # ???????? + + + diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..1f1a142 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + ${log.pattern} + + + + + + + + + + ${log.filePath}/debug.log + + + + ${log.filePath}/debug/debug-%d{yyyy-MM-dd}.log.gz + + + ${log.maxHistory} + + + + ${log.pattern} + + + + debug + ACCEPT + + DENY + + + + + + + + ${log.filePath}/info.log + + + + ${log.filePath}/info/info-%d{yyyy-MM-dd}.log.gz + + + ${log.maxHistory} + + + + ${log.pattern} + + + + info + ACCEPT + + DENY + + + + + + + + ${log.filePath}/error.log + + + + ${log.filePath}/error/error-%d{yyyy-MM-dd}.log.gz + + + ${log.maxHistory} + + + + ${log.pattern} + + + + error + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + + + \ No newline at end of file