代码修改

notes-union/src/main/resources/application.properties

@@ -4,7 +4,7 @@ spring.application.name=workbook
 
 ## https端口号.
 server.port=8289
-### 证书的路径.
+## 证书的路径.
 server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
 # 证书密码，请修改为您自己证书的密码.
 server.ssl.key-store-password=bMEPW9BG

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/controller/UserManageController.java

@@ -6,6 +6,8 @@ import com.zjty.tynotes.pas.entity.vo.PageRequest;
 import com.zjty.tynotes.weekly.subject.service.UserManageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
@@ -29,6 +31,8 @@ public class UserManageController {
     @Autowired
     private UserManageService userManageService;
 
+    private static final Logger logger = LoggerFactory.getLogger(UserManageController.class);
+
 
     @ApiOperation(value = "根据id查询用户", response = User.class)
     @GetMapping("/findUser/{id}")
@@ -59,12 +63,14 @@ public class UserManageController {
     @ApiOperation(value = "更新当前用户自身信息")
     @PutMapping("/updateSelf")
     public ResponseEntity updateSelf(@RequestBody @NotNull User user){
+        try {
             User userById = userManageService.findUserById(user.getId());
-        boolean b = userManageService.updateSelf(user,userById);
-        if(b){
-            return ok("更改密码成功");
+            User user1 = userManageService.updateSelf(user, userById);
+            return ok(user1);
+        } catch (Exception e) {
+            logger.error("更改当前用户自身信息失败");
         }
-        return ok("更改密码失败");
+        return ok("更改当前用户信息失败");
     }
 
     @ApiOperation(value = "更新当前用户密码")

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/UserManageService.java

@@ -53,7 +53,7 @@ public interface UserManageService {
      * @param userById
      * @return
      */
-    boolean updateSelf(User user,User userById);
+    User updateSelf(User user,User userById);
 
 //    /**
 //     * 根据任务状态查询人员任务列表

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -267,12 +267,13 @@ public class UserManageServiceImpl implements UserManageService {
     }
 
     @Override
-    public boolean updateSelf(User user,User userById) {
+    public User updateSelf(User user,User userById) {
         userById.setPhone1(user.getPhone1());
         userById.setPhone2(user.getPhone2());
         userById.setEmail(user.getEmail());
         userById.setAddress(user.getAddress());
-        return false;
+        pasUserDao.save(userById);
+        return userById;
     }
 
     /**