From 33f00bbc62bad8e6c50a8a787b91e0b8cc699438 Mon Sep 17 00:00:00 2001 From: tanghc Date: Sun, 28 Jul 2019 10:55:23 +0800 Subject: [PATCH] 1.13.4 --- sop-admin/sop-admin-server/pom.xml | 2 +- .../sop/adminserver/api/isv/result/IsvInfoVO.java | 2 +- .../sop/adminserver/api/isv/result/IsvKeysVO.java | 2 +- .../sop/adminserver/api/isv/result/RoleVO.java | 2 +- .../api/service/result/ServiceInstanceVO.java | 14 +------------- .../bean/GatewayPredicateDefinition.java | 2 +- .../sop/adminserver/bean/ServiceRouteInfo.java | 2 +- .../gitee/sop/adminserver/config/WebConfig.java | 2 +- .../service/RoutePermissionService.java | 2 +- 9 files changed, 9 insertions(+), 21 deletions(-) diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml index c1e9eeb4..ff05f7e3 100644 --- a/sop-admin/sop-admin-server/pom.xml +++ b/sop-admin/sop-admin-server/pom.xml @@ -30,7 +30,7 @@ com.gitee.sop sop-registry-api - 1.13.3-SNAPSHOT + 1.13.4-SNAPSHOT diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvInfoVO.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvInfoVO.java index 98821496..00873b31 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvInfoVO.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvInfoVO.java @@ -7,7 +7,7 @@ import java.util.Date; import java.util.List; /** - * @author thc + * @author tanghc */ @Data public class IsvInfoVO { diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvKeysVO.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvKeysVO.java index a3bf39aa..f8f11d96 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvKeysVO.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvKeysVO.java @@ -4,7 +4,7 @@ import com.gitee.easyopen.doc.annotation.ApiDocField; import lombok.Data; /** - * @author thc + * @author tanghc */ @Data public class IsvKeysVO { diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/RoleVO.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/RoleVO.java index 70b3ab9f..0b2cf955 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/RoleVO.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/RoleVO.java @@ -6,7 +6,7 @@ import lombok.Data; import java.util.Date; /** - * @author thc + * @author tanghc */ @Data public class RoleVO { diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/result/ServiceInstanceVO.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/result/ServiceInstanceVO.java index e7280367..7cffb7de 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/result/ServiceInstanceVO.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/result/ServiceInstanceVO.java @@ -1,11 +1,7 @@ package com.gitee.sop.adminserver.api.service.result; -import com.alibaba.fastjson.annotation.JSONField; import com.gitee.easyopen.doc.annotation.ApiDocField; import lombok.Data; -import org.apache.commons.lang.StringUtils; - -import java.util.Date; /** * @author tanghc @@ -34,19 +30,11 @@ public class ServiceInstanceVO { private String status; @ApiDocField(description = "最后更新时间") - private String lastUpdatedTimestamp; + private String updateTime; @ApiDocField(description = "parentId") private Integer parentId; - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - public Date getUpdateTime() { - if (StringUtils.isBlank(lastUpdatedTimestamp)) { - return null; - } - return new Date(Long.valueOf(lastUpdatedTimestamp)); - } - public String getIpPort() { return ip != null && port > 0 ? ip + ":" + port : ""; } diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/GatewayPredicateDefinition.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/GatewayPredicateDefinition.java index c58a6e76..02c845e7 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/GatewayPredicateDefinition.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/GatewayPredicateDefinition.java @@ -8,7 +8,7 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * @author thc + * @author tanghc */ @Data public class GatewayPredicateDefinition { diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/ServiceRouteInfo.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/ServiceRouteInfo.java index 9a3d1034..3613b03d 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/ServiceRouteInfo.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/ServiceRouteInfo.java @@ -7,7 +7,7 @@ import java.util.Date; import java.util.List; /** - * @author thc + * @author tanghc */ @Data public class ServiceRouteInfo { diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/config/WebConfig.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/config/WebConfig.java index 07dabc5d..7a157171 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/config/WebConfig.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/config/WebConfig.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; /** - * @author thc + * @author tanghc */ @Configuration public class WebConfig { diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/RoutePermissionService.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/RoutePermissionService.java index 2cf4a344..3a352bbd 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/RoutePermissionService.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/RoutePermissionService.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; /** * 路由权限业务类 * - * @author thc + * @author tanghc */ @Service @Slf4j