代码整理

common/src/main/java/com/diagbot/exception/CommonException.java

@@ -2,7 +2,7 @@ package com.diagbot.exception;
 
 
 /**
- * @Description: 通用错误处理
+ * @Description: 通用错误封装
  * @author: gaodm
  * @time: 2018/8/1 14:56
  */

common/src/main/java/com/diagbot/util/ArrayUtil.java

@@ -3,10 +3,9 @@ package com.diagbot.util;
 import org.apache.commons.lang3.ArrayUtils;
 
 /**
- * @Description:数组工具类
- * @author: gaodaming
- * @date: 2016/6/13 16:21
- * @version: V1.0
+ * @Description: 数组工具类
+ * @author: gaodm
+ * @time: 2018/8/6 16:22
  */
 public class ArrayUtil {
     /**

common/src/main/java/com/diagbot/util/DateUtil.java

@@ -6,7 +6,7 @@ import java.util.Calendar;
 import java.util.Date;
 
 /**
- * @Description: 日期帮助类
+ * @Description: 日期工具类
  * @author: gaodm
  * @time: 2018/8/6 11:17
  */

log-service/src/main/java/com/diagbot/LogServiceApplication.java

@@ -3,6 +3,9 @@ package com.diagbot;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.netflix.hystrix.EnableHystrix;
+import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * @Description: 日志服务启动文件
@@ -11,6 +14,9 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
  */
 @SpringBootApplication
 @EnableEurekaClient
+@EnableFeignClients
+@EnableHystrixDashboard
+@EnableHystrix
 public class LogServiceApplication {
 
 	public static void main(String[] args) {

log-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -1,10 +1,10 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.util.Date;
 

log-service/src/main/java/com/diagbot/rabbit/Receiver.java

@@ -3,7 +3,6 @@ package com.diagbot.rabbit;
 import com.alibaba.fastjson.JSON;
 import com.diagbot.entity.SysLog;
 import com.diagbot.facade.SysLogFacade;
-import com.diagbot.service.SysLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

log-service/src/main/java/com/diagbot/rabbit/User.java

@@ -1,41 +0,0 @@
-package com.diagbot.rabbit;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/8/2 11:14
- */
-public class User {
-    private String username;
-    private String password;
-
-
-    public User(String username, String password) {
-        this.username = username;
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "username='" + username + '\'' +
-                ", password='" + password + '\'' +
-                '}';
-    }
-}

user-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.entity.SysLog;
 import com.diagbot.facade.LoggerFacade;
-import com.diagbot.service.LoggerService;
 import com.diagbot.util.HttpUtils;
 import com.diagbot.util.UserUtils;
 import org.apache.commons.lang.StringUtils;

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -1,18 +1,9 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.client.AuthServiceClient;
-import com.diagbot.dto.LoginDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.JWT;
 import com.diagbot.entity.User;
-import com.diagbot.exception.CommonException;
-import com.diagbot.exception.ErrorCode;
 import com.diagbot.mapper.UserMapper;
 import com.diagbot.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 /**

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.User;
@@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Collections;
-
 /**
  * @Description: 用户对外接口层
  * @author: gaodm