编译通过的更新

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

@@ -1,4 +1,4 @@
-package cn.gygxzc.envir;
+package cn.gygxzc.envir.bus;
 
 /**
  * @author tuonina

cloud-bus/src/main/java/cn/gygxzc/envir/RabbitConfiguration.java → cloud-bus/src/main/java/cn/gygxzc/envir/bus/RabbitConfiguration.java

@@ -1,4 +1,4 @@
-package cn.gygxzc.envir;
+package cn.gygxzc.envir.bus;
 
 import cn.gygxzc.tina.cloud.bus.constant.QueueName;
 import org.springframework.amqp.core.Queue;

cloud-bus/src/main/java/cn/gygxzc/envir/entity/PushModel.java → cloud-bus/src/main/java/cn/gygxzc/envir/bus/entity/PushModel.java

@@ -1,4 +1,4 @@
-package cn.gygxzc.envir.entity;
+package cn.gygxzc.envir.bus.entity;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package cn.gygxzc.envir.email;
+package cn.gygxzc.envir.bus.mail;
 
 import cn.gygxzc.envir.core.entity.MailEntity;
 import org.springframework.cloud.openfeign.FeignClient;

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

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

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

@@ -1,29 +1,27 @@
-package cn.gygxzc.envir.email.impl;
+package cn.gygxzc.envir.bus.mail.impl;
 
-import cn.gygxzc.envir.QueueName;
-import cn.gygxzc.envir.email.IEmailSender;
+import cn.gygxzc.envir.bus.QueueName;
+import cn.gygxzc.envir.bus.mail.IMailBusSender;
 import cn.gygxzc.envir.core.entity.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 {
-
+public class MailBusSenderImpl implements IMailBusSender {
     private final AmqpTemplate template;
 
     @Autowired
-    public EmailSenderImpl(AmqpTemplate template) {
+    public MailBusSenderImpl(AmqpTemplate template) {
         this.template = template;
     }
 
     @Override
     public void sendMail(MailEntity mail) {
-        template.convertAndSend(QueueName.EMAIL,mail);
+        template.convertAndSend(QueueName.EMAIL, mail);
     }
 }

cloud-bus/src/main/java/cn/gygxzc/envir/sender/IMessagePusher.java → cloud-bus/src/main/java/cn/gygxzc/envir/bus/message/IMessagePusher.java

@@ -1,6 +1,6 @@
-package cn.gygxzc.envir.sender;
+package cn.gygxzc.envir.bus.message;
 
-import cn.gygxzc.envir.entity.PushModel;
+import cn.gygxzc.envir.bus.entity.PushModel;
 
 import java.util.List;
 

cloud-bus/src/main/java/cn/gygxzc/envir/sender/impl/MessagePusher.java → cloud-bus/src/main/java/cn/gygxzc/envir/bus/message/impl/MessagePusher.java

@@ -1,7 +1,7 @@
-package cn.gygxzc.envir.sender.impl;
+package cn.gygxzc.envir.bus.message.impl;
 
-import cn.gygxzc.envir.entity.PushModel;
-import cn.gygxzc.envir.sender.IMessagePusher;
+import cn.gygxzc.envir.bus.entity.PushModel;
+import cn.gygxzc.envir.bus.message.IMessagePusher;
 import cn.gygxzc.tina.cloud.bus.constant.QueueName;
 import cn.gygxzc.tina.cloud.bus.utils.GsonUtils;
 import org.springframework.amqp.core.AmqpTemplate;

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

@@ -1,6 +1,6 @@
 package cn.gygxzc.envir.api.test.controller;
 
-import cn.gygxzc.envir.core.encrypt.SerializedField;
+import cn.gygxzc.cloud.tina.auth.encrypt.SerializedField;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,10 +19,10 @@ public class TestEncryptController {
 
     @GetMapping
     @SerializedField
-    public Object encrypt(){
-        Map<String,Object> resp = new HashMap<>();
-        resp.put("content","我爱北京天安门！");
-        resp.put("code",1);
+    public Object encrypt() {
+        Map<String, Object> resp = new HashMap<>();
+        resp.put("content", "我爱北京天安门！");
+        resp.put("code", 1);
         return resp;
     }