Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/TokenCheckHandleInterceptor.java

@@ -31,6 +31,7 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        //扫码登录还没做好，暂时先注释
 //        String requestURI = request.getRequestURI();
 //        //根据uri确认是否要拦截
 //        if (!shouldFilter(requestURI)){

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
 #        login-password: druid
   redis:
     database: 1
-    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
+    host: redis.default
     password: MMC@2022&REDIS
     port: 6379
 

csm-service/cms-service-user/src/main/resources/application-prod.yml

@@ -38,7 +38,7 @@ spring:
 #        login-password: druid
   redis:
     database: 1
-    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
+    host: redis.default
     password: MMC@2022&REDIS
     port: 6379
 

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: c4c184f6677536af1d4693f7fbcf5eb6b9784947
+  newTag: c806874e936588535446245fc63b8acc7dd8db5a