feat:新增定时更新人员部门

zydd-misc/src/main/java/com/tykj/zydd/misc/exception/GlobalExceptionHandler.java

@@ -62,6 +62,13 @@ public class GlobalExceptionHandler {
         return e.getResponseObj();
     }
 
+//    @ExceptionHandler(ApiException.class)
+//    public ResponseObj errorMessage(ApiException e) {
+//        log.warn("[自定义异常]"+e.getResponseObj().getMessage());
+//        return e.getResponseObj();
+//    }
+
+
     /**
      * 数据合法性验证报错会通过这个方法处理并通过统一的返回方式进行返回
      *

zydd-misc/src/main/java/com/tykj/zydd/misc/sm_utils/Sm4Util.java

@@ -132,7 +132,7 @@ public class Sm4Util {
 //        System.out.println("解密:" + decryptStr);
 
 
-        String decrypt = decrypt("No3E5a0/73I+/TMJZ43eVQ==", KEY);
+        String decrypt = decrypt("6nAW06JHV+7aPxIj1XYJmw==", KEY);
         System.out.println(decrypt);
 
     }

zydd-pickup/src/main/java/com/tykj/zydd/pickup/service/impl/PickUpServiceImpl.java

@@ -116,7 +116,7 @@ public class PickUpServiceImpl implements PickUpService {
                 userVO.setUserName(specificUser.getEmployeeName());
                 KxAdmin kxAdmin = kxAdmins.stream().filter(a -> a.getUsername().equals(specificUser.getEmployeeName())).findFirst().orElse(new KxAdmin());
                 if (kxAdmin.getAccount() == null) {
-                    throw new ApiException(specificUser.getEmployeeName() + "该用户没有从钉钉免登请先从钉钉登入");
+                    throw new ApiException(specificUser.getEmployeeName() + "该用户没有从钉钉免登请先从钉钉登入,或者对该用户进行停用处理");
                 }
                 userVO.setAccountId(kxAdmin.getAccount());
                 userVOS.add(userVO);
@@ -145,7 +145,7 @@ public class PickUpServiceImpl implements PickUpService {
                 pickUp.setStatus(1);
                 pickUp.setOrganizationCode(currentUser.getOrganizationCode());
                 pickUpDAO.save(pickUp);
-                throw new ApiException("该用户为被启用");
+                throw new ApiException("该用户未被启用");
             }
             SendWorkMessageDTO sendWorkMessageDTO = new SendWorkMessageDTO();
             sendWorkMessageDTO.setContent(notificationDTO.getContent());

zydd-union/src/main/resources/application-local.properties

@@ -5,7 +5,7 @@ spring.datasource.url=jdbc:mysql://localhost:3306/zzd?serverTimezone=Asia/Shangh
 spring.datasource.username=root
 spring.datasource.password=root
 
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=update
 spring.main.allow-bean-definition-overriding=true
 

zydd-union/src/main/resources/application-test.properties

@@ -5,7 +5,7 @@ spring.datasource.username=root
 spring.datasource.password=tykj@2022
 
 
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=update
 spring.main.allow-bean-definition-overriding=true
 

zydd-user/src/main/java/com/tykj/zydd/user/init/UserAndDepartmentInit.java

+package com.tykj.zydd.user.init;
+
+import com.tykj.zydd.user.service.ZyddUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+
+@Component
+@Slf4j
+public class UserAndDepartmentInit {
+
+
+    @Resource
+    private ZyddUserService zyddUserService;
+
+
+
+    @PostConstruct
+    @Scheduled(cron = "0 0 12 * * ?")
+    public void init(){
+        log.info("开始更新部门人员");
+        zyddUserService.cacheUnit();
+        log.info("部门人员已更新");
+    }
+}

zydd-user/src/main/java/com/tykj/zydd/user/jwt/JwtTokenAuthenticationFilter.java

 package com.tykj.zydd.user.jwt;
 
+import com.tykj.zydd.misc.exception.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.AntPathMatcher;
@@ -27,12 +28,51 @@ public class JwtTokenAuthenticationFilter extends GenericFilterBean {
         this.jwtTokenProvider = jwtTokenProvider;
     }
 
+//    @Override
+//    public void doFilter(ServletRequest req, ServletResponse res, FilterChain filterChain)
+//            throws IOException, ServletException {
+//        HttpServletRequest request = (HttpServletRequest) req;
+//        HttpServletResponse response = (HttpServletResponse) res;
+//        try {
+//            String token = jwtTokenProvider.resolveToken(request);
+//            if (token != null){
+//                //验证token
+//                Boolean aBoolean = jwtTokenProvider.redisValidToken(token);
+//                if (aBoolean) {
+//                    //说明token存在
+//                    jwtTokenProvider.getAuthentication(token);
+//                    //同时刷新token
+//                    jwtTokenProvider.flashToken(token);
+//                }else {
+////                    response.setStatus(HttpStatus.FORBIDDEN.value());
+////                    response.setContentType("application/json");
+////                    response.setCharacterEncoding("utf-8");
+////                    response.getWriter().println("{\"code\":403,\"msg\":\"token不合法\"}");
+////                    response.getWriter().flush();
+////                    response.getWriter().close();
+//                    throw new ApiException("token不合法", String.valueOf(HttpStatus.FORBIDDEN.value()));
+////                    return;
+//                }
+//            }
+//
+//        } catch (InvalidJwtAuthenticationException e) {
+////            response.setStatus(HttpStatus.FORBIDDEN.value());
+////            response.setContentType("application/json");
+////            response.setCharacterEncoding("utf-8");
+////            response.getWriter().println("{\"code\":403,\"msg\":\"token不合法\"}");
+////            response.getWriter().flush();
+////            response.getWriter().close();
+//            throw new ApiException("token不合法", String.valueOf(HttpStatus.FORBIDDEN.value()));
+//            return;
+//        }
+//        filterChain.doFilter(request,response);
+//    }
+
     @Override
     public void doFilter(ServletRequest req, ServletResponse res, FilterChain filterChain)
             throws IOException, ServletException {
         HttpServletRequest request = (HttpServletRequest) req;
         HttpServletResponse response = (HttpServletResponse) res;
-        try {
         String token = jwtTokenProvider.resolveToken(request);
         if (token != null){
             //验证token
@@ -43,7 +83,7 @@ public class JwtTokenAuthenticationFilter extends GenericFilterBean {
                 //同时刷新token
                 jwtTokenProvider.flashToken(token);
             }else {
-                    response.setStatus(HttpStatus.FORBIDDEN.value());
+                    response.setStatus(HttpStatus.OK.value());
                     response.setContentType("application/json");
                     response.setCharacterEncoding("utf-8");
                     response.getWriter().println("{\"code\":403,\"msg\":\"token不合法\"}");
@@ -52,16 +92,6 @@ public class JwtTokenAuthenticationFilter extends GenericFilterBean {
                     return;
             }
         }
-
-        } catch (InvalidJwtAuthenticationException e) {
-            response.setStatus(HttpStatus.FORBIDDEN.value());
-            response.setContentType("application/json");
-            response.setCharacterEncoding("utf-8");
-            response.getWriter().println("{\"code\":403,\"msg\":\"token不合法\"}");
-            response.getWriter().flush();
-            response.getWriter().close();
-            return;
-        }
         filterChain.doFilter(request,response);
     }