From 0638f3c1fe428cc9ea78508ce65628c38090c18f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 28 二月 2021 14:39:53 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi-admin/src/main/resources/application.yml |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8c4b983..35919fa 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,9 +3,9 @@
   # 鍚嶇О
   name: RuoYi
   # 鐗堟湰
-  version: 3.3.0
+  version: 3.4.0
   # 鐗堟潈骞翠唤
-  copyrightYear: 2020
+  copyrightYear: 2021
   # 瀹炰緥婕旂ず寮�鍏�
   demoEnabled: true
   # 鏂囦欢璺緞,浣跨敤jvm绯荤粺鍙橀噺,鍏煎windows鍜宭inux;
@@ -84,7 +84,7 @@
 # https://baomidou.com/config/
 mybatis-plus:
   # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
   typeAliasesPackage: com.ruoyi.**.domain
   # 閽堝 typeAliasesPackage锛屽鏋滈厤缃簡璇ュ睘鎬э紝鍒欎粎浠呬細鎵弿璺緞涓嬩互璇ョ被浣滀负鐖剁被鐨勫煙瀵硅薄
@@ -190,3 +190,13 @@
   excludes: /system/notice/*
   # 鍖归厤閾炬帴
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+feign:
+  # 寮�鍚帇缂�
+  compression:
+    request:
+      enabled: true
+    response:
+      enabled: true
+  okhttp:
+    enabled: true
\ No newline at end of file

--
Gitblit v1.9.3