From 46cde1f2ee4d363111c7a65fa16751ceccbfeca3 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Thu, 10 Sep 2020 13:55:18 +0800
Subject: [PATCH] Update techhero-project-emergencycommand-dev.yml

---
 techhero-project-emergencycommand-dev.yml   | 146 --------------------------------------------------------------------------------------------------------------------------------------------------
 techhero-project-emergencycommand-local.yml | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+), 146 deletions(-)
 delete mode 100644 techhero-project-emergencycommand-dev.yml
 create mode 100644 techhero-project-emergencycommand-local.yml

diff --git a/techhero-project-emergencycommand-dev.yml b/techhero-project-emergencycommand-dev.yml
deleted file mode 100644
index 84a7702..0000000
--- a/techhero-project-emergencycommand-dev.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-spring:
-  thymeleaf:
-    prefix: classpath:/templates/
-    suffix: .html
-    encoding: UTF-8
-    mode: HTML5
-
-#缓存
-cache:
-  redis:
-    entity:30;account:30;
-
-#全局相关
-global:
-  swagger:
-    import: true
-  file:
-    #本地测试配置,需根据实际情况调整#
-    path: D:\\temp\\
-    bucketName: jyksy-gjjybzh
-    endpoint: ctyoss.chutianyun.gov.cn:8060
-    akey: L3B7SA05OXT0V9WKD02N
-    skey: D0O4yTDqBCteH0p5dAgRibxZ8rNSLg0PShFF94IL
-    yjzhBucketName: yjzh
-  esms:
-    soTimeout: 3000
-    shortConnMode: false
-    mtMaxConns: 1
-    ip: sms.chutianyun.gov.cn
-    sendPort: 8090
-    receivePort: 8088
-    name: jyksyzwpt
-    password: TyHdc1ul
-
-aliyun:
-  accessKeyId: LTAI4FkmdGP1dhEMWs1Csnm5
-  accessKeySecret: 66Kdty0k1aC9GUofUdHzLduoQxzS8p
-  endpointUrl: http://1608795094315923.mns.cn-beijing.aliyuncs.com/
-
-#数据源
-rdsdatasource:
-  type: com.alibaba.druid.pool.DruidDataSource
-  url: jdbc:oracle:thin:@119.96.87.17:1521:orcl
-  username: yjzh
-  password: yjzh
-  driver-class-name: oracle.jdbc.OracleDriver
-  initialSize: 9                                  #初始化提供的连接数
-  minIdle: 9                                      #数据库连接池的最小维持连接数
-  maxActive: 20                                   #最大的连接数
-  maxWait: 60000
-  timeBetweenEvictionRunsMillis: 60000            #空闲时间超过minEvictableIdleTimeMillis的连接则释放
-  minEvictableIdleTimeMillis: 300000              #等待连接获取的最大超时时间
-  validationQuery: SELECT 1 FROM DUAL             #启动开启检查连接性
-  filters: stat,slf4j                             #监控配置
-  connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000  # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-  useGlobalDataSourceStat: true                   # 合并多个DruidDataSource的监控数据
-  filter:
-    commons-log:
-      statement-log-enabled: true
-      statement-executable-sql-log-enable: true
-
-ztkdatasource:
-  type: com.alibaba.druid.pool.DruidDataSource
-  url: jdbc:oracle:thin:@119.96.87.17:1521:orcl
-  username: yjzh_zt
-  password: yjzh_zt
-  driver-class-name: oracle.jdbc.OracleDriver
-  initialSize: 5                                  #初始化提供的连接数
-  minIdle: 5                                      #数据库连接池的最小维持连接数
-  maxActive: 20                                   #最大的连接数
-  maxWait: 60000
-  timeBetweenEvictionRunsMillis: 60000            #空闲时间超过minEvictableIdleTimeMillis的连接则释放
-  minEvictableIdleTimeMillis: 300000              #等待连接获取的最大超时时间
-  validationQuery: SELECT 1 FROM DUAL             #启动开启检查连接性
-  filters: stat,slf4j                             #监控配置
-  connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000  # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-  useGlobalDataSourceStat: true                   # 合并多个DruidDataSource的监控数据
-  filter:
-    commons-log:
-      statement-log-enabled: true
-      statement-executable-sql-log-enable: true
-
-jckdatasource:
-  type: com.alibaba.druid.pool.DruidDataSource
-  url: jdbc:oracle:thin:@119.96.87.17:1521:orcl
-  username: jcsj
-  password: jcsj123
-  driver-class-name: oracle.jdbc.OracleDriver
-  initialSize: 5                                  #初始化提供的连接数
-  minIdle: 5                                      #数据库连接池的最小维持连接数
-  maxActive: 20                                   #最大的连接数
-  maxWait: 60000
-  timeBetweenEvictionRunsMillis: 60000            #空闲时间超过minEvictableIdleTimeMillis的连接则释放
-  minEvictableIdleTimeMillis: 300000              #等待连接获取的最大超时时间
-  validationQuery: SELECT 1 FROM DUAL             #启动开启检查连接性
-  filters: stat,slf4j                             #监控配置
-  connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000  # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-  useGlobalDataSourceStat: true                   # 合并多个DruidDataSource的监控数据
-  filter:
-    commons-log:
-      statement-log-enabled: true
-      statement-executable-sql-log-enable: true
-
-zcptdatasource:
-  type: com.alibaba.druid.pool.DruidDataSource
-  url: jdbc:oracle:thin:@119.96.87.17:1521:orcl
-  username: zcpt_zt
-  password: zcpt_zt123
-  driver-class-name: oracle.jdbc.OracleDriver
-  initialSize: 5                                  #初始化提供的连接数
-  minIdle: 5                                      #数据库连接池的最小维持连接数
-  maxActive: 20                                   #最大的连接数
-  maxWait: 60000
-  timeBetweenEvictionRunsMillis: 60000            #空闲时间超过minEvictableIdleTimeMillis的连接则释放
-  minEvictableIdleTimeMillis: 300000              #等待连接获取的最大超时时间
-  validationQuery: SELECT 1 FROM DUAL             #启动开启检查连接性
-  filters: stat,slf4j                             #监控配置
-  connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000  # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-  useGlobalDataSourceStat: true                   # 合并多个DruidDataSource的监控数据
-  filter:
-    commons-log:
-      statement-log-enabled: true
-      statement-executable-sql-log-enable: true
-
-logging:
-  config: classpath:logback-techhero.xml
-
-xyLink:
-  token: 0909d14617eb48fa1a03bc58bcef9435d0a533dc1d4a191d78dc853f7a2d50c1
-  enterpriseId: babeb0d578fb9a2b1c3f8374109bbf718ed08199
-  appId: BNPNNVVUNVVNT
-
-qr:
-  basePath: /Users/cnnoter/Data/TempData/
-
-dbfhUrl:
-  fhUrl: http://119.96.87.17:10301/
-
-invitation:
-  preUrl: http://119.96.87.17:10302/open/zh/invitation/joinMeeting/ #到达入会页面连接前缀
-  annoUrl: http://119.96.87.17:10302/open/zh/invitation/anno/ #到达入会下载页面连接
-
-msg:
-  msgType: 1 # 1: 代表发送消息 2:代表发送短信 3: 消息和短信齐发
-  msgRole: zhgz02,zhld01  #zhgz02 考区指挥人员对应支撑平台考区值班员  zhld01 考区负责人对应指挥领导
-  msgBody: 这是发短信的模版
diff --git a/techhero-project-emergencycommand-local.yml b/techhero-project-emergencycommand-local.yml
new file mode 100644
index 0000000..84a7702
--- /dev/null
+++ b/techhero-project-emergencycommand-local.yml
@@ -0,0 +1,146 @@
+spring:
+  thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    encoding: UTF-8
+    mode: HTML5
+
+#缓存
+cache:
+  redis:
+    entity:30;account:30;
+
+#全局相关
+global:
+  swagger:
+    import: true
+  file:
+    #本地测试配置,需根据实际情况调整#
+    path: D:\\temp\\
+    bucketName: jyksy-gjjybzh
+    endpoint: ctyoss.chutianyun.gov.cn:8060
+    akey: L3B7SA05OXT0V9WKD02N
+    skey: D0O4yTDqBCteH0p5dAgRibxZ8rNSLg0PShFF94IL
+    yjzhBucketName: yjzh
+  esms:
+    soTimeout: 3000
+    shortConnMode: false
+    mtMaxConns: 1
+    ip: sms.chutianyun.gov.cn
+    sendPort: 8090
+    receivePort: 8088
+    name: jyksyzwpt
+    password: TyHdc1ul
+
+aliyun:
+  accessKeyId: LTAI4FkmdGP1dhEMWs1Csnm5
+  accessKeySecret: 66Kdty0k1aC9GUofUdHzLduoQxzS8p
+  endpointUrl: http://1608795094315923.mns.cn-beijing.aliyuncs.com/
+
+#数据源
+rdsdatasource:
+  type: com.alibaba.druid.pool.DruidDataSource
+  url: jdbc:oracle:thin:@119.96.87.17:1521:orcl
+  username: yjzh
+  password: yjzh
+  driver-class-name: oracle.jdbc.OracleDriver
+  initialSize: 9                                  #初始化提供的连接数
+  minIdle: 9                                      #数据库连接池的最小维持连接数
+  maxActive: 20                                   #最大的连接数
+  maxWait: 60000
+  timeBetweenEvictionRunsMillis: 60000            #空闲时间超过minEvictableIdleTimeMillis的连接则释放
+  minEvictableIdleTimeMillis: 300000              #等待连接获取的最大超时时间
+  validationQuery: SELECT 1 FROM DUAL             #启动开启检查连接性
+  filters: stat,slf4j                             #监控配置
+  connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000  # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
+  useGlobalDataSourceStat: true                   # 合并多个DruidDataSource的监控数据
+  filter:
+    commons-log:
+      statement-log-enabled: true
+      statement-executable-sql-log-enable: true
+
+ztkdatasource:
+  type: com.alibaba.druid.pool.DruidDataSource
+  url: jdbc:oracle:thin:@119.96.87.17:1521:orcl
+  username: yjzh_zt
+  password: yjzh_zt
+  driver-class-name: oracle.jdbc.OracleDriver
+  initialSize: 5                                  #初始化提供的连接数
+  minIdle: 5                                      #数据库连接池的最小维持连接数
+  maxActive: 20                                   #最大的连接数
+  maxWait: 60000
+  timeBetweenEvictionRunsMillis: 60000            #空闲时间超过minEvictableIdleTimeMillis的连接则释放
+  minEvictableIdleTimeMillis: 300000              #等待连接获取的最大超时时间
+  validationQuery: SELECT 1 FROM DUAL             #启动开启检查连接性
+  filters: stat,slf4j                             #监控配置
+  connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000  # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
+  useGlobalDataSourceStat: true                   # 合并多个DruidDataSource的监控数据
+  filter:
+    commons-log:
+      statement-log-enabled: true
+      statement-executable-sql-log-enable: true
+
+jckdatasource:
+  type: com.alibaba.druid.pool.DruidDataSource
+  url: jdbc:oracle:thin:@119.96.87.17:1521:orcl
+  username: jcsj
+  password: jcsj123
+  driver-class-name: oracle.jdbc.OracleDriver
+  initialSize: 5                                  #初始化提供的连接数
+  minIdle: 5                                      #数据库连接池的最小维持连接数
+  maxActive: 20                                   #最大的连接数
+  maxWait: 60000
+  timeBetweenEvictionRunsMillis: 60000            #空闲时间超过minEvictableIdleTimeMillis的连接则释放
+  minEvictableIdleTimeMillis: 300000              #等待连接获取的最大超时时间
+  validationQuery: SELECT 1 FROM DUAL             #启动开启检查连接性
+  filters: stat,slf4j                             #监控配置
+  connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000  # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
+  useGlobalDataSourceStat: true                   # 合并多个DruidDataSource的监控数据
+  filter:
+    commons-log:
+      statement-log-enabled: true
+      statement-executable-sql-log-enable: true
+
+zcptdatasource:
+  type: com.alibaba.druid.pool.DruidDataSource
+  url: jdbc:oracle:thin:@119.96.87.17:1521:orcl
+  username: zcpt_zt
+  password: zcpt_zt123
+  driver-class-name: oracle.jdbc.OracleDriver
+  initialSize: 5                                  #初始化提供的连接数
+  minIdle: 5                                      #数据库连接池的最小维持连接数
+  maxActive: 20                                   #最大的连接数
+  maxWait: 60000
+  timeBetweenEvictionRunsMillis: 60000            #空闲时间超过minEvictableIdleTimeMillis的连接则释放
+  minEvictableIdleTimeMillis: 300000              #等待连接获取的最大超时时间
+  validationQuery: SELECT 1 FROM DUAL             #启动开启检查连接性
+  filters: stat,slf4j                             #监控配置
+  connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000  # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
+  useGlobalDataSourceStat: true                   # 合并多个DruidDataSource的监控数据
+  filter:
+    commons-log:
+      statement-log-enabled: true
+      statement-executable-sql-log-enable: true
+
+logging:
+  config: classpath:logback-techhero.xml
+
+xyLink:
+  token: 0909d14617eb48fa1a03bc58bcef9435d0a533dc1d4a191d78dc853f7a2d50c1
+  enterpriseId: babeb0d578fb9a2b1c3f8374109bbf718ed08199
+  appId: BNPNNVVUNVVNT
+
+qr:
+  basePath: /Users/cnnoter/Data/TempData/
+
+dbfhUrl:
+  fhUrl: http://119.96.87.17:10301/
+
+invitation:
+  preUrl: http://119.96.87.17:10302/open/zh/invitation/joinMeeting/ #到达入会页面连接前缀
+  annoUrl: http://119.96.87.17:10302/open/zh/invitation/anno/ #到达入会下载页面连接
+
+msg:
+  msgType: 1 # 1: 代表发送消息 2:代表发送短信 3: 消息和短信齐发
+  msgRole: zhgz02,zhld01  #zhgz02 考区指挥人员对应支撑平台考区值班员  zhld01 考区负责人对应指挥领导
+  msgBody: 这是发短信的模版
--
libgit2 0.26.0