Merge remote-tracking branch 'origin/master'

Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:8u292-jre-buster
+ARG JAR_FILE=/target/*.jar
+COPY ${JAR_FILE} system-card.jar
+COPY fonts/ /usr/share/fonts
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=prod","/system-card.jar"]

src/main/resources/application-prod.yml

@@ -0,0 +1,116 @@
+server:
+  port: 8002
+  url: https://www.tenlion.com.cn/systemcard
+  system-title: 名片系统
+  system-sub-title: 名片系统
+  servlet:
+    context-path: /systemcard
+
+spring:
+  login-url: /oauth/login
+  login-failure: /oauth/login?error
+  login-process: /userlogin
+  assets-matchers: /assets/**
+  thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    mode: HTML5
+    encoding: UTF-8
+    cache: false
+  main:
+    allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 1GB
+      max-request-size: 1GB
+  datasource:
+    druid:
+      url: jdbc:mysql://localhost:3306/db_card?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
+      db-type: mysql
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      username: root
+      password: TSkj@0471.250
+      initial-size: 2
+      min-idle: 2
+      max-active: 10
+      # 配置获取连接等待超时的时间
+      max-wait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      time-between-eviction-runs-millis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      min-evictable-idle-time-millis: 300000
+      validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      # 打开PSCache，并且指定每个连接上PSCache的大小
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 10
+      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+      filter:
+        commons-log:
+          connection-logger-name: stat,wall,log4j
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 2000
+      # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      # 合并多个DruidDataSource的监控数据
+      use-global-data-source-stat: true
+
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+logging:
+  file:
+    name: /projects/logs/system-card.log
+  level:
+    root: error
+    com.cm: debug
+    ink.wgink: debug
+    cn.com: debug
+
+
+swagger:
+  base-package-list: ink.wgink,cn.com.tenlion
+
+# 文件上传管理
+file:
+  # 文件的保存路径
+  upload-path: /projects/uploadFiles
+  # 图片类型
+  image-types: png,jpg,jpeg,gif,blob
+  # 视频类型
+  video-types: mp4,rmvb
+  # 音频类型
+  audio-types: mp3,wmv
+  # 文件类型
+  file-types: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf
+  # 同时上传最大支持数
+  max-file-count: 6
+  # 图片输出压缩质量，大于0，默认0.4
+  image-output-quality: 0.4
+  # 媒体最大时长（单位：秒）
+#  media-max-duration:
+#    # 后台
+#    backend:
+#      video: 10
+#      audio: 60
+#    # 微信
+#    wechat:
+#      video: 10
+#      audio: 60
+#    # app
+#    app:
+#      video: 10
+#      audio: 60
+open-platform:
+  wechat:
+    mini-app:
+      # 激活状态
+      active: true
+      authorizeUrl: https://api.weixin.qq.com/sns/jscode2session
+      grantType: authorization_code
+      appKey: wxe17874894f7ff27b
+      appSecret: 170855ab04c5149bcd3efe96621fe7e0