diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java b/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java index 87031391a..9a93509bf 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Accounts.java @@ -43,6 +43,9 @@ import org.hibernate.validator.constraints.Length; @Table(name = "MXK_ACCOUNTS") public class Accounts extends JpaBaseEntity implements Serializable { private static final long serialVersionUID = 6829592256223630307L; + + public static final String DEFAULT_PASSWORD_SUFFIX = UserInfo.DEFAULT_PASSWORD_SUFFIX; + @Id @Column @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") diff --git a/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java b/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java index fa0822c44..6e623c173 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java @@ -43,6 +43,9 @@ import org.springframework.web.multipart.MultipartFile; @Table(name = "MXK_USERINFO") public class UserInfo extends JpaBaseEntity { private static final long serialVersionUID = 6402443942083382236L; + + public static final String DEFAULT_PASSWORD_SUFFIX = "MaxKey@888"; + // @Id @Column diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java index 67f06e431..4438ce5e6 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java @@ -81,7 +81,7 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService UserInfo userInfo =buildUserInfo(attributeMap,sr.getName(),sr.getNameInNamespace()); if(userInfo != null) { - userInfo.setPassword(userInfo.getUsername() + "Maxkey@888"); + userInfo.setPassword(userInfo.getUsername() + UserInfo.DEFAULT_PASSWORD_SUFFIX); userInfoService.saveOrUpdate(userInfo); _logger.info("userInfo " + userInfo); } diff --git a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java index 2250c7a13..b5721834a 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkUsersService.java @@ -70,7 +70,7 @@ public class DingtalkUsersService extends AbstractSynchronizerService implement _logger.debug("name : {} , {} , {}", user.getName(),user.getLoginId(),user.getUserid()); UserInfo userInfo = buildUserInfo(user); _logger.trace("userInfo {}" , userInfo); - userInfo.setPassword(userInfo.getUsername() + "Maxkey@888"); + userInfo.setPassword(userInfo.getUsername() + UserInfo.DEFAULT_PASSWORD_SUFFIX); userInfoService.saveOrUpdate(userInfo); } } diff --git a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java index 115b9561c..f2650ec19 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java @@ -61,7 +61,7 @@ public class FeishuUsersService extends AbstractSynchronizerService implements I for(FeishuUsers user : usersResponse.getData().getItems()) { UserInfo userInfo = buildUserInfo(user); _logger.info("userInfo : " + userInfo); - userInfo.setPassword(userInfo.getUsername() + "Maxkey@888"); + userInfo.setPassword(userInfo.getUsername() + UserInfo.DEFAULT_PASSWORD_SUFFIX); userInfoService.saveOrUpdate(userInfo); } } diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java index 1a24019cb..62fe2c93e 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java @@ -73,7 +73,7 @@ public class LdapUsersService extends AbstractSynchronizerService implements IS } UserInfo userInfo = buildUserInfo(attributeMap,sr.getName(),sr.getNameInNamespace()); - userInfo.setPassword(userInfo.getUsername() + "Maxkey@888"); + userInfo.setPassword(userInfo.getUsername() + UserInfo.DEFAULT_PASSWORD_SUFFIX); userInfoService.saveOrUpdate(userInfo); _logger.info("userInfo " + userInfo); } diff --git a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java index a82d45cea..b2697e594 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java @@ -57,7 +57,7 @@ public class WorkweixinUsersService extends AbstractSynchronizerService implemen for(WorkWeixinUsers user : usersResponse.getUserlist()) { UserInfo userInfo = buildUserInfo(user); _logger.info("userInfo : " + userInfo); - userInfo.setPassword(userInfo.getUsername() + "Maxkey@888"); + userInfo.setPassword(userInfo.getUsername() + UserInfo.DEFAULT_PASSWORD_SUFFIX); userInfoService.saveOrUpdate(userInfo); } } 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 8bffd567e..fe3c9b98b 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 @@ -76,7 +76,7 @@ - +