From 8d682f5b182f5f3c7a1e8751429b774cadd5eddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=97=AD?= <2795210596@qq.com> Date: Thu, 20 Mar 2025 22:03:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tmerclub-im/src/main/resources/bootstrap.yml | 2 +- tmerclub-marketing/src/main/resources/bootstrap.yml | 2 +- tmerclub-order/src/main/resources/bootstrap.yml | 2 +- tmerclub-payment/src/main/resources/bootstrap.yml | 2 +- tmerclub-product/src/main/resources/bootstrap.yml | 2 +- tmerclub-search/src/main/resources/bootstrap.yml | 2 +- tmerclub-seckill/src/main/resources/bootstrap.yml | 2 +- tmerclub-user/src/main/resources/bootstrap.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tmerclub-im/src/main/resources/bootstrap.yml b/tmerclub-im/src/main/resources/bootstrap.yml index ff23e25..8c26ba9 100644 --- a/tmerclub-im/src/main/resources/bootstrap.yml +++ b/tmerclub-im/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: ${tmerclub_PORT:9120} + port: ${TMERCLUB_IM_PORT:9120} spring: application: name: @artifactId@ diff --git a/tmerclub-marketing/src/main/resources/bootstrap.yml b/tmerclub-marketing/src/main/resources/bootstrap.yml index 167b6d9..4703e91 100644 --- a/tmerclub-marketing/src/main/resources/bootstrap.yml +++ b/tmerclub-marketing/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: ${tmerclub_PORT:9109} + port: ${TMERCLUB_MARKETING_PORT:9109} spring: application: name: @artifactId@ diff --git a/tmerclub-order/src/main/resources/bootstrap.yml b/tmerclub-order/src/main/resources/bootstrap.yml index e2a46fd..00c8859 100644 --- a/tmerclub-order/src/main/resources/bootstrap.yml +++ b/tmerclub-order/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: ${tmerclub_PORT:9106} + port: ${TMERCLUB_ORDER_PORT:9106} spring: application: name: @artifactId@ diff --git a/tmerclub-payment/src/main/resources/bootstrap.yml b/tmerclub-payment/src/main/resources/bootstrap.yml index d0faeb0..8d95e01 100644 --- a/tmerclub-payment/src/main/resources/bootstrap.yml +++ b/tmerclub-payment/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: ${tmerclub_PORT:9113} + port: ${TMERCLUB_PAYMENT_PORT:9113} spring: application: name: @artifactId@ diff --git a/tmerclub-product/src/main/resources/bootstrap.yml b/tmerclub-product/src/main/resources/bootstrap.yml index b27d368..52bdb29 100644 --- a/tmerclub-product/src/main/resources/bootstrap.yml +++ b/tmerclub-product/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: ${tmerclub_PORT:9104} + port: ${TMERCLUB_PRODUCT_PORT:9104} spring: application: name: @artifactId@ diff --git a/tmerclub-search/src/main/resources/bootstrap.yml b/tmerclub-search/src/main/resources/bootstrap.yml index 4c55a59..d5ccdd0 100644 --- a/tmerclub-search/src/main/resources/bootstrap.yml +++ b/tmerclub-search/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: ${tmerclub_PORT:9108} + port: ${TMERCLUB_SEARCH_PORT:9108} spring: application: name: @artifactId@ diff --git a/tmerclub-seckill/src/main/resources/bootstrap.yml b/tmerclub-seckill/src/main/resources/bootstrap.yml index f4dc42e..065f884 100644 --- a/tmerclub-seckill/src/main/resources/bootstrap.yml +++ b/tmerclub-seckill/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: ${tmerclub_PORT:9115} + port: ${TMERCLUB_SECKILL_PORT:9115} spring: application: name: @artifactId@ diff --git a/tmerclub-user/src/main/resources/bootstrap.yml b/tmerclub-user/src/main/resources/bootstrap.yml index 5f143bf..61ef677 100644 --- a/tmerclub-user/src/main/resources/bootstrap.yml +++ b/tmerclub-user/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: ${tmerclub_PORT:9105} + port: ${TMERCLUB_USER_PORT:9105} spring: application: name: @artifactId@ From 06778fb0f48efd656cfe7d7b758672b934c20a23 Mon Sep 17 00:00:00 2001 From: wzgaoyn Date: Thu, 20 Mar 2025 22:12:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tmerclub-auth/pom.xml | 5 +++++ .../main/java/com/tmerclub/cloud/AuthApplication.java | 3 +++ tmerclub-auth/src/main/resources/bootstrap.yml | 6 +++--- .../src/main/resources/mapper/AuthAccountMapper.xml | 10 +++++----- .../src/main/resources/mapper/AuthSocialMapper.xml | 2 +- .../src/main/resources/mapper/MenuPermissionMapper.xml | 4 ++-- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/tmerclub-auth/pom.xml b/tmerclub-auth/pom.xml index a5594e2..609fd2a 100644 --- a/tmerclub-auth/pom.xml +++ b/tmerclub-auth/pom.xml @@ -72,6 +72,11 @@ tmerclub-api-order ${project.version} + + org.projectlombok + lombok + provided + diff --git a/tmerclub-auth/src/main/java/com/tmerclub/cloud/AuthApplication.java b/tmerclub-auth/src/main/java/com/tmerclub/cloud/AuthApplication.java index adf113c..19c3fa9 100644 --- a/tmerclub-auth/src/main/java/com/tmerclub/cloud/AuthApplication.java +++ b/tmerclub-auth/src/main/java/com/tmerclub/cloud/AuthApplication.java @@ -1,6 +1,7 @@ package com.tmerclub.cloud; +import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,10 +13,12 @@ import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServic */ @SpringBootApplication(scanBasePackages = "com.tmerclub.cloud", exclude = UserDetailsServiceAutoConfiguration.class) @EnableDubbo(scanBasePackages = "com.moyuer.tmerclub.**.feign") +@Slf4j public class AuthApplication { public static void main(String[] args) { SpringApplication.run(AuthApplication.class, args); + log.info("------ AuthApplication start success ------"); } } diff --git a/tmerclub-auth/src/main/resources/bootstrap.yml b/tmerclub-auth/src/main/resources/bootstrap.yml index 00d8acc..447ebe5 100644 --- a/tmerclub-auth/src/main/resources/bootstrap.yml +++ b/tmerclub-auth/src/main/resources/bootstrap.yml @@ -15,9 +15,9 @@ spring: file-extension: yml shared-configs: - application.${spring.cloud.nacos.config.file-extension} - username: ${NACOS_USERNAME:nacos} - password: ${NACOS_PASSWORD:BYzL!Z3C} - namespace: ${NACOS_NAMESPACE:} + username: ${spring.cloud.nacos.discovery.username} + password: ${spring.cloud.nacos.discovery.password} + namespace: ${spring.cloud.nacos.discovery.namespace} logging: tracer: pattern: '%5p [${spring.application.name:},%X{X-B3-Parent-SpanName},%X{X-B3-TraceId},%X{X-B3-SpanId}]' diff --git a/tmerclub-auth/src/main/resources/mapper/AuthAccountMapper.xml b/tmerclub-auth/src/main/resources/mapper/AuthAccountMapper.xml index 10bede0..2a24c51 100644 --- a/tmerclub-auth/src/main/resources/mapper/AuthAccountMapper.xml +++ b/tmerclub-auth/src/main/resources/mapper/AuthAccountMapper.xml @@ -133,7 +133,7 @@ - select uid,email, phone, username,status from auth_account where status != -1 @@ -152,7 +152,7 @@ ) - select username,`status`,user_id,is_admin,phone from auth_account where sys_type = #{systemType} and user_id in #{userId} @@ -165,7 +165,7 @@ WHERE user_id = #{userId} - select email,phone,username,`status`,user_id,uid from auth_account where sys_type = #{sysType} @@ -178,7 +178,7 @@ - select user_id, sys_type,uid,password,is_admin,tenant_id, status, email,phone,username from auth_account where sys_type = #{sysType} and status != -1 @@ -200,7 +200,7 @@ #{userId} - select user_id, sys_type,uid,phone,password,is_admin,tenant_id, status,username, is_pass_shop from auth_account where sys_type = #{sysType} and is_admin = 1 and tenant_id = #{tenantId} limit 1 diff --git a/tmerclub-auth/src/main/resources/mapper/AuthSocialMapper.xml b/tmerclub-auth/src/main/resources/mapper/AuthSocialMapper.xml index 2bb88bc..b493ed7 100644 --- a/tmerclub-auth/src/main/resources/mapper/AuthSocialMapper.xml +++ b/tmerclub-auth/src/main/resources/mapper/AuthSocialMapper.xml @@ -74,7 +74,7 @@ select count(*) from auth_social where uid = #{uid} and social_type = #{socialType} - SELECT asl.*, aa.user_id diff --git a/tmerclub-auth/src/main/resources/mapper/MenuPermissionMapper.xml b/tmerclub-auth/src/main/resources/mapper/MenuPermissionMapper.xml index be14e95..b45eb80 100644 --- a/tmerclub-auth/src/main/resources/mapper/MenuPermissionMapper.xml +++ b/tmerclub-auth/src/main/resources/mapper/MenuPermissionMapper.xml @@ -125,7 +125,7 @@ JOIN menu_permission mp ON rm.menu_permission_id = mp.menu_permission_id WHERE ur.user_id = #{userId} - select permission, uri, method, true as hasPermission from menu_permission @@ -151,7 +151,7 @@ - select * from menu_permission where menu_permission_id in