diff --git a/.gitignore b/.gitignore index 454659a..c57563f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,46 +1,2 @@ -framework/src/main/resources/static/assets/401-099a3a32.js -framework/src/main/resources/static/assets/401-fffd1e4b.css -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 +framework/src/main/resources/static/ +business-css/target/ diff --git a/framework/.gitignore b/framework/.gitignore index d5bd64e..077644c 100644 --- a/framework/.gitignore +++ b/framework/.gitignore @@ -32,73 +32,5 @@ build/ ### VS Code ### .vscode/ -src/main/resources/static/favicon.ico -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 +framework/src/main/resources/static/ + diff --git a/framework/frontend/vite.config.ts b/framework/frontend/vite.config.ts index e458fbb..fe7de1f 100644 --- a/framework/frontend/vite.config.ts +++ b/framework/frontend/vite.config.ts @@ -27,7 +27,7 @@ export default ({ mode }: ConfigEnv): UserConfig => { // 线上API地址 //target: 'http://192.168.1.20:8090/', // 本地API地址 - target: 'http://localhost:8093', + target: 'http://localhost:8090', changeOrigin: true, rewrite: path => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') diff --git a/framework/src/main/java/com/yfd/platform/config/SecurityConfig.java b/framework/src/main/java/com/yfd/platform/config/SecurityConfig.java index f1e1cfa..a4b2343 100644 --- a/framework/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/framework/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -55,10 +55,9 @@ public class SecurityConfig { .requestMatchers("/user/code").permitAll() .requestMatchers(HttpMethod.GET, "/*.html", - "/**/*.html", - "/**/*.css", - "/**/*.js", - "/webSocket/**").permitAll() + "/webSocket/**", + "/assets/**", + "/icon/**").permitAll() .requestMatchers( "/swagger-ui.html", "/swagger-ui/**", @@ -74,7 +73,6 @@ public class SecurityConfig { "/avatar/**", "/systemurl/**", "/api/imageserver/upload").permitAll() - .requestMatchers("/**/**").permitAll() .anyRequest().authenticated() ) .cors(cors -> {}); diff --git a/framework/src/main/java/com/yfd/platform/config/WebConfig.java b/framework/src/main/java/com/yfd/platform/config/WebConfig.java index c242a34..45b051a 100644 --- a/framework/src/main/java/com/yfd/platform/config/WebConfig.java +++ b/framework/src/main/java/com/yfd/platform/config/WebConfig.java @@ -41,10 +41,13 @@ public class WebConfig implements WebMvcConfigurer { @SneakyThrows @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - // 菜单图标访问路径 - String iconUrl = "file:" + System.getProperty("user.dir") + "\\src" + - "\\main\\resources\\static\\icon\\"; - registry.addResourceHandler("/menu/**").addResourceLocations(iconUrl).setCachePeriod(0); + registry.addResourceHandler("/icon/**") + .addResourceLocations("classpath:/static/icon/") + .setCachePeriod(0); + + registry.addResourceHandler("/assets/**") + .addResourceLocations("classpath:/static/assets/") + .setCachePeriod(0); registry.addResourceHandler("swagger-ui.html").addResourceLocations( "classpath:/META-INF/resources/"); diff --git a/framework/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java b/framework/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java index fc4a972..56002e3 100644 --- a/framework/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java +++ b/framework/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java @@ -26,11 +26,18 @@ public class DynamicDataSourceConfig { return DruidDataSourceBuilder.create().build(); } + @Bean + @ConfigurationProperties("spring.datasource.druid.slave") + public DataSource wglSlaveDataSource(){ + return DruidDataSourceBuilder.create().build(); + } + @Bean @Primary public DynamicDataSource dataSource(DataSource wglMasterDataSource, DataSource wglSlaveDataSource) { Map targetDataSources = new HashMap<>(); targetDataSources.put("master",wglMasterDataSource); + targetDataSources.put("slave",wglSlaveDataSource); return new DynamicDataSource(wglMasterDataSource, targetDataSources); } diff --git a/framework/src/main/resources/application-dev.yml b/framework/src/main/resources/application-dev.yml index 922f44e..4832cbf 100644 --- a/framework/src/main/resources/application-dev.yml +++ b/framework/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8093 + port: 8090 spring: #应用名称 @@ -10,12 +10,12 @@ spring: druid: master: 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 password: ylfw20230626@ slave: 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 password: ylfw20230626@ diff --git a/framework/src/main/resources/application-framework.yml b/framework/src/main/resources/application-framework.yml new file mode 100644 index 0000000..5e3c670 --- /dev/null +++ b/framework/src/main/resources/application-framework.yml @@ -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 \ No newline at end of file diff --git a/framework/src/main/resources/application-server.yml b/framework/src/main/resources/application-server.yml index 22018e7..9d9e3e1 100644 --- a/framework/src/main/resources/application-server.yml +++ b/framework/src/main/resources/application-server.yml @@ -37,7 +37,6 @@ swagger-ui: file-space: #项目文档空间 files: D:\demoproject\files\ #单独上传的文件附件 - 3dmodel: D:\demoproject\3dmodel\ #单独上传的文件附件 useravatar: D:\demoproject\useravatar\ #用户头像 system: D:\demoproject\system\ #系统文档根目录,用于头像等静态资源 diff --git a/framework/src/main/resources/application.yml b/framework/src/main/resources/application.yml index 85d5749..7d97f80 100644 --- a/framework/src/main/resources/application.yml +++ b/framework/src/main/resources/application.yml @@ -22,9 +22,7 @@ management: metrics: tags: application: ${spring.application.name:platform} - export: - prometheus: - enabled: true + # Springdoc 默认配置 springdoc: