From c7f492c5accca21bdf149148a5be6503552139f1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 21:55:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/application-dev.yml | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index b0129c1..4bdf70c 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -1,3 +1,23 @@
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 8085
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
+
+
# 椤圭洰鐩稿叧閰嶇疆
platform:
# 鍚嶇О
@@ -12,25 +32,6 @@
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
captchaType: math
-
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8080
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
spring:
@@ -76,12 +77,12 @@
spring.data:
redis:
# 鍦板潃
- #host: 42.193.1.25
- host: 127.0.0.1
+ host: 42.193.1.25
+# host: 127.0.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
- #password: ycl2018
- password:
+ password: ycl2018
+# password:
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
@@ -125,7 +126,7 @@
spring:
data:
mongodb:
- uri: mongodb://root1:yunwei%402024@192.168.3.88:27017/zgyw?authSource=admin
+ uri: mongodb://root1:yunwei%402024@127.0.0.1:27017/zgyw?authSource=admin
# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
request:
@@ -140,6 +141,21 @@
apikey: 72fcfd6825304f7fa0453134de620f3a
accesskey: fc9503a521544e76a8e69b912a2f177bc6362b19
+HK:
+ userName: admin
+ password: zg@2024dx
+ host: 51.92.65.49
+ appKey: 29555942
+ appSecret: t9U7tCplCyYHzQPPL7cH
+
+DH:
+ userName: admin
+ password: zg@2024dx
+
+YS:
+ userName: admin
+ password: zg2024dx
+
# gb281瑙嗛缃戝叧鍦板潃锛岀敤浜庤幏鍙杛tsp鏍煎紡鐨勬祦鍦板潃
rtsp:
server: http://192.168.3.88:7788
--
Gitblit v1.8.0