zh_CN

src/main/java/com/dk/common/infrastructure/aspect/ServiceAspect.java

@@ -121,7 +121,7 @@ public class ServiceAspect implements HandlerInterceptor {
 //            /* 从请求头中获取主键Id，用于用Id进行查询的是否加入语言和公司 */
 //            MybatisSqlIntercept.primaryKey = httpServletRequest.getHeader("primaryKey");
             /* 从请求头中获取国际化参数 */
-            MybatisSqlIntercept.I18N = httpServletRequest.getHeader("i18n");
+//            MybatisSqlIntercept.I18N = httpServletRequest.getHeader("i18n");
 
 //        opInfoMapper.setOpInfo("","","");
         } catch (Exception ex) {

src/main/java/com/dk/common/infrastructure/util/MybatisSqlIntercept.java

@@ -48,7 +48,6 @@ import java.util.Map;
                 Object.class, RowBounds.class, ResultHandler.class})})
 public class MybatisSqlIntercept implements Interceptor {
 
-    public static String I18N = "";
 //    public static String primaryKey = null;
 
     @Value("${aes-key}")
@@ -69,9 +68,7 @@ public class MybatisSqlIntercept implements Interceptor {
             }
 
             String authorization = httpServletRequest.getHeader("Authorization");
-
             if(authorization != null) {
-
                 String[] tokens = authorization.split(" ");
                 String decrypt = AESSecurityUtil.decrypt(AESKey, tokens[1]);
                 String cpIdString = JwtUtil.getCpId(decrypt);
@@ -79,7 +76,11 @@ public class MybatisSqlIntercept implements Interceptor {
                     //设置企业Id
                     cpId = Integer.valueOf(cpIdString);
                 }
+            }
 
+            String I18N = "zh_CN";
+            if(httpServletRequest!=null){
+                I18N = httpServletRequest.getHeader("i18n");
             }
 
             Object[] args = invocation.getArgs();