Merge branch 'master-tiande' into master_tiande_company

ace-auth/ace-auth-server/src/main/resources/bootstrap.yml

@@ -16,6 +16,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

ace-control/ace-monitor/src/main/resources/application.yml

@@ -5,6 +5,7 @@ spring:
     nacos:
       discovery:
         server-addr: 127.0.0.1:8848
+        namespace: tiande_spcloud
 
 server:
   port: 8764 #启动端口

ace-gate/src/main/resources/bootstrap.yml

@@ -19,6 +19,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

ace-modules/ace-admin/src/main/resources/bootstrap.yml

@@ -18,7 +18,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
-
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -240,7 +240,7 @@
         <if test="realName !=null and  realName != ''">
             and d.realname like CONCAT('%',#{realName},'%')
         </if>
-        <if test="citySet != null ">
+        <if test="citySet != null and citySet.size > 0 ">
             and d.city_code in
             <foreach collection="citySet" item="item" index="index" open="(" separator="," close=")">
                 #{item}

xx-activity/xx-activity-server/src/main/resources/bootstrap.yml

@@ -26,6 +26,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

xx-app/xx-app-server/src/main/resources/bootstrap.yml

@@ -26,6 +26,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

xx-campsite/xx-campsite-server/src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
-
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

xx-im/xx-im-server/src/main/resources/bootstrap.yml

@@ -26,6 +26,7 @@ spring:
         server-addr: 127.0.0.1:8848
           #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

xx-order/xx-order-server/src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，+ mongodb日志配置
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
-
+        namespace: tiande_spcloud
 #---
 #spring:
 #  profiles: pro

xx-summit/xx-summit-server/src/main/resources/bootstrap.yml

@@ -26,6 +26,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

xx-tour/xx-tour-server/src/main/resources/bootstrap.yml

@@ -37,6 +37,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

xx-uccn/xx-uccn-server/src/main/resources/bootstrap.yml

@@ -17,6 +17,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

xx-universal/xx-universal-server/src/main/resources/bootstrap.yml

@@ -27,6 +27,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

xx-user-behavior-collect/xx-user-behavior-server/src/main/resources/bootstrap.yml

@@ -17,6 +17,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro

xx-vehicle/xx-vehicle-server/src/main/resources/bootstrap.yml

@@ -26,7 +26,7 @@ spring:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
-
+        namespace: tiande_spcloud
 ---
 spring:
   profiles: pro