Merge branch 'master' of shikejing/guns-separation into master

guns-main/src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ spring:
  profiles: prod
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://172.26.0.114:3306/guns-separation?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT
    url: jdbc:mysql://172.26.0.104:3306/guns-separation?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT
    username: root
    password: jkzlehr
    # 连接池大小根据实际情况调整