From 969229bd03ad3fa7dd178510cef657c0bc9ad2fb Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期三, 29 三月 2023 15:48:30 +0800
Subject: [PATCH] init

---
 DriverTravel/guns-admin/src/main/resources/application.yml     |    2 
 UserTravel/guns-admin/src/main/resources/application.yml       |  110 ++++++++++-----------
 DispatchTravel/guns-admin/src/main/resources/application.yml   |   77 +++++++++------
 ManagementTravel/guns-admin/src/main/resources/application.yml |   64 +++++-------
 4 files changed, 127 insertions(+), 126 deletions(-)

diff --git a/DispatchTravel/guns-admin/src/main/resources/application.yml b/DispatchTravel/guns-admin/src/main/resources/application.yml
index ee69913..7f97316 100644
--- a/DispatchTravel/guns-admin/src/main/resources/application.yml
+++ b/DispatchTravel/guns-admin/src/main/resources/application.yml
@@ -1,6 +1,14 @@
 server:
   port: 5003
 
+guns:
+  swagger-open: true              #是否开启swagger (true/false)
+  kaptcha-open: false             #是否开启登录时验证码 (true/false)
+#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
+  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
+  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
+  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
+
 spring:
   application:
     name: dispatch-server
@@ -20,15 +28,6 @@
       max-request-size: 100MB
       max-file-size: 100MB
 
-guns:
-  swagger-open: true              #是否开启swagger (true/false)
-  kaptcha-open: false             #是否开启登录时验证码 (true/false)
-#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
-  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
-  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
-  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
-
-
 mybatis-plus:
   typeAliasesPackage: com.stylefeng.guns.modular.system.model
 
@@ -38,13 +37,36 @@
 eureka:
   client:
     service-url: #注册中心地址
-      defaultZone: http://sinata:sinata@127.0.0.1:8081/eureka #启用身份验证的方式连接
+      defaultZone: http://127.0.0.1:8081/eureka #启用身份验证的方式连接
     register-with-eureka: true #在注册中心进行注册
     fetch-registry: true #从Eureka中获取注册信息。
+
+---
 
 #配置Swagger接口扫描范围
 swagger:
   base-package: com.stylefeng.guns.modular
+
+spring:
+  datasource:
+    url: jdbc:mysql://192.168.5.102:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: 123456
+    db-name: guns #用来搜集数据库的所有表
+    filters: wall,mergeStat
+
+#多数据源情况的配置
+guns:
+  muti-datasource:
+    open: false
+    url: jdbc:mysql://127.0.0.1:3306/guns_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: root
+    dataSourceNames:
+    - dataSourceGuns
+    - dataSourceBiz
+
+---
 
 
 wx:
@@ -56,18 +78,26 @@
   mchId: 1593080081 #微信支付分配的商户号
   key: JnhREmZwHNKyFUQPEhijp1gdaCUzKg8P #key为商户平台设置的密钥key:
 
+---
+
 alipay:
   appid: 1  #应用程序唯一标识
   appPrivateKey: 1 #开发者应用私钥
   alipayPublicKey: 1 #应用公钥
   alipay_public_key: 1 #支付宝公钥
 
+---
+
 juhe: #聚合数据
   appKey: 01ba594fee41fc7214ca77ef51c783c9 #
 
 
+---
+
 #filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
 filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
+
+
 
 #支付回调地址
 #正式环境
@@ -75,30 +105,13 @@
 #正式测试环境
 callbackPath: http://123.56.89.63:80/dispatch
 
+
+---
+
 #交通部推送数据功能开关
 pushMinistryOfTransport: false
 
+---
 jiguang:
   masterSecret: fca87938cb39a72360ea3293
-  appKey: 7eecaa0ce660780f4b364684
-
-
----
-spring:
-  profiles: dev
-  datasource:
-    url: jdbc:mysql://192.168.5.102:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    db-name: jyxtravel-sjdb #用来搜集数据库的所有表
-    filters: wall,mergeStat
----
-spring:
-  profiles: prod
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowPublicKeyRetrieval=true&&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    db-name: kuanzhaiyx #用来搜集数据库的所有表
-    filters: wall,mergeStat
----
\ No newline at end of file
+  appKey: 7eecaa0ce660780f4b364684
\ No newline at end of file
diff --git a/DriverTravel/guns-admin/src/main/resources/application.yml b/DriverTravel/guns-admin/src/main/resources/application.yml
index 4197770..b8dcfda 100644
--- a/DriverTravel/guns-admin/src/main/resources/application.yml
+++ b/DriverTravel/guns-admin/src/main/resources/application.yml
@@ -4,7 +4,7 @@
   application:
     name: driver-server
   profiles:
-    active: dev
+    active: @spring.active@
   mvc:
     static-path-pattern: /static/**
     view:
diff --git a/ManagementTravel/guns-admin/src/main/resources/application.yml b/ManagementTravel/guns-admin/src/main/resources/application.yml
index 5e2144b..4ccfb7f 100644
--- a/ManagementTravel/guns-admin/src/main/resources/application.yml
+++ b/ManagementTravel/guns-admin/src/main/resources/application.yml
@@ -15,7 +15,7 @@
 
 spring:
   profiles:
-    active: local
+    active: dev
   mvc:
     static-path-pattern: /static/**
     view:
@@ -45,55 +45,49 @@
   path: logs/
   file: guns.log
 
-#eureka:
-#  client:
-#    service-url: #注册中心地址
-#      defaultZone: http://sinata:sinata@139.9.249.67:8000/eureka #启用身份验证的方式连接
-#    register-with-eureka: true #在注册中心进行注册
-#    fetch-registry: true #从Eureka中获取注册信息。
+#filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
+filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
 
-
+#交通部推送数据功能开关
+pushMinistryOfTransport: false
 ---
-
-#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: dev
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.5.102:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
     password: 123456
-    db-name: kuanzhaiyx #用来搜集数据库的所有表
+    db-name: jyxtravel-sjdb #用来搜集数据库的所有表
     filters: wall,mergeStat
-
-
-
 #多数据源情况的配置
 guns:
   muti-datasource:
     open: false
     url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
-#    password: Root2020!
+    #    password: Root2020!
     password: 123456
     dataSourceNames:
       - dataSourceGuns
       - dataSourceBiz
-
-
 ---
-
-#filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
-filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
-
-
-#交通部推送数据功能开关
-pushMinistryOfTransport: false
-
+spring:
+  profiles: prod
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowPublicKeyRetrieval=true&&serverTimezone=Asia/Shanghai
+    username: root
+    password: 123456
+    db-name: kuanzhaiyx #用来搜集数据库的所有表
+    filters: wall,mergeStat
+#多数据源情况的配置
+guns:
+  muti-datasource:
+    open: false
+    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    #    password: Root2020!
+    password: 123456
+    dataSourceNames:
+      - dataSourceGuns
+      - dataSourceBiz
+---
diff --git a/UserTravel/guns-admin/src/main/resources/application.yml b/UserTravel/guns-admin/src/main/resources/application.yml
index 7692df0..5e97090 100644
--- a/UserTravel/guns-admin/src/main/resources/application.yml
+++ b/UserTravel/guns-admin/src/main/resources/application.yml
@@ -1,20 +1,11 @@
 server:
   port: 5001
 
-guns:
-  swagger-open: true              #是否开启swagger (true/false)
-  kaptcha-open: false             #是否开启登录时验证码 (true/false)
-#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
-  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
-  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
-  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
-
 spring:
   application:
     name: user-server
   profiles:
     active: dev
-#    active: produce
   mvc:
     static-path-pattern: /static/**
     view:
@@ -28,6 +19,14 @@
     multipart:
       max-request-size: 100MB
       max-file-size: 100MB
+
+guns:
+  swagger-open: true              #是否开启swagger (true/false)
+  kaptcha-open: false             #是否开启登录时验证码 (true/false)
+#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
+  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
+  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
+  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
 
 mybatis-plus:
   typeAliasesPackage: com.stylefeng.guns.modular
@@ -46,50 +45,10 @@
     register-with-eureka: true #在注册中心进行注册
     fetch-registry: true #从Eureka中获取注册信息。
 
----
-
 
 #配置Swagger接口扫描范围
 swagger:
   base-package: com.stylefeng.guns.modular
-
-
-#spring:
-#  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:
-  datasource:
-    url: jdbc:mysql://192.168.0.80:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    db-name: kuanzhaiyx #用来搜集数据库的所有表
-    filters: wall,mergeStat
-#spring:
-#  datasource:
-#    url: jdbc:mysql://192.168.0.80:3306/jyxtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-#    username: root
-#    password: 123456
-#    db-name: jyxtravel #用来搜集数据库的所有表
-#    filters: wall,mergeStat
-
-#多数据源情况的配置
-guns:
-  muti-datasource:
-    open: false
-    url: jdbc:mysql://127.0.0.1:3306/guns_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: root
-    dataSourceNames:
-      - dataSourceGuns
-      - dataSourceBiz
-
----
-
 
 
 wx:
@@ -101,21 +60,15 @@
   mchId: 1523106371 #微信支付分配的商户号
   key: s4TQO0NqPaRc0YfGptejNjlOpFlt4y2K #key为商户平台设置的密钥key:
 
----
-
 alipay:
   appid: 2021003104609428  #应用程序唯一标识
   appPrivateKey: MIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQC8SojFfM8fJTf3SWN2HoSDYT9bhhHQd5jkrT0eIe8jYIoYdZQT/Pt1Ld1z+JEoV2w4CYfX8dYyLOcG0iKYUPrIvNWT9E8jD+YillKuqC4U53ii5M+Zq023Xail0avxMLqM4o60CrqFaf0EtqCIwIa0Jx1Az5FEIIZAhxHCYAQtuqKJWU6LBEFqX9ZGBbD18pyFwi3fVFhmMVqD8TW7mULk40s32DkM7dXysj//ks5NUU8FmaXRvg5/1eb4jcVu8pQpifxm4uHP9SLKXRpATSCo0vfNOFs7p6yMvkmViIUzmMLfmQEoJYxZPkyfkPIlNqAiQytKCgeDEJ2DXRL7y7iBAgMBAAECggEAaEh7ka07ZYuOgJYT0RK736vXlFAfw67JbjWIeQzgTl6kfUF5nsxpVI/va9CKTKaGmE6m/vHA6Q83cO6nHGcVTmJPg982iTvAAP3ykyswQoGkrcs+M2TN6TWlNxl2OmH7oBXGZW7fuQ5nhNnE9Zhzwok7SW7sjKfa0xg7vMTC67PS4YlV4xiQbCv/HG9lw0hLZHuii3niaGrlm1/BJqwHRmeb+hYgsMjTdIZX/9XYi+zeI433f3+mtMq9MrRvcjwF48r+gBY2sbakWTVYj06g5HpQ3VbPXKkU1isBVt9wgZEjWXQFR+Gp1Ei6hWqmfj3ia3U7raqWdg+Imrq3NKjwJQKBgQDzRGl8DJeghZfc2iLO4nSByjMhZQgqqSDqPwKskDo1v0PPfBTECgvoKkqqSXIRbgOmnRK1NBD+2DmCeQJwMD0TrV92WI9ypgBvBUn9BudqgRYL2q7kAhzLRXvalQ4m4PWXtXjHH0Llg91eHgpzA0Ob0Kr3+E8qzcAxVb1ix9vRfwKBgQDGJXx9ZbNdnFLQ8RAj7KxC1IE5jVvNPQCKhLHZR9QdvUwELnUZxKhyIORciDizb+R2iLriYwtD/5fO6NxylmM8V0mE6a5R3Ahkv/pBFW7hAg9N8XP/rKSiPp7sDRN6S26KT7ciCMerU5uicGu7PQekWq5ft9cdgYZJwhJMfGl1/wKBgE4WXrnoHN/1IitNhjDctkNXUZRdpwJyqdMniMc1wMmx7KV0kgHfq7TJppAE5W2838Ui1HeAEBiN9d/w0hyLD3/6fhMyGFHYAXmhu/9RsQUaDKafetZL60xAsKIYiKNoQM2C/hME8OdVrcBhaj9DA/fHQqo4dckqpI/xkspbly8nAoGAW141xWz8BJJs7cP6+VXNKRPscqloR391nGoLyHGCsiPzxYnWnYc9VUMtii2WV8ekxbPO2U1qiHR3gAWIgZ4vLEfjstI+e6jGhg6wSwqjEkZs4DgSkTb+w4G0roxpCt91nXmcrKj3yVzIS2MjijdeKr9V4PVY0FZFogVHgtVrm+kCf1/JTK2s6B6Bnxszl50TizyFFhrk3x6vZr5MiL8SQ76YVx7AJzPVdkEsiZj4ti80uua3ULrNMZVRi75BSuJ99Ag1YCFYkbGa8DdCPva3TS5nCFQTHBe7SW9Rj6XweP7asRsdPr1A2sL4vdDA2iLJqfktruge7jmlX9ky+go+unI= #开发者应用私钥
   alipayPublicKey: ; #应用公钥
   alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEqIxXzPHyU390ljdh6Eg2E/W4YR0HeY5K09HiHvI2CKGHWUE/z7dS3dc/iRKFdsOAmH1/HWMiznBtIimFD6yLzVk/RPIw/mIpZSrqguFOd4ouTPmatNt12opdGr8TC6jOKOtAq6hWn9BLagiMCGtCcdQM+RRCCGQIcRwmAELbqiiVlOiwRBal/WRgWw9fKchcIt31RYZjFag/E1u5lC5ONLN9g5DO3V8rI//5LOTVFPBZml0b4Of9Xm+I3FbvKUKYn8ZuLhz/Uiyl0aQE0gqNL3zThbO6esjL5JlYiFM5jC35kBKCWMWT5Mn5DyJTagIkMrSgoHgxCdg10S+8u4gQIDAQAB #支付宝公钥
 
----
-
 juhe: #聚合数据
   appKey: 01ba594fee41fc7214ca77ef51c783c9 #
 
-
----
 
 #filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
 filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
@@ -126,8 +79,49 @@
 #测试环境
 callbackPath: http://39.96.82.2:80/user
 
+#交通部推送数据功能开关
+pushMinistryOfTransport: false
+
+
 
 ---
-
-#交通部推送数据功能开关
-pushMinistryOfTransport: false
\ No newline at end of file
+spring:
+  profiles: dev
+  datasource:
+    url: jdbc:mysql://192.168.5.102:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: 123456
+    db-name: jyxtravel-sjdb #用来搜集数据库的所有表
+    filters: wall,mergeStat
+#多数据源情况的配置
+guns:
+  muti-datasource:
+    open: false
+    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    #    password: Root2020!
+    password: 123456
+    dataSourceNames:
+      - dataSourceGuns
+      - dataSourceBiz
+---
+spring:
+  profiles: prod
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowPublicKeyRetrieval=true&&serverTimezone=Asia/Shanghai
+    username: root
+    password: 123456
+    db-name: kuanzhaiyx #用来搜集数据库的所有表
+    filters: wall,mergeStat
+#多数据源情况的配置
+guns:
+  muti-datasource:
+    open: false
+    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    #    password: Root2020!
+    password: 123456
+    dataSourceNames:
+      - dataSourceGuns
+      - dataSourceBiz
+---

--
Gitblit v1.7.1