From 97a44bfae75fbdb5c2fd66447d95599605d95c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Mon, 23 Sep 2024 10:16:33 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=8E=BB=E9=99=A4=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-beta.yml | 7 ------ .../src/main/resources/application-dev.yml | 8 ------- .../src/main/resources/application-prod.yml | 18 +++++++------- .../src/main/resources/application.yml | 24 +------------------ .../src/main/resources/application-beta.yml | 3 --- .../src/main/resources/application-dev.yml | 3 --- .../src/main/resources/application-prod.yml | 15 ++++-------- .../src/main/resources/application.yml | 23 +----------------- 8 files changed, 15 insertions(+), 86 deletions(-) diff --git a/crmeb/crmeb-admin/src/main/resources/application-beta.yml b/crmeb/crmeb-admin/src/main/resources/application-beta.yml index 367d16cc..d10a3ec8 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-beta.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-beta.yml @@ -19,13 +19,6 @@ server: min-spare-threads: 30 # 初始化启动线程数量 spring: - profiles: - # 配置的环境 - active: beta - servlet: - multipart: - max-file-size: 50MB #设置单个文件大小 - max-request-size: 50MB #设置单次请求文件的总大小 # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource diff --git a/crmeb/crmeb-admin/src/main/resources/application-dev.yml b/crmeb/crmeb-admin/src/main/resources/application-dev.yml index 404a8158..df5a49bf 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-dev.yml @@ -13,14 +13,6 @@ server: port: 20010 spring: - profiles: - # 配置的环境 - active: dev - # 数据库配置 - servlet: - multipart: - max-file-size: 50MB #设置单个文件大小 - max-request-size: 50MB #设置单次请求文件的总大小 datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver diff --git a/crmeb/crmeb-admin/src/main/resources/application-prod.yml b/crmeb/crmeb-admin/src/main/resources/application-prod.yml index e1544e30..881a5bb9 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-prod.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-prod.yml @@ -51,16 +51,14 @@ logging: file: path: ./crmeb_log -# mybatis 配置 -mybatis-plus: - # 配置slq打印日志 - configuration: - log-impl: - #swagger 配置 swagger: basic: - enable: true #是否开启界面 - check: true #是否打开验证 - username: #访问swagger的账号 - password: #访问swagger的密码 + #是否开启界面 + enable: false + #是否打开验证 + check: true + #访问swagger的账号 + username: crmeb + #访问swagger的密码 + password: 123456 diff --git a/crmeb/crmeb-admin/src/main/resources/application.yml b/crmeb/crmeb-admin/src/main/resources/application.yml index 02720d8f..84b649a6 100644 --- a/crmeb/crmeb-admin/src/main/resources/application.yml +++ b/crmeb/crmeb-admin/src/main/resources/application.yml @@ -23,7 +23,7 @@ server: spring: profiles: # 配置的环境 - active: + active: dev servlet: multipart: max-file-size: 50MB #设置单个文件大小 @@ -34,28 +34,6 @@ spring: locale: zh_CN time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss - # 数据库配置 - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: crmeb - password: 111111 - - redis: - host: 127.0.0.1 #地址 - port: 6379 #端口 - password: 111111 - timeout: 30000 # 连接超时时间（毫秒） - database: 15 #默认数据库 - jedis: - pool: - max-active: 200 # 连接池最大连接数（使用负值表示没有限制） - max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） - max-idle: 10 # 连接池中的最大空闲连接 - min-idle: 0 # 连接池中的最小空闲连接 - time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 - debug: true logging: diff --git a/crmeb/crmeb-front/src/main/resources/application-beta.yml b/crmeb/crmeb-front/src/main/resources/application-beta.yml index c2beaff6..36d7a26d 100644 --- a/crmeb/crmeb-front/src/main/resources/application-beta.yml +++ b/crmeb/crmeb-front/src/main/resources/application-beta.yml @@ -6,9 +6,6 @@ server: port: 20009 spring: - profiles: - # 配置的环境 - active: beta # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource diff --git a/crmeb/crmeb-front/src/main/resources/application-dev.yml b/crmeb/crmeb-front/src/main/resources/application-dev.yml index 1d5a5302..3eb306ac 100644 --- a/crmeb/crmeb-front/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-front/src/main/resources/application-dev.yml @@ -6,9 +6,6 @@ server: port: 20011 spring: - profiles: - # 配置的环境 - active: dev # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource diff --git a/crmeb/crmeb-front/src/main/resources/application-prod.yml b/crmeb/crmeb-front/src/main/resources/application-prod.yml index 3bc577f4..85ec299b 100644 --- a/crmeb/crmeb-front/src/main/resources/application-prod.yml +++ b/crmeb/crmeb-front/src/main/resources/application-prod.yml @@ -39,17 +39,12 @@ logging: config: classpath:logback-spring.xml file: path: ./crmeb_log - -# mybatis 配置 -mybatis-plus: - # 配置slq打印日志 - configuration: - log-impl: - #swagger 配置 swagger: basic: - enable: true #是否开启界面 + enable: false #是否开启界面 check: true #是否打开验证 - username: #访问swagger的账号 - password: #访问swagger的密码 + #访问swagger的账号 + username: crmeb + #访问swagger的密码 + password: 123456 diff --git a/crmeb/crmeb-front/src/main/resources/application.yml b/crmeb/crmeb-front/src/main/resources/application.yml index f4d78b4a..d9814817 100644 --- a/crmeb/crmeb-front/src/main/resources/application.yml +++ b/crmeb/crmeb-front/src/main/resources/application.yml @@ -16,7 +16,7 @@ spring: profiles: # 配置的环境 # active: #spring.profiles.active# - active: + active: dev servlet: multipart: max-file-size: 50MB #设置单个文件大小 @@ -29,27 +29,6 @@ spring: locale: zh_CN time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss - # 数据库配置 - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: crmeb - password: 111111 - redis: - host: 127.0.0.1 #地址 - port: 6379 #端口 - password: 111111 - timeout: 30000 # 连接超时时间（毫秒） - database: 3 #默认数据库 - jedis: - pool: - max-active: 200 # 连接池最大连接数（使用负值表示没有限制） - max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） - max-idle: 10 # 连接池中的最大空闲连接 - min-idle: 0 # 连接池中的最小空闲连接 - time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 - debug: true logging: level: -- Gitee From 230de68d2e6e728358e44b0387dd8dcd81375fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Mon, 23 Sep 2024 10:19:28 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96SwaggerConfig=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zbkj/admin/config/SwaggerConfig.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SwaggerConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SwaggerConfig.java index 92202171..08aa729d 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SwaggerConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/SwaggerConfig.java @@ -34,12 +34,11 @@ import static com.google.common.collect.Lists.newArrayList; */ @Configuration @EnableSwagger2 -@ConfigurationProperties(prefix = "api.doc") public class SwaggerConfig{ //是否开启swagger，正式环境一般是需要关闭的，可根据springboot的多环境配置进行设置 - Boolean swaggerEnabled = true; - + @Value("${swagger.basic.enable}") + private Boolean enable; @Value("${server.port}") private String port; @@ -53,7 +52,7 @@ public class SwaggerConfig{ .host(domain) .apiInfo(apiInfo()) // 是否开启 - .enable(swaggerEnabled) + .enable(enable) .select() // 扫描的路径包 .apis(RequestHandlerSelectors.basePackage("com.zbkj.admin")) @@ -73,7 +72,7 @@ public class SwaggerConfig{ .host(domain) .apiInfo(apiInfo()) // 是否开启 - .enable(swaggerEnabled) + .enable(enable) .select() // 扫描的路径包 .apis(RequestHandlerSelectors.basePackage("com.zbkj.admin")) -- Gitee From 36efff1fa8a0bb628c89186865645ca04dce83ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Mon, 23 Sep 2024 10:27:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7Mysql=20connector?= =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9mysql=208?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb-admin/src/main/resources/application-beta.yml | 2 +- crmeb/crmeb-admin/src/main/resources/application-prod.yml | 4 ++-- crmeb/crmeb-common/pom.xml | 5 +++-- crmeb/crmeb-front/src/main/resources/application-beta.yml | 6 +++--- crmeb/crmeb-front/src/main/resources/application-dev.yml | 8 ++++---- crmeb/crmeb-front/src/main/resources/application-prod.yml | 8 ++++---- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/crmeb/crmeb-admin/src/main/resources/application-beta.yml b/crmeb/crmeb-admin/src/main/resources/application-beta.yml index d10a3ec8..e9ecbcd2 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-beta.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-beta.yml @@ -22,7 +22,7 @@ spring: # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 username: crmeb password: 111111 diff --git a/crmeb/crmeb-admin/src/main/resources/application-prod.yml b/crmeb/crmeb-admin/src/main/resources/application-prod.yml index 881a5bb9..0d6d833f 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-prod.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-prod.yml @@ -23,7 +23,7 @@ spring: # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 username: crmeb password: 1111111 @@ -61,4 +61,4 @@ swagger: #访问swagger的账号 username: crmeb #访问swagger的密码 - password: 123456 + password: 111111 diff --git a/crmeb/crmeb-common/pom.xml b/crmeb/crmeb-common/pom.xml index 01c3a9c4..3f95f2e0 100644 --- a/crmeb/crmeb-common/pom.xml +++ b/crmeb/crmeb-common/pom.xml @@ -81,8 +81,9 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j + 8.0.33 diff --git a/crmeb/crmeb-front/src/main/resources/application-beta.yml b/crmeb/crmeb-front/src/main/resources/application-beta.yml index 36d7a26d..38423076 100644 --- a/crmeb/crmeb-front/src/main/resources/application-beta.yml +++ b/crmeb/crmeb-front/src/main/resources/application-beta.yml @@ -9,10 +9,10 @@ spring: # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: root - password: 123456 + username: crmeb + password: 111111 redis: host: 127.0.0.1 #地址 port: 6379 #端口 diff --git a/crmeb/crmeb-front/src/main/resources/application-dev.yml b/crmeb/crmeb-front/src/main/resources/application-dev.yml index 3eb306ac..2b61b061 100644 --- a/crmeb/crmeb-front/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-front/src/main/resources/application-dev.yml @@ -9,14 +9,14 @@ spring: # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/crmeb_java_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: root - password: 123456 + username: crmeb + password: 111111 redis: host: 127.0.0.1 #地址 port: 6379 #端口 - password: 123456 + password: 111111 timeout: 10000 # 连接超时时间（毫秒） database: 10 #默认数据库 jedis: diff --git a/crmeb/crmeb-front/src/main/resources/application-prod.yml b/crmeb/crmeb-front/src/main/resources/application-prod.yml index 85ec299b..967e4683 100644 --- a/crmeb/crmeb-front/src/main/resources/application-prod.yml +++ b/crmeb/crmeb-front/src/main/resources/application-prod.yml @@ -12,14 +12,14 @@ spring: # 数据库配置 datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/crmeb_java?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 - username: root - password: 123456 + username: crmeb + password: 111111 redis: host: 127.0.0.1 #地址 port: 6379 #端口 - password: 123456 + password: 111111 timeout: 10000 # 连接超时时间（毫秒） database: 15 #默认数据库 jedis: -- Gitee From 5d2814aec011a3c36e3e3cebfc2f45b2c0976844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Mon, 23 Sep 2024 10:27:11 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7Mysql=20connector?= =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9mysql=208?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb-admin/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/crmeb-admin/src/main/resources/application-dev.yml b/crmeb/crmeb-admin/src/main/resources/application-dev.yml index df5a49bf..1aac3009 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-dev.yml @@ -15,7 +15,7 @@ server: spring: datasource: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8 username: crmeb password: 111111 -- Gitee From a15ce64e13cadc8ce9c4e0a044732ecb98be6fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Sun, 29 Dec 2024 16:45:01 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mysql=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb-common/pom.xml | 1 - crmeb/pom.xml | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/crmeb/crmeb-common/pom.xml b/crmeb/crmeb-common/pom.xml index 3f95f2e0..dadc6a00 100644 --- a/crmeb/crmeb-common/pom.xml +++ b/crmeb/crmeb-common/pom.xml @@ -83,7 +83,6 @@ com.mysql mysql-connector-j - 8.0.33 diff --git a/crmeb/pom.xml b/crmeb/pom.xml index 21f741f2..76f11b2f 100644 --- a/crmeb/pom.xml +++ b/crmeb/pom.xml @@ -59,9 +59,9 @@ - mysql - mysql-connector-java - 5.1.24 + com.mysql + mysql-connector-j + 8.0.33 -- Gitee From 2adbc9599c122217ca86bc28328fab1d3c4d17e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Sun, 29 Dec 2024 16:47:13 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zbkj/admin/config/WebConfig.java | 19 ++++++++++++++-- .../java/com/zbkj/front/config/WebConfig.java | 22 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebConfig.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebConfig.java index a71594da..6fe30f22 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebConfig.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/WebConfig.java @@ -15,6 +15,9 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.handler.MappedInterceptor; +import java.nio.file.Path; +import java.nio.file.Paths; + /** * token验证拦截器 * +---------------------------------------------------------------------- @@ -90,8 +93,20 @@ public class WebConfig implements WebMvcConfigurer { .addResourceLocations("classpath:/META-INF/resources/webjars/"); /** 本地文件上传路径 */ - registry.addResourceHandler(Constants.UPLOAD_TYPE_IMAGE + "/**") - .addResourceLocations("file:" + crmebConfig.getImagePath() + "/" + Constants.UPLOAD_TYPE_IMAGE + "/"); + // 判断当前环境，如果是windows下，就直接映射，如果是linux，再使用配置文件中的路径 + String osName = System.getProperty("os.name").toLowerCase(); + if (osName.contains("win")) { + Path currentPath = Paths.get("").toAbsolutePath(); + String currentPathString = currentPath.toString(); + registry.addResourceHandler(Constants.UPLOAD_TYPE_IMAGE + "/**") + .addResourceLocations("file:" + currentPathString + "/" + Constants.UPLOAD_TYPE_IMAGE + "/" + Constants.UPLOAD_TYPE_IMAGE + "/"); + } else if (osName.contains("nix") || osName.contains("nux") || osName.contains("mac")) { + registry.addResourceHandler(Constants.UPLOAD_TYPE_IMAGE + "/**") + .addResourceLocations("file:" + crmebConfig.getImagePath() + "/" + Constants.UPLOAD_TYPE_IMAGE + "/"); + } else { + System.out.println("未知操作系统: " + osName); + } + } @Bean diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/WebConfig.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/WebConfig.java index 763f7a7a..ab180205 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/WebConfig.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/config/WebConfig.java @@ -1,8 +1,11 @@ package com.zbkj.front.config; +import com.zbkj.common.config.CrmebConfig; +import com.zbkj.common.constants.Constants; import com.zbkj.common.interceptor.SwaggerInterceptor; import com.zbkj.front.filter.ResponseFilter; import com.zbkj.front.interceptor.FrontTokenInterceptor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -14,6 +17,9 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.handler.MappedInterceptor; +import java.nio.file.Path; +import java.nio.file.Paths; + /** * token验证拦截器 * +---------------------------------------------------------------------- @@ -31,6 +37,8 @@ public class WebConfig implements WebMvcConfigurer { // 这里使用一个Bean为的是可以在拦截器中自由注入，也可以在拦截器中使用SpringUtil.getBean 获取 // 但是觉得这样更优雅 + @Autowired + CrmebConfig crmebConfig; @Bean public HandlerInterceptor frontTokenInterceptor(){ @@ -100,6 +108,20 @@ public class WebConfig implements WebMvcConfigurer { .addResourceLocations("classpath:/META-INF/resources/"); registry.addResourceHandler("/webjars/**") .addResourceLocations("classpath:/META-INF/resources/webjars/"); + /** 本地文件上传路径 */ + // 判断当前环境，如果是windows下，就直接映射，如果是linux，再使用配置文件中的路径 + String osName = System.getProperty("os.name").toLowerCase(); + if (osName.contains("win")) { + Path currentPath = Paths.get("").toAbsolutePath(); + String currentPathString = currentPath.toString(); + registry.addResourceHandler(Constants.UPLOAD_TYPE_IMAGE + "/**") + .addResourceLocations("file:" + currentPathString + "/" + Constants.UPLOAD_TYPE_IMAGE + "/" + Constants.UPLOAD_TYPE_IMAGE + "/"); + } else if (osName.contains("nix") || osName.contains("nux") || osName.contains("mac")) { + registry.addResourceHandler(Constants.UPLOAD_TYPE_IMAGE + "/**") + .addResourceLocations("file:" + crmebConfig.getImagePath() + "/" + Constants.UPLOAD_TYPE_IMAGE + "/"); + } else { + System.out.println("未知操作系统: " + osName); + } } @Bean -- Gitee From 46a5ccae4717cb3bc766ba66fef00794118e6dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Sun, 29 Dec 2024 16:47:34 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 74 +++---------------- 1 file changed, 9 insertions(+), 65 deletions(-) diff --git a/crmeb/crmeb-admin/src/main/resources/logback-spring.xml b/crmeb/crmeb-admin/src/main/resources/logback-spring.xml index c087b233..58eb861f 100644 --- a/crmeb/crmeb-admin/src/main/resources/logback-spring.xml +++ b/crmeb/crmeb-admin/src/main/resources/logback-spring.xml @@ -27,27 +27,12 @@ - - - - - - { - "app": "${APP_NAME}", - "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}", - "level": "%level", - "thread": "%thread", - "class": "%logger{40}", - "message": "%msg" } - %n - - + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n utf-8 - @@ -56,21 +41,7 @@ ${log.path}/log_debug.log - - - - - - { - "app": "${APP_NAME}", - "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}", - "level": "%level", - "thread": "%thread", - "class": "%logger{40}", - "message": "%msg" } - %n - - + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n utf-8 @@ -98,20 +69,7 @@ - - - - - { - "app": "${APP_NAME}", - "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}", - "level": "%level", - "thread": "%thread", - "class": "%logger{40}", - "message": "%msg" } - %n - - + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n utf-8 @@ -138,21 +96,7 @@ ${log.path}/log_warn.log - - - - - - { - "app": "${APP_NAME}", - "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}", - "level": "%level", - "thread": "%thread", - "class": "%logger{40}", - "message": "%msg" } - %n - - + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n utf-8 @@ -162,7 +106,7 @@ 100MB - 2 + 30 @@ -224,10 +168,10 @@ - - - - + + + + -- Gitee