diff --git a/README.md b/README.md
index 10fb7020e..6da9b2d4f 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ Download the current version of Baidu Pan,Download | **hf73** |
+| v 2.8.0 RC1 | 2021/06/01 | Download | **06ms** |
# Roadmap
diff --git a/README_en.md b/README_en.md
index ad9f23720..3ddfb0c46 100644
--- a/README_en.md
+++ b/README_en.md
@@ -94,7 +94,7 @@ Download the current version of Baidu Pan,Download | **hf73** |
+| v 2.8.0 RC1 | 2021/06/01 | Download | **06ms** |
# Roadmap
diff --git a/README_zh.md b/README_zh.md
index cbcdb352a..97f3acefd 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -96,7 +96,7 @@ QQ交流群：434469201
| 版本 | 日期 | 下载地址 | 提取码 |
| --------| :----- | :---- | :----: |
-| v 2.7.0 GA | 2021/04/15 | 链接下载 | **hf73** |
+| v 2.8.0 RC1 | 2021/06/01 | 链接下载 | **06ms** |
# Roadmap
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index b91a16336..67c8d823a 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -17,10 +17,12 @@
*(MAXKEY-210416) 同步器历史同步日志审计功能
*(MAXKEY-210417) 删除json2form插件，优化CSS，整合javacript脚本
*(MAXKEY-210418) 增加用户状态USERSTATE的属性（在职、退休、离职等），status用做活动/锁定/禁用等状态
- *(MAXKEY-210419) 模板布局优化及段落注释说明
- *(MAXKEY-210420) 构建时依赖问题修复
- *(MAXKEY-210421) 依赖jar的版本统一配置gradle.properties
- *(MAXKEY-210422) 依赖jar引用、更新和升级
+ *(MAXKEY-210419) 分离角色权限管理模块，未来和其他系统集成适配，实现权限的统一管理
+ *(MAXKEY-210420) 模板布局优化及段落注释说明
+ *(MAXKEY-210421) 优化启动脚本，解决长度过长问题
+ *(MAXKEY-210422) 构建时依赖问题修复
+ *(MAXKEY-210423) 依赖jar的版本统一配置gradle.properties
+ *(MAXKEY-210424) 依赖jar引用、更新和升级
spring 5.3.7
springBoot 2.4.5
springSecurity 5.5.0
diff --git a/build.gradle b/build.gradle
index c63b68efb..3c4dcf193 100644
--- a/build.gradle
+++ b/build.gradle
@@ -403,7 +403,7 @@ project('maxkey-common') {
def paths = ["$rootDir/build/MaxKey-v${project.version}GA",
"$rootDir/build/MaxKey-v${project.version}GA/maxkey",
"$rootDir/build/MaxKey-v${project.version}GA/maxkey_mgt",
- "$rootDir/build/MaxKey-v${project.version}GA/maxkey_lib"];
+ "$rootDir/build/MaxKey-v${project.version}GA/lib"];
//遍历数组，调用createDir闭包，创建目录
paths.forEach(){path->
@@ -414,10 +414,10 @@ project('maxkey-common') {
}
};
- println "copy Dep Jars to $rootDir/build/MaxKey-v${project.version}GA/maxkey_lib"
+ println "copy Dep Jars to $rootDir/build/MaxKey-v${project.version}GA/lib"
from configurations.runtimeClasspath
- into "$rootDir/build/MaxKey-v${project.version}GA/maxkey_lib";
+ into "$rootDir/build/MaxKey-v${project.version}GA/lib";
}
}
@@ -450,7 +450,7 @@ task copyMaxKeyLibs(type: Copy) {
from "$rootDir/build/maxkey-jars/maxkey-protocol-oauth-2.0-${project.version}.jar"
from "$rootDir/build/maxkey-jars/maxkey-protocol-saml-2.0-${project.version}.jar"
from "$rootDir/build/maxkey-jars/maxkey-protocol-tokenbased-${project.version}.jar"
- into "$rootDir/build/MaxKey-v${project.version}GA/maxkey_lib";
+ into "$rootDir/build/MaxKey-v${project.version}GA/lib";
}
task copyMaxKeyShellScript(type: Copy) {
diff --git a/config/build_standard.gradle b/config/build_standard.gradle
index a9d90f65f..19864e897 100644
--- a/config/build_standard.gradle
+++ b/config/build_standard.gradle
@@ -398,7 +398,7 @@ project('maxkey-common') {
def paths = ["$rootDir/build/MaxKey-v${project.version}GA",
"$rootDir/build/MaxKey-v${project.version}GA/maxkey",
"$rootDir/build/MaxKey-v${project.version}GA/maxkey_mgt",
- "$rootDir/build/MaxKey-v${project.version}GA/maxkey_lib"];
+ "$rootDir/build/MaxKey-v${project.version}GA/lib"];
//遍历数组，调用createDir闭包，创建目录
paths.forEach(){path->
@@ -409,10 +409,10 @@ project('maxkey-common') {
}
};
- println "copy Dep Jars to $rootDir/build/MaxKey-v${project.version}GA/maxkey_lib"
+ println "copy Dep Jars to $rootDir/build/MaxKey-v${project.version}GA/lib"
from configurations.runtimeClasspath
- into "$rootDir/build/MaxKey-v${project.version}GA/maxkey_lib";
+ into "$rootDir/build/MaxKey-v${project.version}GA/lib";
}
}
@@ -445,7 +445,7 @@ task copyMaxKeyLibs(type: Copy) {
from "$rootDir/build/maxkey-jars/maxkey-protocol-oauth-2.0-${project.version}.jar"
from "$rootDir/build/maxkey-jars/maxkey-protocol-saml-2.0-${project.version}.jar"
from "$rootDir/build/maxkey-jars/maxkey-protocol-tokenbased-${project.version}.jar"
- into "$rootDir/build/MaxKey-v${project.version}GA/maxkey_lib";
+ into "$rootDir/build/MaxKey-v${project.version}GA/lib";
}
task copyMaxKeyShellScript(type: Copy) {
diff --git a/shellscript/start_maxkey.bat b/shellscript/start_maxkey.bat
index 9686ee49d..5ba658005 100644
--- a/shellscript/start_maxkey.bat
+++ b/shellscript/start_maxkey.bat
@@ -10,7 +10,7 @@ rem SET JAVA_OPTS="%JAVA_OPTS% -Dfile.encoding=GBK"
SET JAVA_OPTS=%JAVA_OPTS% -DjavaMark=%JAVA_MARK%
SET JAVA_CONF=./maxkey
-SET JAVA_LIBPATH=./maxkey_lib
+SET JAVA_LIBPATH=./lib
SET JAVA_LIBMAXKEYPATH=./maxkey
SET JAVA_CLASSPATH=./classes;./bin;%JAVA_CONF%
SET JAVA_MAINCLASS=org.maxkey.MaxKeyApplication
diff --git a/shellscript/start_maxkey.sh b/shellscript/start_maxkey.sh
index e66e70077..5d53893ec 100644
--- a/shellscript/start_maxkey.sh
+++ b/shellscript/start_maxkey.sh
@@ -8,7 +8,7 @@ JAVA_OPTS="${JAVA_OPTS} -Dfile.encoding=UTF-8"
JAVA_OPTS="${JAVA_OPTS} -DjavaMark=${JAVA_MARK}"
JAVA_CONF=./maxkey
-JAVA_LIBPATH=./maxkey_lib
+JAVA_LIBPATH=./lib
JAVA_LIBMAXKEYPATH=./maxkey
JAVA_CLASSPATH=./classes:./bin:$JAVA_CONF:
JAVA_MAINCLASS=org.maxkey.MaxKeyApplication
diff --git a/shellscript/start_maxkey_mgt.bat b/shellscript/start_maxkey_mgt.bat
index 67a29069d..e4bf2d45c 100644
--- a/shellscript/start_maxkey_mgt.bat
+++ b/shellscript/start_maxkey_mgt.bat
@@ -10,7 +10,7 @@ rem SET JAVA_OPTS="%JAVA_OPTS% -Dfile.encoding=GBK"
SET JAVA_OPTS=%JAVA_OPTS% -DjavaMark=%JAVA_MARK%
SET JAVA_CONF=./maxkey_mgt
-SET JAVA_LIBPATH=./maxkey_lib
+SET JAVA_LIBPATH=./lib
SET JAVA_LIBMAXKEYPATH=./maxkey_mgt
SET JAVA_CLASSPATH=./classes;./bin;%JAVA_CONF%
SET JAVA_MAINCLASS=org.maxkey.MaxKeyMgtApplication
diff --git a/shellscript/start_maxkey_mgt.sh b/shellscript/start_maxkey_mgt.sh
index b081bf7f5..9faa8f164 100644
--- a/shellscript/start_maxkey_mgt.sh
+++ b/shellscript/start_maxkey_mgt.sh
@@ -8,7 +8,7 @@ JAVA_OPTS="${JAVA_OPTS} -Dfile.encoding=UTF-8"
JAVA_OPTS="${JAVA_OPTS} -DjavaMark=${JAVA_MARK}"
JAVA_CONF=./maxkey_mgt
-JAVA_LIBPATH=./maxkey_lib
+JAVA_LIBPATH=./lib
JAVA_LIBMAXKEYPATH=./maxkey_mgt
JAVA_CLASSPATH=./classes:./bin:$JAVA_CONF:
JAVA_MAINCLASS=org.maxkey.MaxKeyMgtApplication