hongxudong 2 лет назад
Родитель
Сommit
a7f0ae416b

+ 2 - 1
src/main/java/com/dk/common/infrastructure/aspect/ServiceAspect.java

@@ -104,7 +104,8 @@ public class ServiceAspect implements HandlerInterceptor {
         //查询及登录方法跳过
         if (!joinPoint.getSignature().getName().startsWith("select") &&
                 !joinPoint.getSignature().getName().startsWith("get") &&
-                !joinPoint.getSignature().getName().equals("login")
+                !joinPoint.getSignature().getName().equals("login") &&
+                !joinPoint.getSignature().getDeclaringTypeName().equals("com.dk.oauth.service.impl.AuthAccessTokenServiceImpl")
         ) {
             UserVO user = authUtils.getUser();
             if (user!=null && !skipMethod.contains(joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName())) {

+ 3 - 10
src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -650,18 +650,11 @@ public class Constant {
         REDIS_USER("USER-"),
         REDIS_REQUEST("Request-"),
         REDIS_HG_HAP_TOKEN("HG-HAP-TOKEN"),
-        REDIS_QV_TOKEN("QV-TOKEN-"),
-        REDIS_ORDER_KJL_DESIGN_ING("KJL-DESIGN-ING-"),
 
-        // 客户跟进
-        REDIS_CUSTOMER_FOLLOW("CUSTOMER-FOLLOW-"),
-        REDIS_CUSTOMER_FOLLOW_VALUE("-VALUE"),
 
-        //打印机
-        REDIS_LABEL_PRINTER("Label-Printer-"),
-
-        //打印模板
-        REDIS_LABEL_PRINT_LAYOUT("Label-Print-Layout-"),
+        //微信
+        REDIS_WECHAT_ACCESS_TOKEN("DKIC_WECHAT-ACCESS-TOKEN"),
+        REDIS_LOGIN_UUID("DKIC_LOGIN-UUID-"),
 
         ;
 

+ 4 - 2
src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -19,10 +19,12 @@ public enum ErrorCodeEnum {
     USER_IS_BINDED(1009, "当前用户已被其他人绑定"),
     USER_HAS_LOGIN_BY_OTHER(1010, "当前用户已在其他设备登录,请重新登录"),
     USER_IS_EXIST_TEL(1011, "电话已存在"),
-    USER_IS_EXIST_USERCODE(1012, "用户编码已存在"),
+    USER_IS_EXIST(1012, "用户已注册"),
     USER_IS_EXIST_QV_USERID_TEL(1014, "企微用户ID和电话都在企业微信中已存在"),
-    USER_QV_NOT_EXIST(1015, "当前用户不存在"),
+    USER_NOT_EXIST(1015, "当前用户不存在"),
     FTY_ERROR(1016, "工厂编码错误"),
+    USER_NO_COMPANY(1017, "当前用户未绑定公司"),
+    COMPANY_CAN_NOT_LOGIN(1018, "当前用户绑定公司不可登录"),
     APP_NOT_EXIST(9999, "当前系统应用不存在"),
 
     SYSTEM_NULL(2001, "系统不存在"),