Merge remote-tracking branch 'origin/dev' into dev

xuhy

7 天以前 3b6789ae8cb8138533b2cc362f37ad94b605a58d

 UserZYTravel/guns-admin/src/main/resources/application.yml

@@ -2,7 +2,7 @@
  port: 8006

guns:
  swagger-open: true              #是否开启swagger (true/false)
  swagger-open: false              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
@@ -13,7 +13,7 @@
  application:
    name: user-server
  profiles:
    active: @spring.active@
    active: produce
  mvc:
    static-path-pattern: /static/**
    view:
@@ -27,12 +27,16 @@
    multipart:
      max-request-size: 100MB
      max-file-size: 100MB
  redis:
    database: 0
    host: 127.0.0.1
    port: 16379
    password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5

mybatis-plus:
  typeAliasesPackage: com.stylefeng.guns.modular

log:
  path: guns-logs
  configuration:
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl

eureka:
  client:
@@ -49,23 +53,14 @@
  base-package: com.stylefeng.guns.modular


#spring:
#  profiles: local
#  datasource:
#    url: jdbc:mysql://Rm-wz9rpe0t74ys3b1h8go.mysql.rds.aliyuncs.com:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: Root2020!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat


################# 测试环境 ###################
spring:
  profiles: local
  datasource:
    url: jdbc:mysql://localhost:3306/zytravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    password: 0KiwEhl6EnIFWNqB7d1FJLWKy9urjvMS
#    password: 123456
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat

@@ -79,37 +74,6 @@
    dataSourceNames:
      - dataSourceGuns
      - dataSourceBiz

---

spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/guns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: root
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat

---

spring:
  profiles: test
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/guns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: root
    filters: wall,mergeStat

---

spring:
  profiles: produce
  datasource:
      url: jdbc:mysql://127.0.0.1:3306/guns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
      username: root
      password: root
      filters: wall,mergeStat


---
@@ -140,16 +104,16 @@
---

#filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
filePath: D:/web/orderPostionFile/  #存储订单轨迹文件路径

#支付回调地址
#正式环境
#callbackPath: https://okyueche.com:443/user
callbackPath: https://www.zycx.ztrbkj.com:443/user
#测试环境
callbackPath: http://39.108.37.243/user
#callbackPath: http://39.108.37.243/user


---

#交通部推送数据功能开关
pushMinistryOfTransport: false
pushMinistryOfTransport: true