Merge branch 'develop'

cms-common/cms-common-util/src/main/java/com/mmc/iuav/http/HttpsRequestUtil.java

@@ -51,7 +51,14 @@ public class HttpsRequestUtil {
             if (conn.getResponseCode() == 200) {
                 rsp = getStreamAsString(conn.getInputStream(), "utf-8");
             } else {
-                rsp = getStreamAsString(conn.getErrorStream(), "utf-8");
+//                rsp = getStreamAsString(conn.getErrorStream(), "utf-8");
+                InputStream errorStream = conn.getErrorStream();
+                if (errorStream != null) {
+                    rsp = getStreamAsString(errorStream, "utf-8");
+                } else {
+                    // 处理没有错误流的情况，例如返回默认错误信息
+                    rsp = "Invalid Result - invalid business license";
+                }
             }
         } catch (Exception e) {
             if (null != out) {

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

@@ -95,6 +95,7 @@ public class AuthServiceImpl implements AuthService {
         String unionId;
         String openId;
         String sessionKey;
+        log.info("登录信息:{}",   wxLoginVO);
         log.info("上级推荐人:{}",   wxLoginVO.getRcdUserId());
         if (wxLoginVO.getFromPort().toString().equals(WxConstant.APP.toString())) {
             //调用小程序登录接口，里面包含unionId

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: dcde35a3fce63eb86a0c2aaf62982a7d2f916be4
+  newTag: 630bc290b85f8591c38152668845af8ec7d400f1