FIX

ReleaseNotes.txt

@@ -14,9 +14,10 @@
 	*(MAXKEY-200613) OAuth2授权页面优化，显示目标系统图标和相关授权提示
 	*(MAXKEY-200614) OAuth2 secret修改后登陆错误修复
 	*(MAXKEY-200615) CAS单点登陆后进行验证空指针的异常处理，原因权限调整
-	*(MAXKEY-200616) 依赖jar升级,消除非必要依赖
-	                spring 5.2.6.RELEASE
-					springBoot 2.3.0.RELEASE
+	*(MAXKEY-200616) LINUX操作系统支持
+	*(MAXKEY-200617) 依赖jar升级,消除非必要依赖
+	                spring 5.2.7.RELEASE
+					springBoot 2.3.1.RELEASE
 					springSecurity 5.3.2.RELEASE
 					jackson  2.11.0
 					log4j 2.13.3

build.gradle

@@ -31,13 +31,13 @@ allprojects {
 	compileJava.options.encoding = 'UTF-8'
 	
 	eclipse {
-		
+		/*第一次时请注释这段eclipse设置，可能报错*/
 		jdt  {
 		    File f = file('.settings/org.eclipse.core.resources.prefs')
 		    f.write('eclipse.preferences.version=1\n')
 		    f.append('encoding/<project>=UTF-8') //use UTF-8
 		}
-		/**/
+		
 		
 		/*
 		wtp {

gradle.properties

@@ -4,8 +4,8 @@ vendor	=https://github.com/shimingxy/MaxKey
 author	=shimingxy
 #Version For use jar
 log4jVersion         	=2.13.3
-springVersion        	=5.2.6.RELEASE
-springBootVersion    	=2.3.0.RELEASE
+springVersion        	=5.2.7.RELEASE
+springBootVersion    	=2.3.1.RELEASE
 springSecurityVersion	=5.3.2.RELEASE
 hibernateVersion	 	=6.1.2.Final
 slf4jVersion	 	 	=1.7.30

maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component

-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
 	<wb-module deploy-name="maxkey-identity-scim">
 		<wb-resource deploy-path="/" source-path="src/main/resources"/>
 		<wb-resource deploy-path="/" source-path="src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/test/java"/>
-        <wb-resource deploy-path="/" source-path="/src/test/resources"/>
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-core/maxkey-core">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>

maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties

+global.application=MaxKey\u5E94\u7528\u5B89\u5168\u7CFB\u7EDF
+global.change.language=\u8BED\u97F3\u9009\u62E9
+global.change.language.en=English
+global.change.language.zh=\u4E2D\u6587
+global.text.welcome=\u6B22\u8FCE\u60A8
+global.text.manage=\u7BA1\u7406
+global.text.copyright=\u7248\u6743\u6240\u6709
+global.text.copyright.content=Copyright 2018-2020 shimingxy@163.com
+global.text.copyright.license=Licensed under the Apache License, Version 2.0
+global.text.logout=\u9000\u51FA
+global.logout.tip=\u6CE8\u9500\u6210\u529F
+global.logout.text.suffix=\u91CD\u65B0\u767B\u5F55
+global.logout.text.prefix=\u60A8\u5DF2\u7ECF\u6210\u529F\u9000\u51FA\u767B\u5F55\uFF0C\u8BF7\u5173\u95ED\u6D4F\u89C8\u5668\u6216\u8005
+login.session.timeout.tip=\u767B\u5F55\u4F1A\u8BDD\u8D85\u65F6
+login.session.timeout.prefix=\u60A8\u7684\u767B\u5F55\u4F1A\u8BDD\u5DF2\u7ECF\u8D85\u65F6\uFF0C\u8BF7
+login.session.timeout.suffix=\u91CD\u65B0\u767B\u5F55
+
+common.window.title=\u7A97\u53E3
+common.alert.title=\u63D0\u793A\u4FE1\u606F
+common.alert.closeText=\u5173\u95ED
+common.conform.title=\u786E\u8BA4\u63D0\u793A
+common.conform.yes=\u786E\u5B9A
+common.conform.no=\u5173\u95ED
+common.select.hintText=\u8BF7\u9009\u62E9\u60A8\u8981\u64CD\u4F5C\u7684\u6570\u636E
+common.delete.hintText=\u60A8\u786E\u5B9A\u8981\u5220\u9664\u5417?
+common.grid.loadtext=\u6B63\u5728\u52A0\u8F7D...
+common.grid.loadnodata=\u6CA1\u6709\u67E5\u8BE2\u5230\u7B26\u5408\u6570\u636E
+common.submit.hintText=\u60A8\u786E\u5B9A\u8981\u8FDB\u884C\u6B64\u9879\u64CD\u4F5C\u5417?
+common.submit.errorText=\u6267\u884C\u64CD\u4F5C\u5931\u8D25
+common.text.startdate=\u5F00\u59CB\u65F6\u95F4
+common.text.enddate=\u7ED3\u675F\u65F6\u95F4
+common.text.createdby=\u521B\u5EFA\u4EBA
+common.text.createddate=\u521B\u5EFA\u65F6\u95F4
+common.text.modifiedby=\u4FEE\u6539\u4EBA
+common.text.modifieddate=\u4FEE\u6539\u65F6\u95F4
+common.text.status.enabled=\u542F\u7528
+common.text.status.disabled=\u505C\u7528
+		
+login.text.login.twofactor.obtain.valid=\u91CD\u65B0\u83B7\u53D6
+login.text.login.twofactor.obtain=\u83B7\u53D6\u52A8\u6001\u9A8C\u8BC1\u7801
+login.text.login.twofactor.obtain.valid.unit=\u79D2
+login.text.login.twofactor.validTime=\u5269\u4F59\u65F6\u95F4
+login.text.login.twofactor.validTime.unit=\u79D2
+login.text.login.twofactor=\u5B89\u5168\u8BA4\u8BC1
+login.text.login.normal=\u57FA\u672C\u8BA4\u8BC1
+login.text.username=\u7528\u6237\u540D
+login.text.password=\u5BC6    \u7801
+login.text.captcha=\u9A8C\u8BC1\u7801
+login.text.remeberme=\u8BB0\u4F4F\u767B\u5F55
+login.text.forgotpassword=\u5FD8\u8BB0\u5BC6\u7801
+login.button.login=\u767B\u5F55
+login.text.currenttime=\u65F6    \u95F4
+login.text.otherlogins=\u5176\u4ED6\u767B\u5F55\u65B9\u5F0F
+login.text.register=\u7528\u6237\u6CE8\u518C
+
+login.password.expired=\u5BC6\u7801\u8FC7\u671F
+login.password.expired.tip=\u5BC6\u7801\u8FC7\u671F\uFF0C\u8BF7\u4FEE\u6539\u5BC6\u7801
+login.password.oldPassword=\u539F\u5BC6\u7801
+login.password.newPassword=\u65B0\u5BC6\u7801
+login.password.confirmPassword=\u786E\u8BA4\u65B0\u5BC6\u7801
+login.password.initial.change.tip=\u9996\u6B21\u767B\u5F55\uFF0C\u8BF7\u4FEE\u6539\u521D\u59CB\u5316\u5BC6\u7801
+login.password.changepassword=\u5BC6\u7801\u4FEE\u6539
+login.password.applogin.changepassword=\u5E94\u7528\u767B\u5F55\u5BC6\u7801\u8BBE\u7F6E
+
+login.social.link=\u7ED1\u5B9A
+login.social.unlink=\u89E3\u9664
+login.social.icon=\u56FE\u6807
+login.social.provider=\u4F9B\u5E94\u5546
+
+userinfo.displayName=\u7528\u6237\u540D
+userinfo.username=\u767B\u5F55\u8D26\u53F7
+userinfo.email=\u90AE\u7BB1\u5730\u5740
+userinfo.mobile=\u624B\u673A\u53F7\u7801
+userinfo.userType=\u7528\u6237\u7C7B\u578B
+userinfo.picture=\u5934\u50CF
+userinfo.familyName=\u59D3
+userinfo.givenName=\u540D
+userinfo.middleName=\u4E2D\u95F4\u540D
+userinfo.nickName=\u6635\u79F0
+userinfo.gender=\u6027\u522B
+userinfo.gender.female=\u5973
+userinfo.gender.male=\u7537
+userinfo.married=\u5A5A\u59FB\u72B6\u6001
+userinfo.married.unknown=\u672A\u77E5
+userinfo.married.single=\u5355\u8EAB
+userinfo.married.married=\u5DF2\u5A5A
+userinfo.married.divorce=\u79BB\u5F02
+userinfo.married.widowed=\u4E27\u5076
+userinfo.website=\u4e2a\u4eba\u4e3b\u9875
+userinfo.idtype=\u8bc1\u4ef6\u7c7b\u578b
+userinfo.idtype.unknown=\u672A\u77E5
+userinfo.idtype.idcard=\u8EAB\u4EFD\u8BC1
+userinfo.idtype.passport=\u62A4\u7167
+userinfo.idtype.studentcard=\u5B66\u751F\u8BC1
+userinfo.idtype.militarycard=\u519B\u4EBA\u8BC1
+userinfo.idCardNo=\u8BC1\u4EF6\u53F7\u7801
+userinfo.startWorkDate=\u5DE5\u4F5C\u5F00\u59CB\u65F6\u95F4
+userinfo.preferredLanguage=\u8BED\u97F3\u504F\u597D
+userinfo.timeZone=\u65F6\u533A
+userinfo.locale=\u8BED\u8A00\u9009\u62E9
+userinfo.employeeNumber=\u5458\u5DE5\u7F16\u53F7
+userinfo.windowsAccount=AD\u57DF\u8D26\u53F7
+userinfo.organization=\u6240\u5C5E\u673A\u6784
+userinfo.division=\u5206\u652F\u673A\u6784
+userinfo.department=\u90E8\u95E8
+userinfo.costCenter=\u6210\u672C\u4E2D\u5FC3
+userinfo.jobTitle=\u804C\u4F4D
+userinfo.jobLevel=\u7EA7\u522B
+userinfo.manager=\u4E0A\u7EA7\u7ECF\u7406
+userinfo.assistant=\u52A9\u7406
+userinfo.entryDate=\u5165\u804C\u65F6\u95F4
+userinfo.quitDate=\u79BB\u804C\u65F6\u95F4
+userinfo.workCountry=\u56FD\u5BB6
+userinfo.workRegion=\u7701
+userinfo.workLocality=\u57CE\u5E02
+userinfo.workStreetAddress=\u5730\u5740
+userinfo.workPostalCode=\u90AE\u7F16
+userinfo.workFax=\u4F20\u771F
+userinfo.workPhoneNumber=\u5DE5\u4F5C\u7535\u8BDD
+userinfo.workEmail=\u5DE5\u4F5C\u90AE\u4EF6
+userinfo.homeCountry=\u56FD\u5BB6
+userinfo.homeRegion=\u7701
+userinfo.homeLocality=\u57CE\u5E02
+userinfo.homeStreetAddress=\u5BB6\u5EAD\u5730\u5740
+userinfo.homePostalCode=\u5BB6\u5EAD\u90AE\u7F16
+userinfo.homeFax=\u5BB6\u5EAD\u4F20\u771F
+userinfo.homePhoneNumber=\u5BB6\u5EAD\u7535\u8BDD
+userinfo.homeEmail=\u5BB6\u5EAD\u90AE\u7BB1
+userinfo.theme=\u4E3B\u9898
+userinfo.theme.default=\u9ED1\u8272\u7ECF\u5178
+userinfo.theme.minty=\u8584\u8377\u6E05\u65B0
+userinfo.theme.pulse=\u6FC0\u60C5\u7D2B\u8346
+
+
+userinfo.authnType=\u767B\u5F55\u65B9\u5F0F
+userinfo.authnType.authnType.1=\u666E\u901A\u767B\u5F55
+userinfo.authnType.authnType.2=\u624B\u673A\u4EE4\u724C
+userinfo.authnType.authnType.3=\u77ED\u4FE1\u9A8C\u8BC1
+userinfo.authnType.authnType.4=\u90AE\u4EF6\u9A8C\u8BC1
+userinfo.authnType.authnType.5=\u65F6\u95F4\u4EE4\u724C
+userinfo.authnType.authnType.6=\u8BA1\u6570\u5668\u4EE4\u724C
+userinfo.authnType.authnType.7=HOTP\u4EE4\u724C
+userinfo.authnType.authnType.8=RSA\u4EE4\u724C
+userinfo.authnType.authnType.9=\u6570\u5B57\u8BC1\u4E66
+userinfo.authnType.authnType.10=USB Key
+
+#account
+account.username=\u7528\u6237\u540D
+account.displayName=\u7528\u6237\u59D3\u540D
+account.appId=\u5E94\u7528\u7F16\u53F7
+account.appName=\u5E94\u7528\u540D\u79F0
+account.relatedUsername=\u7528\u6237\u8D26\u53F7
+account.relatedPassword=\u8D26\u53F7\u5BC6\u7801
+
+login.totp.sharedSecret=\u5171\u4EAB\u5BC6\u7801
+login.totp.period=\u5468\u671F
+login.totp.digits=\u6570\u5B57
+login.totp.crypto=\u52A0\u5BC6\u65B9\u5F0F
+login.totp.generate=\u91CD\u65B0\u751F\u6210
+login.totp.title=TimeBased One Time Password
+
+login.hotp.sharedSecret=\u5171\u4EAB\u5BC6\u7801
+login.hotp.period=\u5468\u671F
+login.hotp.digits=\u6570\u5B57
+login.hotp.crypto=\u52A0\u5BC6\u65B9\u5F0F
+login.hotp.generate=\u91CD\u65B0\u751F\u6210
+login.hotp.title=HOTP One Time Password
+
+login.counter.sharedSecret=\u5171\u4EAB\u5BC6\u7801
+login.counter.period=\u5468\u671F
+login.counter.digits=\u6570\u5B57
+login.counter.crypto=\u52A0\u5BC6\u65B9\u5F0F
+login.counter.generate=\u91CD\u65B0\u751F\u6210
+login.counter.title=Counter Based One Time Password
+
+apps.number=\u5E8F\u53F7
+apps.icon=\u56FE\u6807
+apps.name=\u5E94\u7528\u540D\u79F0
+apps.protocol=\u8BBF\u95EE\u534F\u8BAE
+apps.category=\u7C7B\u578B
+apps.account=\u8D26\u53F7
+
+apps.oauth.approval.title=OAuth \u6388\u6743\u8BF7\u6C42
+apps.oauth.approval.info=\u6B64\u7B2C\u4E09\u65B9\u5E94\u7528\u8BF7\u6C42\u83B7\u5F97\u4EE5\u4E0B\u6743\u9650:
+apps.oauth.approval.context=\u8BBF\u95EE\u4F60\u7684\u4E2A\u4EBA\u4FE1\u606F
+apps.oauth.approval.authorize=\u540C\u610F\u6388\u6743
+
+button.text.action=\u8BBF\u95EE
+button.text.visit=\u8BBF\u95EE
+button.text.save=\u4FDD\u5B58
+button.text.select=\u8BF7\u9009\u62E9
+button.text.search=\u67E5\u8BE2
+button.text.expandsearch=\u5C55\u5F00
+button.text.collapsesearch=\u6536\u7F29
+
+forgotpassword.emailmobile=\u90AE\u7BB1\u6216\u624B\u673A
+forgotpassword.nextstep=\u4E0B\u4E00\u6B65
+forgotpassword.resetpwd.notfound.prefix=\u90AE\u7BB1\u6216\u624B\u673A\u53F7
+forgotpassword.resetpwd.notfound.suffix=\u4E0D\u5B58\u5728,\u8BF7
+forgotpassword.backstep=\u91CD\u65B0\u8F93\u5165
+forgotpassword.pwdreseted.password=\u8F93\u5165\u5BC6\u7801\u6216\u786E\u8BA4\u5BC6\u7801\u9519\u8BEF\uFF0C\u8BF7
+forgotpassword.pwdreseted.captcha=\u9A8C\u8BC1\u7801\u9519\u8BEF\uFF0C\u8BF7
+forgotpassword.pwdreseted.success.tip=\u5BC6\u7801\u91CD\u7F6E\u6210\u529F\uFF0C\u8BF7\u524D\u5F80
+forgotpassword.pwdreseted.success.login=\u767B\u5F55
+
+log.loginhistory.id=\u7F16\u53F7
+log.loginhistory.sessionId=\u4F1A\u8BDD
+log.loginhistory.username=\u767B\u5F55\u540D
+log.loginhistory.displayName=\u7528\u6237\u540D\u79F0
+log.loginhistory.provider=\u63D0\u4F9B\u5546
+log.loginhistory.message=\u72B6\u6001
+log.loginhistory.loginType=\u767B\u5F55\u65B9\u5F0F
+log.loginhistory.sourceIp=\u8BBF\u95EE\u5730\u5740
+log.loginhistory.browser=\u6D4F\u89C8\u5668
+log.loginhistory.loginTime=\u767B\u5F55\u65F6\u95F4
+log.loginhistory.logoutTime=\u9000\u51FA\u65F6\u95F4
+log.loginhistory.platform=\u5E73\u53F0
+log.loginhistory.application=\u5E94\u7528
+log.loginhistory.loginUrl=\u767B\u5F55\u5730\u5740
+log.loginhistory.code=\u4EE3\u7801
+log.loginhistory.rpUserInfo=\u7B2C\u4E09\u65B9
+
+log.loginappshistory.id=\u7F16\u53F7
+log.loginappshistory.sessionId=\u4F1A\u8BDD
+log.loginappshistory.uid=\u7528\u6237\u7F16\u53F7
+log.loginappshistory.username=\u767B\u5F55\u540D
+log.loginappshistory.displayName=\u7528\u6237\u540D
+log.loginappshistory.appId=\u5E94\u7528\u7F16\u53F7
+log.loginappshistory.appName=\u5E94\u7528\u540D\u79F0
+log.loginappshistory.loginTime=\u767B\u5F55\u65F6\u95F4
+
+log.operate.servicename=\u670D\u52A1
+log.operate.message=\u6D88\u606F
+log.operate.content=\u5185\u5BB9
+log.operate.messageType=\u6D88\u606F\u7C7B\u578B
+log.operate.operateType=\u64CD\u4F5C\u7C7B\u578B
+log.operate.username=\u64CD\u4F5C\u4EBA
+
+message.action.insert.success=\u65B0\u589E\u64CD\u4F5C\u6210\u529F
+message.action.insert.error=\u65B0\u589E\u64CD\u4F5C\u5931\u8D25
+message.action.update.success=\u66F4\u65B0\u64CD\u4F5C\u6210\u529F
+message.action.update.error=\u66F4\u65B0\u64CD\u4F5C\u5931\u8D25
+message.action.delete.success=\u5220\u9664\u64CD\u4F5C\u6210\u529F
+message.action.delete.error=\u5220\u9664\u64CD\u4F5C\u5931\u8D25
+
+#navs
+navs.mypps=\u6211\u7684\u5E94\u7528
+navs.setting=\u8BBE\u7F6E
+navs.setting.security=\u5B89\u5168\u8BBE\u7F6E
+navs.setting.sociallink=\u8BA4\u8BC1\u5173\u8054
+navs.setting.changepassword=\u5BC6\u7801\u4FEE\u6539
+navs.setting.appaccount=\u5E94\u7528\u8D26\u53F7
+navs.setting.timetoken=\u65F6\u95F4\u4EE4\u724C
+
+navs.myprofile=\u6211\u7684\u8D44\u6599
+
+navs.audit=\u5BA1\u8BA1
+navs.audit.login=\u767B\u5F55\u65E5\u5FD7
+navs.audit.signon=\u8BBF\u95EE\u65E5\u5FD7
+navs.audit.operation=\u64CD\u4F5C\u65E5\u5FD7
\ No newline at end of file