diff --git a/build.gradle b/build.gradle index 8b29a3963..c3e1f469b 100644 --- a/build.gradle +++ b/build.gradle @@ -402,6 +402,7 @@ subprojects { implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}" implementation group: 'org.reflections', name: 'reflections', version: '0.9.11' implementation group: 'io.prometheus', name: 'simpleclient', version: '0.5.0' + implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}" //阿里云 implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}" diff --git a/config/build_docker.gradle b/config/build_docker.gradle index 4135bac22..0e6bac9f6 100644 --- a/config/build_docker.gradle +++ b/config/build_docker.gradle @@ -352,6 +352,7 @@ subprojects { implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}" implementation group: 'org.reflections', name: 'reflections', version: '0.9.11' implementation group: 'io.prometheus', name: 'simpleclient', version: '0.5.0' + implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}" //阿里云 implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}" diff --git a/config/build_jar.gradle b/config/build_jar.gradle index 3c6b77add..ccb5695e1 100644 --- a/config/build_jar.gradle +++ b/config/build_jar.gradle @@ -352,6 +352,7 @@ subprojects { implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}" implementation group: 'org.reflections', name: 'reflections', version: '0.9.11' implementation group: 'io.prometheus', name: 'simpleclient', version: '0.5.0' + implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}" //阿里云 implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}" diff --git a/config/build_standard.gradle b/config/build_standard.gradle index ac5ff51b8..a3f839b4f 100644 --- a/config/build_standard.gradle +++ b/config/build_standard.gradle @@ -388,6 +388,7 @@ subprojects { implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}" implementation group: 'org.reflections', name: 'reflections', version: '0.9.11' implementation group: 'io.prometheus', name: 'simpleclient', version: '0.5.0' + implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}" //阿里云 implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}" diff --git a/gradle.properties b/gradle.properties index 92c17ce78..80846b35c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -143,6 +143,7 @@ aopallianceVersion =1.0 aspectjtoolsVersion =1.9.4 evictorVersion =1.0.0 lettuceVersion =6.1.4.RELEASE +pinyin4jVersion =2.5.1 #xml jdomVersion =2.0.2 dom4jVersion =1.6.1 diff --git a/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java b/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java index 1379570c5..53af41e83 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/AccountsStrategy.java @@ -42,17 +42,20 @@ public class AccountsStrategy extends JpaBaseEntity implements Serializable { private String name; @Column private String appId; + private byte[] appIcon; @Column private String appName; @Column private String mapping; - @Column String filters ; - @Column String orgIdsList; @Column + String suffixes; + @Column + String createType; + @Column String status; @Column String description; @@ -173,7 +176,31 @@ public class AccountsStrategy extends JpaBaseEntity implements Serializable { this.mapping = mapping; } - @Override + public byte[] getAppIcon() { + return appIcon; + } + + public void setAppIcon(byte[] appIcon) { + this.appIcon = appIcon; + } + + public String getCreateType() { + return createType; + } + + public void setCreateType(String createType) { + this.createType = createType; + } + + public String getSuffixes() { + return suffixes; + } + + public void setSuffixes(String suffixes) { + this.suffixes = suffixes; + } + + @Override public String toString() { StringBuilder builder = new StringBuilder(); builder.append("AccountsStrategy [id="); diff --git a/maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java b/maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java index 972bbb7f9..536546f46 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java @@ -140,9 +140,6 @@ public class Apps extends JpaBaseEntity implements Serializable { @Column private String adapter; - - @Column - protected int accountMgmt; protected Accounts appUser; @Column @@ -586,14 +583,6 @@ public class Apps extends JpaBaseEntity implements Serializable { this.adapterName = adapterName; } - public int getAccountMgmt() { - return accountMgmt; - } - - public void setAccountMgmt(int accountMgmt) { - this.accountMgmt = accountMgmt; - } - @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java index bce088c4b..097ddd5a0 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java @@ -22,6 +22,8 @@ package org.maxkey.persistence.mapper; import java.util.List; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.maxkey.entity.Accounts; import org.maxkey.entity.AccountsStrategy; @@ -37,4 +39,9 @@ public interface AccountsMapper extends IJpaBaseMapper { public List queryUserNotInStrategy(AccountsStrategy strategy); public long deleteByStrategy(AccountsStrategy strategy); + + public List queryByAppIdAndDate(Accounts account); + + @Select("select * from mxk_accounts where appid=#{appId} and relatedusername=#{relatedUsername}") + public List queryByAppIdAndAccount(@Param ("appId") String appId,@Param ("relatedUsername") String relatedUsername); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java index 8c84dbf66..4449d8b89 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java @@ -34,6 +34,13 @@ import org.maxkey.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; +import net.sourceforge.pinyin4j.PinyinHelper; +import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; +import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; +import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; +import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType; +import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; + @Repository public class AccountsService extends JpaBaseService{ @@ -133,22 +140,7 @@ public class AccountsService extends JpaBaseService{ account.setUserId(user.getId()); account.setUsername(user.getUsername()); account.setDisplayName(user.getDisplayName()); - - if(strategy.getMapping().equalsIgnoreCase("username")) { - account.setRelatedUsername(user.getUsername()); - }else if(strategy.getMapping().equalsIgnoreCase("mobile")) { - account.setRelatedUsername(user.getMobile()); - }else if(strategy.getMapping().equalsIgnoreCase("email")) { - account.setRelatedUsername(user.getEmail()); - }else if(strategy.getMapping().equalsIgnoreCase("employeeNumber")) { - account.setRelatedUsername(user.getEmployeeNumber()); - }else if(strategy.getMapping().equalsIgnoreCase("windowsAccount")) { - account.setRelatedUsername(user.getWindowsAccount()); - }else if(strategy.getMapping().equalsIgnoreCase("idCardNo")) { - account.setRelatedUsername(user.getIdCardNo()); - }else { - account.setRelatedUsername(user.getUsername()); - } + account.setRelatedUsername(generateAccount(user,strategy)); account.setRelatedPassword(ReciprocalUtils.encode(userInfoService.randomPassword())); account.setCreateType("automatic"); @@ -160,7 +152,9 @@ public class AccountsService extends JpaBaseService{ deleteByStrategy(strategy); } public void refreshAllByStrategy() { - for( AccountsStrategy strategy : accountsStrategyService.query(null)) { + AccountsStrategy queryStrategy = new AccountsStrategy(); + queryStrategy.setCreateType("automatic"); + for( AccountsStrategy strategy : accountsStrategyService.query(queryStrategy)) { refreshByStrategy(strategy); } } @@ -174,4 +168,89 @@ public class AccountsService extends JpaBaseService{ return getMapper().deleteByStrategy(strategy); } + + public List queryByAppIdAndDate(Accounts account) { + return getMapper().queryByAppIdAndDate(account); + } + + public List queryByAppIdAndAccount(String appId,String relatedUsername){ + return getMapper().queryByAppIdAndAccount(appId,relatedUsername); + } + + + public String generateAccount(UserInfo userInfo,AccountsStrategy accountsStrategy) { + String shortAccount = generateAccount(userInfo,accountsStrategy,true); + String account = generateAccount(userInfo,accountsStrategy,false); + String accountResult = shortAccount; + List AccountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),shortAccount +accountsStrategy.getSuffixes()); + if(!AccountsList.isEmpty()) { + if(accountsStrategy.getMapping().equalsIgnoreCase("email")) { + accountResult = account; + AccountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),account + accountsStrategy.getSuffixes()); + } + if(!AccountsList.isEmpty()) { + for(int i =1 ;i < 100 ;i++) { + accountResult = account + i; + AccountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),accountResult + accountsStrategy.getSuffixes()); + if(AccountsList.isEmpty())break; + } + } + } + if(StringUtils.isNotBlank(accountsStrategy.getSuffixes())){ + accountResult = accountResult + accountsStrategy.getSuffixes(); + } + return accountResult; + } + + + private String generateAccount(UserInfo userInfo,AccountsStrategy strategy,boolean isShort) { + String account = ""; + if(strategy.getMapping().equalsIgnoreCase("username")) { + account = userInfo.getUsername(); + }else if(strategy.getMapping().equalsIgnoreCase("mobile")) { + account = userInfo.getMobile(); + }else if(strategy.getMapping().equalsIgnoreCase("email")) { + try { + if(isShort) { + account = getPinYinShortName(userInfo.getDisplayName()); + }else { + account = getPinYinName(userInfo.getDisplayName()); + } + }catch(Exception e) { + e.printStackTrace(); + } + }else if(strategy.getMapping().equalsIgnoreCase("employeeNumber")) { + account = userInfo.getEmployeeNumber(); + }else if(strategy.getMapping().equalsIgnoreCase("windowsAccount")) { + account = userInfo.getWindowsAccount(); + }else if(strategy.getMapping().equalsIgnoreCase("idCardNo")) { + account = userInfo.getIdCardNo(); + }else { + account = userInfo.getUsername(); + } + + return account; + } + + public static String getPinYinName(String name) throws BadHanyuPinyinOutputFormatCombination { + HanyuPinyinOutputFormat pinyinFormat = new HanyuPinyinOutputFormat(); + pinyinFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE); + pinyinFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE); + pinyinFormat.setVCharType(HanyuPinyinVCharType.WITH_V); + return PinyinHelper.toHanYuPinyinString(name, pinyinFormat, "",false); + } + + public static String getPinYinShortName(String name) throws BadHanyuPinyinOutputFormatCombination { + char[] strs = name.toCharArray(); + String pinyinName = ""; + for(int i=0;i - - and id = #{id} - - - and appid = #{appId} - - - and name = #{name} - + + and mas.id = #{id} + + + and mas.appid = #{appId} + + + and mas.name = #{name} + - - - + + + \ No newline at end of file diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml index 5a64a5d09..b28bde90b 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml @@ -21,9 +21,6 @@ and vendor = #{vendor} - - and accountmgmt = #{accountMgmt} - @@ -71,7 +68,6 @@ principal, credentials, - accountmgmt, visible, @@ -113,7 +109,6 @@ #{principal}, #{credentials}, - #{accountMgmt}, #{visible}, @@ -162,7 +157,6 @@ principal = #{principal}, credentials = #{credentials}, - accountmgmt = #{accountMgmt}, visible = #{visible}, sortindex = #{sortIndex}, diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java index 29ad3a931..8d672532d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java @@ -21,7 +21,10 @@ import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.entity.Accounts; +import org.maxkey.entity.AccountsStrategy; +import org.maxkey.entity.UserInfo; import org.maxkey.persistence.service.AccountsService; +import org.maxkey.persistence.service.AccountsStrategyService; import org.maxkey.persistence.service.AppsService; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.web.WebContext; @@ -48,6 +51,10 @@ public class AccountsController { @Qualifier("accountsService") AccountsService accountsService; + @Autowired + @Qualifier("accountsStrategyService") + AccountsStrategyService accountsStrategyService; + @Autowired @Qualifier("appsService") protected AppsService appsService; @@ -142,4 +149,11 @@ public class AccountsController { } + @ResponseBody + @RequestMapping(value = "/generate") + public String generate(@ModelAttribute("appAccounts") Accounts appAccounts) { + AccountsStrategy accountsStrategy = accountsStrategyService.get(appAccounts.getStrategyId()); + UserInfo userInfo = userInfoService.get(appAccounts.getUserId()); + return accountsService.generateAccount(userInfo,accountsStrategy); + } } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsStrategyController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsStrategyController.java index 96957aef1..0532ced4f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsStrategyController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsStrategyController.java @@ -57,12 +57,20 @@ public class AccountsStrategyController { return new ModelAndView("accountsstrategy/accountsstrategyList"); } + @RequestMapping(value={"/select"}) + public ModelAndView selectAccountsStrategyList(){ + return new ModelAndView("accountsstrategy/selectAccountsStrategy"); + } @RequestMapping(value = { "/grid" }) @ResponseBody public JpaPageResults queryDataGrid(@ModelAttribute("accountsStrategy") AccountsStrategy accountsStrategy) { _logger.debug(""+accountsStrategy); - return accountsStrategyService.queryPageResults(accountsStrategy); + JpaPageResults accountsStrategyList =accountsStrategyService.queryPageResults(accountsStrategy); + for (AccountsStrategy strategy : accountsStrategyList.getRows()){ + WebContext.setAttribute(strategy.getId(), strategy.getAppIcon()); + } + return accountsStrategyList; } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties index 71585ff8a..79a7eb6f2 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties @@ -313,7 +313,6 @@ apps.extendAttr.parameter.type=\u7c7b\u578b apps.extendAttr.parameter.value=\u503c apps.principal=\u51ed\u8bc1 apps.credentials=\u79d8\u94a5 -apps.accountMgmt=\u8D26\u53F7\u7BA1\u7406 #adapter apps.adapter.name=\u540D\u79F0 apps.adapter.adapter=\u9002\u914D\u5668 @@ -456,6 +455,10 @@ accounts.strategy.name=\u7B56\u7565\u540D\u79F0 accounts.strategy.mapping=\u8D26\u53F7\u6620\u5C04 accounts.strategy.filters=\u7528\u6237\u6761\u4EF6 accounts.strategy.orgidslist=\u673A\u6784\u5217\u8868 +accounts.strategy.suffixes=\u540E\u7F00 +accounts.strategy.createType=\u65B9\u5F0F +accounts.strategy.createType.manual=\u624B\u52A8 +accounts.strategy.createType.automatic=\u81EA\u52A8 #socials.provider socials.provider.id=\u7F16\u53F7 socials.provider.provider=\u63D0\u4F9B\u8005 diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties index fb8881d1d..3e99bf85c 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties @@ -316,7 +316,6 @@ apps.extendAttr.parameter.type=type apps.extendAttr.parameter.value=value apps.principal=principal apps.credentials=credentials -apps.accountMgmt=AccountMgmt #adapter apps.adapter.name=name @@ -464,6 +463,10 @@ accounts.strategy.name=name accounts.strategy.mapping=mapping accounts.strategy.filters=filters accounts.strategy.orgidslist=orgIdsList +accounts.strategy.suffixes=suffixes +accounts.strategy.createType=createType +accounts.strategy.createType.manual=manual +accounts.strategy.createType.automatic=automatic socials.provider.id=Id socials.provider.provider=Provider diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties index 9e8081f45..f143bff7f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties @@ -315,7 +315,6 @@ apps.extendAttr.parameter.type=\u7c7b\u578b apps.extendAttr.parameter.value=\u503c apps.principal=\u51ed\u8bc1 apps.credentials=\u79d8\u94a5 -apps.accountMgmt=\u8D26\u53F7\u7BA1\u7406 apps.adapter.name=\u540D\u79F0 apps.adapter.adapter=\u9002\u914D\u5668 apps.adapter.protocol=\u534F\u8BAE @@ -461,6 +460,10 @@ accounts.strategy.name=\u7B56\u7565\u540D\u79F0 accounts.strategy.mapping=\u8D26\u53F7\u6620\u5C04 accounts.strategy.filters=\u7528\u6237\u6761\u4EF6 accounts.strategy.orgidslist=\u673A\u6784\u5217\u8868 +accounts.strategy.suffixes=\u540E\u7F00 +accounts.strategy.createType=\u65B9\u5F0F +accounts.strategy.createType.manual=\u624B\u52A8 +accounts.strategy.createType.automatic=\u81EA\u52A8 #socials.provider socials.provider.id=\u7F16\u53F7 socials.provider.provider=\u63D0\u4F9B\u8005 diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl index 57ef986fe..d53d5f2a2 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl @@ -17,6 +17,19 @@ $("#relatedPassword").val(data+""); }); }); + + $("#generateAccountBtn").on("click",function(){ + $.post("<@base/>/accounts/generate/", { + _method:"post", + userId : $("#userId").val(), + appId : $("#appId").val(), + strategyId : $("#strategyId").val(), + currTime:(new Date()).getTime() + }, function(data) { + $("#relatedUsername").val(data+""); + }); + }); + $("#view").on("click",function(){ if($("#relatedPassword").attr("type")=="text"){ $("#relatedPassword").attr("type","password"); @@ -73,7 +86,7 @@ " - wurl="<@base/>/apps/select?accountMgmt=1" + wurl="<@base/>/accountsstrategy/select" wwidth="800" wheight="620" target="window"/> @@ -86,6 +99,7 @@ + "/> @@ -104,7 +118,9 @@ + + "/> "/> diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl index c4dce7ffc..57cef718d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl @@ -214,6 +214,26 @@ function showOrgsTree() { + + <@locale code="accounts.strategy.suffixes" />： + + + + + + <@locale code="accounts.strategy.createType" />： + + + + + <@locale code="accounts.strategy.orgidslist" />： @@ -224,13 +244,13 @@ function showOrgsTree() { <@locale code="accounts.strategy.filters" />： - + <@locale code="common.text.description" />： - + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl index 6049017f2..9089ba76f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl @@ -5,8 +5,17 @@ <#include "../layout/common.cssjs.ftl"/> @@ -96,9 +105,12 @@ Id <@locale code="accounts.strategy.name"/> - <@locale code="app.name"/> - <@locale code="accounts.strategy.status"/> - <@locale code="common.text.description"/> + <@locale code="apps.icon"/> + <@locale code="apps.id"/> + <@locale code="apps.name"/> + <@locale code="accounts.strategy.createType" /> + <@locale code="common.text.status"/> + <@locale code="common.text.description"/> <@locale code="common.text.createdby"/> <@locale code="common.text.createddate"/> <@locale code="common.text.modifiedby"/> diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyUpdate.ftl index 87abfa765..b8d2d3a9d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyUpdate.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyUpdate.ftl @@ -224,6 +224,26 @@ function showOrgsTree() { + + + <@locale code="accounts.strategy.suffixes" />： + + + + + + <@locale code="accounts.strategy.createType" />： + + + + <@locale code="accounts.strategy.orgidslist" />： @@ -235,13 +255,13 @@ function showOrgsTree() { <@locale code="accounts.strategy.filters" />： - + <@locale code="common.text.description" />： - + diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/selectAccountsStrategy.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/selectAccountsStrategy.ftl new file mode 100644 index 000000000..cb51ab463 --- /dev/null +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/selectAccountsStrategy.ftl @@ -0,0 +1,91 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + + + + + + +
<@locale code="accounts.strategy.name"/>: +
+ + "> + +
+ 		+
+ " /> +
+
+ + + + + + + + + + + + + + + + + + + + +
Id<@locale code="accounts.strategy.name"/><@locale code="apps.icon"/><@locale code="apps.id"/><@locale code="apps.name"/><@locale code="accounts.strategy.createType" /><@locale code="common.text.status"/><@locale code="common.text.createdby"/><@locale code="common.text.createddate"/><@locale code="common.text.modifiedby"/><@locale code="common.text.modifieddate"/>
+ + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl index fd3c2d02b..83c5938ce 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl @@ -24,24 +24,15 @@ - <@locale code="apps.loginUrl"/>： + - <@locale code="apps.logoutUrl"/>： - - - - - - <@locale code="apps.accountMgmt"/>： + <@locale code="apps.loginUrl"/>： - + <@locale code="apps.logoutType"/> diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl index b19e49953..504d4fc5f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl @@ -31,17 +31,8 @@ <@locale code="apps.logoutUrl"/>： - - - - - - <@locale code="apps.accountMgmt"/>： - + <@locale code="apps.logoutType"/> diff --git a/setEnvVars.bat b/setEnvVars.bat index 4716f7c92..798b17248 100644 --- a/setEnvVars.bat +++ b/setEnvVars.bat @@ -1,7 +1,7 @@ echo off echo set env -set JAVA_HOME=D:\IDE\jdk-17 -set GRADLE_HOME=D:\IDE\gradle-7.2 +set JAVA_HOME=D:\IDE\jdk-8.0.312.7 +set GRADLE_HOME=C:\IDE\gradle-7.2 call %JAVA_HOME%/bin/java -version call %GRADLE_HOME%/bin/gradle -version