diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java index 98c79254537f97ef7d975a654b33f74a5d60458a..d36fbcd41653a1ebaccc2003086797a7e48f5787 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java @@ -1078,6 +1078,20 @@ public class EntityManagerContainer extends EntityManagerContainerBasic { return new ArrayList<>(os); } + public List idsInOrInOrIsMember(Class cls, String firstAttribute, + Collection firstCollection, String secondAttribute, Collection secondCollection, + String isMemberAttribute, Object isMemberValue) throws Exception { + EntityManager em = this.get(cls); + CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(String.class); + Root root = cq.from(cls); + Predicate p = cb.or(root.get(firstAttribute).in(firstCollection), + root.get(secondAttribute).in(secondCollection), + cb.isMember(isMemberValue, root.get(isMemberAttribute))); + List os = em.createQuery(cq.select(root.get(JpaObject.id_FIELDNAME)).where(p)).getResultList(); + return new ArrayList<>(os); + } + public void commit() throws Exception { try { for (EntityManager em : entityManagerMap.values()) { diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Person.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Person.java index 3b8238e0b67c75f312cf8f06e882d532caa95792..016daa538ffe8d497bb07ff058af3f57e435d46f 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Person.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Person.java @@ -54,6 +54,8 @@ public class Person extends ConfigObject { public static final Boolean DEFAULT_ENABLESAFELOGOUT = false; + public static final String DEFAULT_ENCRYPTTYPE = ""; + public Person() { this.captchaLogin = DEFAULT_CAPTCHALOGIN; this.codeLogin = DEFAULT_CODELOGIN; @@ -70,6 +72,7 @@ public class Person extends ConfigObject { this.language = DEFAULT_LANGUAGE; this.tokenName = DEFAULT_TOKENNAME; this.enableSafeLogout = DEFAULT_ENABLESAFELOGOUT; + this.encryptType = DEFAULT_ENCRYPTTYPE; } public static Person defaultInstance() { @@ -135,6 +138,13 @@ public class Person extends ConfigObject { @FieldDescribe("是否启用安全注销.") private Boolean enableSafeLogout; + @FieldDescribe("加密方式,支持国密sm4") + private String encryptType; + + public String getEncryptType() { + return StringUtils.isEmpty(this.encryptType) ? DEFAULT_ENCRYPTTYPE : this.encryptType; + } + @FieldDescribe("扩展设置.") private Map extension; diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Token.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Token.java index 73e16da0c3a240fff9b565fcaf5f1ac75afee237..2d9b672ad6eb49f74c8ccb4f511fa9db2a0d39d9 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Token.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Token.java @@ -35,8 +35,6 @@ public class Token extends ConfigObject { public static final String defaultSslKeyStorePassword = "123456"; public static final String defaultSslKeyManagerPassword = "123456"; - public static final String DEFAULT_ENCRYPTTYPE = ""; - public static final Boolean DEFAULT_RSAENABLE = false; // 此对象临时计算无需存储 @@ -53,7 +51,7 @@ public class Token extends ConfigObject { this.password = ""; this.sslKeyStorePassword = defaultSslKeyStorePassword; this.sslKeyManagerPassword = defaultSslKeyManagerPassword; - this.encryptType = DEFAULT_ENCRYPTTYPE; + this.rsaEnable = DEFAULT_RSAENABLE; } @@ -70,9 +68,6 @@ public class Token extends ConfigObject { @FieldDescribe("ssl管理密码") private String sslKeyManagerPassword; - @FieldDescribe("加密方式,支持国密sm4") - private String encryptType; - @FieldDescribe("LDAP认证配置") private LdapAuth ldapAuth; @@ -92,14 +87,6 @@ public class Token extends ConfigObject { return null == this.rsaEnable ? DEFAULT_RSAENABLE : this.rsaEnable; } - public String getEncryptType() { - return StringUtils.isEmpty(this.encryptType) ? DEFAULT_ENCRYPTTYPE : this.encryptType; - } - - public void setEncryptType(String encryptType) { - this.encryptType = encryptType; - } - // 前面的代码是 key+surfix 结果是nullo2platform public String getKey() { String val = Objects.toString(key, "") + surfix; diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/connection/CipherConnectionAction.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/connection/CipherConnectionAction.java index aa689b5e1042c6a83c66a45c8a5566c9a94879c9..a918381405d6599df45da1286a9c5ab7f8a83e64 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/connection/CipherConnectionAction.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/connection/CipherConnectionAction.java @@ -313,7 +313,7 @@ public class CipherConnectionAction { public static List cipher() throws Exception { EffectivePerson effectivePerson = EffectivePerson.cipher(Config.token().getCipher(), - Config.token().getEncryptType()); + Config.person().getEncryptType()); return ListTools.toList(new NameValuePair(Config.person().getTokenName(), effectivePerson.getToken())); } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/EffectivePerson.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/EffectivePerson.java index 98bffe91604fde0233d0ce48ffc15039627b0b04..0906acc9f75968ed3f3b242e73ac2bfa1293d217 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/EffectivePerson.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/EffectivePerson.java @@ -75,7 +75,7 @@ public class EffectivePerson extends GsonPropertyObject { } public EffectivePerson(String distinguishedName, TokenType tokenType, String key) throws Exception { - this(distinguishedName, tokenType, key, Config.token().getEncryptType()); + this(distinguishedName, tokenType, key, Config.person().getEncryptType()); } public EffectivePerson(String distinguishedName, TokenType tokenType, String key, String encryptType) diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/HttpToken.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/HttpToken.java index ef36ed0bc2a8b5963b37909936b732bd8d8f6815..202a9f645366bd4f54b1b2f6020f387fbe0d7dc9 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/HttpToken.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/HttpToken.java @@ -60,7 +60,7 @@ public class HttpToken { try { String plain = ""; try { - plain = Crypto.decrypt(token, key, Config.token().getEncryptType()); + plain = Crypto.decrypt(token, key, Config.person().getEncryptType()); } catch (Exception e) { logger.warn("can not decrypt token:{}, {}, remote address:{}.", token, e.getMessage(), address); return EffectivePerson.anonymous(); @@ -102,7 +102,7 @@ public class HttpToken { return EffectivePerson.anonymous(); } return new EffectivePerson(URLDecoder.decode(matcher.group(3), StandardCharsets.UTF_8.name()), tokenType, - key, Config.token().getEncryptType()); + key, Config.person().getEncryptType()); } catch (Exception e) { e.printStackTrace(); } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/Crypto.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/Crypto.java index cda7ee987e368576cfd97cae62b0f2c157811b61..ea5d8a0f844de99ddf0f998c1c101e8f03791f60 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/Crypto.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/Crypto.java @@ -55,7 +55,7 @@ public class Crypto { private static final String TYPE_SM4 = "sm4"; public static String encrypt(String data, String key) throws Exception { - return encrypt(data, key, Config.token().getEncryptType()); + return encrypt(data, key, Config.person().getEncryptType()); } public static String encrypt(String data, String key, String type) @@ -100,9 +100,8 @@ public class Crypto { return classSm4; } - public static String decrypt(String data, String key) - throws Exception { - return decrypt(data, key, Config.token().getEncryptType()); + public static String decrypt(String data, String key) throws Exception { + return decrypt(data, key, Config.person().getEncryptType()); } public static String decrypt(String data, String key, String type) diff --git a/o2server/x_console/src/main/java/com/x/server/console/action/ActionConfig.java b/o2server/x_console/src/main/java/com/x/server/console/action/ActionConfig.java index 1b2d7dda9a26cbeb19d3978fd6954d19b2b8383b..ebcdf88bbfe10f5afb1af2faf030b031df1b2f65 100644 --- a/o2server/x_console/src/main/java/com/x/server/console/action/ActionConfig.java +++ b/o2server/x_console/src/main/java/com/x/server/console/action/ActionConfig.java @@ -40,7 +40,7 @@ public class ActionConfig extends ActionBase { connection.setUseCaches(false); connection.setRequestProperty("Content-Type", HttpMediaType.APPLICATION_JSON_UTF_8); EffectivePerson effectivePerson = EffectivePerson.cipher(Config.token().getCipher(), - Config.token().getEncryptType()); + Config.person().getEncryptType()); connection.setRequestProperty(Config.person().getTokenName(), effectivePerson.getToken()); connection.setRequestMethod("GET"); connection.setDoOutput(false); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/BaseAction.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/BaseAction.java index 86241caecead1ff327a02e2f8fe9dc522fedf0b4..6e58b0708f5694cdf4f27139ff102380768e3f9d 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/BaseAction.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/BaseAction.java @@ -80,7 +80,7 @@ abstract class BaseAction extends StandardJaxrsAction { tokenType = Config.ternaryManagement().getTokenType(credential); } EffectivePerson effectivePerson = new EffectivePerson(credential, tokenType, Config.token().getCipher(), - Config.token().getEncryptType()); + Config.person().getEncryptType()); if ((null != request) && (null != response)) { httpToken.setToken(request, response, effectivePerson); } @@ -113,7 +113,7 @@ abstract class BaseAction extends StandardJaxrsAction { tokenType = TokenType.auditManager; } EffectivePerson effectivePerson = new EffectivePerson(person.getDistinguishedName(), tokenType, - Config.token().getCipher(), Config.token().getEncryptType()); + Config.token().getCipher(), Config.person().getEncryptType()); if ((null != request) && (null != response)) { if (!isMoaTerminal(request)) { String clientIp = HttpToken.remoteAddress(request); @@ -203,7 +203,7 @@ abstract class BaseAction extends StandardJaxrsAction { && LdapTools.auth(person.getUnique(), password)) { return true; } - return (StringUtils.equals(Crypto.encrypt(password, Config.token().getKey(), Config.token().getEncryptType()), + return (StringUtils.equals(Crypto.encrypt(password, Config.token().getKey(), Config.person().getEncryptType()), person.getPassword()) || StringUtils.equals(MD5Tool.getMD5Str(password), person.getPassword())); } diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ActionLogin.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ActionLogin.java index b39900bedee1e4d0e538009b48b9cd912f86e975..2ea3ef756873608050d564bd57a76217f5851849 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ActionLogin.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ActionLogin.java @@ -65,7 +65,7 @@ class ActionLogin extends BaseAction { List roles = business.organization().role().listWithPerson(person.getDistinguishedName()); wo.setRoleList(roles); EffectivePerson effective = new EffectivePerson(wo.getDistinguishedName(), TokenType.user, - Config.token().getCipher(), Config.token().getEncryptType()); + Config.token().getCipher(), Config.person().getEncryptType()); wo.setToken(effective.getToken()); HttpToken httpToken = new HttpToken(); httpToken.setToken(request, response, effective); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/mpweixin/ActionLoginWithCode.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/mpweixin/ActionLoginWithCode.java index dd20aae66d49ec53293345f2e1dc22f92d2a0c83..1e95e3711bf3f38f6cd5581e2b20eb6471671361 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/mpweixin/ActionLoginWithCode.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/mpweixin/ActionLoginWithCode.java @@ -61,7 +61,7 @@ public class ActionLoginWithCode extends BaseAction { List roles = business.organization().role().listWithPerson(person.getDistinguishedName()); wo.setRoleList(roles); EffectivePerson effective = new EffectivePerson(wo.getDistinguishedName(), TokenType.user, - Config.token().getCipher(), Config.token().getEncryptType()); + Config.token().getCipher(), Config.person().getEncryptType()); wo.setToken(effective.getToken()); HttpToken httpToken = new HttpToken(); httpToken.setToken(request, response, effective); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/qiyeweixin/ActionGetLogin.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/qiyeweixin/ActionGetLogin.java index 2505a274a541c10bfef0173894b755c2575baf72..6ffd52efbf129766ba71cef5b9d4c3fee2aecd08 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/qiyeweixin/ActionGetLogin.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/qiyeweixin/ActionGetLogin.java @@ -64,7 +64,7 @@ class ActionGetLogin extends BaseAction { List roles = business.organization().role().listWithPerson(person.getDistinguishedName()); wo.setRoleList(roles); EffectivePerson effective = new EffectivePerson(wo.getDistinguishedName(), TokenType.user, - Config.token().getCipher(), Config.token().getEncryptType()); + Config.token().getCipher(), Config.person().getEncryptType()); wo.setToken(effective.getToken()); HttpToken httpToken = new HttpToken(); httpToken.setToken(request, response, effective); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java index 0ab651371bc8dbdae27502dc7b7157657e1128c8..e08a7a5d014d06f2cf1f7e4b2046d61361a0fb4f 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java @@ -38,7 +38,7 @@ class ActionGetEncrypt extends BaseAction { throw new ExceptionClientNotExist(client); } String str = credential + TOKEN_SPLIT + new Date().getTime(); - String token = Crypto.encrypt(str, key, Config.token().getEncryptType()); + String token = Crypto.encrypt(str, key, Config.person().getEncryptType()); Wo wo = new Wo(); wo.setToken(token); result.setData(wo); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetLogin.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetLogin.java index 28f5d0f29cadd5032137b3c0c09f0222a1234296..6c59681ba9332794af8a086646809529d66520a9 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetLogin.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetLogin.java @@ -54,7 +54,7 @@ class ActionGetLogin extends BaseAction { String content = null; logger.debug("decrypt sso client:{}, token:{}, key:{}.", client, token, sso.getKey()); try { - content = Crypto.decrypt(token, sso.getKey(), Config.token().getEncryptType()); + content = Crypto.decrypt(token, sso.getKey(), Config.person().getEncryptType()); logger.debug("decrypt sso client:{}, token:{}, key:{}, content:{}.", client, token, sso.getKey(), content); } catch (Exception e) { @@ -98,7 +98,7 @@ class ActionGetLogin extends BaseAction { tokenType = TokenType.auditManager; } EffectivePerson effective = new EffectivePerson(wo.getDistinguishedName(), tokenType, - Config.token().getCipher(), Config.token().getEncryptType()); + Config.token().getCipher(), Config.person().getEncryptType()); wo.setToken(effective.getToken()); HttpToken httpToken = new HttpToken(); httpToken.setToken(request, response, effective); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java index 9209bc9368f120e7799b0290c34d82f9b98fa208..1ec38f76958ed0ba77578968b0242a6ef75a4706 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java @@ -41,7 +41,7 @@ class ActionPostEncrypt extends BaseAction { throw new ExceptionClientNotExist(wi.getClient()); } String str = wi.getCredential() + TOKEN_SPLIT + new Date().getTime(); - String token = Crypto.encrypt(str, wi.getKey(), Config.token().getEncryptType()); + String token = Crypto.encrypt(str, wi.getKey(), Config.person().getEncryptType()); Wo wo = new Wo(); wo.setToken(token); result.setData(wo); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostLogin.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostLogin.java index c5be8ec00fda40b5693a29c589dfd33df4778a74..cb93005f0415c2e16aa8186833dbafc6eb03d633 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostLogin.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostLogin.java @@ -57,7 +57,7 @@ class ActionPostLogin extends BaseAction { String content = null; logger.debug("decrypt sso client:{}, token:{}, key:{}.", wi.getClient(), wi.getToken(), sso.getKey()); try { - content = Crypto.decrypt(wi.getToken(), sso.getKey(), Config.token().getEncryptType()); + content = Crypto.decrypt(wi.getToken(), sso.getKey(), Config.person().getEncryptType()); } catch (Exception e) { throw new ExceptionReadToken(wi.getClient(), wi.getToken()); } @@ -99,7 +99,7 @@ class ActionPostLogin extends BaseAction { tokenType = TokenType.auditManager; } EffectivePerson effective = new EffectivePerson(wo.getDistinguishedName(), tokenType, - Config.token().getCipher(), Config.token().getEncryptType()); + Config.token().getCipher(), Config.person().getEncryptType()); wo.setToken(effective.getToken()); HttpToken httpToken = new HttpToken(); httpToken.setToken(request, response, effective); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/welink/ActionLogin.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/welink/ActionLogin.java index 16cbfa9344a01e7e907c469509b841b89a1aa956..954ed7f604dc84b67404894b376fad016d32f107 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/welink/ActionLogin.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/welink/ActionLogin.java @@ -59,7 +59,7 @@ public class ActionLogin extends BaseAction { List roles = business.organization().role().listWithPerson(person.getDistinguishedName()); wo.setRoleList(roles); EffectivePerson effective = new EffectivePerson(wo.getDistinguishedName(), TokenType.user, - Config.token().getCipher(), Config.token().getEncryptType()); + Config.token().getCipher(), Config.person().getEncryptType()); wo.setToken(effective.getToken()); HttpToken httpToken = new HttpToken(); httpToken.setToken(request, response, effective); diff --git a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/zhengwudingding/ActionLogin.java b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/zhengwudingding/ActionLogin.java index 3e193e5f25dd108531f7a35a1b995f8f28d82f3e..c01c8271ee2349a79abd5d71b7a9ac3e7c304638 100644 --- a/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/zhengwudingding/ActionLogin.java +++ b/o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/zhengwudingding/ActionLogin.java @@ -50,7 +50,7 @@ class ActionLogin extends BaseAction { List roles = business.organization().role().listWithPerson(person.getDistinguishedName()); wo.setRoleList(roles); EffectivePerson effective = new EffectivePerson(wo.getDistinguishedName(), TokenType.user, - Config.token().getCipher(), Config.token().getEncryptType()); + Config.token().getCipher(), Config.person().getEncryptType()); wo.setToken(effective.getToken()); HttpToken httpToken = new HttpToken(); httpToken.setToken(request, response, effective); diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/factory/PersonFactory.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/factory/PersonFactory.java index ddf672af58cd19c6b2c4560c3eb743a102bdbcb3..dd70aa35531fd73f4ea7a5601b6eeffb8f7dad78 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/factory/PersonFactory.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/factory/PersonFactory.java @@ -192,7 +192,7 @@ public class PersonFactory extends AbstractFactory { public void setPassword(Person person, String password, boolean isInitialization) throws Exception { Calendar cal = Calendar.getInstance(); person.setChangePasswordTime(cal.getTime()); - person.setPassword(Crypto.encrypt(password, Config.token().getKey(), Config.token().getEncryptType())); + person.setPassword(Crypto.encrypt(password, Config.token().getKey(), Config.person().getEncryptType())); Integer passwordPeriod = Config.person().getPasswordPeriod(); if (passwordPeriod == null || passwordPeriod <= 0) { person.setPasswordExpiredTime(null); diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionInput.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionInput.java index 44bffbc11441fa898442a244fdc3fc09586cab4c..7251d416ff3615dda368e3524ef1892542adf5a5 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionInput.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionInput.java @@ -109,7 +109,7 @@ class ActionInput extends BaseAction { } } for (PersonItem o : people) { - o.setPassword(Crypto.encrypt(o.getPassword(), Config.token().getKey(), Config.token().getEncryptType())); + o.setPassword(Crypto.encrypt(o.getPassword(), Config.token().getKey(), Config.person().getEncryptType())); } } diff --git a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/factory/PersonFactory.java b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/factory/PersonFactory.java index ec2d73c383ee82710a230e5bbee9a5212ee1793f..4c4f35343983560339a7a99a37fc8f9b48266f25 100644 --- a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/factory/PersonFactory.java +++ b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/factory/PersonFactory.java @@ -257,7 +257,7 @@ public class PersonFactory extends AbstractFactory { public void setPassword(Person person, String password) throws Exception { Calendar cal = Calendar.getInstance(); person.setChangePasswordTime(cal.getTime()); - person.setPassword(Crypto.encrypt(password, Config.token().getKey(), Config.token().getEncryptType())); + person.setPassword(Crypto.encrypt(password, Config.token().getKey(), Config.person().getEncryptType())); Integer passwordPeriod = Config.person().getPasswordPeriod(); if (passwordPeriod == null || passwordPeriod <= 0) { person.setPasswordExpiredTime(null); diff --git a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java index 7a1281c590c71f8588fd1978d51b77b618c871d9..06bb4441d1324accf313a1d5f4326d6139a88753 100644 --- a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java +++ b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/password/ActionChangePassword.java @@ -57,7 +57,7 @@ class ActionChangePassword extends ActionBase { logger.info("user{name:" + person.getName() + "} use superPermission."); } else { if (!StringUtils.equals( - Crypto.encrypt(wi.getOldPassword(), Config.token().getKey(), Config.token().getEncryptType()), + Crypto.encrypt(wi.getOldPassword(), Config.token().getKey(), Config.person().getEncryptType()), person.getPassword())) { throw new ExceptionOldPasswordNotMatch(); } diff --git a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPassword.java b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPassword.java index 1ca3c0caf56f933f7143059cbc65a150dcd8ab3c..dd3c41a18d61812f77627f359ab68449b392a0d1 100644 --- a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPassword.java +++ b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPassword.java @@ -79,7 +79,7 @@ class ActionSetPassword extends BaseAction { logger.info("user{name:" + person.getName() + "} use superPermission."); } else { if (!StringUtils.equals( - Crypto.encrypt(oldPassword, Config.token().getKey(), Config.token().getEncryptType()), + Crypto.encrypt(oldPassword, Config.token().getKey(), Config.person().getEncryptType()), person.getPassword())) { throw new ExceptionOldPasswordNotMatch(); } diff --git a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ActionReset.java b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ActionReset.java index 2e57553f3a7897470fc0dd3230ee29820d32951d..3edbdaf85506f6742818a45988907d8fa9a734d9 100644 --- a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ActionReset.java +++ b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ActionReset.java @@ -61,7 +61,7 @@ class ActionReset extends BaseAction { } } emc.beginTransaction(Person.class); - person.setPassword(Crypto.encrypt(password, Config.token().getKey(), Config.token().getEncryptType())); + person.setPassword(Crypto.encrypt(password, Config.token().getKey(), Config.person().getEncryptType())); person.setChangePasswordTime(new Date()); emc.check(person, CheckPersistType.all); emc.commit(); diff --git a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ActionSetPasswordAnonymous.java b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ActionSetPasswordAnonymous.java index d28a88424a551a2c9baad26c5f505812112479d9..1cd4fa6435d8a99d45df412b63778ae09dd69239 100644 --- a/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ActionSetPasswordAnonymous.java +++ b/o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ActionSetPasswordAnonymous.java @@ -86,7 +86,7 @@ public class ActionSetPasswordAnonymous extends BaseAction { LOGGER.info("user{name:" + person.getName() + "} use superPermission."); } else { if (!StringUtils.equals( - Crypto.encrypt(oldPassword, Config.token().getKey(), Config.token().getEncryptType()), + Crypto.encrypt(oldPassword, Config.token().getKey(), Config.person().getEncryptType()), person.getPassword())) { throw new ExceptionOldPasswordNotMatch(); } diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/factory/PersonFactory.java b/o2server/x_program_center/src/main/java/com/x/program/center/factory/PersonFactory.java index 6cb7c86c108ad63a5ad4e0c0ef95e468a0f1c515..f5b0eb2dddb8965d0020dc7af3e6d5e130563e8d 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/factory/PersonFactory.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/factory/PersonFactory.java @@ -83,7 +83,7 @@ public class PersonFactory extends AbstractFactory { public void setPassword(Person person, String password) throws Exception { Calendar cal = Calendar.getInstance(); person.setChangePasswordTime(cal.getTime()); - person.setPassword(Crypto.encrypt(password, Config.token().getKey(), Config.token().getEncryptType())); + person.setPassword(Crypto.encrypt(password, Config.token().getKey(), Config.person().getEncryptType())); Integer passwordPeriod = Config.person().getPasswordPeriod(); if (passwordPeriod == null || passwordPeriod <= 0) { person.setPasswordExpiredTime(null); diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/adminlogin/ActionLogin.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/adminlogin/ActionLogin.java index 4ec81b674b919ada27ddc02485f99636d707bf70..51fb794391fcc25f0abebde69988975ea705e9fa 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/adminlogin/ActionLogin.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/adminlogin/ActionLogin.java @@ -32,7 +32,7 @@ class ActionLogin extends BaseAction { } HttpToken httpToken = new HttpToken(); EffectivePerson ep = new EffectivePerson(Config.token().initialManagerInstance().getName(), TokenType.manager, - Config.token().getCipher(), Config.token().getEncryptType()); + Config.token().getCipher(), Config.person().getEncryptType()); httpToken.setToken(request, response, ep); Wo wo = new Wo(); Config.token().initialManagerInstance().copyTo(wo, JpaObject.FieldsInvisible); diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionExecuteToken.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionExecuteToken.java index 2eafe582fbec57a1f750b17af7662925800a6f15..184b42907e3868197d28cff348c8e7d1c335dcf5 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionExecuteToken.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionExecuteToken.java @@ -87,7 +87,7 @@ class ActionExecuteToken extends BaseAction { private String decrypt(String client, String token, Sso sso) throws ExceptionReadToken { String value = ""; try { - value = Crypto.decrypt(token, sso.getKey(), Config.token().getEncryptType()); + value = Crypto.decrypt(token, sso.getKey(), Config.person().getEncryptType()); LOGGER.debug("decrypt sso client:{}, token:{}, key:{}, content:{}.", client::toString, token::toString, sso::getKey, value::toString); } catch (Exception e) { diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionToken.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionToken.java index 28790d588d8425188a9891346df00255b7ff2fe8..1566ea0cda447653919c4b6cc8ddff4fd6d1e489 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionToken.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/invoke/ActionToken.java @@ -29,7 +29,7 @@ class ActionToken extends BaseAction { } wo.setValue(Crypto.encrypt(effectivePerson.getDistinguishedName() + SPLIT + (new Date().getTime()), - sso.getKey(), Config.token().getEncryptType())); + sso.getKey(), Config.person().getEncryptType())); result.setData(wo); return result;