diff --git a/bonus-api/pom.xml b/bonus-api/pom.xml
index c976668..4148e8a 100644
--- a/bonus-api/pom.xml
+++ b/bonus-api/pom.xml
@@ -18,11 +18,4 @@
bonus-api系统接口
-
-
- org.springframework.boot
- spring-boot-starter-data-mongodb
-
-
-
diff --git a/bonus-modules/bonus-tcp/src/main/resources/bootstrap.yml b/bonus-auth/src/main/resources/bootstrap-dev.yml
similarity index 54%
rename from bonus-modules/bonus-tcp/src/main/resources/bootstrap.yml
rename to bonus-auth/src/main/resources/bootstrap-dev.yml
index 1d45d22..2a4fce5 100644
--- a/bonus-modules/bonus-tcp/src/main/resources/bootstrap.yml
+++ b/bonus-auth/src/main/resources/bootstrap-dev.yml
@@ -1,29 +1,27 @@
# Tomcat
server:
- port: 21997
+ port: 8200
-# Spring
-spring:
- application:
- # 应用名称
- name: bonus-tcp
- profiles:
- # 环境配置
- active: dev
+## Spring 测试环境
+spring:
cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
nacos:
username: nacos
- password: Jjsp@nacos2023
+ password: nacos
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
- namespace: ljzhgd
+ server-addr: 192.168.0.14:8848
+ namespace: gz_attendance_test
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: ljzhgd
+ server-addr: 192.168.0.14:8848
+ namespace: gz_attendance_test
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
diff --git a/bonus-auth/src/main/resources/bootstrap-local.yml b/bonus-auth/src/main/resources/bootstrap-local.yml
new file mode 100644
index 0000000..8208c8b
--- /dev/null
+++ b/bonus-auth/src/main/resources/bootstrap-local.yml
@@ -0,0 +1,26 @@
+# Tomcat
+server:
+ port: 8200
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_att_fly_test
+ config:
+ # 配置中心地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_att_fly_test
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/bonus-auth/src/main/resources/bootstrap-prod.yml b/bonus-auth/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..80e8f23
--- /dev/null
+++ b/bonus-auth/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,26 @@
+# Tomcat
+server:
+ port: 8200
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 10.1.0.142:8848
+ namespace: gz_att_prod
+ config:
+ # 配置中心地址
+ server-addr: 10.1.0.142:8848
+ namespace: gz_att_prod
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/bonus-auth/src/main/resources/bootstrap.yml b/bonus-auth/src/main/resources/bootstrap.yml
index 443b320..3b52246 100644
--- a/bonus-auth/src/main/resources/bootstrap.yml
+++ b/bonus-auth/src/main/resources/bootstrap.yml
@@ -1,7 +1,3 @@
-# Tomcat
-server:
- port: 8200
-
## Spring 测试环境
spring:
application:
@@ -9,30 +5,13 @@ spring:
name: gz-att-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@
\ No newline at end of file
+ active: local
+
+management:
+ server:
+ port: -1
+ endpoints:
+ web:
+ exposure:
+ include: [] # 不暴露任何端点
+ enabled-by-default: false
diff --git a/bonus-gateway/src/main/resources/bootstrap-dev.yml b/bonus-gateway/src/main/resources/bootstrap-dev.yml
new file mode 100644
index 0000000..df11460
--- /dev/null
+++ b/bonus-gateway/src/main/resources/bootstrap-dev.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+ port: 8100
+
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_attendance_test
+ config:
+ # 配置中心地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_attendance_test
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/bonus-gateway/src/main/resources/bootstrap-local.yml b/bonus-gateway/src/main/resources/bootstrap-local.yml
new file mode 100644
index 0000000..8159a18
--- /dev/null
+++ b/bonus-gateway/src/main/resources/bootstrap-local.yml
@@ -0,0 +1,26 @@
+# Tomcat
+server:
+ port: 8100
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_att_fly_test
+ config:
+ # 配置中心地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_att_fly_test
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/bonus-gateway/src/main/resources/bootstrap-prod.yml b/bonus-gateway/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..8cb6858
--- /dev/null
+++ b/bonus-gateway/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,26 @@
+# Tomcat
+server:
+ port: 8100
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 10.1.0.142:8848
+ namespace: gz_att_prod
+ config:
+ # 配置中心地址
+ server-addr: 10.1.0.142:8848
+ namespace: gz_att_prod
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/bonus-gateway/src/main/resources/bootstrap.yml b/bonus-gateway/src/main/resources/bootstrap.yml
index cf1eef4..519c5b4 100644
--- a/bonus-gateway/src/main/resources/bootstrap.yml
+++ b/bonus-gateway/src/main/resources/bootstrap.yml
@@ -1,7 +1,3 @@
-# Tomcat
-server:
- port: 8100
-
## Spring 测试环境
spring:
application:
@@ -9,33 +5,8 @@ spring:
name: gz-att-gateway
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
+
#系统 自动 加解密开关
system:
#返回数据加密
@@ -45,4 +16,12 @@ system:
#加密组件
jasypt:
encryptor:
- password: Encrypt
\ No newline at end of file
+ password: Encrypt
+management:
+ server:
+ port: -1
+ endpoints:
+ web:
+ exposure:
+ include: [] # 不暴露任何端点
+ enabled-by-default: false
diff --git a/bonus-modules/bonus-file/pom.xml b/bonus-modules/bonus-file/pom.xml
index 7479036..f35962f 100644
--- a/bonus-modules/bonus-file/pom.xml
+++ b/bonus-modules/bonus-file/pom.xml
@@ -16,50 +16,50 @@
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-sentinel
-
+
org.springframework.boot
spring-boot-starter-actuator
-
+
com.github.tobato
fastdfs-client
-
+
io.minio
minio
${minio.version}
-
+
com.bonus
bonus-api-system
-
+
com.bonus
@@ -71,10 +71,7 @@
commons-net
3.9.0
-
- org.springframework.boot
- spring-boot-starter-data-mongodb
-
+
com.bonus
bonus-common-entity
@@ -106,5 +103,5 @@
-
-
\ No newline at end of file
+
+
diff --git a/bonus-modules/bonus-job/pom.xml b/bonus-modules/bonus-job/pom.xml
index 6481680..a0966bd 100644
--- a/bonus-modules/bonus-job/pom.xml
+++ b/bonus-modules/bonus-job/pom.xml
@@ -16,38 +16,43 @@
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-sentinel
-
+
+
+ com.squareup.okhttp3
+ okhttp
+
+
org.springframework.boot
spring-boot-starter-actuator
-
+
io.springfox
springfox-swagger-ui
${swagger.fox.version}
-
+
org.quartz-scheduler
@@ -59,19 +64,29 @@
-
+
com.mysql
mysql-connector-j
-
+
com.bonus
bonus-common-log
-
+
+
+ com.bonus
+ bonus-common-datasource
+
+
+
+
+ com.bonus
+ bonus-common-datascope
+
com.bonus
@@ -101,5 +116,5 @@
-
-
\ No newline at end of file
+
+
diff --git a/bonus-modules/bonus-job/src/main/resources/bootstrap-dev.yml b/bonus-modules/bonus-job/src/main/resources/bootstrap-dev.yml
new file mode 100644
index 0000000..da616ba
--- /dev/null
+++ b/bonus-modules/bonus-job/src/main/resources/bootstrap-dev.yml
@@ -0,0 +1,30 @@
+# Tomcat
+server:
+ port: 8300
+
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_attendance_test
+ config:
+ # 配置中心地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_attendance_test
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+path:
+ wechatDevUrl: http://192.168.0.14:21907/gz_att_wechat
diff --git a/bonus-modules/bonus-job/src/main/resources/bootstrap-local.yml b/bonus-modules/bonus-job/src/main/resources/bootstrap-local.yml
new file mode 100644
index 0000000..7b6e6d3
--- /dev/null
+++ b/bonus-modules/bonus-job/src/main/resources/bootstrap-local.yml
@@ -0,0 +1,29 @@
+# Tomcat
+server:
+ port: 8300
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_att_fly_test
+ config:
+ # 配置中心地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_att_fly_test
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+path:
+ wechatDevUrl: http://127.0.0.1:21907/gz_att_wechat
diff --git a/bonus-modules/bonus-job/src/main/resources/bootstrap-prod.yml b/bonus-modules/bonus-job/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..6aaaea6
--- /dev/null
+++ b/bonus-modules/bonus-job/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,29 @@
+# Tomcat
+server:
+ port: 8300
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 10.1.0.142:8848
+ namespace: gz_att_prod
+ config:
+ # 配置中心地址
+ server-addr: 10.1.0.142:8848
+ namespace: gz_att_prod
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+path:
+ wechatDevUrl: https://jj.jypxks.com/gz_att_wechat
diff --git a/bonus-modules/bonus-job/src/main/resources/bootstrap.yml b/bonus-modules/bonus-job/src/main/resources/bootstrap.yml
index d9019c9..8ca2165 100644
--- a/bonus-modules/bonus-job/src/main/resources/bootstrap.yml
+++ b/bonus-modules/bonus-job/src/main/resources/bootstrap.yml
@@ -1,29 +1,8 @@
-# Tomcat
-server:
- port: 9203
-
# Spring
-spring:
+spring:
application:
# 应用名称
- name: bonus-job
+ name: gz-att-job
profiles:
# 环境配置
- active: dev
- cloud:
- nacos:
- username: nacos
- password: nacos
- discovery:
- # 服务注册地址
- server-addr: 192.168.0.14:8848
- namespace: f1fcd3ea-9460-4597-8acd-0f334527017c
- config:
- # 配置中心地址
- server-addr: 192.168.0.14:8848
- namespace: f1fcd3ea-9460-4597-8acd-0f334527017c
- # 配置文件格式
- file-extension: yml
- # 共享配置
- shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ active: local
diff --git a/bonus-modules/bonus-system/pom.xml b/bonus-modules/bonus-system/pom.xml
index 091243f..e8c1d19 100644
--- a/bonus-modules/bonus-system/pom.xml
+++ b/bonus-modules/bonus-system/pom.xml
@@ -8,70 +8,70 @@
24.6.0
4.0.0
-
+
gz_att_system
bonus-modules-system系统模块
-
+
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
-
+
com.alibaba.cloud
spring-cloud-starter-alibaba-sentinel
-
+
org.springframework.boot
spring-boot-starter-actuator
-
+
io.springfox
springfox-swagger-ui
${swagger.fox.version}
-
+
com.mysql
mysql-connector-j
-
+
com.bonus
bonus-common-datasource
-
+
com.bonus
bonus-common-datascope
-
+
com.bonus
bonus-common-log
-
+
com.bonus
@@ -119,5 +119,5 @@
-
-
\ No newline at end of file
+
+
diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml
new file mode 100644
index 0000000..40863f9
--- /dev/null
+++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+ port: 1810
+
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_attendance_test
+ config:
+ # 配置中心地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_attendance_test
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-local.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-local.yml
new file mode 100644
index 0000000..e8aaeb7
--- /dev/null
+++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-local.yml
@@ -0,0 +1,26 @@
+# Tomcat
+server:
+ port: 1810
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_att_fly_test
+ config:
+ # 配置中心地址
+ server-addr: 192.168.0.14:8848
+ namespace: gz_att_fly_test
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-prod.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 0000000..68ac67e
--- /dev/null
+++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+ port: 1810
+
+## Spring 测试环境
+spring:
+ cloud:
+ loadbalancer:
+ nacos:
+ enabled: true
+ nacos:
+ username: nacos
+ password: nacos
+ discovery:
+ # 服务注册地址
+ server-addr: 10.1.0.142:8848
+ namespace: gz_att_prod
+ config:
+ # 配置中心地址
+ server-addr: 10.1.0.142:8848
+ namespace: gz_att_prod
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml
index 01ce68d..26ffbea 100644
--- a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml
+++ b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml
@@ -1,38 +1,47 @@
-# Tomcat
-server:
- port: 1810
-
-## Spring 测试环境
+# Spring
spring:
application:
# 应用名称
name: gz-att-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@
\ No newline at end of file
+ active: local
+ task:
+ scheduling:
+ pool:
+ size: 1 # 定时任务线程池大小
+ thread-name-prefix: scheduled-task- # 定时任务线程名称前缀
+
+# 跨域配置
+# 允许的源(多个用逗号分隔)
+cors:
+ allowed-origins: http://localhost:*,http://127.0.0.1:*,http://192.168.0.14:*,http://10.1.0.*:*
+ allowed-methods: GET,POST,PUT,DELETE,OPTIONS
+ allowed-headers: Content-Type,X-Requested-With,Token,Authorization,X-Custom-Header
+ allow-credentials: true
+ max-age: 3600
+# 安全头配置
+# 是否启用严格的安全头
+security:
+ headers:
+ strict: true
+ clear-server-info: true
+ hsts:
+ enabled: true
+
+
+# CSP和安全头配置
+# 是否启用CSP报告模式(true为仅报告,false为强制执行)
+csp:
+ report-only: false
+ allow-iframe: true
+ enable-webgl: true
+
+management:
+ server:
+ port: -1
+ endpoints:
+ web:
+ exposure:
+ include: [] # 不暴露任何端点
+ enabled-by-default: false
diff --git a/bonus-modules/pom.xml b/bonus-modules/pom.xml
index eb2c2e9..7a502ca 100644
--- a/bonus-modules/pom.xml
+++ b/bonus-modules/pom.xml
@@ -13,9 +13,6 @@
bonus-gen
bonus-job
bonus-file
- bonus-app
- bonus-bracelet
- bonus-tcp
bonus-modules
diff --git a/pom.xml b/pom.xml
index f597cb1..6e60eb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,84 +226,33 @@
-
-
-
-
- gz_attendance_dev
-
- gz_attendance_dev
- 127.0.0.1:8848
- gz_attendance_dev
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
-
-
+
bonus-common