From 5a6bc4892c91cd589324f195abc4dc62e62738cf Mon Sep 17 00:00:00 2001 From: Parker Date: Sun, 12 Dec 2021 01:30:02 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...CryptoAsymmetric.java => LoginCrypto.java} | 12 ++---- ...AsymmetricAop.java => LoginCryptoAop.java} | 41 +++++++++++-------- .../system/login/web/LoginRestController.java | 4 +- .../impl/CryptoSymmetricServiceImpl.java | 8 +++- 4 files changed, 37 insertions(+), 28 deletions(-) rename opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/{ApiCryptoAsymmetric.java => LoginCrypto.java} (81%) rename opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/aspect/{ApiCryptoAsymmetricAop.java => LoginCryptoAop.java} (79%) diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/ApiCryptoAsymmetric.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/LoginCrypto.java similarity index 81% rename from opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/ApiCryptoAsymmetric.java rename to opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/LoginCrypto.java index 8dbfbd5b..6ab9e2aa 100644 --- a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/ApiCryptoAsymmetric.java +++ b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/LoginCrypto.java @@ -19,7 +19,9 @@ package org.opsli.common.annotation; import java.lang.annotation.*; /** - * Api非对称加解密 + * 登录加解密 + * 入参 非对称 公钥加密 私钥解密 + * 出参 对称 公要加密 公要解密 * * @author Parker * @date 2021年5月18日14:46:02 @@ -27,15 +29,9 @@ import java.lang.annotation.*; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface ApiCryptoAsymmetric { +public @interface LoginCrypto { /** 加密启用状态 */ boolean enable() default true; - /** 请求解密 */ - boolean requestDecrypt() default true; - - /** 返回加密 */ - boolean responseEncrypt() default true; - } diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/aspect/ApiCryptoAsymmetricAop.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/aspect/LoginCryptoAop.java similarity index 79% rename from opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/aspect/ApiCryptoAsymmetricAop.java rename to opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/aspect/LoginCryptoAop.java index 1894f403..59a48d6c 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/aspect/ApiCryptoAsymmetricAop.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/aspect/LoginCryptoAop.java @@ -21,8 +21,11 @@ import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.TypeUtil; import lombok.extern.slf4j.Slf4j; import opsli.plugins.crypto.CryptoPlugin; +import opsli.plugins.crypto.enums.CryptoSymmetricType; import opsli.plugins.crypto.model.CryptoAsymmetric; +import opsli.plugins.crypto.model.CryptoSymmetric; import opsli.plugins.crypto.strategy.CryptoAsymmetricService; +import opsli.plugins.crypto.strategy.CryptoSymmetricService; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -30,7 +33,7 @@ import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.opsli.api.base.encrypt.BaseEncrypt; import org.opsli.api.base.result.ResultVo; -import org.opsli.common.annotation.ApiCryptoAsymmetric; +import org.opsli.common.annotation.LoginCrypto; import org.opsli.common.exception.ServiceException; import org.opsli.core.msg.CoreMsg; import org.opsli.core.options.CryptoConfigFactory; @@ -45,7 +48,7 @@ import java.util.Map; import static org.opsli.common.constants.OrderConstants.ENCRYPT_ADN_DECRYPT_AOP_SORT; /** - * Api非对称加解密 拦截处理 + * 登录加解密 拦截处理 * * @author parker * @date 2021-01-23 @@ -54,9 +57,9 @@ import static org.opsli.common.constants.OrderConstants.ENCRYPT_ADN_DECRYPT_AOP_ @Order(ENCRYPT_ADN_DECRYPT_AOP_SORT) @Aspect @Component -public class ApiCryptoAsymmetricAop { +public class LoginCryptoAop { - @Pointcut("@annotation(org.opsli.common.annotation.ApiCryptoAsymmetric)") + @Pointcut("@annotation(org.opsli.common.annotation.LoginCrypto)") public void encryptAndDecrypt() { } @@ -75,12 +78,12 @@ public class ApiCryptoAsymmetricAop { // 获得 方法 Method method = signature.getMethod(); // 获得方法注解 - ApiCryptoAsymmetric annotation = - method.getAnnotation(ApiCryptoAsymmetric.class); + LoginCrypto annotation = + method.getAnnotation(LoginCrypto.class); // 获得非对称加解密 执行器 CryptoAsymmetricService asymmetric = null; - // 加解密模型 + // 非对称加解密模型 CryptoAsymmetric cryptoAsymmetric = null; if(annotation != null && annotation.enable()){ asymmetric = CryptoPlugin.getAsymmetric(); @@ -88,7 +91,7 @@ public class ApiCryptoAsymmetricAop { } // 1. 请求解密 - if(annotation != null && annotation.enable() && annotation.requestDecrypt()){ + if(annotation != null && annotation.enable()){ if(cryptoAsymmetric != null){ enterDecrypt(args, method, asymmetric, cryptoAsymmetric); } @@ -97,10 +100,16 @@ public class ApiCryptoAsymmetricAop { // 2. 执行方法 returnValue = point.proceed(args); - // 3. 返回加密 - if(annotation != null && annotation.enable() && annotation.responseEncrypt()){ + // 3. 返回加密 返回加密为对称加密 + if(annotation != null && annotation.enable()){ if(cryptoAsymmetric != null){ - returnValue = resultEncrypt(returnValue, asymmetric, cryptoAsymmetric); + CryptoSymmetricService symmetric = CryptoPlugin.getSymmetric(); + CryptoSymmetric symmetricModel = symmetric.createNilModel(); + symmetricModel.setCryptoType(CryptoSymmetricType.DES); + symmetricModel.setPrivateKey(cryptoAsymmetric.getPublicKey()); + + // 执行加密操作 + returnValue = resultEncrypt(returnValue, symmetric, symmetricModel); } } return returnValue; @@ -152,12 +161,12 @@ public class ApiCryptoAsymmetricAop { /** * 出参加密 * @param returnValue 出参（对象） - * @param asymmetric 非对称加解密执行器 - * @param cryptoModel 非对称加解密模型 + * @param symmetric 对称加解密执行器 + * @param cryptoModel 对称加解密模型 * @return Object */ @SuppressWarnings("unchecked") - private Object resultEncrypt(Object returnValue, CryptoAsymmetricService asymmetric, CryptoAsymmetric cryptoModel) { + private Object resultEncrypt(Object returnValue, CryptoSymmetricService symmetric, CryptoSymmetric cryptoModel) { if(returnValue != null){ try { // 执行加密过程 @@ -165,10 +174,10 @@ public class ApiCryptoAsymmetricAop { // 重新赋值 data ResultVo ret = (ResultVo) returnValue; ret.setData( - asymmetric.encrypt(cryptoModel, ret.getData()) + symmetric.encrypt(cryptoModel, ret.getData()) ); }else { - returnValue = asymmetric.encrypt(cryptoModel, returnValue); + returnValue = symmetric.encrypt(cryptoModel, returnValue); } }catch (Exception e){ // 非对称加密失败 diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java index ae316681..c149e026 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java @@ -26,7 +26,7 @@ import org.opsli.api.wrapper.system.menu.MenuModel; import org.opsli.api.wrapper.system.options.OptionsModel; import org.opsli.api.wrapper.system.tenant.TenantModel; import org.opsli.api.wrapper.system.user.UserModel; -import org.opsli.common.annotation.ApiCryptoAsymmetric; +import org.opsli.common.annotation.LoginCrypto; import org.opsli.common.annotation.Limiter; import org.opsli.common.enums.DictType; import org.opsli.common.thread.AsyncProcessExecutor; @@ -73,7 +73,7 @@ public class LoginRestController { * 登录 登录数据加密 */ @Limiter - @ApiCryptoAsymmetric(responseEncrypt = false) + @LoginCrypto @ApiOperation(value = "登录", notes = "登录") @PostMapping("/system/login") public ResultVo login(@RequestBody LoginForm form, HttpServletRequest request){ diff --git a/opsli-plugins/opsli-plugins-crypto/src/main/java/opsli/plugins/crypto/strategy/impl/CryptoSymmetricServiceImpl.java b/opsli-plugins/opsli-plugins-crypto/src/main/java/opsli/plugins/crypto/strategy/impl/CryptoSymmetricServiceImpl.java index 54f56159..cadef75a 100644 --- a/opsli-plugins/opsli-plugins-crypto/src/main/java/opsli/plugins/crypto/strategy/impl/CryptoSymmetricServiceImpl.java +++ b/opsli-plugins/opsli-plugins-crypto/src/main/java/opsli/plugins/crypto/strategy/impl/CryptoSymmetricServiceImpl.java @@ -18,8 +18,12 @@ package opsli.plugins.crypto.strategy.impl; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.crypto.Mode; +import cn.hutool.crypto.Padding; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SmUtil; +import cn.hutool.crypto.symmetric.AES; +import cn.hutool.crypto.symmetric.DES; import cn.hutool.crypto.symmetric.SymmetricCrypto; import cn.hutool.json.JSONException; import cn.hutool.json.JSONUtil; @@ -245,11 +249,11 @@ public class CryptoSymmetricServiceImpl implements CryptoSymmetricService { byte[] keyBytes = Base64.decode(model.getPrivateKey()); switch (model.getCryptoType()) { case AES:{ - tmp = SecureUtil.aes(keyBytes); + tmp = new AES(Mode.ECB, Padding.PKCS5Padding, keyBytes); break; } case DES:{ - tmp = SecureUtil.des(keyBytes); + tmp = new DES(Mode.ECB, Padding.PKCS5Padding, keyBytes); break; } case DE_SEDE:{