From 298d104fece85bc22608fec9ecafdae81b561d36 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 01 三月 2022 21:59:31 +0800
Subject: [PATCH] 优化配置文件与日志

---
 /dev/null                                   |  111 ----------------------
 src/main/resources/application-dev.yml      |   58 +++++------
 src/main/resources/all-application.yml      |   65 +++++++-----
 src/main/resources/application-docker.yml   |   11 -
 src/main/resources/logback-spring-local.xml |    9 +
 src/main/resources/application.yml          |    2 
 6 files changed, 78 insertions(+), 178 deletions(-)

diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 5e77236..d814459 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -30,24 +30,44 @@
         poolMaxWait: 5
     # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
     datasource:
-        # 浣跨敤mysql 鎵撳紑23-28琛屾敞閲婏紝 鍒犻櫎29-36琛�
-        # name: wvp
-        # url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true
-        # username:
-        # password:
-        # type: com.alibaba.druid.pool.DruidDataSource
-        # driver-class-name: com.mysql.cj.jdbc.Driver
-        name: eiot
-        url: jdbc:sqlite::resource:wvp.sqlite
-        username:
-        password:
         type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name:  org.sqlite.JDBC
-        journal_mode: WAL
-        synchronous: NORMAL
-        transaction_mode: IMMEDIATE
-        max-active: 1
-        min-idle: 1
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false
+        username: root
+        password: root123
+        druid:
+            initialSize: 10                       # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
+            maxActive: 200                        # 杩炴帴姹犳渶澶ц繛鎺ユ暟
+            minIdle: 5                            # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
+            maxWait: 60000                        # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂达紝鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗锛岀己鐪佸惎鐢ㄥ叕骞抽攣锛屽苟鍙戞晥鐜囦細鏈夋墍涓嬮檷锛屽鏋滈渶瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣銆�
+            keepAlive: true                       # 杩炴帴姹犱腑鐨刴inIdle鏁伴噺浠ュ唴鐨勮繛鎺ワ紝绌洪棽鏃堕棿瓒呰繃minEvictableIdleTimeMillis锛屽垯浼氭墽琛宬eepAlive鎿嶄綔銆�
+            validationQuery: select 1             # 妫�娴嬭繛鎺ユ槸鍚︽湁鏁坰ql锛岃姹傛槸鏌ヨ璇彞锛屽父鐢╯elect 'x'銆傚鏋渧alidationQuery涓簄ull锛宼estOnBorrow銆乼estOnReturn銆乼estWhileIdle閮戒笉浼氳捣浣滅敤銆�
+            testWhileIdle: true                   # 寤鸿閰嶇疆涓簍rue锛屼笉褰卞搷鎬ц兘锛屽苟涓斾繚璇佸畨鍏ㄦ�с�傜敵璇疯繛鎺ョ殑鏃跺�欐娴嬶紝濡傛灉绌洪棽鏃堕棿澶т簬timeBetweenEvictionRunsMillis锛屾墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堛��
+            testOnBorrow: false                   # 鐢宠杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
+            testOnReturn: false                   # 褰掕繕杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
+            poolPreparedStatements: false         # 鏄惁闁嬪暉PSCache锛屼甫涓旀寚瀹氭瘡鍊嬮�g窔涓奝SCache鐨勫ぇ灏�
+            timeBetweenEvictionRunsMillis: 60000  # 閰嶇疆闁撻殧澶氫箙鎵嶉�茶涓�娆℃娓紝妾㈡脯闇�瑕侀棞闁夌殑绌洪枓閫g窔锛屽柈浣嶆槸姣
+            minEvictableIdleTimeMillis: 300000    # 閰嶇疆涓�鍊嬮�g窔鍦ㄦ睜涓渶灏忕敓瀛樼殑鏅傞枔锛屽柈浣嶆槸姣
+            filters: stat,wall,slf4j             # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛岀洃鎺х粺璁$敤鐨刦ilter:sta, 鏃ュ織鐢ㄧ殑filter:log4j, 闃插尽sql娉ㄥ叆鐨刦ilter:wall
+            useGlobalDataSourceStat: true         # 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
+            # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
+            connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000
+            #stat-view-servlet.url-pattern: /admin/druid/*
+
+# druid绠$悊鐩戞帶椤甸潰鐨勪竴浜涢厤缃�
+rj-druid-manage:
+    allow:                        # 璁块棶druid鐩戞帶椤甸潰鐨処P鐧藉悕鍗�
+    deny: 192.168.1.100           # 璁块棶druid鐩戞帶椤甸潰IP榛戝悕鍗�
+    loginUsername: rjAdmin          # 璁块棶druid鐩戞帶椤甸潰璐﹀彿
+    loginPassword: rj@2022     # 璁块棶druid鐩戞帶椤甸潰瀵嗙爜
+
+#mybatis:
+#    configuration:
+#        # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤
+#        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#        # 杩斿洖绫诲瀷涓篗ap,鏄剧ずnull瀵瑰簲鐨勫瓧娈�
+#        call-setters-on-nulls: true
+## [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙�
 
 # [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙�
 server:
@@ -136,15 +156,8 @@
 
 # [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
 logging:
-    file:
-        name: logs/wvp.log
-        max-history: 30
-        max-size: 10MB
-        total-size-cap: 300MB
-    level:
-        com.genersoft.iot: debug
-        com.genersoft.iot.vmp.storager.dao: info
-        com.genersoft.iot.vmp.gb28181: debug
+    config: classpath:logback-spring-local.xml
+
 # [鏍规嵁涓氬姟闇�姹傞厤缃甝
 user-settings:
     # [鍙�塢 鏈嶅姟ID锛屼笉鍐欏垯涓�000000
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 55738fb..dfd7865 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -16,24 +16,41 @@
         password:
         # [鍙�塢 瓒呮椂鏃堕棿
         timeout: 10000
-    # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
+        # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
+        # mysql鏁版嵁婧�
     datasource:
-        # 浣跨敤mysql 鎵撳紑23-28琛屾敞閲婏紝 鍒犻櫎29-36琛�
-        name: wvp
-        url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true&useSSL=false
-        username:
-        password:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.cj.jdbc.Driver
+        url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false
+        username: root
+        password: root123
+        druid:
+            initialSize: 10                       # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
+            maxActive: 200                        # 杩炴帴姹犳渶澶ц繛鎺ユ暟
+            minIdle: 5                            # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
+            maxWait: 60000                        # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂达紝鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗锛岀己鐪佸惎鐢ㄥ叕骞抽攣锛屽苟鍙戞晥鐜囦細鏈夋墍涓嬮檷锛屽鏋滈渶瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣銆�
+            keepAlive: true                       # 杩炴帴姹犱腑鐨刴inIdle鏁伴噺浠ュ唴鐨勮繛鎺ワ紝绌洪棽鏃堕棿瓒呰繃minEvictableIdleTimeMillis锛屽垯浼氭墽琛宬eepAlive鎿嶄綔銆�
+            validationQuery: select 1             # 妫�娴嬭繛鎺ユ槸鍚︽湁鏁坰ql锛岃姹傛槸鏌ヨ璇彞锛屽父鐢╯elect 'x'銆傚鏋渧alidationQuery涓簄ull锛宼estOnBorrow銆乼estOnReturn銆乼estWhileIdle閮戒笉浼氳捣浣滅敤銆�
+            testWhileIdle: true                   # 寤鸿閰嶇疆涓簍rue锛屼笉褰卞搷鎬ц兘锛屽苟涓斾繚璇佸畨鍏ㄦ�с�傜敵璇疯繛鎺ョ殑鏃跺�欐娴嬶紝濡傛灉绌洪棽鏃堕棿澶т簬timeBetweenEvictionRunsMillis锛屾墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堛��
+            testOnBorrow: false                   # 鐢宠杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
+            testOnReturn: false                   # 褰掕繕杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
+            poolPreparedStatements: false         # 鏄惁闁嬪暉PSCache锛屼甫涓旀寚瀹氭瘡鍊嬮�g窔涓奝SCache鐨勫ぇ灏�
+            timeBetweenEvictionRunsMillis: 60000  # 閰嶇疆闁撻殧澶氫箙鎵嶉�茶涓�娆℃娓紝妾㈡脯闇�瑕侀棞闁夌殑绌洪枓閫g窔锛屽柈浣嶆槸姣
+            minEvictableIdleTimeMillis: 300000    # 閰嶇疆涓�鍊嬮�g窔鍦ㄦ睜涓渶灏忕敓瀛樼殑鏅傞枔锛屽柈浣嶆槸姣
+            filters: stat,wall,slf4j             # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛岀洃鎺х粺璁$敤鐨刦ilter:sta, 鏃ュ織鐢ㄧ殑filter:log4j, 闃插尽sql娉ㄥ叆鐨刦ilter:wall
+            useGlobalDataSourceStat: true         # 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
+            # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
+            connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000
+            #stat-view-servlet.url-pattern: /admin/druid/*
 
-# [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙�
+#[鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙�
 server:
     port: 18080
 
 # 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
 sip:
     # [蹇呴』淇敼] 鏈満鐨処P
-    ip:
+    ip: 192.168.118.70
     # [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
     port: 5060
     # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
@@ -48,10 +65,9 @@
 
 #zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
 media:
-    # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄥ敮涓�id锛岀敤浜庤Е鍙慼ook鏃跺尯鍒槸鍝彴鏈嶅姟鍣�,general.mediaServerId
-    id:
+    id: FQ3TF8yT83wh5Wvz
     # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
-    ip:
+    ip: 192.168.118.70
     # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port
     http-port: 80
     # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
@@ -68,25 +84,7 @@
     record-assist-port: 18081
 # [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
 logging:
-    file:
-        name: logs/wvp.log
-        max-history: 30
-        max-size: 10MB
-        total-size-cap: 300MB
-    level:
-        com.genersoft.iot: debug
-        com.genersoft.iot.vmp.storager.dao: info
-        com.genersoft.iot.vmp.gb28181: info
-
-# [鏍规嵁涓氬姟闇�姹傞厤缃甝
-user-settings:
-    # 鎺ㄦ祦鐩存挱鏄惁褰曞埗
-    record-push-live: true
-    auto-apply-play: false
-
-# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
-swagger-ui:
-    enabled: true
+    config: classpath:logback-spring-local.xml
 
 # 鐗堟湰淇℃伅锛� 涓嶉渶淇敼
 version:
diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml
index 96a9ad0..6487f9a 100644
--- a/src/main/resources/application-docker.yml
+++ b/src/main/resources/application-docker.yml
@@ -69,16 +69,9 @@
     sdp-ip: ${sip.ip}
     stream-ip: ${sip.ip}
 # [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
+# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
 logging:
-    file:
-        name: logs/wvp.log
-        max-history: 30
-        max-size: 10MB
-        total-size-cap: 300MB
-    level:
-        com.genersoft.iot: debug
-        com.genersoft.iot.vmp.storager.dao: info
-        com.genersoft.iot.vmp.gb28181: info
+    config: classpath:logback-spring-local.xml
 
 # [鏍规嵁涓氬姟闇�姹傞厤缃甝
 user-settings:
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
deleted file mode 100644
index 9a10952..0000000
--- a/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-spring:
-    # REDIS鏁版嵁搴撻厤缃�
-    redis:
-        # [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
-        host: 127.0.0.1
-        # [蹇呴』淇敼] 绔彛鍙�
-        port: 6379
-        # [鍙�塢 鏁版嵁搴� DB
-        database: 6
-        # [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
-        password:
-        # [鍙�塢 瓒呮椂鏃堕棿
-        timeout: 10000
-        # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
-        # mysql鏁版嵁婧�
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false
-        username: root
-        password: root123
-        druid:
-            initialSize: 10                       # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
-            maxActive: 200                        # 杩炴帴姹犳渶澶ц繛鎺ユ暟
-            minIdle: 5                            # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
-            maxWait: 60000                        # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂达紝鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗锛岀己鐪佸惎鐢ㄥ叕骞抽攣锛屽苟鍙戞晥鐜囦細鏈夋墍涓嬮檷锛屽鏋滈渶瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣銆�
-            keepAlive: true                       # 杩炴帴姹犱腑鐨刴inIdle鏁伴噺浠ュ唴鐨勮繛鎺ワ紝绌洪棽鏃堕棿瓒呰繃minEvictableIdleTimeMillis锛屽垯浼氭墽琛宬eepAlive鎿嶄綔銆�
-            validationQuery: select 1             # 妫�娴嬭繛鎺ユ槸鍚︽湁鏁坰ql锛岃姹傛槸鏌ヨ璇彞锛屽父鐢╯elect 'x'銆傚鏋渧alidationQuery涓簄ull锛宼estOnBorrow銆乼estOnReturn銆乼estWhileIdle閮戒笉浼氳捣浣滅敤銆�
-            testWhileIdle: true                   # 寤鸿閰嶇疆涓簍rue锛屼笉褰卞搷鎬ц兘锛屽苟涓斾繚璇佸畨鍏ㄦ�с�傜敵璇疯繛鎺ョ殑鏃跺�欐娴嬶紝濡傛灉绌洪棽鏃堕棿澶т簬timeBetweenEvictionRunsMillis锛屾墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堛��
-            testOnBorrow: false                   # 鐢宠杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
-            testOnReturn: false                   # 褰掕繕杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆�
-            poolPreparedStatements: false         # 鏄惁闁嬪暉PSCache锛屼甫涓旀寚瀹氭瘡鍊嬮�g窔涓奝SCache鐨勫ぇ灏�
-            timeBetweenEvictionRunsMillis: 60000  # 閰嶇疆闁撻殧澶氫箙鎵嶉�茶涓�娆℃娓紝妾㈡脯闇�瑕侀棞闁夌殑绌洪枓閫g窔锛屽柈浣嶆槸姣
-            minEvictableIdleTimeMillis: 300000    # 閰嶇疆涓�鍊嬮�g窔鍦ㄦ睜涓渶灏忕敓瀛樼殑鏅傞枔锛屽柈浣嶆槸姣
-            filters: stat,wall,slf4j             # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛岀洃鎺х粺璁$敤鐨刦ilter:sta, 鏃ュ織鐢ㄧ殑filter:log4j, 闃插尽sql娉ㄥ叆鐨刦ilter:wall
-            useGlobalDataSourceStat: true         # 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
-            # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
-            connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000
-            #stat-view-servlet.url-pattern: /admin/druid/*
-
-    # druid绠$悊鐩戞帶椤甸潰鐨勪竴浜涢厤缃�
-rj-druid-manage:
-    allow:                        # 璁块棶druid鐩戞帶椤甸潰鐨処P鐧藉悕鍗�
-    deny: 192.168.1.100           # 璁块棶druid鐩戞帶椤甸潰IP榛戝悕鍗�
-    loginUsername: rjAdmin          # 璁块棶druid鐩戞帶椤甸潰璐﹀彿
-    loginPassword: rj@2022     # 璁块棶druid鐩戞帶椤甸潰瀵嗙爜
-    resetEnable: false            # 鏄惁鑳藉閲嶇疆鏁版嵁 绂佺敤HTML椤甸潰涓婄殑鈥淩eset All鈥濆姛鑳�
-#mybatis:
-#    configuration:
-#        # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤
-#        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-#        # 杩斿洖绫诲瀷涓篗ap,鏄剧ずnull瀵瑰簲鐨勫瓧娈�
-#        call-setters-on-nulls: true
-## [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙h皟鐢ㄩ兘鏄繖涓鍙�
-server:
-    port: 18080
-
-# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
-sip:
-    # [蹇呴』淇敼] 鏈満鐨処P
-    ip: 192.168.118.70
-    # [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
-    port: 5060
-    # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
-    # 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
-    # 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
-    # [鍙�塢
-    domain: 4401020049
-    # [鍙�塢
-    id: 44010200492000000001
-    # [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�, 绉婚櫎瀵嗙爜灏嗕笉杩涜鏍¢獙
-    password: admin123
-
-#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
-media:
-    # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
-    ip: 192.168.118.70
-    # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port
-    http-port: 80
-    # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
-    secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
-    # 鍚敤澶氱鍙fā寮�, 澶氱鍙fā寮忎娇鐢ㄧ鍙e尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙d娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙f祴璇�
-    rtp:
-        # [鍙�塢 鏄惁鍚敤澶氱鍙fā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
-        enable: true
-        # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�,
-        port-range: 30000,30500 # 绔彛鑼冨洿
-        # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
-        send-port-range: 30000,30500 # 绔彛鑼冨洿
-    # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
-    record-assist-port: 18081
-# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
-logging:
-    config: classpath:logback-spring-local.xml
-
-
-# [鏍规嵁涓氬姟闇�姹傞厤缃甝
-user-settings:
-    # 鎺ㄦ祦鐩存挱鏄惁褰曞埗
-    record-push-live: true
-    auto-apply-play: false
-
-# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
-swagger-ui:
-    enabled: true
-
-# 鐗堟湰淇℃伅锛� 涓嶉渶淇敼
-version:
-    version: "@project.version@"
-    description: "@project.description@"
-    artifact-id: "@project.artifactId@"
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d74c444..3d7808a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: local
+    active: dev
diff --git a/src/main/resources/logback-spring-local.xml b/src/main/resources/logback-spring-local.xml
index 6d81842..90fe940 100644
--- a/src/main/resources/logback-spring-local.xml
+++ b/src/main/resources/logback-spring-local.xml
@@ -31,7 +31,7 @@
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<!--涓嶵hresholdFilter鐨勫尯鍒�,鍏佽onmatch-->
 			<!--璁剧疆鏃ュ織绾у埆 鎺ユ敹info绾у埆鐨勬棩蹇�-->
-			<level>INFO</level>
+			<level>DEBUG</level>
 		</filter>
 	</appender>
 
@@ -80,6 +80,13 @@
 		<appender-ref ref="RollingFileError" />
 	</root>
 
+	<logger name="com.genersoft.iot.vmp.storager.dao" level="INFO">
+		<appender-ref ref="STDOUT"/>
+	</logger>
+	<logger name="com.genersoft.iot.vmp.gb28181" level="DEBUG">
+		<appender-ref ref="STDOUT"/>
+	</logger>
+
 	<!--璁板綍druid-sql鐨勮褰�-->
 	<logger name="druid.sql.Statement" level="debug" additivity="true">
 		<!--AppenderRef ref="Console"/-->

--
Gitblit v1.8.0