Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/common/config/WebSocketConfig.java

@@ -6,8 +6,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-//    @Bean
-//    public ServerEndpointExporter serverEndpointExporter() {
-//        return new ServerEndpointExporter();
-//    }
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
 }

src/main/java/cn/cslg/pas/common/core/GlobalExceptionHandler.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.common.core;
 
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -13,11 +14,17 @@ import org.springframework.web.context.request.WebRequest;
 @ControllerAdvice
 public class GlobalExceptionHandler {
 
-    @ExceptionHandler(value = {Exception.class})
+    @ExceptionHandler(value = {XiaoShiException.class})
     @ResponseBody
     public Response handleAllExceptions(XiaoShiException ex) {
         // 返回一个包含错误信息的 HTTP 响应
         return Response.error(ex.getErrorCode(), ex.getErrorMessage());
     }
 
+    @ExceptionHandler(value = {UnLoginException.class})
+    @ResponseBody
+    public Response handleAllExceptions(UnLoginException ex) {
+        // 返回一个包含错误信息的 HTTP 响应
+        return Response.error("401", "未登录");
+    }
 }

src/main/java/cn/cslg/pas/service/common/PersonFieldService.java

@@ -263,11 +263,8 @@ public class PersonFieldService {
         Integer productId = getTabelColumDTO.getProductId();
         //根据登录人id和type查询
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
         String key = "";
 
@@ -617,8 +614,8 @@ public class PersonFieldService {
         try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+        throw new UnLoginException("未登录");
+    }
         String userId = personnelVO.getId();
         String tableName = addSelfFieldDTO.getTableName();
         if (tableName == null||tableName.equals("")) {