From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-smoke/src/main/resources/application-pro.yml | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ycl-smoke/src/main/resources/application-pro.yml b/ycl-smoke/src/main/resources/application-pro.yml
index acbbec7..045f68f 100644
--- a/ycl-smoke/src/main/resources/application-pro.yml
+++ b/ycl-smoke/src/main/resources/application-pro.yml
@@ -1,5 +1,5 @@
server:
- port: 8083
+ port: 8084
tomcat:
uri-encoding: UTF-8
servlet:
@@ -24,8 +24,9 @@
spring:
redis:
database: 0
- host: localhost
- password:
+ host: 127.0.0.1
+ port: 6380
+ password: ycl2018
jedis:
pool:
max-active: 8
@@ -33,9 +34,9 @@
min-idle: 0
timeout: 0
datasource:
- url: jdbc:mysql://42.193.1.25:3306/sccg?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
- username: root
- password: 321$YcYl@1970!
+ url: jdbc:mysql://10.110.247.252:3306/sccg?characterEncoding=utf-8
+ username: toor
+ password: v6VGHAzXEu$zF7
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -64,8 +65,15 @@
url: http://localhost:8082/sccg/text/sms_res
videoPoint:
- url: http://183.245.159.161:8281
- port: 8281
+ url: http://172.28.194.180:7902
+ port: 7902
userName: suichang
passWord: a12345677
- ip: 10.10.10.10
\ No newline at end of file
+ ip: 10.10.10.10
+
+aliyun:
+ oss:
+ endpoint: http://oss-cn-zjls-lszwy-d01-a.ops.zjlscloud.com
+ keyId: Tkf72Q1gdzETsZf6
+ keySecret: tRk39S6B1kSGARRdS4DF6jxr5nBYj5
+ bucketName: zhzfptoss
\ No newline at end of file
--
Gitblit v1.8.0