Merge branch 'dev'

zhongzheng-admin/src/main/resources/application.yml

@@ -261,7 +261,7 @@ tencent:
 
 aliyun:
   sms:
-    signName: 祥粤学校
+    signName: 中正科技
     registerTemplateCode: SMS_228670004
     loginTemplateCode: SMS_228670005
     forgetTemplateCode: SMS_228685033

zhongzheng-api/src/main/resources/application.yml

@@ -256,7 +256,7 @@ tencent:
 
 aliyun:
   sms:
-    signName: 祥粤学校
+    signName: 中正科技
     registerTemplateCode: SMS_228670004
     loginTemplateCode: SMS_228670005
     forgetTemplateCode: SMS_228685033

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -1255,7 +1255,7 @@ public class WxLoginService implements IWxLoginService {
         if (user == null) {
             throw new CustomException("您尚未注册，请前往小程序注册");
         }
-        if (!Validator.isNotNull(user.getGzhOpenId())) {
+        if (Validator.isEmpty(user.getGzhOpenId())) {
             user.setGzhOpenId(openId);
             user.setUnionId(unionId);
             iUserService.updateById(user);

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -1254,7 +1254,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         String url = "";
         //中正学堂PC域名和H5域名 https://zzyxt.gdzzkj.net/  h.gdzzkj.net
 //        String domain = "http://192.168.1.222:6002/";
-//        String domainH5 = "https://h.xyyxt.net";
+//        String domainH5 = "http://120.79.166.78:19006";
         String domain = "https://zzyxt.gdzzkj.net/";
         String domainH5 = "https://h.gdzzkj.net";
         Long tenantId = 867735392558919680L; //祥粤云
@@ -1262,7 +1262,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             domain = "https://web.xyyxt.net/";
             domainH5 = "https://h.xyyxt.net";
 //            domain = "http://192.168.1.222:6002/";
-//            domainH5 = "https://h.xyyxt.net";
+//            domainH5 = "http://120.79.166.78:19006";
         }
         Goods goods = baseMapper.queryGoodsByIdTenant(bo.getGoodsId(), bo.getTenantId());
         if (ObjectUtils.isNull(goods)) {