V2.8.0 RC1

V2.8.0 RC1

README.md

@@ -94,7 +94,7 @@ Download the current version of Baidu Pan,<a href="https://maxkey.top/zh/about/d
 
 | Version    | ReleaseDate   |  Download URL  |  Code  |
 | --------| :-----  | :----  | :----:  |
-| v 2.7.0 GA | 2021/04/15   |  <a href="https://pan.baidu.com/s/1shP3ld63r39ugyZCG5f1lQ" target="_blank">Download</a>  |  **hf73**  |
+| v 2.8.0 RC1 | 2021/06/01   |  <a href="https://pan.baidu.com/s/1fMr45bhahVWpdcTxXDxP9Q" target="_blank">Download</a>  |  **06ms**  |
 
 
 # Roadmap

README_en.md

@@ -94,7 +94,7 @@ Download the current version of Baidu Pan,<a href="https://maxkey.top/zh/about/d
 
 | Version    | Date   |  URL  |  Code  |
 | --------| :-----  | :----  | :----:  |
-| v 2.7.0 GA | 2021/04/15   |  <a href="https://pan.baidu.com/s/1shP3ld63r39ugyZCG5f1lQ" target="_blank">Download</a>  |  **hf73**  |
+| v 2.8.0 RC1 | 2021/06/01   |  <a href="https://pan.baidu.com/s/1fMr45bhahVWpdcTxXDxP9Q" target="_blank">Download</a>  |  **06ms**  |
 
 
 # Roadmap

README_zh.md

@@ -96,7 +96,7 @@ QQ交流群：<b>434469201</b>
 
 | 版本    | 日期   |  下载地址  |  提取码  |
 | --------| :-----  | :----  | :----:  |
-| v 2.7.0 GA | 2021/04/15   |  <a href="https://pan.baidu.com/s/1shP3ld63r39ugyZCG5f1lQ" target="_blank">链接下载</a>  |  **hf73**  |
+| v 2.8.0 RC1 | 2021/06/01   |  <a href="https://pan.baidu.com/s/1fMr45bhahVWpdcTxXDxP9Q" target="_blank">链接下载</a>  |  **06ms**  |
 
 
 # Roadmap

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

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) {

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) {

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

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

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

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