Browse Source

admin file modify

Airhead 6 years ago
parent
commit
3b2889fdb3
39 changed files with 38 additions and 41 deletions
  1. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/HttpAdvice.java
  2. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/RequestToMethodItem.java
  3. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/SQLTimeAdvice.java
  4. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/config/ScheduledConfig.java
  5. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/config/WebsocketConfig.java
  6. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/properties/AdminClientProperties.java
  7. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/util/MD5.java
  8. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/util/NetworkUtil.java
  9. 0 3
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/util/SpringUtil.java
  10. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/SocketClient.java
  11. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/SocketEndPoint.java
  12. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/SocketHeart.java
  13. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/event/HttpEvent.java
  14. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/event/IEvent.java
  15. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/event/SQLTimeEvent.java
  16. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/sender/EventSender.java
  17. 1 1
      admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/sender/SimpleEventSender.java
  18. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/AdminServerApplication.java
  19. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/config/AdminServerAutoConfig.java
  20. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/config/WebsocketConfig.java
  21. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/config/ZuulAutoConfig.java
  22. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/eureka/DiscoveryController.java
  23. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/eureka/DiscoveryService.java
  24. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/manage/ServerHeart.java
  25. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/manage/ServerManager.java
  26. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/model/MicroService.java
  27. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/model/RuleRoute.java
  28. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/model/Server.java
  29. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/properties/AdminServerProperties.java
  30. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/util/DateUtil.java
  31. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/util/MD5.java
  32. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/SocketEndPoint.java
  33. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/WebSocketHandler.java
  34. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/WebSocketHandlerInterceptor.java
  35. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/store/ElasticSearchStore.java
  36. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/store/EsEventBuffer.java
  37. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/store/EventStore.java
  38. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/zuul/RouterCreater.java
  39. 1 1
      admin/admin-server-starter/src/main/java/com/yihu/admin/server/zuul/SimplerRouter.java

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/HttpAdvice.java

@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
 * Created by chenweida on 2018/5/23 0023.1
 * Created by chenweida on 2018/5/23 0023.
 */
@Aspect
@Component

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/RequestToMethodItem.java

@ -26,7 +26,7 @@ import java.util.Enumeration;
import java.util.List;
/**
 * Created by chenweida on 2018/5/23 0023.1
 * Created by chenweida on 2018/5/23 0023.
 */
public class RequestToMethodItem {
    public String controllerName;

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/advice/SQLTimeAdvice.java

@ -22,7 +22,7 @@ import java.util.Date;
import java.util.UUID;
/**
 * Created by chenweida on 2018/5/21 0021.1
 * Created by chenweida on 2018/5/21 0021.
 * 数据库sql的拦截
 */
@Aspect

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/config/ScheduledConfig.java

@ -10,7 +10,7 @@ import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
/**
 * Created by chenweida on 2018/5/22 0022.1
 * Created by chenweida on 2018/5/22 0022.
 */
@Configuration
@EnableScheduling

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/config/WebsocketConfig.java

@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
/**
 * Created by chenweida on 2018/5/22 0022.1
 * Created by chenweida on 2018/5/22 0022.
 */
@ComponentScan(basePackages = {
        "com.yihu.admin.client.websocket",

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/properties/AdminClientProperties.java

@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
 * Created by chenweida on 2018/5/15 0015.1
 * Created by chenweida on 2018/5/15 0015.
 */
@Component
public class AdminClientProperties {

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/util/MD5.java

@ -4,7 +4,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
/*
 * MD5 算法1
 * MD5 算法
 */
public class MD5 {

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/util/NetworkUtil.java

@ -6,7 +6,7 @@ import java.io.IOException;
/** 
 * 常用获取客户端信息的工具 1
 * 常用获取客户端信息的工具 
 *  
 */
public final class NetworkUtil {

+ 0 - 3
admin/admin-client-starter/src/main/java/com/yihu/admin/client/util/SpringUtil.java

@ -5,9 +5,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
/**
 * 1
 */
@Component
public class SpringUtil implements ApplicationContextAware {

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/SocketClient.java

@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.Map;
/**
 * Created by chenweida on 2018/5/22 0022.1
 * Created by chenweida on 2018/5/22 0022.
 */
@Component
public class SocketClient {

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/SocketEndPoint.java

@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest;
import java.util.Date;
/**
 * Created by chenweida on 2018/5/22 0022.1
 * Created by chenweida on 2018/5/22 0022.
 */
@RestController
@RequestMapping("socketClient")

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/SocketHeart.java

@ -8,7 +8,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
/**
 * Created by chenweida on 2018/5/22 0022.1
 * Created by chenweida on 2018/5/22 0022.
 */
@Component
public class SocketHeart {

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/event/HttpEvent.java

@ -1,7 +1,7 @@
package com.yihu.admin.client.websocket.event;
/**
 * Created by chenweida on 2018/5/23 0023.1
 * Created by chenweida on 2018/5/23 0023.
 */
public class HttpEvent extends IEvent {

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/event/IEvent.java

@ -3,7 +3,7 @@ package com.yihu.admin.client.websocket.event;
import java.util.Date;
/**
 * Created by chenweida on 2018/5/22 0022.1
 * Created by chenweida on 2018/5/22 0022.
 */
public class IEvent {

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/event/SQLTimeEvent.java

@ -1,7 +1,7 @@
package com.yihu.admin.client.websocket.event;
/**
 * Created by chenweida on 2018/5/23 0023.1
 * Created by chenweida on 2018/5/23 0023.
 */
public class SQLTimeEvent extends IEvent {
    /**

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/sender/EventSender.java

@ -4,7 +4,7 @@ package com.yihu.admin.client.websocket.sender;
import com.yihu.admin.client.websocket.event.IEvent;
/**
 * Created by chenweida on 2018/5/23 0023.1
 * Created by chenweida on 2018/5/23 0023.
 */
public interface EventSender {

+ 1 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/sender/SimpleEventSender.java

@ -8,7 +8,7 @@ import java.lang.reflect.Method;
import java.util.Date;
/**
 * Created by chenweida on 2018/5/23 0023.1
 * Created by chenweida on 2018/5/23 0023.
 */
public class SimpleEventSender implements EventSender {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/AdminServerApplication.java

@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
/**
 * Created by chenweida on 2018/5/15 0015.1
 * Created by chenweida on 2018/5/15 0015.
 */
@SpringBootApplication
@EnableDiscoveryClient//服务注册到发现服务

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/config/AdminServerAutoConfig.java

@ -26,7 +26,7 @@ import javax.annotation.PostConstruct;
import java.io.IOException;
/**
 * Created by chenweida on 2018/5/15 0015.1
 * Created by chenweida on 2018/5/15 0015.
 */
@ComponentScan(basePackages = {
        "com.yihu.admin.server.eureka",

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/config/WebsocketConfig.java

@ -13,7 +13,7 @@ import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
/**
 * Created by chenweida on 2018/5/22 0022.1
 * Created by chenweida on 2018/5/22 0022.
 */
@Configuration
@ComponentScan(basePackages = {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/config/ZuulAutoConfig.java

@ -11,7 +11,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
 * Created by chenweida on 2018/5/15 0015.1
 * Created by chenweida on 2018/5/15 0015.
 */
@EnableZuulProxy
@Configuration

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/eureka/DiscoveryController.java

@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2018/5/5 0005.1
 * Created by chenweida on 2018/5/5 0005.
 */
@RestController
@RequestMapping(value = "/discovery", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/eureka/DiscoveryService.java

@ -22,7 +22,7 @@ import java.util.List;
import java.util.UUID;
/**
 * Created by chenweida on 2018/5/15 0015.1
 * Created by chenweida on 2018/5/15 0015.
 */
@Service
public class DiscoveryService {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/manage/ServerHeart.java

@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2018/5/17 0017.1
 * Created by chenweida on 2018/5/17 0017.
 */
public class ServerHeart implements Runnable {
    private Logger logger = LoggerFactory.getLogger(ServerHeart.class);

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/manage/ServerManager.java

@ -20,7 +20,7 @@ import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2018/5/17 0017.1
 * Created by chenweida on 2018/5/17 0017.
 */
@Component
public class ServerManager {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/model/MicroService.java

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
/**
 * Created by chenweida on 2018/5/15 0015.1
 * Created by chenweida on 2018/5/15 0015.
 * 微服务实体
 */
public class MicroService {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/model/RuleRoute.java

@ -1,7 +1,7 @@
package com.yihu.admin.server.model;
/**
 * Created by chenweida on 2018/4/19 0019.1
 * Created by chenweida on 2018/4/19 0019.
 */
public class RuleRoute {
    /**

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/model/Server.java

@ -10,7 +10,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
 * Created by chenweida on 2018/5/15 0015.1
 * Created by chenweida on 2018/5/15 0015.
 */
public class Server {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/properties/AdminServerProperties.java

@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
 * Created by chenweida on 2018/5/15 0015.1
 * Created by chenweida on 2018/5/15 0015.
 */
@Component
public class AdminServerProperties {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/util/DateUtil.java

@ -30,7 +30,7 @@ public class DateUtil {
	/**
	 * 时间格式转中文格式1
	 * 时间格式转中文格式
	 */
	public static String dateToChinese(Date date) {
		SimpleDateFormat formatter =   new SimpleDateFormat( "yyyy年MM月dd日 EEEEaaaa hh:mm", Locale.CHINA);

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/util/MD5.java

@ -4,7 +4,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
/*
 * MD5 算法1
 * MD5 算法
 */
public class MD5 {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/SocketEndPoint.java

@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.socket.handler.TextWebSocketHandler;
/**
 * Created by chenweida on 2018/5/22 0022.1
 * Created by chenweida on 2018/5/22 0022.
 */
@RestController
@RequestMapping("socketServer")

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/WebSocketHandler.java

@ -15,7 +15,7 @@ import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession;
/**
 * Created by chenweida on 2018/5/22 0022.1
 * Created by chenweida on 2018/5/22 0022.
 */
public class WebSocketHandler extends TextWebSocketHandler {
    private static Logger logger = LoggerFactory.getLogger(WebSocketHandler.class);

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/WebSocketHandlerInterceptor.java

@ -16,7 +16,7 @@ import java.util.Map;
/**
 * WebSocket拦截器----握手之前将登陆用户信息从session设置到WebSocketSession1
 * WebSocket拦截器----握手之前将登陆用户信息从session设置到WebSocketSession
 */
public class WebSocketHandlerInterceptor extends HttpSessionHandshakeInterceptor {
    private Logger logger = LoggerFactory.getLogger(WebSocketHandlerInterceptor.class);

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/store/ElasticSearchStore.java

@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
/**
 * Created by chenweida on 2018/5/23 0023.1
 * Created by chenweida on 2018/5/23 0023.
 */
public class ElasticSearchStore implements EventStore {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/store/EsEventBuffer.java

@ -16,7 +16,7 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
/**
 * Created by chenweida on 2018/2/24.1
 * Created by chenweida on 2018/2/24.
 */
@Component
public class EsEventBuffer {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/websocket/store/EventStore.java

@ -3,7 +3,7 @@ package com.yihu.admin.server.websocket.store;
import net.sf.json.JSONObject;
/**
 * Created by chenweida on 2018/5/23 0023.1
 * Created by chenweida on 2018/5/23 0023.
 */
public interface EventStore {

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/zuul/RouterCreater.java

@ -12,7 +12,7 @@ import java.util.List;
import java.util.UUID;
/**
 * Created by chenweida on 2018/5/15 0015.1
 * Created by chenweida on 2018/5/15 0015.
 */
public class RouterCreater {
    private Logger logger= LoggerFactory.getLogger(RouterCreater.class);

+ 1 - 1
admin/admin-server-starter/src/main/java/com/yihu/admin/server/zuul/SimplerRouter.java

@ -15,7 +15,7 @@ import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2018/4/27 0027.1
 * Created by chenweida on 2018/4/27 0027.
 * 简单的实现路由器
 */
public class SimplerRouter extends SimpleRouteLocator implements RefreshableRouteLocator {