Explorar o código

配合前端优化

tangbin hai 9 meses
pai
achega
9ea8d599e8

+ 6 - 1
yezhu-api/src/main/java/com/kioor/user/controller/ApiUserController.java

@@ -9,6 +9,7 @@
 package com.kioor.user.controller;
 
 
+import cn.hutool.crypto.digest.DigestUtil;
 import com.kioor.annotation.Login;
 import com.kioor.annotation.LoginUser;
 import com.kioor.common.utils.Result;
@@ -16,6 +17,7 @@ import com.kioor.common.validator.ValidatorUtils;
 import com.kioor.user.dto.UserRequestDTO;
 import com.kioor.user.entity.UserEntity;
 import com.kioor.user.service.UserService;
+import io.micrometer.common.util.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -52,8 +54,11 @@ public class ApiUserController {
 
         UserEntity userEntity = userService.getUserByUserId(userId);
         userEntity.setUsername(dto.getUsername());
-        userEntity.setOpenFlag(dto.getOpenFlag());
+        if(StringUtils.isNotBlank(dto.getPassword())) {
+            userEntity.setPassword(DigestUtil.sha256Hex(dto.getPassword()));
+        }
         userEntity.setRemarks(dto.getRemarks());
+        userEntity.setOpenFlag(dto.getOpenFlag());
         userService.updateById(userEntity);
 
         return new Result();

+ 3 - 0
yezhu-api/src/main/java/com/kioor/user/dto/UserRequestDTO.java

@@ -27,6 +27,9 @@ public class UserRequestDTO {
     @NotBlank(message = "用户名不能为空")
     private String username;
 
+    @Schema(description = "密码")
+    private String password;
+
     @Schema(description = "签名")
     private String remarks;
 

+ 4 - 0
yezhu-api/src/main/java/com/kioor/websocket/WebSocketServer.java

@@ -98,6 +98,10 @@ public class WebSocketServer {
     public void onClose(Session session) {
         //客户端断开连接
         log.debug("websocket close, session id:" + session.getId());
+        if(servers.get(session.getId()) == null){
+            log.debug("websocket close, session id not found:" + session.getId());
+            return;
+        }
         Long userId = servers.get(session.getId()).getUserId();
         //踢下线
         kickUserOffline(userId);