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 922021712f375f6cdd6bc877ab8060a27e5f55a3..08aa729dfbc752d929722ab492ed4f5039fa4a47 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")) 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 a71594daa3f7ad6b5b9661eb9ff6b2ead33e5e60..6fe30f22b9137ad0994008ccd4e107b782464318 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-admin/src/main/resources/application-beta.yml b/crmeb/crmeb-admin/src/main/resources/application-beta.yml index 367d16cc40c909af7afa7c349a31c79c8f952bd5..e9ecbcd2fee2ff22d38f596a6bc7a8a44010a914 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-beta.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-beta.yml @@ -19,17 +19,10 @@ 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 - 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-dev.yml b/crmeb/crmeb-admin/src/main/resources/application-dev.yml index 404a81584ecf6dde83f9ef25b0495363f418bd23..1aac30091b23c4ad12dc7e79174a034c59c25b9f 100644 --- a/crmeb/crmeb-admin/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-admin/src/main/resources/application-dev.yml @@ -13,17 +13,9 @@ 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 + 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 e1544e303cc65fb3017da1ec0d622f20aee802af..0d6d833f1d032f6440f41ae05dd4b0c89cde34bb 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 @@ -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: 111111 diff --git a/crmeb/crmeb-admin/src/main/resources/application.yml b/crmeb/crmeb-admin/src/main/resources/application.yml index 02720d8f1f91c208f72536aae1216a59aecf5880..84b649a6a9f8f3a3830385cae6ec9910155c9fb5 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-admin/src/main/resources/logback-spring.xml b/crmeb/crmeb-admin/src/main/resources/logback-spring.xml index c087b2337fa865beb7006dbd5c56e9c80a71566a..58eb861f2430d084dc049dee84191a865068da5f 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 @@ - - - - + + + + diff --git a/crmeb/crmeb-common/pom.xml b/crmeb/crmeb-common/pom.xml index 01c3a9c46330ce10f583bdf7ea84647f238315d2..dadc6a00624b670f9567530219e2207e3bf30e09 100644 --- a/crmeb/crmeb-common/pom.xml +++ b/crmeb/crmeb-common/pom.xml @@ -81,8 +81,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j 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 763f7a7aa85b767266c0d7d429c71317d98df032..ab1802053d2c12b0870c5e94d0c5de7e22448400 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 diff --git a/crmeb/crmeb-front/src/main/resources/application-beta.yml b/crmeb/crmeb-front/src/main/resources/application-beta.yml index c2beaff6b7595e24596bec2a2917e37c1e899480..38423076cc8b803fccfc7053e15f3305efacdc56 100644 --- a/crmeb/crmeb-front/src/main/resources/application-beta.yml +++ b/crmeb/crmeb-front/src/main/resources/application-beta.yml @@ -6,16 +6,13 @@ server: port: 20009 spring: - profiles: - # 配置的环境 - active: beta # 数据库配置 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 1d5a53026df10d1ec29a153a7f965f7cb1d4d0ba..2b61b0618d346159fc02546cc58e998956974b58 100644 --- a/crmeb/crmeb-front/src/main/resources/application-dev.yml +++ b/crmeb/crmeb-front/src/main/resources/application-dev.yml @@ -6,20 +6,17 @@ server: port: 20011 spring: - profiles: - # 配置的环境 - active: dev # 数据库配置 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 3bc577f4c5b6b2246d2e69352de038140f429c31..967e468365a95912ac40871a3b25a150381a2444 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: @@ -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 f4d78b4ae18df845b084a6185cdce1268ba1e5ff..d9814817a4eb43ded7ee194614ab96aad99ac2d7 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: diff --git a/crmeb/pom.xml b/crmeb/pom.xml index 21f741f21c6b4201149c2d3901e6e8894af12f42..76f11b2f0062ef2accd48f145fc750732952917f 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