Revert "本特勒2.0项目初始"

application-file/src/main/java/com/factory/file/domain/service/FileInfoServiceImpl.java

@@ -28,7 +28,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
-@Service
+@Service("FileInfo")
 public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> implements FileInfoService {
     @Resource
     private FileSystemProperties fileSystemProperties;

application-file/src/main/java/com/factory/file/interfaces/facade/FileController.java

@@ -20,32 +20,32 @@ import javax.annotation.Resource;
 public class FileController {
 
     @Resource
-    private FileInfoService fileInfoService;
+    private FileInfoService FileInfo;
 
     @ApiOperation(value = "文件上传")
     @PostMapping(value = "/uploadOneWithType")
     @ResponseBody
     public ResponseBean<FileRes> uploadOneWithType(@RequestBody MultipartFile file, FileType fileType) {
-        return fileInfoService.upload(file, fileType);
+        return FileInfo.upload(file, fileType);
     }
 
     @ApiOperation(value = "文件上传")
     @PostMapping(value = "/uploadOne")
     @ResponseBody
     public ResponseBean<FileRes> upload(@RequestBody MultipartFile file) {
-        return fileInfoService.upload(file, null);
+        return FileInfo.upload(file, null);
     }
     @ApiOperation(value = "文件上传(保存文件原名)")
     @PostMapping(value = "/uploadTwo")
     @ResponseBody
     public ResponseBean<FileRes> uploadTwo(@RequestBody MultipartFile file) {
-        return fileInfoService.uploadTwo(file);
+        return FileInfo.uploadTwo(file);
     }
     @ApiOperation(value = "获取文件信息")
     @PostMapping(value = "/getInfo")
     @ResponseBody
     public ResponseBean<FileRes> getInfo(@RequestBody Long id) {
-        return fileInfoService.getByid(id);
+        return FileInfo.getByid(id);
     }
 
 }

application-file/target/classes/application-aut.yml

@@ -0,0 +1,104 @@
+server:
+  port: 30045
+spring:
+  application:
+    name: application-file
+  redis:
+    host: 39.100.230.190
+    port: 8120
+    password: jh1q2w3e4r
+    database: 13
+    lettuce:
+      pool:
+        max-active: 5
+  datasource:
+    dynamic:
+      primary: self #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+      datasource:
+        self:
+          url: jdbc:mysql://39.100.230.190:8092/zhoudu_base?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: Jh@Jh2019!
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        file:
+          url: jdbc:mysql://39.100.230.190:8092/zhoudu_base?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: Jh@Jh2019!
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+    hikari:
+      maximum-pool-size: 5
+
+cn:
+  jiheng:
+    file:
+      file-store-dir: download
+      zip-out-dir: zip
+      download-prefix: https://s2.jihengcc.cn/file/download
+
+jetcache:
+  statIntervalMinutes: 15
+  areaInCacheName: false
+  hidePackages: top.jiheng.factory
+  local:
+    # 默认2小时本地缓存
+    default:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 3600000
+      expireAfterAccessInMillis: 1800000
+    # 長時本地緩存，主要用于要求时效一般
+    longTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 300000
+      expireAfterAccessInMillis: 180000
+    # 短時本地緩存，主要用于要求时效较高的配置
+    shortTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 60000
+      expireAfterAccessInMillis: 40000
+  remote:
+    # 默认2小时的远程缓存
+    default:
+      type: redis
+      expireAfterWriteInMillis: 43200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}
+    # 长时远程緩存，主要用于要求时效要求一般的集中式缓存
+    longTime:
+      type: redis
+      expireAfterWriteInMillis: 7200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}
+    # 短時远程緩存，主要用于要求时效较高的集中式缓存
+    shortTime:
+      type: redis
+      expireAfterWriteInMillis: 300000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}

application-file/target/classes/application-dev.yml

@@ -0,0 +1,100 @@
+server:
+  port: 30045
+spring:
+  application:
+    name: application-web
+  redis:
+    host: 192.168.31.14
+    port: 6379
+    lettuce:
+      pool:
+        max-active: 5
+  datasource:
+    dynamic:
+      primary: self #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+      datasource:
+        #本项目使用
+        self:
+          url: jdbc:mysql://www.jihengcc.cn:17336/zhoudu_base?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: 1q2w3e4r
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        #本项目使用
+        file:
+          url: jdbc:mysql://www.jihengcc.cn:17336/zhoudu_base?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: 1q2w3e4r
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+      hikari:
+        max-pool-size: 1
+cn:
+  jiheng:
+    file:
+      file-store-dir: download
+      zip-out-dir: zip
+      download-prefix: http://39.100.230.190:30045/
+
+jetcache:
+  statIntervalMinutes: 15
+  areaInCacheName: false
+  hidePackages: top.jiheng.factory
+  local:
+    # 默认2小时本地缓存
+    default:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 3600000
+      expireAfterAccessInMillis: 1800000
+    # 長時本地緩存，主要用于要求时效一般
+    longTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 300000
+      expireAfterAccessInMillis: 180000
+    # 短時本地緩存，主要用于要求时效较高的配置
+    shortTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 60000
+      expireAfterAccessInMillis: 40000
+  remote:
+    # 默认2小时的远程缓存
+    default:
+      type: redis
+      expireAfterWriteInMillis: 43200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:192.168.31.14}
+      port: ${SPRING.REDIS.PORT:6379}
+    # 长时远程緩存，主要用于要求时效要求一般的集中式缓存
+    longTime:
+      type: redis
+      expireAfterWriteInMillis: 7200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:192.168.31.14}
+      port: ${SPRING.REDIS.PORT:6379}
+    # 短時远程緩存，主要用于要求时效较高的集中式缓存
+    shortTime:
+      type: redis
+      expireAfterWriteInMillis: 300000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:192.168.31.14}
+      port: ${SPRING.REDIS.PORT:6379}

application-file/target/classes/application-prod.yml

@@ -0,0 +1,106 @@
+server:
+  port: 30045
+spring:
+  application:
+    name: application-file
+  redis:
+    host: 39.100.230.190
+    port: 8120
+    password: jh1q2w3e4r
+    database: 15
+    lettuce:
+      pool:
+        max-active: 5
+  datasource:
+    dynamic:
+      primary: self #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+      datasource:
+        self:
+          url: jdbc:mysql://rm-2zesmqi0ku3lf9p3c.mysql.rds.aliyuncs.com:3306/zhoudu_base?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: zhoudu
+          password: zhoudu&yujia#SY
+          driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        file:
+          url: jdbc:mysql://rm-2zesmqi0ku3lf9p3c.mysql.rds.aliyuncs.com:3306/zhoudu_base?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: zhoudu
+          password: zhoudu&yujia#SY
+          driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+    hikari:
+      maximum-pool-size: 5
+
+cn:
+  jiheng:
+    file:
+      file-store-dir: download
+      zip-out-dir: zip
+#      download-prefix: http://81.70.84.72:30045/
+      download-prefix: http://8.140.188.124:30045/file/
+#      download-prefix: http://172.18.0.24:30045/
+
+jetcache:
+  statIntervalMinutes: 15
+  areaInCacheName: false
+  hidePackages: top.jiheng.factory
+  local:
+    # 默认2小时本地缓存
+    default:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 3600000
+      expireAfterAccessInMillis: 1800000
+    # 長時本地緩存，主要用于要求时效一般
+    longTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 300000
+      expireAfterAccessInMillis: 180000
+    # 短時本地緩存，主要用于要求时效较高的配置
+    shortTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 60000
+      expireAfterAccessInMillis: 40000
+  remote:
+    # 默认2小时的远程缓存
+    default:
+      type: redis
+      expireAfterWriteInMillis: 43200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}
+    # 长时远程緩存，主要用于要求时效要求一般的集中式缓存
+    longTime:
+      type: redis
+      expireAfterWriteInMillis: 7200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}
+    # 短時远程緩存，主要用于要求时效较高的集中式缓存
+    shortTime:
+      type: redis
+      expireAfterWriteInMillis: 300000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}

application-file/target/classes/application-test.yml

@@ -0,0 +1,104 @@
+server:
+  port: 40045
+spring:
+  application:
+    name: application-file
+  redis:
+    host: 39.100.230.190
+    port: 8120
+    password: jh1q2w3e4r
+    database: 14
+    lettuce:
+      pool:
+        max-active: 5
+  datasource:
+    dynamic:
+      primary: self #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+      datasource:
+        self:
+          url: jdbc:mysql://39.100.230.190:8092/zhoudu_ceshi?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: Jh@Jh2019!
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        file:
+          url: jdbc:mysql://39.100.230.190:8092/zhoudu_ceshi?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: Jh@Jh2019!
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+    hikari:
+      maximum-pool-size: 5
+
+cn:
+  jiheng:
+    file:
+      file-store-dir: download
+      zip-out-dir: zip
+      download-prefix: https://s2t.jihengcc.cn/file/
+
+jetcache:
+  statIntervalMinutes: 15
+  areaInCacheName: false
+  hidePackages: top.jiheng.factory
+  local:
+    # 默认2小时本地缓存
+    default:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 3600000
+      expireAfterAccessInMillis: 1800000
+    # 長時本地緩存，主要用于要求时效一般
+    longTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 300000
+      expireAfterAccessInMillis: 180000
+    # 短時本地緩存，主要用于要求时效较高的配置
+    shortTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 60000
+      expireAfterAccessInMillis: 40000
+  remote:
+    # 默认2小时的远程缓存
+    default:
+      type: redis
+      expireAfterWriteInMillis: 43200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}
+    # 长时远程緩存，主要用于要求时效要求一般的集中式缓存
+    longTime:
+      type: redis
+      expireAfterWriteInMillis: 7200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}
+    # 短時远程緩存，主要用于要求时效较高的集中式缓存
+    shortTime:
+      type: redis
+      expireAfterWriteInMillis: 300000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}

application-file/target/classes/application-uat.yml

@@ -0,0 +1,104 @@
+server:
+  port: 30045
+spring:
+  application:
+    name: application-file
+  redis:
+    host: 39.100.230.190
+    port: 8120
+    password: jh1q2w3e4r
+    database: 13
+    lettuce:
+      pool:
+        max-active: 5
+  datasource:
+    dynamic:
+      primary: self #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+      datasource:
+        self:
+          url: jdbc:mysql://39.100.230.190:8092/longdy?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: Jh@Jh2019!
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        file:
+          url: jdbc:mysql://39.100.230.190:8092/longdy?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: Jh@Jh2019!
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+    hikari:
+      maximum-pool-size: 5
+
+cn:
+  jiheng:
+    file:
+      file-store-dir: download
+      zip-out-dir: zip
+      download-prefix: https:///s2.jihengcc.cn/file/
+
+jetcache:
+  statIntervalMinutes: 15
+  areaInCacheName: false
+  hidePackages: top.jiheng.factory
+  local:
+    # 默认2小时本地缓存
+    default:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 3600000
+      expireAfterAccessInMillis: 1800000
+    # 長時本地緩存，主要用于要求时效一般
+    longTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 300000
+      expireAfterAccessInMillis: 180000
+    # 短時本地緩存，主要用于要求时效较高的配置
+    shortTime:
+      type: caffeine
+      keyConvertor: fastjson
+      expireAfterWriteInMillis: 60000
+      expireAfterAccessInMillis: 40000
+  remote:
+    # 默认2小时的远程缓存
+    default:
+      type: redis
+      expireAfterWriteInMillis: 43200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}
+    # 长时远程緩存，主要用于要求时效要求一般的集中式缓存
+    longTime:
+      type: redis
+      expireAfterWriteInMillis: 7200000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}
+    # 短時远程緩存，主要用于要求时效较高的集中式缓存
+    shortTime:
+      type: redis
+      expireAfterWriteInMillis: 300000
+      keyConvertor: fastjson
+      valueEncoder: kryo
+      valueDecoder: kryo
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+      host: ${SPRING.REDIS.HOST:39.100.230.190}
+      port: ${SPRING.REDIS.PORT:8120}
+      password: ${SPRING.REDIS.PASSWORD:jh1q2w3e4r}

application-file/target/classes/application.yml

@@ -0,0 +1,61 @@
+server:
+  servlet:
+    context-path: /file/
+spring:
+  profiles:
+    active: uat
+  servlet:
+    multipart:
+      max-file-size: 10240MB
+      max-request-size: 10240MB
+swagger:
+  enabled: true
+  docket:
+    apis:
+      title: "文件上传"
+      base-package: cn.jiheng.factory.application.file.interfaces.facade
+  authorization:
+    key-name: Authorization
+  ui-config:
+    json-editor: true
+  description: "统一上传返回文件id,url为完整url不需要拼接"
+cn:
+  jiheng:
+    auth:
+      permit-url-list:
+        - /swagger-ui.html
+        - /webjars/**
+        - /swagger-resources/**
+        - /v2/**
+        - /favicon.ico
+        - /doc.html
+        - /csrf
+        - /error**
+        - /**
+      token-prefix: 'Bearer '
+token:
+  expire:
+    long:
+      time: 172800
+      refreshTime: 345600
+    short:
+      time: 7200
+
+logging:
+  file:
+    path: logs
+    max-size: 10MB
+  level:
+    root: info
+    cn.jiheng.factory.application.file: info
+
+
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/*.xml
+  global-config:
+    db-config:
+      table-prefix: t_
+      table-underline: true
+      logic-delete-field: deleted  #全局逻辑删除字段值 3.3.0开始支持，详情看下面。
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)