Compare commits

...

2 Commits

Author SHA1 Message Date
haozq 15f0ba7edf Merge remote-tracking branch 'origin/main' 2025-12-19 10:00:02 +08:00
haozq b4afe205d2 修改包名称 2025-12-19 09:59:47 +08:00
813 changed files with 161 additions and 1126 deletions

View File

@ -16,7 +16,6 @@
<module name="bonus-gateway" />
<module name="hn_czl_screen" />
<module name="bonus-common-core" />
<module name="HnRealNameBmw" />
<module name="bonus-api-system" />
<module name="realname-app" />
<module name="ldlz-framework" />
@ -24,10 +23,11 @@
<module name="ldlz-admin" />
<module name="bonus-common-datasource" />
<module name="ldlz-system" />
<module name="HnRealNameMmw" />
<module name="bonus-common-config" />
<module name="ldlz-generator" />
<module name="hn-czl-service" />
<module name="real-name-screen" />
<module name="real-name" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel target="8" />
@ -35,10 +35,10 @@
<component name="JavacSettings">
<option name="PREFER_TARGET_JDK_COMPILER" value="false" />
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="HnRealNameBmw" options="-parameters" />
<module name="HnRealNameMmw" options="-parameters" />
<module name="hn-czl-service" options="-parameters" />
<module name="hn_czl_screen" options="-parameters" />
<module name="real-name" options="-parameters" />
<module name="real-name-screen" options="-parameters" />
<module name="realname-app" options="-parameters" />
</option>
</component>

View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/HnRealNameBmw/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/HnRealNameBmw/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hn-czl-service/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hn-czl-service/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java" charset="UTF-8" />
@ -49,6 +47,8 @@
<file url="file://$PROJECT_DIR$/hn_czl_screen/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/real-name-screen/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/real-name-screen/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/real-name/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/real-name/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/realname-app/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/realname-app/src/main/resources" charset="UTF-8" />
</component>

View File

@ -13,6 +13,7 @@
<option value="$PROJECT_DIR$/HnRealNameManageApp - 副本/pom.xml" />
<option value="$PROJECT_DIR$/realname-app/pom.xml" />
<option value="$PROJECT_DIR$/real-name-screen/pom.xml" />
<option value="$PROJECT_DIR$/real-name/pom.xml" />
</list>
</option>
</component>

File diff suppressed because it is too large Load Diff

View File

@ -26,14 +26,14 @@ spring:
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
# nacos地址
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# namespace: 289db019-a290-4903-ac1a-5d341af8b272
namespace: 07736b2e-9922-415e-8624-50b275be556e
config:
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# namespace: 289db019-a290-4903-ac1a-5d341af8b272
namespace: 07736b2e-9922-415e-8624-50b275be556e
# 配置文件格式
file-extension: yml
group: DEFAULT_GROUP

View File

@ -1,43 +1,45 @@
# Tomcat
server:
port: 18080
servlet:
context-path: hncloud
spring:
cloud:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
config:
# 配置中心地址
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# 配置文件格式
file-extension: yml
#共享配置文件
shared-dataids: application-dev.yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
sentinel:
# 取消控制台懒加载
eager: true
transport:
# 控制台地址
dashboard: 192.168.0.14:18848
# nacos配置持久化
datasource:
ds1:
nacos:
server-addr: 192.168.0.14:18848
namespace: e0337b55-080d-456e-8449-46d68dceee5b
dataId: sentinel-bonus-gateway
groupId: DEFAULT_GROUP
data-type: json
rule-type: gw-flow
## Tomcat
#server:
# port: 18080
# servlet:
# context-path: bnscloud
#spring:
# cloud:
# nacos:
# discovery:
# # 服务注册地址
# server-addr: 127.0.0.1:8848
# # namespace: 289db019-a290-4903-ac1a-5d341af8b272
## server-addr: 192.168.0.14:18848
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# # namespace: e0337b55-080d-456e-8449-46d68dceee5b
# config:
# # 配置中心地址
## server-addr: 192.168.0.14:18848
# # namespace: e0337b55-080d-456e-8449-46d68dceee5b
# server-addr: 127.0.0.1:8848
# # namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# # 配置文件格式
# file-extension: yml
# #共享配置文件
# shared-dataids: application-dev.yml
# # 共享配置
# shared-configs:
# - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# sentinel:
# # 取消控制台懒加载
# eager: true
# transport:
# # 控制台地址
# dashboard: 192.168.0.14:18848
# # nacos配置持久化
# datasource:
# ds1:
# nacos:
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
# dataId: sentinel-bonus-gateway
# groupId: DEFAULT_GROUP
# data-type: json
# rule-type: gw-flow

View File

@ -1,15 +1,57 @@
# Spring
# Tomcat
server:
port: 18080
servlet:
context-path: bnscloud
spring:
cloud:
gateway:
httpclient:
max-in-memory-buffer-size: 512KB # 默认256KB
application:
# 应用名称
name: bonus-gateway
profiles:
# 环境配置
active: dev
cloud:
gateway:
httpclient:
max-in-memory-buffer-size: 512KB # 默认256KB
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
config:
# 配置中心地址
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# 配置文件格式
file-extension: yml
#共享配置文件
shared-dataids: application-dev.yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
sentinel:
# 取消控制台懒加载
eager: true
transport:
# 控制台地址
dashboard: 192.168.0.14:18848
# nacos配置持久化
datasource:
ds1:
nacos:
server-addr: 192.168.0.14:18848
namespace: e0337b55-080d-456e-8449-46d68dceee5b
dataId: sentinel-bonus-gateway
groupId: DEFAULT_GROUP
data-type: json
rule-type: gw-flow
#加密组件
jasypt:
@ -17,5 +59,4 @@ jasypt:
password: Encrypt
feign:
hystrix:
enabled: true
enabled: true

View File

@ -11,15 +11,14 @@ spring:
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# namespace: 289db019-a290-4903-ac1a-5d341af8b272
namespace: 07736b2e-9922-415e-8624-50b275be556e
config:
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# namespace: 289db019-a290-4903-ac1a-5d341af8b272
namespace: 07736b2e-9922-415e-8624-50b275be556e
# 配置文件格式
file-extension: yml
group: DEFAULT_GROUP

View File

@ -19,21 +19,19 @@ spring:
cloud:
nacos:
# nacos.core.auth.enabled=true 开启权限验证
username: nacos
password: nacos
discovery:
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
# nacos地址
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# namespace: 289db019-a290-4903-ac1a-5d341af8b272
namespace: 07736b2e-9922-415e-8624-50b275be556e
config:
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# namespace: 289db019-a290-4903-ac1a-5d341af8b272
namespace: 07736b2e-9922-415e-8624-50b275be556e
# 配置文件格式
file-extension: yml
group: DEFAULT_GROUP

View File

@ -9,7 +9,7 @@
<relativePath/>
</parent>
<groupId>com.bonus.boot</groupId>
<artifactId>HnRealNameMmw</artifactId>
<artifactId>real-name-screen</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>real-name-web</name>
<description>real-name-web</description>

View File

@ -22,8 +22,8 @@ spring:
# server-addr: 192.168.0.14:18848
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# namespace: 289db019-a290-4903-ac1a-5d341af8b272
namespace: 07736b2e-9922-415e-8624-50b275be556e
# 配置文件格式
file-extension: yml
group: DEFAULT_GROUP
@ -35,8 +35,8 @@ spring:
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
# nacos地址
server-addr: 127.0.0.1:8848
namespace: 289db019-a290-4903-ac1a-5d341af8b272
# namespace: 07736b2e-9922-415e-8624-50b275be556e
# namespace: 289db019-a290-4903-ac1a-5d341af8b272
namespace: 07736b2e-9922-415e-8624-50b275be556e
logging:

View File

@ -9,7 +9,7 @@
<relativePath/>
</parent>
<groupId>com.bonus.boot</groupId>
<artifactId>HnRealNameBmw</artifactId>
<artifactId>real-name</artifactId>
<version>1.0.1-SNAPSHOT</version>
<name>real-name</name>
<description>manager</description>

Some files were not shown because too many files have changed in this diff Show More