From a29a0a0785f966294ba01982fba62c1ff0f23bea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 22 四月 2021 17:33:07 +0800
Subject: [PATCH] 增加对设备的兼容性

---
 src/main/resources/application-dev.yml |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fdcae2e..e1397d7 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -11,7 +11,7 @@
         password:
         # [鍙�塢 瓒呮椂鏃堕棿
         timeout: 10000
-    # [涓嶅彲鐢╙ jdbc鏁版嵁搴撻厤缃�, 鏆備笉鏀寔
+    # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
     datasource:
         # name: eiot
         # url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
@@ -31,6 +31,16 @@
 # [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
 server:
     port: 18080
+    # [鍙�塢 HTTPS閰嶇疆锛� 榛樿涓嶅紑鍚�
+    ssl:
+        # [鍙�塢 鏄惁寮�鍚疕TTPS璁块棶
+        enabled: false
+        # [鍙�塢 璇佷功鏂囦欢璺緞锛屾斁缃湪resource/鐩綍涓嬪嵆鍙紝淇敼xxx涓烘枃浠跺悕
+        key-store: classpath:xxx.jks
+        # [鍙�塢 璇佷功瀵嗙爜
+        key-password: password
+        # [鍙�塢 璇佷功绫诲瀷锛� 榛樿涓簀ks锛屾牴鎹疄闄呬慨鏀�
+        key-store-type: JKS
 
 # 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
 sip:
@@ -47,13 +57,6 @@
     id: 44010200492000000001
     # [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�
     password: admin123
-
-# 鐧婚檰鐨勭敤鎴峰悕瀵嗙爜
-auth:
-    # [鍙�塢 鐢ㄦ埛鍚�
-    username: admin
-    # [鍙�塢 瀵嗙爜, 榛樿涓篴dmin
-    password: 21232f297a57a5a743894a0e4a801fc3
 
 #zlm鏈嶅姟鍣ㄩ厤缃�
 media:
@@ -92,4 +95,14 @@
     level:
         com:
             genersoft:
-                iot: debug
\ No newline at end of file
+                iot: debug
+# [鏍规嵁涓氬姟闇�姹傞厤缃甝
+userSettings:
+    # 淇濆瓨绉诲姩浣嶇疆鍘嗗彶杞ㄨ抗锛歵rue:淇濈暀鍘嗗彶鏁版嵁锛宖alse:浠呬繚鐣欐渶鍚庣殑浣嶇疆(榛樿)
+    savePositionHistory: false
+
+# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
+springfox:
+    documentation:
+        swagger-ui:
+            enabled: true
\ No newline at end of file

--
Gitblit v1.8.0