Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java

@@ -37,8 +37,8 @@ public class TenantContextHolder {
     public static Long getRequiredTenantId() {
         Long tenantId = getTenantId();
         if (tenantId == null) {
-            throw new NullPointerException("TenantContextHolder 不存在租户编号！可参考文档："
-                + DocumentEnum.TENANT.getUrl());
+            throw new NullPointerException("商户id不存在"
+                );
         }
         return tenantId;
     }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import cn.iocoder.yudao.module.member.controller.admin.user.dto.AdminUserQueryDTO;
 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserUpdateMobileReqVO;
@@ -104,6 +105,7 @@ public class MemberUserServiceImpl implements MemberUserService {
         user.setPassword(encodePassword("123456")); // 加密密码
         user.setRegisterIp(registerIp);
         user.setPromoterId(promoterId);
+        user.setTenantId(TenantContextHolder.getRequiredTenantId());
         memberUserMapper.insert(user);
         return user;
     }

yudao-server/src/main/resources/application-prod.yaml

@@ -240,5 +240,5 @@ wx:
       database: 16 # 数据库索引
       password: 20221122@dev # 密码，建议生产环境开启
 phone:
-  query-url: http://phone.cyywl.top/cyywl-phone-query-api/
+  query-url: http://cy-phone-bill-inquiry-server:4006/cyywl-phone-query-api/
   token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0

yudao-server/src/main/resources/application-test.yaml

@@ -222,3 +222,7 @@ wx:
       port: 6369 # 端口
       database: 16 # 数据库索引
       password: 20221122@dev # 密码，建议生产环境开启
+
+phone:
+  query-url: https://cmx.bskies.cc:8000/cyywl-phone-query-api/
+  token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0

yudao-ui-admin/src/views/login.vue

@@ -75,14 +75,14 @@
               </el-form-item>
 
               <!--  社交登录 -->
-             <el-form-item style="width:100%;">
-                  <div class="oauth-login" style="display:flex">
-                    <div class="oauth-login-item" v-for="item in SysUserSocialTypeEnum" :key="item.type" @click="doSocialLogin(item)">
-                      <img :src="item.img" height="25px" width="25px" alt="登录" >
-                      <span>{{item.title}}</span>
-                    </div>
-                </div>
-              </el-form-item>
+<!--             <el-form-item style="width:100%;">-->
+<!--                  <div class="oauth-login" style="display:flex">-->
+<!--                    <div class="oauth-login-item" v-for="item in SysUserSocialTypeEnum" :key="item.type" @click="doSocialLogin(item)">-->
+<!--                      <img :src="item.img" height="25px" width="25px" alt="登录" >-->
+<!--                      <span>{{item.title}}</span>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--              </el-form-item>-->
 
             </el-form>
           </div>
@@ -132,8 +132,8 @@ export default {
       mobileCodeTimer: 0,
       loginForm: {
         loginType: "uname",
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         captchaVerification: "",
         mobile: "",
         mobileCode: "",