bonus
/
lp_smz_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

配置文件简化修改

This commit is contained in:
方亮 2026-02-05 10:22:07 +08:00
parent 55ed1e2f08
commit a86a1cea13
37 changed files with 609 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArcFace64.dat
View File

@ -1 +1 @@
EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHJFGCIEEAGLIYJDGPGGGPCVAXJEBRILDTALHEACDJJLIOFDHOIPEDEUEYHXAOCUHZFWGVHAILAZAMDWHNDMCCAPEBHEBLARGZANGSJIDRFYCRDECPBCBYJCDGBYDNDTDPGXFWAHHLESEHJCDTBOEQHJEUIFFEHYELDIBGEDHVIUDQBIEOAFGOAQHXFFIYCCDLFPCXCABUGEEKBREXDLHSFPIAGUFSIUFCGPEXESFEDTAAILCGIJBBEBGWGLHJIOIXCYHWFYBJIKJLGNFCGBITCVJSACAGCPDDEJFYCEFSJBGYCFHIARGXFKAZELBMCLAODUDGARCBEBGLGIEHFNBAGRFHJRGUECBWFJHBDIEUIEIQCQDZIOFVHLCIFYAMBAGMGEBVCHGOCUGKFFEZCDACBEECCLBEBRDDBBGWEAJBDKIUAXFABDEUABHZCPAIGGGNDWFLHDGJFACDEWGPHPFRAPHBCPHJBZFTFNDBDIBRGJJDJKFVGKHNEIHDDLGWCQBKHCCHESJIFUAMAHJLEYEMHFBRBYAEGKDJFPHXFAJEERIMGEJAJGACAWEPAGAEIGFOFFDLECAUINHKGCCRAUITFTJCGFFWJNFFJQFACPFYFACEJQIWCEHJDUJMDQDKGKANANHQFMCTIAJEJSCPEHCZENGVJPANFRBREIISAQCMGBBAAMJPCKDYHOEQFJJGBIEICGHVAABSJAGWGKJGBRENGMBRCOIZGGAFCYHQCCDNDMBQJFHDIPBEGLJIBVJAFOCWJGCOINGFDUGBCPEKEIHUIIDUITANDZFBDIIVEWDDAZCUIZACDOGBFQDYFPGWJDAMFLGWBXFVAKBVBUGSGFCLDGBADFHBEZCIHZECDHEFFWAFHHGZCOBMASHYEFEDGUBADIIFDFDZDQAHBVDQEDEFHZHOBBJMCVINGUIUGYAIEHCXBBGGGWBBGNDWFGBHAKIQDRHRHLBJGEDEDCDRGHEKJBBIEGALDXAPBAFRIOGHEJCLJVITCODLGPBEJUCQBIJTCTHYFUFHDOHDBPHOEOFTGYHSAEAVFKGSFBAOJDDKJRGFHXASDHFP
EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHIYEWIHIGBHBOBFAZHKJFFEHICACEBBBMIPIDBQETFPBOIAFCFVHNFIGODZBXEADHFBFUJPIXHVAQGLHTGEEUBNDWCPGRBRGZIQFGHQFYFCBHFCGXIAGCBKHVBHGWJUIYBJFAGPFUEBENJVGMCIIUJSJKCBJTBXEQIOEIGIIYGJCHFZFGECHEBOCAHQGADQACCPBMDTBUCNAJCYDSCNBPIVDFIICCHPGUHJEZIJDUFPGXECJBBCEJHVAOJFCHFKCWCICAEKHODKBTJKATCLALJDCOHUFTANAQBMBXAEEEFVJJDJJTBOGRDGJMIBGODYHWBDECEZFSEMCUFLELDMBBHRCFCXEKETEVEXJTBRFJDMJPBUEICZGBABFHIYDBBAIFEUBXDWAPGBGMDYHQAIFBFEAHDBECBUDKJQEVECHXCZFRAKHKHQCLJOACJFBTCPJQHNGGJLCSCPARCJAUIJHKGVEIAABXDXELJACXGSBPHMEEGDDSFZCWFQEKBVBCEKHRFTGDDIHNDFEOIVHXAAFUEDCJDEGGADHCJCFNCFEUDIJJFHGEBIJEGEDQEBEOELDPAUHCITAZAACSAWHAEIHUGMAFGFGVBPDHDYJJGYITGPAMIQBEIZDUFDGYBLBMCYBMGCCOISBGIACLCFGPHEDGCPAHIXDOCHJUAXCOHWANJLGUIWDNDSEHIPIHIVFVDWAHDVIMEOFAJNBFAJHFHGCIEABGFDIQBOEKIQDPDLJBIUGCEOHUBCIGILECJNDREWFEHACPCADSIKJJFFACGKALAAIIGACMEKDSEEDUFIALDHDQFRDGAGDHJUJFGLHRDYCTBDFDAYGZILFCFKDNGYADHMIOHEAKJRFKBMEBJEIBHHJGCSGTFZFKEJGTHFFOIDBGFLDODCEAASHEFUFMCSICIAFSCHFUFSBQFRJBBLGODPCGDTEPJJAIFYFKHQGIBUAKCMJOFOCYDNGRAZBRFCIVFXHIHKAYAAEDJPHLBAEYDUDAFNGNFUAICZDMJDEXAYJQFWEWFPCBCGIQHVFYGPHXCGBDBCHBINCPARGAASDVICCFBZEEAZDQ

26
auth/src/main/resources/bootstrap-local.yml Normal file
View File

@ -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}

26
auth/src/main/resources/bootstrap-prod.yml Normal file
View File

@ -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}

26
auth/src/main/resources/bootstrap-test.yml Normal file
View File

@ -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}

34
auth/src/main/resources/bootstrap.yml
View File

@ -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
enabled: false

27
gateway/src/main/resources/bootstrap-local.yml Normal file
View File

@ -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}

26
gateway/src/main/resources/bootstrap-prod.yml Normal file
View File

@ -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}

27
gateway/src/main/resources/bootstrap-test.yml Normal file
View File

@ -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}

44
gateway/src/main/resources/bootstrap.yml
View File

@ -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

26
modules/app/src/main/resources/bootstrap-local.yml Normal file
View File

@ -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}

26
modules/app/src/main/resources/bootstrap-prod.yml Normal file
View File

@ -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}

26
modules/app/src/main/resources/bootstrap-test.yml Normal file
View File

@ -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}

29
modules/app/src/main/resources/bootstrap.yml
View File

@ -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@
active: local

26
modules/attMachine/src/main/resources/bootstrap-local.yml Normal file
View File

@ -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}

26
modules/attMachine/src/main/resources/bootstrap-prod.yml Normal file
View File

@ -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}

26
modules/attMachine/src/main/resources/bootstrap-test.yml Normal file
View File

@ -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}

25
modules/attMachine/src/main/resources/bootstrap.yml
View File

@ -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@
active: local

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

@ -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<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) {

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

@ -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);

21
modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java
View File

@ -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;
}
/**
* 持证

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

@ -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;

29
modules/bmw/src/main/resources/bootstrap-local.yml Normal file
View File

@ -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

29
modules/bmw/src/main/resources/bootstrap-prod.yml Normal file
View File

@ -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

29
modules/bmw/src/main/resources/bootstrap-test.yml Normal file
View File

@ -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

31
modules/bmw/src/main/resources/bootstrap.yml
View File

@ -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
enabled: false

10
modules/bmw/src/main/resources/mapper/basic/UserMapper.xml
View File

@ -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
<where>
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
<if test='params.isAdmin != "1"'>
AND sr.id !='5' and sr.id !='36'
</if>
<if test="params.userName != null and params.userName != ''">
and t.username like concat('%', #{params.userName}, '%')
</if>
@ -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
<where>
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
<if test='params.isAdmin != "1"'>
AND sr.id !='5' and sr.id !='36'
</if>
<if test="params.userName != null and params.userName != ''">
and t.username like concat('%', #{params.userName}, '%')
</if>

4
modules/file/pom.xml
View File

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

26
modules/file/src/main/resources/bootstrap-local.yml Normal file
View File

@ -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}

26
modules/file/src/main/resources/bootstrap-prod.yml Normal file
View File

@ -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}

26
modules/file/src/main/resources/bootstrap-test.yml Normal file
View File

@ -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}

34
modules/file/src/main/resources/bootstrap.yml
View File

@ -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
enabled: false

8
modules/lineProtector/pom.xml
View File

@ -31,12 +31,6 @@
<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>
@ -57,4 +51,4 @@
</dependencies>
</project>
</project>

26
modules/system/src/main/resources/bootstrap-local.yml Normal file
View File

@ -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}

26
modules/system/src/main/resources/bootstrap-prod.yml Normal file
View File

@ -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}

26
modules/system/src/main/resources/bootstrap-test.yml Normal file
View File

@ -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}

33
modules/system/src/main/resources/bootstrap.yml
View File

@ -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

24
pom.xml
View File

@ -348,20 +348,6 @@
<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>
@ -376,16 +362,6 @@
</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>