diff --git a/ArcFace64.dat b/ArcFace64.dat index 1068490..1968326 100644 --- a/ArcFace64.dat +++ b/ArcFace64.dat @@ -1 +1 @@ -EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHJFGCIEEAGLIYJDGPGGGPCVAXJEBRILDTALHEACDJJLIOFDHOIPEDEUEYHXAOCUHZFWGVHAILAZAMDWHNDMCCAPEBHEBLARGZANGSJIDRFYCRDECPBCBYJCDGBYDNDTDPGXFWAHHLESEHJCDTBOEQHJEUIFFEHYELDIBGEDHVIUDQBIEOAFGOAQHXFFIYCCDLFPCXCABUGEEKBREXDLHSFPIAGUFSIUFCGPEXESFEDTAAILCGIJBBEBGWGLHJIOIXCYHWFYBJIKJLGNFCGBITCVJSACAGCPDDEJFYCEFSJBGYCFHIARGXFKAZELBMCLAODUDGARCBEBGLGIEHFNBAGRFHJRGUECBWFJHBDIEUIEIQCQDZIOFVHLCIFYAMBAGMGEBVCHGOCUGKFFEZCDACBEECCLBEBRDDBBGWEAJBDKIUAXFABDEUABHZCPAIGGGNDWFLHDGJFACDEWGPHPFRAPHBCPHJBZFTFNDBDIBRGJJDJKFVGKHNEIHDDLGWCQBKHCCHESJIFUAMAHJLEYEMHFBRBYAEGKDJFPHXFAJEERIMGEJAJGACAWEPAGAEIGFOFFDLECAUINHKGCCRAUITFTJCGFFWJNFFJQFACPFYFACEJQIWCEHJDUJMDQDKGKANANHQFMCTIAJEJSCPEHCZENGVJPANFRBREIISAQCMGBBAAMJPCKDYHOEQFJJGBIEICGHVAABSJAGWGKJGBRENGMBRCOIZGGAFCYHQCCDNDMBQJFHDIPBEGLJIBVJAFOCWJGCOINGFDUGBCPEKEIHUIIDUITANDZFBDIIVEWDDAZCUIZACDOGBFQDYFPGWJDAMFLGWBXFVAKBVBUGSGFCLDGBADFHBEZCIHZECDHEFFWAFHHGZCOBMASHYEFEDGUBADIIFDFDZDQAHBVDQEDEFHZHOBBJMCVINGUIUGYAIEHCXBBGGGWBBGNDWFGBHAKIQDRHRHLBJGEDEDCDRGHEKJBBIEGALDXAPBAFRIOGHEJCLJVITCODLGPBEJUCQBIJTCTHYFUFHDOHDBPHOEOFTGYHSAEAVFKGSFBAOJDDKJRGFHXASDHFP \ No newline at end of file +EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHIYEWIHIGBHBOBFAZHKJFFEHICACEBBBMIPIDBQETFPBOIAFCFVHNFIGODZBXEADHFBFUJPIXHVAQGLHTGEEUBNDWCPGRBRGZIQFGHQFYFCBHFCGXIAGCBKHVBHGWJUIYBJFAGPFUEBENJVGMCIIUJSJKCBJTBXEQIOEIGIIYGJCHFZFGECHEBOCAHQGADQACCPBMDTBUCNAJCYDSCNBPIVDFIICCHPGUHJEZIJDUFPGXECJBBCEJHVAOJFCHFKCWCICAEKHODKBTJKATCLALJDCOHUFTANAQBMBXAEEEFVJJDJJTBOGRDGJMIBGODYHWBDECEZFSEMCUFLELDMBBHRCFCXEKETEVEXJTBRFJDMJPBUEICZGBABFHIYDBBAIFEUBXDWAPGBGMDYHQAIFBFEAHDBECBUDKJQEVECHXCZFRAKHKHQCLJOACJFBTCPJQHNGGJLCSCPARCJAUIJHKGVEIAABXDXELJACXGSBPHMEEGDDSFZCWFQEKBVBCEKHRFTGDDIHNDFEOIVHXAAFUEDCJDEGGADHCJCFNCFEUDIJJFHGEBIJEGEDQEBEOELDPAUHCITAZAACSAWHAEIHUGMAFGFGVBPDHDYJJGYITGPAMIQBEIZDUFDGYBLBMCYBMGCCOISBGIACLCFGPHEDGCPAHIXDOCHJUAXCOHWANJLGUIWDNDSEHIPIHIVFVDWAHDVIMEOFAJNBFAJHFHGCIEABGFDIQBOEKIQDPDLJBIUGCEOHUBCIGILECJNDREWFEHACPCADSIKJJFFACGKALAAIIGACMEKDSEEDUFIALDHDQFRDGAGDHJUJFGLHRDYCTBDFDAYGZILFCFKDNGYADHMIOHEAKJRFKBMEBJEIBHHJGCSGTFZFKEJGTHFFOIDBGFLDODCEAASHEFUFMCSICIAFSCHFUFSBQFRJBBLGODPCGDTEPJJAIFYFKHQGIBUAKCMJOFOCYDNGRAZBRFCIVFXHIHKAYAAEDJPHLBAEYDUDAFNGNFUAICZDMJDEXAYJQFWEWFPCBCGIQHVFYGPHXCGBDBCHBINCPARGAASDVICCFBZEEAZDQ diff --git a/auth/src/main/resources/bootstrap-local.yml b/auth/src/main/resources/bootstrap-local.yml new file mode 100644 index 0000000..f426f40 --- /dev/null +++ b/auth/src/main/resources/bootstrap-local.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/auth/src/main/resources/bootstrap-prod.yml b/auth/src/main/resources/bootstrap-prod.yml new file mode 100644 index 0000000..a3f3393 --- /dev/null +++ b/auth/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/auth/src/main/resources/bootstrap-test.yml b/auth/src/main/resources/bootstrap-test.yml new file mode 100644 index 0000000..a9c1714 --- /dev/null +++ b/auth/src/main/resources/bootstrap-test.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/auth/src/main/resources/bootstrap.yml b/auth/src/main/resources/bootstrap.yml index 6b67deb..c0e48e6 100644 --- a/auth/src/main/resources/bootstrap.yml +++ b/auth/src/main/resources/bootstrap.yml @@ -1,7 +1,3 @@ -# Tomcat -server: - port: 39200 - ## Spring 测试环境 spring: application: @@ -9,33 +5,7 @@ spring: name: auth profiles: # 环境配置 - 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@ + active: local management: server: @@ -47,4 +17,4 @@ management: enabled-by-default: false endpoint: beans: - enabled: false \ No newline at end of file + enabled: false diff --git a/gateway/src/main/resources/bootstrap-local.yml b/gateway/src/main/resources/bootstrap-local.yml new file mode 100644 index 0000000..793d259 --- /dev/null +++ b/gateway/src/main/resources/bootstrap-local.yml @@ -0,0 +1,27 @@ +# 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} diff --git a/gateway/src/main/resources/bootstrap-prod.yml b/gateway/src/main/resources/bootstrap-prod.yml new file mode 100644 index 0000000..119d302 --- /dev/null +++ b/gateway/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/gateway/src/main/resources/bootstrap-test.yml b/gateway/src/main/resources/bootstrap-test.yml new file mode 100644 index 0000000..88a3096 --- /dev/null +++ b/gateway/src/main/resources/bootstrap-test.yml @@ -0,0 +1,27 @@ +# 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} diff --git a/gateway/src/main/resources/bootstrap.yml b/gateway/src/main/resources/bootstrap.yml index 90513af..94ec02b 100644 --- a/gateway/src/main/resources/bootstrap.yml +++ b/gateway/src/main/resources/bootstrap.yml @@ -1,11 +1,3 @@ -# Tomcat -server: - # 本地、测试 - port: 39100 - # 线上 -# port: 19100 -# servlet: -# context-path: lpRealName # Spring spring: @@ -14,38 +6,4 @@ spring: name: gateway profiles: # 环境配置 - 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 + active: local diff --git a/modules/app/src/main/resources/bootstrap-local.yml b/modules/app/src/main/resources/bootstrap-local.yml new file mode 100644 index 0000000..ce86478 --- /dev/null +++ b/modules/app/src/main/resources/bootstrap-local.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/app/src/main/resources/bootstrap-prod.yml b/modules/app/src/main/resources/bootstrap-prod.yml new file mode 100644 index 0000000..1cc8766 --- /dev/null +++ b/modules/app/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/app/src/main/resources/bootstrap-test.yml b/modules/app/src/main/resources/bootstrap-test.yml new file mode 100644 index 0000000..9e60185 --- /dev/null +++ b/modules/app/src/main/resources/bootstrap-test.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/app/src/main/resources/bootstrap.yml b/modules/app/src/main/resources/bootstrap.yml index cc30ff7..67dd899 100644 --- a/modules/app/src/main/resources/bootstrap.yml +++ b/modules/app/src/main/resources/bootstrap.yml @@ -1,33 +1,8 @@ -# Tomcat -server: - port: 1913 -# servlet: -# context-path: /app - # Spring -spring: +spring: application: # 应用名称 name: app profiles: # 环境配置 - 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@ \ No newline at end of file + active: local diff --git a/modules/attMachine/src/main/resources/bootstrap-local.yml b/modules/attMachine/src/main/resources/bootstrap-local.yml new file mode 100644 index 0000000..c6f605d --- /dev/null +++ b/modules/attMachine/src/main/resources/bootstrap-local.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/attMachine/src/main/resources/bootstrap-prod.yml b/modules/attMachine/src/main/resources/bootstrap-prod.yml new file mode 100644 index 0000000..15c5859 --- /dev/null +++ b/modules/attMachine/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/attMachine/src/main/resources/bootstrap-test.yml b/modules/attMachine/src/main/resources/bootstrap-test.yml new file mode 100644 index 0000000..b07b10c --- /dev/null +++ b/modules/attMachine/src/main/resources/bootstrap-test.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/attMachine/src/main/resources/bootstrap.yml b/modules/attMachine/src/main/resources/bootstrap.yml index ec4d9f5..da7d8fb 100644 --- a/modules/attMachine/src/main/resources/bootstrap.yml +++ b/modules/attMachine/src/main/resources/bootstrap.yml @@ -1,7 +1,3 @@ -# Tomcat -server: - port: 38084 - # Spring spring: application: @@ -9,23 +5,4 @@ spring: name: attMachine profiles: # 环境配置 - 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@ \ No newline at end of file + active: local diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/UserController.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/UserController.java index 8c98a29..0f9d54b 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/UserController.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/controller/UserController.java @@ -1,9 +1,7 @@ package com.bonus.bmw.basic.controller; import com.bonus.bmw.basic.dao.UserDao; -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.entity.*; import com.bonus.bmw.basic.service.OrgService; import com.bonus.bmw.basic.service.UserService; import com.bonus.bmw.person.dao.GetChildListDao; @@ -81,14 +79,20 @@ public class UserController { public PageTableResponse listUsers(PageTableRequest request) { SelfPermissionSettingUtils.getSelfPermission(request); - + Map params = request.getParams(); String orgId = (String) request.getParams().get("orgId"); if(!StringUtils.isEmpty(orgId)){ String childList = getChildListDao.getChildList(orgId); - Map 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) { diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/UserServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/UserServiceImpl.java index 3f0f5d9..f1499a1 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/UserServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/UserServiceImpl.java @@ -71,6 +71,11 @@ 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); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java b/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java index 380dfe7..bdcf1c5 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java @@ -1,20 +1,27 @@ package com.bonus.bmw.config; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + /** * @author fly */ -//@Component +@Component public class IpAndPathConfig { /** * 当前环境 - * 其他 本地 - * test 测试 - * prod 固定 + * 其他/本地 -> dev + * test -> 测试 + * prod -> 生产 */ -// @Value("${environment}") -// public static String environment; - public static String environment = "其他"; + public static String environment; + + // 通过非静态 setter 方法注入，并赋值给 static 字段 + @Value("${environment:dev}") // 默认值设为 dev，防止未配置时报错 + public void setEnvironment(String env) { + IpAndPathConfig.environment = env; + } /** * 持证 diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/utils/ArcFaceHelper.java b/modules/bmw/src/main/java/com/bonus/bmw/person/utils/ArcFaceHelper.java index 08f43af..502f02b 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/utils/ArcFaceHelper.java +++ b/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.*; +import com.arcsoft.face.enums.ImageFormat; import org.apache.commons.lang3.StringUtils; import javax.imageio.ImageIO; import java.awt.color.ColorSpace; diff --git a/modules/bmw/src/main/resources/bootstrap-local.yml b/modules/bmw/src/main/resources/bootstrap-local.yml new file mode 100644 index 0000000..63caf40 --- /dev/null +++ b/modules/bmw/src/main/resources/bootstrap-local.yml @@ -0,0 +1,29 @@ +# 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 diff --git a/modules/bmw/src/main/resources/bootstrap-prod.yml b/modules/bmw/src/main/resources/bootstrap-prod.yml new file mode 100644 index 0000000..5f6c54a --- /dev/null +++ b/modules/bmw/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,29 @@ +# 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 diff --git a/modules/bmw/src/main/resources/bootstrap-test.yml b/modules/bmw/src/main/resources/bootstrap-test.yml new file mode 100644 index 0000000..e4be41b --- /dev/null +++ b/modules/bmw/src/main/resources/bootstrap-test.yml @@ -0,0 +1,29 @@ +# 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 diff --git a/modules/bmw/src/main/resources/bootstrap.yml b/modules/bmw/src/main/resources/bootstrap.yml index 13cd7b0..532a38b 100644 --- a/modules/bmw/src/main/resources/bootstrap.yml +++ b/modules/bmw/src/main/resources/bootstrap.yml @@ -1,10 +1,3 @@ -# Tomcat -server: - # 本地、测试 - port: 31912 -# servlet: -# context-path: /bmw - # Spring spring: application: @@ -12,27 +5,7 @@ spring: name: bmw profiles: # 环境配置 - 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@ + active: local devtools: restart: @@ -47,4 +20,4 @@ management: enabled-by-default: false endpoint: beans: - enabled: false \ No newline at end of file + enabled: false diff --git a/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml b/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml index 84c4ed0..cd15470 100644 --- a/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml +++ b/modules/bmw/src/main/resources/mapper/basic/UserMapper.xml @@ -21,7 +21,10 @@ 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 - t.is_active = '1' and t.id != '1' and t.username is not null AND sr.id !='5' and sr.id !='36' + t.is_active = '1' and t.id != '1' and t.username is not null + + AND sr.id !='5' and sr.id !='36' + and t.username like concat('%', #{params.userName}, '%') @@ -81,7 +84,10 @@ 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 - t.is_active = '1' and t.id != '1' and t.username is not null AND sr.id !='5' and sr.id !='36' + t.is_active = '1' and t.id != '1' and t.username is not null + + AND sr.id !='5' and sr.id !='36' + and t.username like concat('%', #{params.userName}, '%') diff --git a/modules/file/pom.xml b/modules/file/pom.xml index 1d35140..e9b8e5b 100644 --- a/modules/file/pom.xml +++ b/modules/file/pom.xml @@ -8,9 +8,7 @@ 1.0-SNAPSHOT 4.0.0 - real-name-file-lp - modules-file文件模块 @@ -165,4 +163,4 @@ - \ No newline at end of file + diff --git a/modules/file/src/main/resources/bootstrap-local.yml b/modules/file/src/main/resources/bootstrap-local.yml new file mode 100644 index 0000000..d36d481 --- /dev/null +++ b/modules/file/src/main/resources/bootstrap-local.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/file/src/main/resources/bootstrap-prod.yml b/modules/file/src/main/resources/bootstrap-prod.yml new file mode 100644 index 0000000..b09bf2c --- /dev/null +++ b/modules/file/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/file/src/main/resources/bootstrap-test.yml b/modules/file/src/main/resources/bootstrap-test.yml new file mode 100644 index 0000000..6e4d9ff --- /dev/null +++ b/modules/file/src/main/resources/bootstrap-test.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/file/src/main/resources/bootstrap.yml b/modules/file/src/main/resources/bootstrap.yml index 30d363b..b1494da 100644 --- a/modules/file/src/main/resources/bootstrap.yml +++ b/modules/file/src/main/resources/bootstrap.yml @@ -1,14 +1,3 @@ -# Tomcat -server: - # 本地、测试 -# port: 31909 - # 线上 - port: 1909 - - -# servlet: -# context-path: /file - # Spring spring: application: @@ -16,26 +5,7 @@ spring: name: file profiles: # 环境配置 - 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@ + active: local management: server: @@ -47,4 +17,4 @@ management: enabled-by-default: false endpoint: beans: - enabled: false \ No newline at end of file + enabled: false diff --git a/modules/lineProtector/pom.xml b/modules/lineProtector/pom.xml index ee449dd..2c0c063 100644 --- a/modules/lineProtector/pom.xml +++ b/modules/lineProtector/pom.xml @@ -31,12 +31,6 @@ com.bonus common-log - - com.bonus - modules-file - 1.0-SNAPSHOT - compile - @@ -57,4 +51,4 @@ - \ No newline at end of file + diff --git a/modules/system/src/main/resources/bootstrap-local.yml b/modules/system/src/main/resources/bootstrap-local.yml new file mode 100644 index 0000000..1d762fb --- /dev/null +++ b/modules/system/src/main/resources/bootstrap-local.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/system/src/main/resources/bootstrap-prod.yml b/modules/system/src/main/resources/bootstrap-prod.yml new file mode 100644 index 0000000..46fddda --- /dev/null +++ b/modules/system/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/system/src/main/resources/bootstrap-test.yml b/modules/system/src/main/resources/bootstrap-test.yml new file mode 100644 index 0000000..6e4d9ff --- /dev/null +++ b/modules/system/src/main/resources/bootstrap-test.yml @@ -0,0 +1,26 @@ +# 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} diff --git a/modules/system/src/main/resources/bootstrap.yml b/modules/system/src/main/resources/bootstrap.yml index 9c01d07..8a447b0 100644 --- a/modules/system/src/main/resources/bootstrap.yml +++ b/modules/system/src/main/resources/bootstrap.yml @@ -1,7 +1,3 @@ -# Tomcat -server: - port: 31910 - ## Spring 测试环境 spring: application: @@ -9,31 +5,6 @@ spring: name: system profiles: # 环境配置 - 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@ + active: local + diff --git a/pom.xml b/pom.xml index e9dcf1b..58c2cd2 100644 --- a/pom.xml +++ b/pom.xml @@ -348,20 +348,6 @@ - - dev - - lp_smz_dev - 192.168.0.14:8848 - lp_smz_dev - nacos - nacos - - - true - - - lSun @@ -376,16 +362,6 @@ - - lp_prod - - lp_prod - 192.168.1.6:4412 - lp_prod - nacos - nacos - -