修改配置

tmerclub-auth/pom.xml

@@ -72,6 +72,11 @@
             <artifactId>tmerclub-api-order</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

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 ------");
     }
 
 }

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}
+        username: ${spring.cloud.nacos.discovery.username}
-        password: ${NACOS_PASSWORD:BYzL!Z3C}
+        password: ${spring.cloud.nacos.discovery.password}
-        namespace: ${NACOS_NAMESPACE:}
+        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}]'

tmerclub-auth/src/main/resources/mapper/AuthAccountMapper.xml

@@ -133,7 +133,7 @@
     <select id="getAccountByInputAccount" resultType="com.tmerclub.cloud.auth.model.AuthAccount">
     select <include refid="Base_Column_List"/> from auth_account where phone = #{validAccount} and sys_type = #{systemType} and `status` &gt;= 0
   </select>
-  <select id="listByUserAccount" resultType="vo.auth.api.com.tmerclub.cloud.AuthAccountVO">
+  <select id="listByUserAccount" resultType="com.tmerclub.cloud.api.auth.vo.AuthAccountVO">
     select uid,email, phone, username,status  from auth_account
     where status != -1
     <if test="sysType != null">
@@ -152,7 +152,7 @@
     )
   </select>
 
-  <select id="listUserByUserIdsAndType" resultType="vo.auth.api.com.tmerclub.cloud.AuthAccountVO">
+  <select id="listUserByUserIdsAndType" resultType="com.tmerclub.cloud.api.auth.vo.AuthAccountVO">
     select username,`status`,user_id,is_admin,phone from auth_account where sys_type = #{systemType} and user_id in
     <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
       #{userId}
@@ -165,7 +165,7 @@
     WHERE user_id = #{userId}
   </select>
 
-  <select id="listByUserIdsAndPhoneAndType" resultType="vo.auth.api.com.tmerclub.cloud.AuthAccountVO">
+  <select id="listByUserIdsAndPhoneAndType" resultType="com.tmerclub.cloud.api.auth.vo.AuthAccountVO">
     select email,phone,username,`status`,user_id,uid from auth_account
     where sys_type = #{sysType}
     <if test="phone != null and phone != ''">
@@ -178,7 +178,7 @@
       </foreach>
     </if>
   </select>
-  <select id="getAuthAccountByInputUserName" resultType="vo.auth.api.com.tmerclub.cloud.AuthAccountVO">
+  <select id="getAuthAccountByInputUserName" resultType="com.tmerclub.cloud.api.auth.vo.AuthAccountVO">
     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
     <if test="inputUserNameType == 1">
@@ -200,7 +200,7 @@
       #{userId}
     </foreach>
   </select>
-  <select id="getAccountInfoByTenantId" resultType="vo.auth.api.com.tmerclub.cloud.AuthAccountVO">
+  <select id="getAccountInfoByTenantId" resultType="com.tmerclub.cloud.api.auth.vo.AuthAccountVO">
     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
   </select>

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>
 
-  <select id="listAvailableSocial" resultType="vo.auth.api.com.tmerclub.cloud.AuthSocialVO">
+  <select id="listAvailableSocial" resultType="com.tmerclub.cloud.api.auth.vo.AuthSocialVO">
     SELECT
       asl.*,
       aa.user_id

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>
-    <select id="listUriPermissionInfo" resultType="bo.rbac.api.com.tmerclub.cloud.UriPermissionBO">
+    <select id="listUriPermissionInfo" resultType="com.tmerclub.cloud.api.rbac.bo.UriPermissionBO">
 
         select permission, uri, method, true as hasPermission
         from menu_permission
@@ -151,7 +151,7 @@
 
     </select>
 
-    <select id="getUriPermissionListByMenuPermIdList" resultType="bo.rbac.api.com.tmerclub.cloud.UriPermissionBO">
+    <select id="getUriPermissionListByMenuPermIdList" resultType="com.tmerclub.cloud.api.rbac.bo.UriPermissionBO">
         select * from menu_permission
         where menu_permission_id in
         <foreach collection="menuPermIdList" item="menuPermId" separator="," open="(" close=")">