ThbTech/JavaProjectRepo
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'develop-framework' (#8) from develop-framework into main-framework

Browse Source 
Reviewed-on: #8
This commit is contained in:
zhengsl 2025-11-21 10:29:51 +08:00
commit aec6f41b25
10 changed files with 56 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.gitignore vendored
View File

@ -1,46 +1,2 @@
framework/src/main/resources/static/assets/401-099a3a32.js framework/src/main/resources/static/
framework/src/main/resources/static/assets/401-fffd1e4b.css business-css/target/
framework/src/main/resources/static/assets/404-6dcbdda2.js
framework/src/main/resources/static/assets/404-51ac6f86.css
framework/src/main/resources/static/assets/BarChart-efd5cbe1.js
framework/src/main/resources/static/assets/editor-b13c93a6.js
framework/src/main/resources/static/assets/FunnelChart-79f3d5f7.js
framework/src/main/resources/static/assets/index-1a396a09.css
framework/src/main/resources/static/assets/index-01e2cfa9.js
framework/src/main/resources/static/assets/index-2b88764d.css
framework/src/main/resources/static/assets/index-04bb232d.js
framework/src/main/resources/static/assets/index-5a5afaa7.css
framework/src/main/resources/static/assets/index-6cf33161.js
framework/src/main/resources/static/assets/index-6ee17396.css
framework/src/main/resources/static/assets/index-9c04fca4.css
framework/src/main/resources/static/assets/index-63bba755.js
framework/src/main/resources/static/assets/index-70f67d2a.js
framework/src/main/resources/static/assets/index-98c36269.js
framework/src/main/resources/static/assets/index-362b32fa.css
framework/src/main/resources/static/assets/index-486d1d98.js
framework/src/main/resources/static/assets/index-2814df08.js
framework/src/main/resources/static/assets/index-5282e30f.js
framework/src/main/resources/static/assets/index-9057b190.js
framework/src/main/resources/static/assets/index-968257e1.css
framework/src/main/resources/static/assets/index-b25f0d08.js
framework/src/main/resources/static/assets/index-b98a9d85.js
framework/src/main/resources/static/assets/index-bca4e108.js
framework/src/main/resources/static/assets/index-c2e52e75.js
framework/src/main/resources/static/assets/index-c03bc2fe.js
framework/src/main/resources/static/assets/index-cdc0bc49.css
framework/src/main/resources/static/assets/index-ce8e85c4.js
framework/src/main/resources/static/assets/index-e5abaec0.js
framework/src/main/resources/static/assets/index-e051e64c.js
framework/src/main/resources/static/assets/index-f52936ec.js
framework/src/main/resources/static/assets/index1-5c7d9d99.js
framework/src/main/resources/static/assets/index2-26043b81.js
framework/src/main/resources/static/assets/lbcz_xg-6b0694a6.js
framework/src/main/resources/static/assets/page.vue_vue_type_script_setup_true_lang-7a09a11a.js
framework/src/main/resources/static/assets/personalCenter-a026f3ae.js
framework/src/main/resources/static/assets/PieChart-bffd7bcc.js
framework/src/main/resources/static/assets/RadarChart-e43ec971.js
framework/src/main/resources/static/assets/resize-24879ea2.js
framework/src/main/resources/static/assets/sortable.esm-616533ae.js
framework/src/main/resources/static/assets/tagsView-6df0ea3e.js
framework/src/main/resources/static/assets/uploader-0562c8e7.js
framework/src/main/resources/static/assets/uploader-4183de44.css

72
framework/.gitignore vendored
View File

@ -32,73 +32,5 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
src/main/resources/static/favicon.ico framework/src/main/resources/static/
src/main/resources/static/index.html
src/main/resources/static/assets/401-88639a9f.js
src/main/resources/static/assets/401-a61ddb94.gif
src/main/resources/static/assets/401-d244ab29.css
src/main/resources/static/assets/404_cloud-98e7ac66.png
src/main/resources/static/assets/404-7ca1fe28.css
src/main/resources/static/assets/404-7d365cf6.js
src/main/resources/static/assets/404-538aa4d7.png
src/main/resources/static/assets/BarChart-4fa92581.js
src/main/resources/static/assets/BarChart.vue_vue_type_script_setup_true_lang-2e88c556.js
src/main/resources/static/assets/editor-1fcae90e.js
src/main/resources/static/assets/editor-501cf061.css
src/main/resources/static/assets/FunnelChart-54cd9c1c.js
src/main/resources/static/assets/index-0c0fc4d5.js
src/main/resources/static/assets/index-0c6de5c4.css
src/main/resources/static/assets/index-0e353610.js
src/main/resources/static/assets/index-0fdbb0c3.css
src/main/resources/static/assets/index-2a2e686f.js
src/main/resources/static/assets/index-2d8a94de.js
src/main/resources/static/assets/index-3c8b576d.js
src/main/resources/static/assets/index-3e4e0c0c.css
src/main/resources/static/assets/index-3ea31a03.css
src/main/resources/static/assets/index-4a40522c.js
src/main/resources/static/assets/index-4af6c095.js
src/main/resources/static/assets/index-4b2c54eb.css
src/main/resources/static/assets/index-4e9a4a3c.css
src/main/resources/static/assets/index-4e36f11e.css
src/main/resources/static/assets/index-5b909b30.js
src/main/resources/static/assets/index-6cfbc6e9.js
src/main/resources/static/assets/index-6d369684.js
src/main/resources/static/assets/index-9cdf102e.js
src/main/resources/static/assets/index-013c92bf.css
src/main/resources/static/assets/index-45b24ee3.js
src/main/resources/static/assets/index-58b7edbc.css
src/main/resources/static/assets/index-97e2e5d7.js
src/main/resources/static/assets/index-336eb0cd.js
src/main/resources/static/assets/index-1124a30a.js
src/main/resources/static/assets/index-5736aae9.js
src/main/resources/static/assets/index-23665d45.js
src/main/resources/static/assets/index-35744cd0.css
src/main/resources/static/assets/index-49408471.js
src/main/resources/static/assets/index-a7bce641.css
src/main/resources/static/assets/index-adef366f.js
src/main/resources/static/assets/index-dd0c8cf0.css
src/main/resources/static/assets/index-dd267244.js
src/main/resources/static/assets/index-de40e6e9.css
src/main/resources/static/assets/index-f9a887b2.css
src/main/resources/static/assets/index1-f104bedb.js
src/main/resources/static/assets/index2-8960589f.js
src/main/resources/static/assets/indicator-5b15d0d1.png
src/main/resources/static/assets/lbcz_sc-0ed76926.js
src/main/resources/static/assets/lbcz_td-b5984317.js
src/main/resources/static/assets/lbcz_xg-aaaefba0.js
src/main/resources/static/assets/logo-03d6d6da.png
src/main/resources/static/assets/page.vue_vue_type_script_setup_true_lang-b61c9f0c.js
src/main/resources/static/assets/personalCenter-035ae2fa.js
src/main/resources/static/assets/personalCenter-ad68cb91.css
src/main/resources/static/assets/PieChart-24d7f015.js
src/main/resources/static/assets/PieChart.vue_vue_type_script_setup_true_lang-d4bdc783.js
src/main/resources/static/assets/RadarChart-f3f7d950.js
src/main/resources/static/assets/RadarChart.vue_vue_type_script_setup_true_lang-c1ab7800.js
src/main/resources/static/assets/resize-76420810.js
src/main/resources/static/assets/rsaEncrypt-96cab0ea.js
src/main/resources/static/assets/sortable.esm-be94e56d.js
src/main/resources/static/assets/tagsView-23de2998.js
src/main/resources/static/assets/top_tx-3cab94c6.png
src/main/resources/static/assets/u287-9a3328bc.gif
src/main/resources/static/assets/uploader-769f4f98.js
src/main/resources/static/assets/uploader-ccfd78f9.css

2
framework/frontend/vite.config.ts
View File

@ -27,7 +27,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
// 线上API地址 // 线上API地址
//target: 'http://192.168.1.20:8090/', //target: 'http://192.168.1.20:8090/',
// 本地API地址 // 本地API地址
target: 'http://localhost:8093', target: 'http://localhost:8090',
changeOrigin: true, changeOrigin: true,
rewrite: path => rewrite: path =>
path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')

8
framework/src/main/java/com/yfd/platform/config/SecurityConfig.java
View File

@ -55,10 +55,9 @@ public class SecurityConfig {
.requestMatchers("/user/code").permitAll() .requestMatchers("/user/code").permitAll()
.requestMatchers(HttpMethod.GET, .requestMatchers(HttpMethod.GET,
"/*.html", "/*.html",
"/**/*.html", "/webSocket/**",
"/**/*.css", "/assets/**",
"/**/*.js", "/icon/**").permitAll()
"/webSocket/**").permitAll()
.requestMatchers( .requestMatchers(
"/swagger-ui.html", "/swagger-ui.html",
"/swagger-ui/**", "/swagger-ui/**",
@ -74,7 +73,6 @@ public class SecurityConfig {
"/avatar/**", "/avatar/**",
"/systemurl/**", "/systemurl/**",
"/api/imageserver/upload").permitAll() "/api/imageserver/upload").permitAll()
.requestMatchers("/**/**").permitAll()
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.cors(cors -> {}); .cors(cors -> {});

11
framework/src/main/java/com/yfd/platform/config/WebConfig.java
View File

@ -41,10 +41,13 @@ public class WebConfig implements WebMvcConfigurer {
@SneakyThrows @SneakyThrows
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
// 菜单图标访问路径 registry.addResourceHandler("/icon/**")
String iconUrl = "file:" + System.getProperty("user.dir") + "\\src" + .addResourceLocations("classpath:/static/icon/")
"\\main\\resources\\static\\icon\\"; .setCachePeriod(0);
registry.addResourceHandler("/menu/**").addResourceLocations(iconUrl).setCachePeriod(0);
registry.addResourceHandler("/assets/**")
.addResourceLocations("classpath:/static/assets/")
.setCachePeriod(0);
registry.addResourceHandler("swagger-ui.html").addResourceLocations( registry.addResourceHandler("swagger-ui.html").addResourceLocations(
"classpath:/META-INF/resources/"); "classpath:/META-INF/resources/");

7
framework/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java
View File

@ -26,11 +26,18 @@ public class DynamicDataSourceConfig {
return DruidDataSourceBuilder.create().build(); return DruidDataSourceBuilder.create().build();
} }
@Bean
@ConfigurationProperties("spring.datasource.druid.slave")
public DataSource wglSlaveDataSource(){
return DruidDataSourceBuilder.create().build();
}
@Bean @Bean
@Primary @Primary
public DynamicDataSource dataSource(DataSource wglMasterDataSource, DataSource wglSlaveDataSource) { public DynamicDataSource dataSource(DataSource wglMasterDataSource, DataSource wglSlaveDataSource) {
Map<Object, Object> targetDataSources = new HashMap<>(); Map<Object, Object> targetDataSources = new HashMap<>();
targetDataSources.put("master",wglMasterDataSource); targetDataSources.put("master",wglMasterDataSource);
targetDataSources.put("slave",wglSlaveDataSource);
return new DynamicDataSource(wglMasterDataSource, targetDataSources); return new DynamicDataSource(wglMasterDataSource, targetDataSources);
} }

6
framework/src/main/resources/application-dev.yml
View File

@ -1,5 +1,5 @@
server: server:
port: 8093 port: 8090
spring: spring:
#应用名称 #应用名称
@ -10,12 +10,12 @@ spring:
druid: druid:
master: master:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://43.138.168.68:3306/frameworkdb2023?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true url: jdbc:mysql://43.138.168.68:3306/businessdb_css?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
username: root username: root
password: ylfw20230626@ password: ylfw20230626@
slave: slave:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://43.138.168.68:3306/frameworkdb2023?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true url: jdbc:mysql://43.138.168.68:3306/businessdb_css?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
username: root username: root
password: ylfw20230626@ password: ylfw20230626@

30
framework/src/main/resources/application-framework.yml Normal file
View File

@ -0,0 +1,30 @@
jasypt:
encryptor:
password: salt
# 密码加密传输，前端公钥加密，后端私钥解密（共性配置）
rsa:
private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
# Actuator & Micrometer 默认配置（共性）
management:
endpoints:
web:
exposure:
include: health,info,metrics,prometheus,env,beans,threaddump,loggers,configprops
endpoint:
health:
show-details: always
metrics:
tags:
application: ${spring.application.name:platform}
# Springdoc 默认配置（共性）
springdoc:
api-docs:
enabled: true
swagger-ui:
enabled: true
path: /swagger-ui.html
packages-to-scan: com.yfd.platform

1
framework/src/main/resources/application-server.yml
View File

@ -37,7 +37,6 @@ swagger-ui:
file-space: #项目文档空间 file-space: #项目文档空间
files: D:\demoproject\files\ #单独上传的文件附件 files: D:\demoproject\files\ #单独上传的文件附件
3dmodel: D:\demoproject\3dmodel\ #单独上传的文件附件
useravatar: D:\demoproject\useravatar\ #用户头像 useravatar: D:\demoproject\useravatar\ #用户头像
system: D:\demoproject\system\ #系统文档根目录，用于头像等静态资源 system: D:\demoproject\system\ #系统文档根目录，用于头像等静态资源

4
framework/src/main/resources/application.yml
View File

@ -22,9 +22,7 @@ management:
metrics: metrics:
tags: tags:
application: ${spring.application.name:platform} application: ${spring.application.name:platform}
export:
prometheus:
enabled: true
# Springdoc 默认配置 # Springdoc 默认配置
springdoc: springdoc: