From bed1fd98ff8a5b083338a1b74a3face378bdbdeb Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 三月 2020 16:15:24 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/resources/application.yml | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 deletions(-)
diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml
index 4ced552..09f17b9 100644
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@@ -3,7 +3,7 @@
# 鍚嶇О
name: RuoYi
# 鐗堟湰
- version: 2.0.0
+ version: 2.1.0
# 鐗堟潈骞翠唤
copyrightYear: 2019
# 瀹炰緥婕旂ず寮�鍏�
@@ -42,7 +42,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: druid
+ active: dev
# 鏂囦欢涓婁紶
servlet:
multipart:
@@ -55,26 +55,6 @@
restart:
# 鐑儴缃插紑鍏�
enabled: true
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: localhost
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 瀵嗙爜
- password:
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
# token閰嶇疆
token:
@@ -85,14 +65,47 @@
# 浠ょ墝鏈夋晥鏈燂紙榛樿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:
- # 鎼滅储鎸囧畾鍖呭埆鍚�
- typeAliasesPackage: com.ruoyi.project.**.domain
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mybatis/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
+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
+ #鑷畾涔夊～鍏呯瓥鐣ユ帴鍙ｅ疄鐜�
+ #meta-object-handler: com.baomidou.springboot.xxx
# PageHelper鍒嗛〉鎻掍欢
pagehelper:
--
Gitblit v1.9.3