From efc4f86d88eb1543bd2c0dd3047d9c6a7b4f270c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 12 四月 2023 22:11:25 +0800 Subject: [PATCH] update 优化 加解密模块 将null判断下推防止任何可能的null出现 --- ruoyi-admin/src/main/resources/application.yml | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 8d70429..31d0de5 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -5,7 +5,7 @@ # 鐗堟湰 version: ${revision} # 鐗堟潈骞翠唤 - copyrightYear: 2022 + copyrightYear: 2023 # 瀹炰緥婕旂ず寮�鍏� demoEnabled: true # 鑾峰彇ip鍦板潃寮�鍏� @@ -48,9 +48,17 @@ # 鏃ュ織閰嶇疆 logging: level: - com.ruoyi: @logging.level@ + org.dromara: @logging.level@ org.springframework: warn - config: classpath:logback.xml + config: classpath:logback-plus.xml + +# 鐢ㄦ埛閰嶇疆 +user: + password: + # 瀵嗙爜鏈�澶ч敊璇鏁� + maxRetryCount: 5 + # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛� + lockTime: 10 # Spring閰嶇疆 spring: @@ -143,11 +151,11 @@ mybatis-plus: # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙i厤缃� 鎴� 鎻愬崌鎵寘绛夌骇 # 渚嬪 com.**.**.mapper - mapperPackage: com.ruoyi.**.mapper + mapperPackage: org.dromara.**.mapper # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆 mapperLocations: classpath*:mapper/**/*Mapper.xml # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅� - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: org.dromara.**.domain # 鍚姩鏃舵槸鍚︽鏌� MyBatis XML 鏂囦欢鐨勫瓨鍦紝榛樿涓嶆鏌� checkConfigLocation: false configuration: @@ -204,7 +212,7 @@ # 鎻忚堪 description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...' # 鐗堟湰 - version: '鐗堟湰鍙�: ${ruoyi-vue-plus.version}' + version: '鐗堟湰鍙�: ${ruoyi.version}' # 浣滆�呬俊鎭� contact: name: Lion Li @@ -228,13 +236,13 @@ #杩欓噷瀹氫箟浜嗕袱涓垎缁勶紝鍙畾涔夊涓紝涔熷彲浠ヤ笉瀹氫箟 group-configs: - group: 1.婕旂ず妯″潡 - packages-to-scan: com.ruoyi.demo + packages-to-scan: org.dromara.demo - group: 2.閫氱敤妯″潡 - packages-to-scan: com.ruoyi.web + packages-to-scan: org.dromara.web - group: 3.绯荤粺妯″潡 - packages-to-scan: com.ruoyi.system + packages-to-scan: org.dromara.system - group: 4.浠g爜鐢熸垚妯″潡 - packages-to-scan: com.ruoyi.generator + packages-to-scan: org.dromara.generator # 闃叉XSS鏀诲嚮 xss: -- Gitblit v1.9.3