From f0bee6af6358e07b5426df16aab37f4259de52f6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 六月 2020 09:08:18 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi/src/main/resources/application.yml |  254 +++++++++++++++++++++++++++++---------------------
 1 files changed, 145 insertions(+), 109 deletions(-)

diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml
index a1f653d..dcadb91 100644
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@@ -1,109 +1,145 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
-  # 鍚嶇О
-  name: RuoYi
-  # 鐗堟湰
-  version: 1.1.0
-  # 鐗堟潈骞翠唤
-  copyrightYear: 2019
-  # 瀹炰緥婕旂ず寮�鍏�
-  demoEnabled: true
-  # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
-  profile: D:/ruoyi/uploadPath
-  # 鑾峰彇ip鍦板潃寮�鍏�
-  addressEnabled: true
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
-  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 8080
-  servlet:
-    # 搴旂敤鐨勮闂矾寰�
-    context-path: /
-  tomcat:
-    # tomcat鐨刄RI缂栫爜
-    uri-encoding: UTF-8
-    # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
-    max-threads: 800
-    # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�25
-    min-spare-threads: 30
-
-
-# 鏃ュ織閰嶇疆
-logging:
-  level:
-    com.ruoyi: debug
-    org.springframework: warn
-
-# Spring閰嶇疆
-spring:
-  # 璧勬簮淇℃伅
-  messages:
-    # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
-    basename: i18n/messages
-  profiles: 
-    active: druid
-  # 鏂囦欢涓婁紶
-  servlet:
-     multipart:
-       # 鍗曚釜鏂囦欢澶у皬
-       max-file-size:  10MB
-       # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
-       max-request-size:  20MB
-  # 鏈嶅姟妯″潡
-  devtools:
-    restart:
-      # 鐑儴缃插紑鍏�
-      enabled: true
-  # redis 閰嶇疆
-  redis:
-    # 鍦板潃
-    host: localhost
-    # 绔彛锛岄粯璁や负6379
-    port: 6379
-    # 杩炴帴瓒呮椂鏃堕棿
-    timeout: 10s
-    lettuce:
-      pool:
-        # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
-        min-idle: 0
-        # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
-        max-idle: 8
-        # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
-        max-active: 8
-        # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
-        max-wait: -1ms
-
-# token閰嶇疆
-token:
-    # 浠ょ墝鑷畾涔夋爣璇�
-    header: Authorization
-    # 浠ょ墝绉橀挜
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
-    expireTime: 30
-  
-# MyBatis閰嶇疆
-mybatis:
-    # 鎼滅储鎸囧畾鍖呭埆鍚�
-    typeAliasesPackage: com.ruoyi.project.**.domain
-    # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
-    mapperLocations: classpath*:mybatis/**/*Mapper.xml
-    # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
-    configLocation: classpath:mybatis/mybatis-config.xml
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper: 
-  helperDialect: mysql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql 
-
-# 闃叉XSS鏀诲嚮
-xss: 
-  # 杩囨护寮�鍏�
-  enabled: true
-  # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
-  excludes: /system/notice/*
-  # 鍖归厤閾炬帴
-  urlPatterns: /system/*,/monitor/*,/tool/*
\ No newline at end of file
+# 椤圭洰鐩稿叧閰嶇疆
+ruoyi:
+  # 鍚嶇О
+  name: RuoYi
+  # 鐗堟湰
+  version: 2.3.0
+  # 鐗堟潈骞翠唤
+  copyrightYear: 2019
+  # 瀹炰緥婕旂ず寮�鍏�
+  demoEnabled: true
+  # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
+  profile: D:/ruoyi/uploadPath
+  # 鑾峰彇ip鍦板潃寮�鍏�
+  addressEnabled: false
+
+# 寮�鍙戠幆澧冮厤缃�
+server:
+  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+  port: 8080
+  servlet:
+    # 搴旂敤鐨勮闂矾寰�
+    context-path: /
+  undertow:
+    # 璁剧疆IO绾跨▼鏁�, 瀹冧富瑕佹墽琛岄潪闃诲鐨勪换鍔�,瀹冧滑浼氳礋璐e涓繛鎺�, 榛樿璁剧疆姣忎釜CPU鏍稿績涓�涓嚎绋�
+    io-threads: 8
+    # 闃诲浠诲姟绾跨▼姹�, 褰撴墽琛岀被浼約ervlet璇锋眰闃诲鎿嶄綔, undertow浼氫粠杩欎釜绾跨▼姹犱腑鍙栧緱绾跨▼,瀹冪殑鍊艰缃彇鍐充簬绯荤粺鐨勮礋杞�
+    worker-threads: 256
+    # 浠ヤ笅鐨勯厤缃細褰卞搷buffer,杩欎簺buffer浼氱敤浜庢湇鍔″櫒杩炴帴鐨処O鎿嶄綔,鏈夌偣绫讳技netty鐨勬睜鍖栧唴瀛樼鐞�
+    # 姣忓潡buffer鐨勭┖闂村ぇ灏�,瓒婂皬鐨勭┖闂磋鍒╃敤瓒婂厖鍒�
+    buffer-size: 512
+    # 鏄惁鍒嗛厤鐨勭洿鎺ュ唴瀛�
+    direct-buffers: true
+
+
+# 鏃ュ織閰嶇疆
+logging:
+  level:
+    com.ruoyi: debug
+    org.springframework: warn
+
+# Spring閰嶇疆
+spring:
+  # 璧勬簮淇℃伅
+  messages:
+    # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
+    basename: i18n/messages
+  profiles: 
+    active: dev
+  # 鏂囦欢涓婁紶
+  servlet:
+     multipart:
+       # 鍗曚釜鏂囦欢澶у皬
+       max-file-size:  10MB
+       # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+       max-request-size:  20MB
+  # 鏈嶅姟妯″潡
+  devtools:
+    restart:
+      # 鐑儴缃插紑鍏�
+      enabled: true
+
+# token閰嶇疆
+token:
+    # 浠ょ墝鑷畾涔夋爣璇�
+    header: Authorization
+    # 浠ょ墝绉橀挜
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
+    expireTime: 30
+  
+## MyBatis閰嶇疆
+#mybatis:
+#    # 鎼滅储鎸囧畾鍖呭埆鍚�
+#    typeAliasesPackage: com.ruoyi.project.**.domain
+#    # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
+#    mapperLocations: classpath*:mybatis/**/*Mapper.xml
+#    # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
+#    configLocation: classpath:mybatis/mybatis-config.xml
+
+# MyBatis閰嶇疆
+mybatis-plus:
+  mapper-locations: classpath*:mybatis/**/*Mapper.xml
+  #瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
+  typeAliasesPackage: com.ruoyi.project
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: true
+  global-config:
+    banner: false
+    #鍒锋柊mapper 璋冭瘯绁炲櫒
+    refresh: true
+    db-config:
+      #涓婚敭绫诲瀷  0:"鏁版嵁搴揑D鑷", 1:"鐢ㄦ埛杈撳叆ID",2:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 3:"鍏ㄥ眬鍞竴ID UUID";
+      id-type: auto
+      #瀛楁绛栫暐 0:"蹇界暐鍒ゆ柇",1:"闈� NULL 鍒ゆ柇"),2:"闈炵┖鍒ゆ柇"
+      field-strategy: not_empty
+      #椹煎嘲涓嬪垝绾胯浆鎹�
+      db-column-underline: true
+      #鏁版嵁搴撳ぇ鍐欎笅鍒掔嚎杞崲
+      #capital-mode: true
+      #搴忓垪鎺ュ彛瀹炵幇绫婚厤缃�
+      #key-generator: com.baomidou.springboot.xxx
+      #閫昏緫鍒犻櫎閰嶇疆
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+      #鏁版嵁搴撶被鍨�
+      db-type: mysql
+    #鑷畾涔塖QL娉ㄥ叆鍣�
+    #sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+    #鑷畾涔夊~鍏呯瓥鐣ユ帴鍙e疄鐜�
+    #meta-object-handler: com.baomidou.springboot.xxx
+
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper: 
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql 
+
+# Swagger閰嶇疆
+swagger:
+  # 鏄惁寮�鍚痵wagger
+  enabled: true
+  # 璇锋眰鍓嶇紑
+  pathMapping: /dev-api
+
+# 闃叉XSS鏀诲嚮
+xss: 
+  # 杩囨护寮�鍏�
+  enabled: true
+  # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+  excludes: /system/notice/*
+  # 鍖归厤閾炬帴
+  urlPatterns: /system/*,/monitor/*,/tool/*
+  
+# 浠g爜鐢熸垚
+gen: 
+  # 浣滆��
+  author: ruoyi
+  # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
+  packageName: com.ruoyi.project.system
+  # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
+  autoRemovePre: false
+  # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
+  tablePrefix: sys_
\ No newline at end of file

--
Gitblit v1.9.3