ArcFace64.dat

@@ -1 +1 @@
-EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHIYEWIHIGBHBOBFAZHKJFFEHICACEBBBMIPIDBQETFPBOIAFCFVHNFIGODZBXEADHFBFUJPIXHVAQGLHTGEEUBNDWCPGRBRGZIQFGHQFYFCBHFCGXIAGCBKHVBHGWJUIYBJFAGPFUEBENJVGMCIIUJSJKCBJTBXEQIOEIGIIYGJCHFZFGECHEBOCAHQGADQACCPBMDTBUCNAJCYDSCNBPIVDFIICCHPGUHJEZIJDUFPGXECJBBCEJHVAOJFCHFKCWCICAEKHODKBTJKATCLALJDCOHUFTANAQBMBXAEEEFVJJDJJTBOGRDGJMIBGODYHWBDECEZFSEMCUFLELDMBBHRCFCXEKETEVEXJTBRFJDMJPBUEICZGBABFHIYDBBAIFEUBXDWAPGBGMDYHQAIFBFEAHDBECBUDKJQEVECHXCZFRAKHKHQCLJOACJFBTCPJQHNGGJLCSCPARCJAUIJHKGVEIAABXDXELJACXGSBPHMEEGDDSFZCWFQEKBVBCEKHRFTGDDIHNDFEOIVHXAAFUEDCJDEGGADHCJCFNCFEUDIJJFHGEBIJEGEDQEBEOELDPAUHCITAZAACSAWHAEIHUGMAFGFGVBPDHDYJJGYITGPAMIQBEIZDUFDGYBLBMCYBMGCCOISBGIACLCFGPHEDGCPAHIXDOCHJUAXCOHWANJLGUIWDNDSEHIPIHIVFVDWAHDVIMEOFAJNBFAJHFHGCIEABGFDIQBOEKIQDPDLJBIUGCEOHUBCIGILECJNDREWFEHACPCADSIKJJFFACGKALAAIIGACMEKDSEEDUFIALDHDQFRDGAGDHJUJFGLHRDYCTBDFDAYGZILFCFKDNGYADHMIOHEAKJRFKBMEBJEIBHHJGCSGTFZFKEJGTHFFOIDBGFLDODCEAASHEFUFMCSICIAFSCHFUFSBQFRJBBLGODPCGDTEPJJAIFYFKHQGIBUAKCMJOFOCYDNGRAZBRFCIVFXHIHKAYAAEDJPHLBAEYDUDAFNGNFUAICZDMJDEXAYJQFWEWFPCBCGIQHVFYGPHXCGBDBCHBINCPARGAASDVICCFBZEEAZDQ
+EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHJFGCIEEAGLIYJDGPGGGPCVAXJEBRILDTALHEACDJJLIOFDHOIPEDEUEYHXAOCUHZFWGVHAILAZAMDWHNDMCCAPEBHEBLARGZANGSJIDRFYCRDECPBCBYJCDGBYDNDTDPGXFWAHHLESEHJCDTBOEQHJEUIFFEHYELDIBGEDHVIUDQBIEOAFGOAQHXFFIYCCDLFPCXCABUGEEKBREXDLHSFPIAGUFSIUFCGPEXESFEDTAAILCGIJBBEBGWGLHJIOIXCYHWFYBJIKJLGNFCGBITCVJSACAGCPDDEJFYCEFSJBGYCFHIARGXFKAZELBMCLAODUDGARCBEBGLGIEHFNBAGRFHJRGUECBWFJHBDIEUIEIQCQDZIOFVHLCIFYAMBAGMGEBVCHGOCUGKFFEZCDACBEECCLBEBRDDBBGWEAJBDKIUAXFABDEUABHZCPAIGGGNDWFLHDGJFACDEWGPHPFRAPHBCPHJBZFTFNDBDIBRGJJDJKFVGKHNEIHDDLGWCQBKHCCHESJIFUAMAHJLEYEMHFBRBYAEGKDJFPHXFAJEERIMGEJAJGACAWEPAGAEIGFOFFDLECAUINHKGCCRAUITFTJCGFFWJNFFJQFACPFYFACEJQIWCEHJDUJMDQDKGKANANHQFMCTIAJEJSCPEHCZENGVJPANFRBREIISAQCMGBBAAMJPCKDYHOEQFJJGBIEICGHVAABSJAGWGKJGBRENGMBRCOIZGGAFCYHQCCDNDMBQJFHDIPBEGLJIBVJAFOCWJGCOINGFDUGBCPEKEIHUIIDUITANDZFBDIIVEWDDAZCUIZACDOGBFQDYFPGWJDAMFLGWBXFVAKBVBUGSGFCLDGBADFHBEZCIHZECDHEFFWAFHHGZCOBMASHYEFEDGUBADIIFDFDZDQAHBVDQEDEFHZHOBBJMCVINGUIUGYAIEHCXBBGGGWBBGNDWFGBHAKIQDRHRHLBJGEDEDCDRGHEKJBBIEGALDXAPBAFRIOGHEJCLJVITCODLGPBEJUCQBIJTCTHYFUFHDOHDBPHOEOFTGYHSAEAVFKGSFBAOJDDKJRGFHXASDHFP

auth/src/main/resources/bootstrap-local.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 39200
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

auth/src/main/resources/bootstrap-prod.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 39200
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-      config:
-        # 配置中心地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

auth/src/main/resources/bootstrap-test.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 39200
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

auth/src/main/resources/bootstrap.yml

@@ -1,3 +1,7 @@
+# Tomcat
+server:
+  port: 39200
+
 ## Spring 测试环境
 spring:
   application:
@@ -5,7 +9,33 @@ spring:
     name: auth
   profiles:
     # 环境配置
-    active: local
+    active: @profiles.active@
+  cloud:
+    loadbalancer:
+      # 关闭Ribbon的负载均衡器
+      ribbon:
+        enabled: false
+      # 开启Nacos的负载均衡器
+      nacos:
+        enabled: true
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        namespace: @name.space@
+        username: @username@
+        password: @password@
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: @name.space@
+        username: @username@
+        password: @password@
 
 management:
   server:
@@ -17,4 +47,4 @@ management:
     enabled-by-default: false
   endpoint:
     beans:
-      enabled: false
+      enabled: false

gateway/src/main/resources/bootstrap-local.yml

@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  # 本地、测试
-  port: 39100
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

gateway/src/main/resources/bootstrap-prod.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 19100
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-      config:
-        # 配置中心地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

gateway/src/main/resources/bootstrap-test.yml

@@ -1,27 +0,0 @@
-# Tomcat
-server:
-  # 本地、测试
-  port: 39100
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_new
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_new
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

gateway/src/main/resources/bootstrap.yml

@@ -1,3 +1,11 @@
+# Tomcat
+server:
+  # 本地、测试
+  port: 39100
+  # 线上
+#  port: 19100
+#  servlet:
+#    context-path: lpRealName
 
 # Spring
 spring:
@@ -6,4 +14,38 @@ spring:
     name: gateway
   profiles:
     # 环境配置
-    active: local
+    active: @profiles.active@
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        namespace: @name.space@
+        username: @username@
+        password: @password@
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: @name.space@
+        username: @username@
+        password: @password@
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
+      transport:
+        # 控制台地址
+        server-addr: 192.168.0.14:8858
+      # nacos配置持久化
+      datasource:
+        ds1:
+          nacos:
+            server-addr: 192.168.0.14:8848
+            dataId: sentinel-gateway
+            groupId: DEFAULT_GROUP
+            data-type: json
+            rule-type: flow

modules/app/src/main/resources/bootstrap-local.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 1913
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/app/src/main/resources/bootstrap-prod.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 1913
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-      config:
-        # 配置中心地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/app/src/main/resources/bootstrap-test.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 1913
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/app/src/main/resources/bootstrap.yml

@@ -1,8 +1,33 @@
+# Tomcat
+server:
+  port: 1913
+#  servlet:
+#    context-path: /app
+
 # Spring
-spring:
+spring: 
   application:
     # 应用名称
     name: app
   profiles:
     # 环境配置
-    active: local
+    active: @profiles.active@
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        namespace: @name.space@
+        username: @username@
+        password: @password@
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: @name.space@
+        username: @username@
+        password: @password@

modules/attMachine/src/main/resources/bootstrap-local.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 38084
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/attMachine/src/main/resources/bootstrap-prod.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 38084
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-      config:
-        # 配置中心地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/attMachine/src/main/resources/bootstrap-test.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 38084
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/attMachine/src/main/resources/bootstrap.yml

@@ -1,3 +1,7 @@
+# Tomcat
+server:
+  port: 38084
+
 # Spring
 spring:
   application:
@@ -5,4 +9,23 @@ spring:
     name: attMachine
   profiles:
     # 环境配置
-    active: local
+    active: @profiles.active@
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        namespace: @name.space@
+        username: @username@
+        password: @password@
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: @name.space@
+        username: @username@
+        password: @password@

modules/bmw/src/main/java/com/bonus/bmw/basic/controller/UserController.java

@@ -1,7 +1,9 @@
 package com.bonus.bmw.basic.controller;
 
 import com.bonus.bmw.basic.dao.UserDao;
-import com.bonus.bmw.basic.entity.*;
+import com.bonus.bmw.basic.entity.BankCardBean;
+import com.bonus.bmw.basic.entity.PushUserBean;
+import com.bonus.bmw.basic.entity.UserBean;
 import com.bonus.bmw.basic.service.OrgService;
 import com.bonus.bmw.basic.service.UserService;
 import com.bonus.bmw.person.dao.GetChildListDao;
@@ -79,20 +81,14 @@ public class UserController {
 	public PageTableResponse listUsers(PageTableRequest request) {
 
 		SelfPermissionSettingUtils.getSelfPermission(request);
-		Map<String, Object> params = request.getParams();
+
 		String orgId = (String) request.getParams().get("orgId");
 		if(!StringUtils.isEmpty(orgId)){
 			String childList = getChildListDao.getChildList(orgId);
+			Map<String, Object> params = request.getParams();
 			params.put("orgAll",childList);
 		}
 
-		String userName = SecurityUtils.getLoginUser().getSysUser().getPhonenumber();
-		if("lpAdmin".equals(userName)){
-			params.put("isAdmin","1");
-		}else {
-			params.put("isAdmin","0");
-		}
-
 		return new PageTableHandler(new PageTableHandler.CountHandler() {
 			@Override
 			public int count(PageTableRequest request) {

modules/bmw/src/main/java/com/bonus/bmw/basic/service/UserServiceImpl.java

@@ -71,11 +71,6 @@ public class UserServiceImpl implements UserService {
 		return i > 0 ? R.ok(null, "添加成功"):R.fail("添加失败");
 	}
 
-	public static void main(String[] args) {
-		BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-		System.out.println(passwordEncoder.encode("Lphd@123456"));
-	}
-
 	private void saveUserRoles(String userId, String roleId) {
 		if (roleId != null) {
 			userDao.deleteUserRole(userId);

modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java

@@ -1,27 +1,20 @@
 package com.bonus.bmw.config;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 /**
  * @author fly
  */
-@Component
+//@Component
 public class IpAndPathConfig {
 
     /**
      * 当前环境
-     * 其他/本地 -> dev
-     * test -> 测试
-     * prod -> 生产
+     * 其他 本地
+     * test 测试
+     * prod 固定
      */
-    public static String environment;
-
-    // 通过非静态 setter 方法注入，并赋值给 static 字段
-    @Value("${environment:dev}") // 默认值设为 dev，防止未配置时报错
-    public void setEnvironment(String env) {
-        IpAndPathConfig.environment = env;
-    }
+//    @Value("${environment}")
+//    public static String environment;
+    public static String environment = "其他";
 
     /**
      * 持证

modules/bmw/src/main/java/com/bonus/bmw/person/utils/ArcFaceHelper.java

@@ -1,7 +1,7 @@
 package com.bonus.bmw.person.utils;
 
 import com.arcsoft.face.*;
-import com.arcsoft.face.enums.ImageFormat;
+import com.arcsoft.face.enums.*;
 import org.apache.commons.lang3.StringUtils;
 import javax.imageio.ImageIO;
 import java.awt.color.ColorSpace;

modules/bmw/src/main/resources/bootstrap-local.yml

@@ -1,29 +0,0 @@
-# Tomcat
-server:
-  port: 31912
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-
-environment: local

modules/bmw/src/main/resources/bootstrap-prod.yml

@@ -1,29 +0,0 @@
-# Tomcat
-server:
-  port: 31912
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-      config:
-        # 配置中心地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-
-environment: prod

modules/bmw/src/main/resources/bootstrap-test.yml

@@ -1,29 +0,0 @@
-# Tomcat
-server:
-  port: 31912
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-
-environment: test

modules/bmw/src/main/resources/bootstrap.yml

@@ -1,3 +1,10 @@
+# Tomcat
+server:
+  # 本地、测试
+    port: 31912
+#  servlet:
+#    context-path: /bmw
+
 # Spring
 spring:
   application:
@@ -5,7 +12,27 @@ spring:
     name: bmw
   profiles:
     # 环境配置
-    active: local
+    active: @profiles.active@
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        namespace: @name.space@
+        username: @username@
+        password: @password@
+      config:
+
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: @name.space@
+        username: @username@
+        password: @password@
 
   devtools:
     restart:
@@ -20,4 +47,4 @@ management:
     enabled-by-default: false
   endpoint:
     beans:
-      enabled: false
+      enabled: false

modules/bmw/src/main/resources/mapper/basic/UserMapper.xml

@@ -21,10 +21,7 @@
 		LEFT JOIN ( SELECT id_number, project_id, is_furlough_person FROM bm_worker_ein_history WHERE ( is_furlough_person = '1' OR exit_status != 1 ) AND is_active = '1' limit 1) bweh ON bweh.id_number = t.id_number
 		LEFT JOIN bm_project bp2 ON bp2.id = bweh.project_id
 		<where>
-			t.is_active = '1' and t.id != '1' and t.username is not null
-			<if test='params.isAdmin != "1"'>
-				AND sr.id !='5' and sr.id !='36'
-			</if>
+			t.is_active = '1' and t.id != '1' and t.username is not null AND sr.id !='5' and sr.id !='36'
 			<if test="params.userName != null and params.userName != ''">
 				and t.username like concat('%', #{params.userName}, '%')
 			</if>
@@ -84,10 +81,7 @@
 		LEFT JOIN ( SELECT id_number, project_id, is_furlough_person FROM bm_worker_ein_history WHERE ( is_furlough_person = '1' OR exit_status != 1 ) AND is_active = '1' limit 1) bweh ON bweh.id_number = t.id_number
 		LEFT JOIN bm_project bp2 ON bp2.id = bweh.project_id
 		<where>
-			t.is_active = '1' and t.id != '1' and t.username is not null
-    		<if test='params.isAdmin != "1"'>
-				AND sr.id !='5' and sr.id !='36'
-			</if>
+			t.is_active = '1' and t.id != '1' and t.username is not null AND sr.id !='5' and sr.id !='36'
 			<if test="params.userName != null and params.userName != ''">
 				and t.username like concat('%', #{params.userName}, '%')
 			</if>

modules/file/pom.xml

@@ -8,7 +8,9 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+
     <artifactId>real-name-file-lp</artifactId>
+
     <description>
         modules-file文件模块
     </description>
@@ -163,4 +165,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

modules/file/src/main/resources/bootstrap-local.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 31909
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/file/src/main/resources/bootstrap-prod.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 1909
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-      config:
-        # 配置中心地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/file/src/main/resources/bootstrap-test.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 31909
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/file/src/main/resources/bootstrap.yml

@@ -1,3 +1,14 @@
+# Tomcat
+server:
+  # 本地、测试
+#  port: 31909
+  # 线上
+  port: 1909
+
+
+#  servlet:
+#    context-path: /file
+
 # Spring
 spring:
   application:
@@ -5,7 +16,26 @@ spring:
     name: file
   profiles:
     # 环境配置
-    active: local
+    active: @profiles.active@
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        namespace: @name.space@
+#        username: @username@
+#        password: @password@
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: @name.space@
+#        username: @username@
+#        password: @password@
 
 management:
   server:
@@ -17,4 +47,4 @@ management:
     enabled-by-default: false
   endpoint:
     beans:
-      enabled: false
+      enabled: false

modules/lineProtector/pom.xml

@@ -31,6 +31,12 @@
             <groupId>com.bonus</groupId>
             <artifactId>common-log</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.bonus</groupId>
+            <artifactId>modules-file</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!--图片压缩-->
         <dependency>
@@ -51,4 +57,4 @@
 
     </dependencies>
 
-</project>
+</project>

modules/system/src/main/resources/bootstrap-local.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 31910
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp_smz_dev
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/system/src/main/resources/bootstrap-prod.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 31910
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-      config:
-        # 配置中心地址
-        server-addr: 192.168.1.6:4412
-        namespace: lp_prod
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/system/src/main/resources/bootstrap-test.yml

@@ -1,26 +0,0 @@
-# Tomcat
-server:
-  port: 31909
-
-## Spring 测试环境
-spring:
-  cloud:
-    loadbalancer:
-      nacos:
-        enabled: true
-    nacos:
-      username: nacos
-      password: nacos
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: lp-smz-test
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

modules/system/src/main/resources/bootstrap.yml

@@ -1,3 +1,7 @@
+# Tomcat
+server:
+  port: 31910
+
 ## Spring 测试环境
 spring:
   application:
@@ -5,6 +9,31 @@ spring:
     name: system
   profiles:
     # 环境配置
-    active: local
-
+    active: @profiles.active@
+  cloud:
+    loadbalancer:
+      # 关闭Ribbon的负载均衡器
+      ribbon:
+        enabled: false
+      # 开启Nacos的负载均衡器
+      nacos:
+        enabled: true
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: @nacos.server@
+        namespace: @name.space@
+        username: @username@
+        password: @password@
+      config:
+        # 配置中心地址
+        server-addr: @nacos.server@
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: @name.space@
+        username: @username@
+        password: @password@
 

pom.xml

@@ -348,6 +348,20 @@
 
     <profiles>
 
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profiles.active>lp_smz_dev</profiles.active>
+                <nacos.server>192.168.0.14:8848</nacos.server>
+                <name.space>lp_smz_dev</name.space>
+                <username>nacos</username>
+                <password>nacos</password>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+
         <profile>
             <id>lSun</id>
             <properties>
@@ -362,6 +376,16 @@
             </activation>
         </profile>
 
+        <profile>
+            <id>lp_prod</id>
+            <properties>
+                <profiles.active>lp_prod</profiles.active>
+                <nacos.server>192.168.1.6:4412</nacos.server>
+                <name.space>lp_prod</name.space>
+                <username>nacos</username>
+                <password>nacos</password>
+            </properties>
+        </profile>
         <!-- 可以添加更多环境配置 -->
     </profiles>