添加邮件发送及加密解密相关方法

FRAMEWORK.md

@@ -98,9 +98,18 @@ Jetty 更加轻量化，更符合Spring Cloud 分布式部署；当然，这个
 数据从后端返回前端，后端对重要数据进行对称加密，并实现签名，保证数据不会被中途拦截篡改；
 数据从前端发送到后端，前端用公钥对数据进行加密，保证数据安全，不会被拦截，并且也需要实现签名，保证数据不被伪造。
 
+
 - 在 安全（auth） 依赖包中添加了关于加密解密相关功能。
 - 修改ClientInfo 实体类，添加了非对称加密的密钥信息
 
+#### 2019/3/4 完成前后端加密解密方法bug修复与集成，已可正常使用，添加邮件MQ发送及Feign发送服务
+
+- 后端使用，添加 SerializedField 注解即可
+- 前端使用，配置中添加 encrypt：true 即可
+- 需要邮件服务去实现相关的发送实现
+
+
+
 
 ### 后期我的工作计划
 

build.gradle

@@ -18,7 +18,7 @@ buildscript {
         pinyin4j_version = '2.5.1'
         rxJavaVersion='2.2.3'
         jwtVersion = '1.3.9'
-        authVersion='1.1.6'
+        authVersion='1.1.7'
     }
     repositories {
         mavenCentral()

cloud-bus/src/main/java/cn/gygxzc/envir/QueueName.java

@@ -0,0 +1,10 @@
+package cn.gygxzc.envir;
+
+/**
+ * @author tuonina
+ * @createTime 2019/3/4
+ */
+public interface QueueName {
+
+    String EMAIL="Email";
+}

cloud-bus/src/main/java/cn/gygxzc/envir/email/IEmailSender.java

@@ -0,0 +1,12 @@
+package cn.gygxzc.envir.email;
+
+/**
+ * 定义邮件发送的Email MQ实现
+ * @author tuonina
+ * @createTime 2019/3/4
+ */
+public interface IEmailSender {
+
+    void sendMail(MailEntity mail);
+
+}

cloud-bus/src/main/java/cn/gygxzc/envir/email/IFeignMailSender.java

@@ -0,0 +1,18 @@
+package cn.gygxzc.envir.email;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 用Feign进行服务间调用方式发送邮件
+ *
+ * @author tuonina
+ * @createTime 2019/3/4
+ */
+@FeignClient("msg")
+public interface IFeignMailSender {
+
+    @PostMapping(value = "/mail")
+    void sendMail(@RequestBody MailEntity mail);
+}

cloud-bus/src/main/java/cn/gygxzc/envir/email/MailEntity.java

@@ -0,0 +1,190 @@
+package cn.gygxzc.envir.email;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.springframework.util.StringUtils;
+
+import javax.activation.DataSource;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author tuonina
+ * @createTime 2019/2/25
+ * 自定义的邮件实体类
+ */
+public class MailEntity implements Serializable {
+
+    public final static long serialVersionUID = 2L;
+    public final static String SEP = ",";
+
+    private Long id;
+    private String to;
+    private String subject;
+    private String content;
+    private String attachments;
+    private MailType type = MailType.SIMP;
+    private String rscPath;
+    private String filePath;
+    private String rscId;
+    /**
+     * 抄送收件人信息
+     * 收件人能看见抄送人信息
+     */
+    private List<String> cc;
+    /**
+     * 匿名抄送收件人，
+     * 匿名：表示收件人看不见抄送人的邮箱地址
+     */
+    private List<String> bcc;
+    private DataSource dataSource;
+    private String fileName;
+    private Date createTime;
+
+    public MailEntity() {
+        this.cc = Collections.emptyList();
+        this.bcc = Collections.emptyList();
+        this.createTime = new Date();
+        id = IdWorker.getId();
+    }
+
+    public void setDataSource(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public String getTo() {
+        return to;
+    }
+
+    public void setTo(String to) {
+        this.to = to;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getAttachments() {
+        return attachments;
+    }
+
+    public void setAttachments(String attachments) {
+        this.attachments = attachments;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public MailType getType() {
+        return type;
+    }
+
+    public void setType(MailType type) {
+        this.type = type;
+    }
+
+    public String getRscPath() {
+        return rscPath;
+    }
+
+    public void setRscPath(String rscPath) {
+        this.rscPath = rscPath;
+    }
+
+    public String getRscId() {
+        return rscId;
+    }
+
+    public void setRscId(String rscId) {
+        this.rscId = rscId;
+    }
+
+    public List<String> getCc() {
+        return cc;
+    }
+
+    public void setCc(List<String> cc) {
+        this.cc = cc;
+    }
+
+
+    public List<String> getBcc() {
+        return bcc;
+    }
+
+    public void setBcc(List<String> bcc) {
+        this.bcc = bcc;
+    }
+
+    public void checkParams() throws RuntimeException {
+        if (!StringUtils.hasLength(to)) {
+            throw new MailParamMissException("无发送对象！");
+        }
+        if (!StringUtils.hasLength(subject)) {
+            throw new MailParamMissException("无邮件主题！");
+        }
+        if (!StringUtils.hasLength(content)) {
+            throw new MailParamMissException("无邮件内容！");
+        }
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * SIMP  纯文档，也不存在附件的
+     */
+    public enum MailType {
+        SIMP, HTML, ATTACHMENTS, TEMPLATE
+    }
+
+    @Override
+    public String toString() {
+        return String.format("to:%s  ", to) +
+                String.format("subject:%s  ", subject) +
+                String.format("content:%s  ", content);
+    }
+}

cloud-bus/src/main/java/cn/gygxzc/envir/email/MailParamMissException.java

@@ -0,0 +1,12 @@
+package cn.gygxzc.envir.email;
+
+/**
+ * @author tuonina
+ * @createTime 2019/2/25
+ */
+public class MailParamMissException extends RuntimeException {
+
+    public MailParamMissException(String message){
+        super(message);
+    }
+}

cloud-bus/src/main/java/cn/gygxzc/envir/email/impl/EmailSenderImpl.java

@@ -0,0 +1,29 @@
+package cn.gygxzc.envir.email.impl;
+
+import cn.gygxzc.envir.QueueName;
+import cn.gygxzc.envir.email.IEmailSender;
+import cn.gygxzc.envir.email.MailEntity;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * @author tuonina
+ * @createTime 2019/3/4
+ */
+@Service
+public class EmailSenderImpl implements IEmailSender {
+
+    private final AmqpTemplate template;
+
+    @Autowired
+    public EmailSenderImpl(AmqpTemplate template) {
+        this.template = template;
+    }
+
+    @Override
+    public void sendMail(MailEntity mail) {
+        template.convertAndSend(QueueName.EMAIL,mail);
+    }
+}

zen-core/src/main/kotlin/cn/gygxzc/envir/core/CoreConst.kt

@@ -6,6 +6,3 @@ package cn.gygxzc.envir.core
  * 系统界别的常量
  */
 
-
-const val REQ_HEADER_ENCRYPT_CLIENT="Origin_Client" //前端表明身份，该字段需要用公钥加密传递
-const val REQ_HEADER_CLIENT="Client"  //每个请求头都必须标明自己的身份

zen-core/src/test/java/cn/gygxzc/envir/core/encrypt/AesUtilsTest.java

@@ -0,0 +1,54 @@
+package cn.gygxzc.envir.core.encrypt;
+
+import cn.gygxzc.cloud.tina.auth.encrypt.AesUtils;
+import cn.gygxzc.cloud.tina.auth.encrypt.RSAUtils;
+import cn.gygxzc.cloud.tina.auth.encrypt.entity.KeyPairStr;
+import org.junit.Test;
+
+/**
+ * @author tuonina
+ * @createTime 2019/3/4
+ */
+public class AesUtilsTest {
+
+    String priKey = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJCe0TX2ujtf59unaf9LWkurT5+T7vYgsPo1LpPAJ1qqd0CvqSpxCgtFb8OSD/40YQP4rOOirwwHGi2IxgqqXHvhBiVeOGNEOr2ku3vEU5b9FPqeEzirDcf+p5pDhG1ZYAmF1QbnFYq138+F2f8Fcz1ooF79I+Y9eTd49N4B6wO1AgMBAAECgYB/OHbqdeVWHgQlIp0ITA1ey5D73HM2aYPGV8plh4AXLiZB7UVvZIllaOvsqy0Ofp1plPTiO1apygWpUMyGzV8U+E5/nbFWFhcADI0wj4fva5dTwZA+e3csFXD1IMawYs7cvXcst7DzzkynnSHh//IbHJfHu3DE2YFhAFSTrpPDcQJBAMJlo99fEm5s5DqIOL3b+H9EwoLM+UceB50d0BMkllLLr/3L/xGZazKwhFxOOF+xQWY5aKB6y6gwpdS5QLi3rYcCQQC+cxJXd4VFN/vkcuWvIW0QCJkL0lofgs2OuDCYcPUExWjgRqd2t/Jmo7so73n6zO4JYzIG8K6wLr/9+de1Q/PjAkANbBElgh32q+QSOoeYbFC7ENdRSq/HfkZOTdmpCLSsYM30+xnQcERbip6I9Qmlacq3MS2NLw1SvpEkn+ndFymPAkEArWinhb7NOTZ9hAhePHVKEfRSLmJtLw3xzwbFMLiBUMPS94s9xio9a9mfe+l5frSD9UY98fXKiZ83r7CDCYiDEwJBALa58YXn3TkqhfXFk5YFDEgyKeJVtzQFQo3iulm0tHFd8upufahQPYytRvX64hRMgrypprmfY8Ve6FseOVgttK0=";
+    String pubKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCQntE19ro7X+fbp2n/S1pLq0+fk+72ILD6NS6TwCdaqndAr6kqcQoLRW/Dkg/+NGED+Kzjoq8MBxotiMYKqlx74QYlXjhjRDq9pLt7xFOW/RT6nhM4qw3H/qeaQ4RtWWAJhdUG5xWKtd/Phdn/BXM9aKBe/SPmPXk3ePTeAesDtQIDAQAB";
+
+
+    @Test
+    public void utilsTest() throws Exception {
+        String key = "e20c5973ecca43d2918d8222a68c2449";
+        String content = "123";
+        System.out.println("加密前：" + content);
+        System.out.println("加密密钥和解密密钥：" + key);
+        String encrypt = AesUtils.aesEncrypt(content, key);
+        System.out.println("加密后：" + encrypt);
+        String decrypt = AesUtils.aesDecrypt(encrypt, key);
+        System.out.println("解密后：" + decrypt);
+    }
+
+    @Test
+    public void generateKeyPair() {
+        KeyPairStr pairStr = RSAUtils.generateKeyPair();
+        System.out.printf("private key: %s\n", pairStr.getKeyPrivate());
+        System.out.printf("public key:%s\n", pairStr.getKeyPublic());
+    }
+
+    @Test
+    public void rsaUtils() throws Exception {
+        String encrypt = "KC7HMrcbt925yckRPXTZjwgyvd0mVIejTdRzAMuGwo2hTm4CzVGc4US9gPcNaIt7OtCkkEiaqh7384036ZssuEkv4y/LSkYD02MK/lsPRMZYy3C/49bAIjz1KDXhrDCjeToK8aDI14eWa6pZHhAxTlwB3lxBZmumHFtjEOpgXXQ=";
+        String source = RSAUtils.decrypt(priKey, encrypt);
+        System.out.printf("source: %s", source);
+    }
+
+
+    @Test
+    public void sign() throws Exception {
+
+        String content = "我爱北京天安门！";
+        String sign = RSAUtils.sign(priKey, content);
+        System.out.printf("sign:%s", sign);
+    }
+
+
+}

zen-web/src/main/java/cn/gygxzc/envir/api/test/controller/DecryptTestController.java

@@ -0,0 +1,24 @@
+package cn.gygxzc.envir.api.test.controller;
+
+import cn.gygxzc.cloud.tina.auth.encrypt.SerializedField;
+import cn.gygxzc.tina.cloud.jwt.session.bean.User;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author tuonina
+ * @createTime 2019/3/4
+ */
+@RestController
+@RequestMapping("/test/crypt")
+public class DecryptTestController {
+
+    @SerializedField
+    @PostMapping("/user")
+    public User postUser(@RequestBody User user) {
+        return user;
+    }
+
+}

zen-web/src/main/java/cn/gygxzc/envir/api/test/controller/TestEncryptController.java

@@ -1,7 +1,6 @@
 package cn.gygxzc.envir.api.test.controller;
 
-import cn.gygxzc.envir.encrypt.SerializedField;
-import org.springframework.stereotype.Controller;
+import cn.gygxzc.envir.core.encrypt.SerializedField;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

zen-web/src/main/kotlin/cn/gygxzc/envir/encrypt/DecodeRequestBodyAdvice.java

@@ -1,35 +0,0 @@
-package cn.gygxzc.envir.encrypt;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.http.HttpInputMessage;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdvice;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-/**
- * @author tuonina
- * @createTime 2019/2/26
- */
-public class DecodeRequestBodyAdvice implements RequestBodyAdvice {
-    @Override
-    public boolean supports(MethodParameter methodParameter, Type targetType, Class<? extends HttpMessageConverter<?>> converterType) {
-        return false;
-    }
-
-    @Override
-    public HttpInputMessage beforeBodyRead(HttpInputMessage inputMessage, MethodParameter parameter, Type targetType, Class<? extends HttpMessageConverter<?>> converterType) throws IOException {
-        return null;
-    }
-
-    @Override
-    public Object afterBodyRead(Object body, HttpInputMessage inputMessage, MethodParameter parameter, Type targetType, Class<? extends HttpMessageConverter<?>> converterType) {
-        return null;
-    }
-
-    @Override
-    public Object handleEmptyBody(Object body, HttpInputMessage inputMessage, MethodParameter parameter, Type targetType, Class<? extends HttpMessageConverter<?>> converterType) {
-        return null;
-    }
-}

zen-web/src/main/kotlin/cn/gygxzc/envir/encrypt/EncodeResponseBodyAdvice.java

@@ -1,55 +0,0 @@
-package cn.gygxzc.envir.encrypt;
-
-import cn.gygxzc.cloud.tina.auth.encrypt.AESUtils;
-import cn.gygxzc.envir.core.CoreConstKt;
-import cn.gygxzc.envir.core.exceptions.InvalidRequestException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.MethodParameter;
-import org.springframework.http.MediaType;
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-
-import java.lang.reflect.Method;
-
-/**
- * @author tuonina
- * @createTime 2019/2/26
- */
-@ControllerAdvice("cn.gygxzc.envir")
-public class EncodeResponseBodyAdvice implements ResponseBodyAdvice {
-    private Logger logger = LoggerFactory.getLogger(EncodeResponseBodyAdvice.class);
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
-    @Override
-    public boolean supports(MethodParameter returnType, Class converterType) {
-        Method method = returnType.getMethod();
-        if (method == null) return false;
-        SerializedField serializedField = method.getAnnotation(SerializedField.class);
-        return serializedField != null && serializedField.encode();
-    }
-
-    @Override
-    public Object beforeBodyWrite(Object body, MethodParameter returnType,
-                                  MediaType selectedContentType, Class selectedConverterType,
-                                  ServerHttpRequest request, ServerHttpResponse response) {
-        String clientKey = request.getHeaders().getFirst(CoreConstKt.REQ_HEADER_CLIENT);
-        if (StringUtils.isBlank(clientKey)) {
-            logger.info("beforeBodyWrite 缺少请求头：{}", CoreConstKt.REQ_HEADER_CLIENT);
-            throw new InvalidRequestException("缺少请求头!");
-        }
-        try {
-            String result = objectMapper.writeValueAsString(body);
-            return AESUtils.encode(result, clientKey);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

zen-web/src/main/kotlin/cn/gygxzc/envir/encrypt/SerializedField.java

@@ -1,20 +0,0 @@
-package cn.gygxzc.envir.encrypt;
-
-import java.lang.annotation.*;
-
-/**
- * @author tuonina
- * @createTime 2019/2/26
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD})
-public @interface SerializedField {
-
-    /**
-     * 是否对数据进行家吗
-     *
-     * @return 默认为true
-     */
-    boolean encode() default true;
-}

zen-web/src/main/kotlin/cn/gygxzc/envir/encrypt/WebDecodeRequestBodyAdvice.java

@@ -0,0 +1,17 @@
+package cn.gygxzc.envir.encrypt;
+
+import cn.gygxzc.cloud.tina.auth.cache.ClientRedisTemplate;
+import cn.gygxzc.cloud.tina.auth.encrypt.DecryptRequestBodyAdvice;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+
+/**
+ * @author tuonina
+ * @createTime 2019/2/26
+ */
+@ControllerAdvice("cn.gygxzc.envir")
+public class WebDecodeRequestBodyAdvice extends DecryptRequestBodyAdvice {
+
+    public WebDecodeRequestBodyAdvice(ClientRedisTemplate redisTemplate) {
+        super(redisTemplate);
+    }
+}

zen-web/src/main/kotlin/cn/gygxzc/envir/encrypt/WebEncodeResponseBodyAdvice.java

@@ -0,0 +1,18 @@
+package cn.gygxzc.envir.encrypt;
+
+import cn.gygxzc.cloud.tina.auth.cache.ClientRedisTemplate;
+import cn.gygxzc.cloud.tina.auth.encrypt.EncryptResponseBodyAdvice;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+
+/**
+ * @author tuonina
+ * @createTime 2019/2/26
+ */
+@ControllerAdvice("cn.gygxzc.envir")
+public class WebEncodeResponseBodyAdvice extends EncryptResponseBodyAdvice {
+
+    public WebEncodeResponseBodyAdvice(ObjectMapper objectMapper, ClientRedisTemplate template) {
+        super(objectMapper, template);
+    }
+}