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

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 4c9aa84..e43091e 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,20 +3,22 @@
   # 鍚嶇О
   name: RuoYi
   # 鐗堟湰
-  version: 3.0.0
+  version: 3.2.0
   # 鐗堟潈骞翠唤
-  copyrightYear: 2019
+  copyrightYear: 2020
   # 瀹炰緥婕旂ず寮�鍏�
   demoEnabled: true
-  # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
-  profile: D:/ruoyi/uploadPath
+  # 鏂囦欢璺緞,浣跨敤jvm绯荤粺鍙橀噺,鍏煎windows鍜宭inux;
+  profile: ${user.dir}/ruoyi/uploadPath
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: false
+  # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁$畻 char 瀛楃楠岃瘉
+  captchaType: math
 
 # 寮�鍙戠幆澧冮厤缃�
 server:
   # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 8081
+  port: 8080
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /
@@ -30,7 +32,6 @@
     buffer-size: 512
     # 鏄惁鍒嗛厤鐨勭洿鎺ュ唴瀛�
     direct-buffers: true
-
 
 # 鏃ュ織閰嶇疆
 logging:

--
Gitblit v1.9.3