From 628b80d0452602c5c02cec9ddbbee266f89d60c8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 18:12:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/resources/application-prod.yml |   35 ++++++++++++++---------------------
 1 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml
index 690ddd5..3d821a2 100644
--- a/ycl-server/src/main/resources/application-prod.yml
+++ b/ycl-server/src/main/resources/application-prod.yml
@@ -14,25 +14,6 @@
   captchaType: math
 
 
-# 寮�鍙戠幆澧冮厤缃�
-server:
-  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 8085
-  servlet:
-    # 搴旂敤鐨勮闂矾寰�
-    context-path: /zgyw
-  tomcat:
-    # tomcat鐨刄RI缂栫爜
-    uri-encoding: UTF-8
-    # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
-    accept-count: 1000
-    threads:
-      # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
-      max: 800
-      # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
-      min-spare: 100
-
-
 spring:
   # 鏁版嵁婧愰厤缃�
   datasource:
@@ -130,8 +111,6 @@
   retry: 4 # 鏈�澶ч噸璇曟鏁�
   youYunDomain: http://51.92.65.56 # 浼樹簯鍦板潃
   haiKangDomain: 51.92.65.48 # 娴峰悍鍦板潃
-  pythonDomain: 11 # python鑴氭湰鍦板潃
-
 youYun:
   tenantId: e10adc3949ba59abbe56e057f20f88dd
   email: yunwei
@@ -139,6 +118,20 @@
   apikey: 72fcfd6825304f7fa0453134de620f3a
   accesskey: fc9503a521544e76a8e69b912a2f177bc6362b19
 
+HK:
+  userName: admin
+  password: zg@2024dx
+  host: 51.92.65.49
+  appKey: 29555942
+  appSecret: t9U7tCplCyYHzQPPL7cH
+  1111: Hik12345+
+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