Merge branch 'fix/sso_master' into 'master'

修复sso encrypt

See merge request o2oa/o2oa!6099

o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java

@@ -40,8 +40,7 @@ class ActionGetEncrypt extends BaseAction {
 			throw new ExceptionClientNotExist(client);
 		}
 		String str = credential + TOKEN_SPLIT + new Date().getTime();
-		byte[] bs = Crypto.encrypt(str.getBytes(DefaultCharset.charset), key.getBytes());
-		String token = new String(Base64.encodeBase64(bs), DefaultCharset.charset);
+		String token = Crypto.encrypt(str, key);
 		Wo wo = new Wo();
 		wo.setToken(token);
 		result.setData(wo);