diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index babe485..5fb8da1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,4 +1,4 @@
-version : '3'
+version : '3.8'
services:
ruoyi-nacos:
container_name: ruoyi-nacos
@@ -12,6 +12,8 @@ services:
- ./nacos/conf/application.properties:/home/nacos/conf/application.properties
ports:
- "8848:8848"
+ - "9848:9848"
+ - "9849:9849"
depends_on:
- ruoyi-mysql
ruoyi-mysql:
diff --git a/docker/mysql/db/readme.txt b/docker/mysql/db/readme.txt
new file mode 100644
index 0000000..0b22f3f
--- /dev/null
+++ b/docker/mysql/db/readme.txt
@@ -0,0 +1 @@
+存放sql目录下的所有脚本,用于docker自动执行。
\ No newline at end of file
diff --git a/docker/nginx/html/dist/readme.txt b/docker/nginx/html/dist/readme.txt
new file mode 100644
index 0000000..eea3a32
--- /dev/null
+++ b/docker/nginx/html/dist/readme.txt
@@ -0,0 +1 @@
+存放前端ruoyi-ui构建好的静态文件,用于nginx请求访问。
\ No newline at end of file
diff --git a/docker/ruoyi/auth/jar/readme.txt b/docker/ruoyi/auth/jar/readme.txt
new file mode 100644
index 0000000..c35ba27
--- /dev/null
+++ b/docker/ruoyi/auth/jar/readme.txt
@@ -0,0 +1 @@
+存放认证中心打包好的jar文件,用于docker启动应用。
\ No newline at end of file
diff --git a/docker/ruoyi/gateway/jar/readme.txt b/docker/ruoyi/gateway/jar/readme.txt
new file mode 100644
index 0000000..5dfbec7
--- /dev/null
+++ b/docker/ruoyi/gateway/jar/readme.txt
@@ -0,0 +1 @@
+存放网关模块打包好的jar文件,用于docker启动应用。
\ No newline at end of file
diff --git a/docker/ruoyi/modules/file/jar/readme.txt b/docker/ruoyi/modules/file/jar/readme.txt
new file mode 100644
index 0000000..bf2b2a7
--- /dev/null
+++ b/docker/ruoyi/modules/file/jar/readme.txt
@@ -0,0 +1 @@
+存放文件服务打包好的jar文件,用于docker启动应用。
\ No newline at end of file
diff --git a/docker/ruoyi/modules/gen/jar/readme.txt b/docker/ruoyi/modules/gen/jar/readme.txt
new file mode 100644
index 0000000..2f25c0a
--- /dev/null
+++ b/docker/ruoyi/modules/gen/jar/readme.txt
@@ -0,0 +1 @@
+存放代码生成打包好的jar文件,用于docker启动应用。
\ No newline at end of file
diff --git a/docker/ruoyi/modules/job/jar/readme.txt b/docker/ruoyi/modules/job/jar/readme.txt
new file mode 100644
index 0000000..58aea0b
--- /dev/null
+++ b/docker/ruoyi/modules/job/jar/readme.txt
@@ -0,0 +1 @@
+存放定时任务打包好的jar文件,用于docker启动应用。
\ No newline at end of file
diff --git a/docker/ruoyi/modules/system/jar/readme.txt b/docker/ruoyi/modules/system/jar/readme.txt
new file mode 100644
index 0000000..cfc2a92
--- /dev/null
+++ b/docker/ruoyi/modules/system/jar/readme.txt
@@ -0,0 +1 @@
+存放系统模块打包好的jar文件,用于docker启动应用。
\ No newline at end of file
diff --git a/docker/ruoyi/visual/monitor/jar/readme.txt b/docker/ruoyi/visual/monitor/jar/readme.txt
new file mode 100644
index 0000000..62b2841
--- /dev/null
+++ b/docker/ruoyi/visual/monitor/jar/readme.txt
@@ -0,0 +1 @@
+存放监控中心打包好的jar文件,用于docker启动应用。
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5b53886..f45f733 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.ruoyi
ruoyi
- 2.5.0
+ 3.0.0
ruoyi
http://www.ruoyi.vip
鑻ヤ緷寰湇鍔$郴缁
- 2.5.0
+ 3.0.0
UTF-8
UTF-8
1.8
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
index 1c24fbc..6ab7161 100644
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 5c8b3af..19afb30 100644
--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-api
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 41652aa..638660e 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index df16e1d..050f9b5 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index ff8ed86..0426a88 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml
index 2fbc8f6..d1ac37c 100644
--- a/ruoyi-common/ruoyi-common-datascope/pom.xml
+++ b/ruoyi-common/ruoyi-common-datascope/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml
index 36d29da..8fde205 100644
--- a/ruoyi-common/ruoyi-common-datasource/pom.xml
+++ b/ruoyi-common/ruoyi-common-datasource/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml
index fe322d1..91c1490 100644
--- a/ruoyi-common/ruoyi-common-log/pom.xml
+++ b/ruoyi-common/ruoyi-common-log/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml
index e498f15..a68652e 100644
--- a/ruoyi-common/ruoyi-common-redis/pom.xml
+++ b/ruoyi-common/ruoyi-common-redis/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
index 3ee61b1..99b7b8a 100644
--- a/ruoyi-common/ruoyi-common-security/pom.xml
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-common
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml
index debba5b..50e97bd 100644
--- a/ruoyi-common/ruoyi-common-swagger/pom.xml
+++ b/ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index d4432b4..5af57ea 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 0a4eb86..01c9fac 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml
index 947a5bf..0c8015e 100644
--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/ruoyi-modules/ruoyi-file/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index c22e9cc..8e18387 100644
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index 7fd1bed..9e1ca55 100644
--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 532260e..66a3c0f 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index ad60e4e..6b13e0f 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "2.5.0",
+ "version": "3.0.0",
"description": "鑻ヤ緷绠$悊绯荤粺",
"author": "鑻ヤ緷",
"license": "MIT",
@@ -33,7 +33,7 @@
],
"repository": {
"type": "git",
- "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+ "url": "https://gitee.com/y_project/RuoYi-Cloud.git"
},
"dependencies": {
"@riophae/vue-treeselect": "0.4.0",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 05b218f..69d144d 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -146,6 +146,62 @@
鏇存柊鏃ュ織
+
+
+ - 鏂板鑿滃崟瀵艰埅鏄剧ず椋庢牸TopNav锛坒alse涓哄乏渚у鑸彍鍗曪紝true涓洪《閮ㄥ鑸彍鍗曪級
+ - 甯冨眬璁剧疆鏀寔淇濆瓨&閲嶇疆閰嶇疆
+ - 瀵屾枃鏈紪杈戝櫒鏀寔鑷畾涔変笂浼犲湴鍧
+ - 瀵屾枃鏈紪杈戠粍浠舵柊澧瀝eadOnly灞炴
+ - 浼樺寲鍙傛暟&瀛楀吀缂撳瓨鎿嶄綔
+ - 鏂板IE娴忚鍣ㄧ増鏈繃浣庢彁绀洪〉闈
+ - 椤电TagsView鏂板鍏抽棴鍙充晶鍔熻兘
+ - 鏄鹃殣鍒楃粍浠跺姞杞藉垵濮嬮粯璁ら殣钘忓垪
+ - 鍏抽棴澶村儚涓婁紶绐楀彛杩樺師榛樿鍥剧墖
+ - 涓汉淇℃伅娣诲姞鎵嬫満&閭閲嶅楠岃瘉
+ - 浠g爜鐢熸垚妯℃澘鏍戣〃鎿嶄綔鍒楁坊鍔犳柊澧炴寜閽
+ - 浠g爜鐢熸垚妯℃澘淇涓诲瓙琛ㄥ瓧娈甸噸鍚嶉棶棰
+ - 鏀寔docker閮ㄧ讲椤圭洰
+ - 鍗囩骇springcloud鍒版渶鏂扮増2020.0.3
+ - 鍗囩骇spring-boot-alibaba鍒版渶鏂扮増2021.1
+ - 鍗囩骇nacos鍒版渶鏂扮増2.0.1 鎬ц兘鎻愬崌
+ - 鍗囩骇spring-boot鍒版渶鏂扮増鏈2.5.0
+ - 鍗囩骇spring-boot-admin鍒版渶鏂扮増2.4.1
+ - 鍗囩骇swagger鍒版渶鏂扮増鏈3.0.0
+ - 鍗囩骇mybatis鍒版渶鏂扮増3.5.6
+ - 鍗囩骇dynamic-ds鍒版渶鏂扮増鏈3.3.2
+ - 鍗囩骇minio鍒版渶鏂扮増鏈8.2.1
+ - 鍗囩骇fastjson鍒版渶鏂扮増1.2.76
+ - 鍗囩骇druid鍒版渶鏂扮増鏈瑅1.2.6
+ - 淇鍥涚骇鑿滃崟鏃犳硶鏄剧ず闂
+ - 淇鏍戣〃鏁版嵁鏄剧ず涓嶅叏&鍔犺浇鎱㈤棶棰
+ - 淇鍏抽棴confirm鎻愮ず妗嗘帶鍒跺彴鎶ラ敊闂
+ - 涓婁紶濯掍綋绫诲瀷娣诲姞瑙嗛鏍煎紡
+ - 澧炲姞feign瀹㈡埛绔疘P澶撮儴淇℃伅
+ - 淇涓ゅ瀛樺湪SQL娉ㄥ叆婕忔礊闂
+ - 浼樺寲鍥剧墖宸ュ叿绫昏鍙栨枃浠讹紝闃叉寮傚父
+ - 淇瀵煎嚭瑙掕壊鏁版嵁鑼冨洿缈昏瘧缂哄皯浠呮湰浜
+ - 淇琛ㄥ崟鏋勫缓閫夋嫨涓嬫媺閫夋嫨鎺у埗鍙版姤閿欓棶棰
+ - 淇璇锋眰褰㈠弬鏈紶鍊艰褰曟棩蹇楀紓甯搁棶棰
+ - 璋冩暣sql榛樿涓哄綋鍓嶆椂闂
+ - 淇敼ip瀛楁闀垮害闃叉ipv6鍦板潃闀垮害涓嶅
+ - 鍒犻櫎鎿嶄綔鏃ュ織璁板綍淇℃伅
+ - 淇firefox涓嬭〃鍗曟瀯寤烘嫋鎷戒細鏂版墦鍗′竴涓夐」鍗
+ - 鐢ㄦ埛&瑙掕壊鍗曟潯鍒犻櫎鏃朵娇鍏堕昏緫鍒犻櫎
+ - 浼樺寲鏍戣〃浠g爜鐢熸垚妯℃澘
+ - 淇閫氱煡鍏憡鏃ュ織璁板綍绫诲瀷
+ - 淇鍚庣瀵煎叆琛ㄦ潈闄愭爣璇
+ - 杩囨护BindingResult瀵硅薄锛岄槻姝㈠紓甯
+ - Redis璁剧疆HashKey搴忓垪鍖
+ - 浼樺寲Excel瀵煎叆澧炲姞绌鸿鍒ゆ柇
+ - 鏍戠骇缁撴瀯鏇存柊瀛愯妭鐐逛娇鐢╮eplaceFirst
+ - 瀵屾枃鏈伐鍏锋爮閰嶇疆瑙嗛
+ - 淇妯℃澘瀛楃缂栫爜
+ - 浼樺寲閫氱敤涓嬭浇瀹屾垚鍚庡垹闄よ妭鐐
+ - 瑙掕壊闈炶嚜瀹氫箟鏉冮檺鑼冨洿娓呯┖閫夋嫨鍊
+ - 淇敼涓婚鍚巑ini绫诲瀷鎸夐挳鏃犳晥闂
+ - 鍏朵粬缁嗚妭浼樺寲
+
+
- 澧炲姞鍒嗗竷寮忎簨鍔eata鏀寔
@@ -449,7 +505,7 @@ export default {
data() {
return {
// 鐗堟湰鍙
- version: "2.5.0",
+ version: "3.0.0",
};
},
methods: {
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index 53cf218..bf2817c 100644
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi
- 2.5.0
+ 3.0.0
4.0.0
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
index c8c1066..a15ef9b 100644
--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ b/ruoyi-visual/ruoyi-monitor/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-visual
- 2.5.0
+ 3.0.0
4.0.0