Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java

@@ -44,13 +44,13 @@ public class AuthServiceImpl implements AuthService {
         if (wxLoginVO.getFromPort().toString().equals(WxConstant.APP.toString())) {
             //调用小程序登录接口，里面包含unionId
             String appWxJson = wxService.appLogin(wxLoginVO);
-            log.error("wx appLogin msg==>" + appWxJson);
             if (appWxJson == null) {
                 return ResultBody.error(ResultEnum.APPLET_PORT_TYPE_ERROR);
             }
+            log.info("wx appLogin msg==>" + JSONObject.toJSONString(appWxJson));
             JSONObject json = JSON.parseObject(appWxJson);
             if (!json.containsKey(WxConstant.OPEN_ID) || !json.containsKey(WxConstant.SESSION_KEY)) {
-                log.error("wx appLogin error==>" + json);
+                log.error("wx appLogin error==>" + JSONObject.toJSONString(json));
                 return ResultBody.error(ResultEnum.APPLET_LOGIN_ERROR, json);
             }
             unionId = json.getString(WxConstant.UNION_ID);
@@ -59,13 +59,13 @@ public class AuthServiceImpl implements AuthService {
         }else if (wxLoginVO.getFromPort().equals(WxConstant.WEB)){
             //获取access_token接口，里面包含unionId
             String pcWxJson = wxService.pcLogin(wxLoginVO);
-            log.error("wx pcLogin msg==>" + pcWxJson);
             if (pcWxJson == null) {
                 return ResultBody.error(ResultEnum.APPLET_PORT_TYPE_ERROR);
             }
+            log.info("wx pcLogin msg==>" + JSONObject.toJSONString(pcWxJson));
             JSONObject json = JSON.parseObject(pcWxJson);
             if (!json.containsKey(WxConstant.OPEN_ID) ||!json.containsKey(WxConstant.SESSION_KEY)) {
-                log.error("wx pcLogin error==>" + json);
+                log.error("wx pcLogin error==>" + JSONObject.toJSONString(json));
                 return ResultBody.error(ResultEnum.APPLET_LOGIN_ERROR, json);
             }
             unionId = json.getString(WxConstant.UNION_ID);

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: 06badeb1febba2f673e79c063949db5f6fccae23
+  newTag: df11775e8608abe924f6185c4cf0cf4c006f8362