From c6f15400d502852b43acefcd33dbcfbb4610b5fc Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 18:10:20 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-smoke/src/main/resources/application-pro.yml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ycl-smoke/src/main/resources/application-pro.yml b/ycl-smoke/src/main/resources/application-pro.yml
index e55b72c..045f68f 100644
--- a/ycl-smoke/src/main/resources/application-pro.yml
+++ b/ycl-smoke/src/main/resources/application-pro.yml
@@ -24,8 +24,8 @@
spring:
redis:
database: 0
- host: 10.53.157.24
- port: 6379
+ host: 127.0.0.1
+ port: 6380
password: ycl2018
jedis:
pool:
@@ -65,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