From 9813a65150a5920dfa0cc9ea9bc07c9481baeb1c Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 15 七月 2022 11:56:16 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/resources/config/application.yaml | 4 +-
safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml | 79 +++++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
new file mode 100644
index 0000000..bfed9b6
--- /dev/null
+++ b/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
@@ -0,0 +1,79 @@
+server:
+ tomcat:
+ uri-encoding: UTF-8
+ basedir: /
+ port: 8009
+ servlet:
+ context-path: /
+
+# mysql
+spring:
+ datasource:
+ emergency:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
+ type: com.alibaba.druid.pool.DruidDataSource
+ goalmanage:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
+ type: com.alibaba.druid.pool.DruidDataSource
+ redis:
+ host: 192.168.0.52
+ port: 6378
+ password: SEF98uvs98dUAUEF90Udssa
+ database: 0 # Redis 数据库号，默认为 0
+ timeout: 15000 # Redis 连接超时时间，单位：毫秒。
+ # 对应 RedisProperties.Jedis 内部类
+ jedis:
+ pool:
+ max-active: 8 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
+ max-idle: 8 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
+ min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
+ max-wait: -1
+
+
+mybatis-plus:
+ configuration:
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+dubbo:
+ registry:
+ protocol: nacos
+ address: nacos://192.168.0.52:8848?namespace=11ee8fe9-ea10-4f63-9752-c33c7ac36e36&username=gkhy_safeplatform_out&password=9485uyJHISes09t
+ application:
+ name: gkhy-safeplatform-out
+ scan:
+ # 扫描rpc接口定义包
+ base-packages: com.gkhy.safePlatform
+ protocol:
+ name: dubbo
+ port: 18082
+ serialization: kryo
+ consumer:
+ # 服务连接超时时间
+ timeout: 3000
+ # 取消服务启动检查
+ check: false
+
+minio:
+ endPoint: 192.168.0.52
+ port: 9001
+ accessKey: kH6eiQtNrWqGNb1r
+ secretKey: ff5ykVUJJn0hi5PghsitdGNSsrW0Xrju
+ secure: false
+ bucketName: szh-stu
+ urlPrefix: http://192.168.0.52/file
+
+
+token:
+ header: Authorization
+ secret: safe666
+ expiration: 7200
+ refreshExpiration: 14400
+ tokenHead: Bearer
+ loginUserHeader: uid
+
diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index f005f0b..cbaaeea 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -3,7 +3,7 @@
name: gkhy-safeplatform-out
profiles:
# active: prod
- active: dev
+ active: out-dev
mybatis-plus:
mapper-locations: classpath:config/mapper/**/*.xml
@@ -11,4 +11,4 @@
logging:
config: classpath:config/log/log4j2.xml
level:
- com.gkhy: info
\ No newline at end of file
+ com.gkhy: info
--
Gitblit v1.9.2