From 8cfba0d8566dafa58a0a094066dabbf15a07d799 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 10:24:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=95=86=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/tenant/core/context/TenantContextHolder.java | 4 ++-- .../module/member/service/user/MemberUserServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java index 93a17b376..c16336992 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java +++ b/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; } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index c5243d4ff..df8bb4bff 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/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; } From ad38894bf345e6c4c992d9b1a200537c743c4ddf Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 10:41:30 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=95=86=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin/src/views/login.vue | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/yudao-ui-admin/src/views/login.vue b/yudao-ui-admin/src/views/login.vue index 15288db4d..6a428cdab 100644 --- a/yudao-ui-admin/src/views/login.vue +++ b/yudao-ui-admin/src/views/login.vue @@ -75,14 +75,14 @@ - -
- -
- + + + + + + + + @@ -132,8 +132,8 @@ export default { mobileCodeTimer: 0, loginForm: { loginType: "uname", - username: "admin", - password: "admin123", + username: "", + password: "", captchaVerification: "", mobile: "", mobileCode: "", From ad0a85b1979bea40b2d71f42906d4eec34606a08 Mon Sep 17 00:00:00 2001 From: axzsd Date: Fri, 26 May 2023 11:18:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index 9729d700c..87f3a7fa6 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/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 \ No newline at end of file From 462e270ed111be65296cff7a7642ebb452849a53 Mon Sep 17 00:00:00 2001 From: axzsd Date: Fri, 26 May 2023 11:20:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-test.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yudao-server/src/main/resources/application-test.yaml b/yudao-server/src/main/resources/application-test.yaml index 1383eea5b..96125b299 100644 --- a/yudao-server/src/main/resources/application-test.yaml +++ b/yudao-server/src/main/resources/application-test.yaml @@ -222,3 +222,6 @@ wx: port: 6369 # 端口 database: 16 # 数据库索引 password: 20221122@dev # 密码，建议生产环境开启 +phone: + query-url: http://192.168.1.94:4006/cyywl-phone-query-api/ + token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0 \ No newline at end of file From ea9900233b3d1e41f2acf4be4d15d387c8fde046 Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 26 May 2023 11:22:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-test.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yudao-server/src/main/resources/application-test.yaml b/yudao-server/src/main/resources/application-test.yaml index 1383eea5b..0a92e6ae6 100644 --- a/yudao-server/src/main/resources/application-test.yaml +++ b/yudao-server/src/main/resources/application-test.yaml @@ -222,3 +222,6 @@ wx: port: 6369 # 端口 database: 16 # 数据库索引 password: 20221122@dev # 密码，建议生产环境开启 +phone: + query-url: http://phone.cyywl.top/cyywl-phone-query-api/ + token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0 \ No newline at end of file From 8ae53f6b089028737089dbed164ce0b2b046c7e2 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 11:23:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-test.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yudao-server/src/main/resources/application-test.yaml b/yudao-server/src/main/resources/application-test.yaml index 1383eea5b..cf4165e83 100644 --- a/yudao-server/src/main/resources/application-test.yaml +++ b/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