From a6fb88d74c20cc28043d75e8a5097fce49cf9a78 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 十月 2021 15:19:42 +0800
Subject: [PATCH] update [重大更新]全业务 增加 接口文档注解 格式化代码
---
ruoyi-admin/src/main/resources/application.yml | 116 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 47 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 3352d1d..4d2da75 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -8,18 +8,15 @@
copyrightYear: 2021
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
- # 鏂囦欢璺緞
- profile: ./ruoyi/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
captcha:
- # 楠岃瘉鐮佸紑鍏�
- enabled: true
+ # 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
- type: math
+ type: MATH
# line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
- category: circle
+ category: CIRCLE
# 鏁板瓧楠岃瘉鐮佷綅鏁�
numberLength: 1
# 瀛楃楠岃瘉鐮侀暱搴�
@@ -61,6 +58,10 @@
com.ruoyi: @logging.level@
org.springframework: warn
config: classpath:logback.xml
+
+# tlog 鍏ㄥ眬璁块棶鎬ц兘鎷︽埅
+tlog:
+ enable-invoke-time-print: true
# Spring閰嶇疆
spring:
@@ -109,6 +110,33 @@
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
expireTime: 30
+# security閰嶇疆
+security:
+ # 鐧诲嚭璺緞
+ logout-url: /logout
+ # 鍖垮悕璺緞
+ anonymous:
+ - /login
+ - /register
+ - /captchaImage
+ # swagger 鏂囨。閰嶇疆
+ - /doc.html
+ - /swagger-resources/**
+ - /webjars/**
+ - /*/api-docs
+ # druid 鐩戞帶閰嶇疆
+ - /druid/**
+ # actuator 鐩戞帶閰嶇疆
+ - /actuator
+ - /actuator/**
+ # 鐢ㄦ埛鏀捐
+ permit-all:
+
+# 閲嶅鎻愪氦
+repeat-submit:
+ # 鍏ㄥ眬闂撮殧鏃堕棿(姣)
+ interval: 5000
+
# MyBatisPlus閰嶇疆
# https://baomidou.com/config/
mybatis-plus:
@@ -132,8 +160,6 @@
# REUSE锛氳鎵ц鍣ㄧ被鍨嬩細澶嶇敤棰勫鐞嗚鍙ワ紙PreparedStatement锛�
# BATCH锛氳鎵ц鍣ㄧ被鍨嬩細鎵归噺鎵ц鎵�鏈夌殑鏇存柊璇彞
executorType: SIMPLE
- # 鎸囧畾澶栭儴鍖� MyBatis Properties 閰嶇疆锛岄�氳繃璇ラ厤缃彲浠ユ娊绂婚厤缃紝瀹炵幇涓嶅悓鐜鐨勯厤缃儴缃�
- configurationProperties: null
configuration:
# 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
# 濡傛灉鎮ㄧ殑鏁版嵁搴撳懡鍚嶇鍚堣鍒欐棤闇�浣跨敤 @TableField 娉ㄨВ鎸囧畾鏁版嵁搴撳瓧娈靛悕
@@ -161,8 +187,10 @@
localCacheScope: SESSION
# 寮�鍚疢ybatis浜岀骇缂撳瓨锛岄粯璁や负 true
cacheEnabled: false
- # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻��
- # logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
+ # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻�� org.apache.ibatis.logging.stdout.StdOutImpl
+ # 鍏抽棴鏃ュ織璁板綍 (鍙崟绾娇鐢� p6spy 鍒嗘瀽) org.apache.ibatis.logging.nologging.NoLoggingImpl
+ # 榛樿鏃ュ織杈撳嚭 org.apache.ibatis.logging.slf4j.Slf4jImpl
+ logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl
global-config:
# 鏄惁鎵撳嵃 Logo banner
banner: true
@@ -196,11 +224,11 @@
# NOT_EMPTY 闈炵┖鍒ゆ柇(鍙瀛楃涓茬被鍨嬪瓧娈�,鍏朵粬绫诲瀷瀛楁渚濈劧涓洪潪NULL鍒ゆ柇)
# DEFAULT 榛樿鐨�,涓�鑸彧鐢ㄤ簬娉ㄨВ閲�
# NEVER 涓嶅姞鍏� SQL
- insertStrategy: NOT_EMPTY
+ insertStrategy: NOT_NULL
# 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
- updateStrategy: NOT_EMPTY
+ updateStrategy: NOT_NULL
# 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
- selectStrategy: NOT_EMPTY
+ where-strategy: NOT_NULL
# Swagger閰嶇疆
swagger:
@@ -209,7 +237,7 @@
# 璇锋眰鍓嶇紑
pathMapping: /dev-api
# 鏍囬
- title: '鏍囬锛歊uoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
+ title: '鏍囬锛�${ruoyi.name}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
# 鎻忚堪
description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
# 鐗堟湰
@@ -219,13 +247,20 @@
name: Lion Li
email: crazylionli@163.com
url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
+ groups:
+ - name: 浠ｇ爜鐢熸垚妯″潡
+ basePackage: com.ruoyi.generator
+ - name: 婕旂ず妗堜緥
+ basePackage: com.ruoyi.demo
+ - name: 绯荤粺妯″潡
+ basePackage: com.ruoyi.web
# 闃叉XSS鏀诲嚮
xss:
# 杩囨护寮�鍏�
enabled: true
# 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice/*
+ excludes: /system/notice
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
@@ -242,11 +277,11 @@
# 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
keepAliveSeconds: 300
# 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
- # CallerRunsPolicy 绛夊緟
- # DiscardOldestPolicy 鏀惧純鏈�鏃х殑
- # DiscardPolicy 涓㈠純
- # AbortPolicy 涓
- rejectedExecutionHandler: CallerRunsPolicy
+ # CALLER_RUNS_POLICY 璋冪敤鏂规墽琛�
+ # DISCARD_OLDEST_POLICY 鏀惧純鏈�鏃х殑
+ # DISCARD_POLICY 涓㈠純
+ # ABORT_POLICY 涓
+ rejectedExecutionHandler: CALLER_RUNS_POLICY
# feign 鐩稿叧閰嶇疆
feign:
@@ -286,6 +321,20 @@
# 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 姣
expire: 30000
+--- # Actuator 鐩戞帶绔偣鐨勯厤缃」
+management:
+ endpoints:
+ web:
+ # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
+ base-path: /actuator
+ exposure:
+ # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
+ # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
+ include: @endpoints.include@
+ endpoint:
+ logfile:
+ external-file: ./logs/sys-console.log
+
--- # 瀹氭椂浠诲姟閰嶇疆
spring:
quartz:
@@ -316,30 +365,3 @@
tablePrefix: QRTZ_
# sqlserver 鍚敤
# selectWithLockSQL: SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?
-
---- # 鐩戞帶閰嶇疆
-spring:
- boot:
- admin:
- # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
- client:
- # 璁剧疆 Spring Boot Admin Server 鍦板潃
- url: http://localhost:9090/admin
- instance:
- prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
- username: ruoyi
- password: 123456
-
-# Actuator 鐩戞帶绔偣鐨勯厤缃」
-management:
- endpoints:
- web:
- # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
- base-path: /actuator
- exposure:
- # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
- # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
- include: '*'
- endpoint:
- logfile:
- external-file: ./logs/sys-console.log
--
Gitblit v1.9.3