提交用户类别和conf环境占位符

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -95,4 +95,9 @@ public class SysUserDTO implements Serializable {
     @ApiModelProperty(value = "部门名称")
     private String deptName;
 
+    /**
+     * 用户标签key
+     */
+    private String userTagKey;
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -95,4 +95,9 @@ public class SysUserEntity extends BaseEntity {
     @TableField(exist = false)
     private String deptName;
 
+    /**
+     * 用户标签键值
+     */
+    private String userTagKey;
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml

@@ -18,7 +18,25 @@
     </select>
 
     <select id="getById" resultType="com.elink.esua.epdc.entity.SysUserEntity">
-        select t1.*, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1
+         select
+         t1.id,
+         t1.username,
+         t1.real_name,
+         t1.head_url,
+         t1.gender,
+         t1.email,
+         t1.mobile,
+         t1.dept_id,
+         t1.super_admin,
+         t1.status,
+         t1.remark,
+         t1.del_flag,
+         t1.creator,
+         t1.create_date,
+         t1.updater,
+         t1.update_date,
+         t1.user_tag_key,
+         (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1
          where t1.id = #{value} and t1.del_flag = 0
     </select>
 

esua-epdc/epdc-gateway/pom.xml

@@ -92,11 +92,12 @@
 
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
+                <!--                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
-                <!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
+                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
+                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
+                <!--                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>-->
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
                 <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -99,6 +99,30 @@
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
+
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+                <includes>
+                    <include>**/application*.yml</include>
+                    <include>**/*.properties</include>
+                    <include>logback-spring.xml</include>
+                    <include>registry.conf</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+                <excludes>
+                    <exclude>**/application*.yml</exclude>
+                    <exclude>**/*.properties</exclude>
+                    <exclude>registry.conf</exclude>
+                    <exclude>logback-spring.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
     </build>
 
     <profiles>
@@ -125,6 +149,7 @@
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.host>47.104.224.45</nacos.host>
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
                 <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
@@ -156,6 +181,7 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.host>47.104.224.45</nacos.host>
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
                 <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
@@ -187,6 +213,7 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>172.31.171.61:9300</nacos.server-addr>
+                <nacos.host>172.31.171.61</nacos.host>
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
                 <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf

@@ -3,7 +3,7 @@ registry {
   type = "nacos"
 
   nacos {
-    serverAddr = "47.104.224.45"
+    serverAddr = @nacos.host@
     namespace = "public"
     cluster = "default"
   }
@@ -14,7 +14,7 @@ config {
   type = "nacos"
 
   nacos {
-    serverAddr = "47.104.224.45"
+    serverAddr = @nacos.host@
     namespace = "public"
     cluster = "default"
   }