7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.13.4

Browse Source
This commit is contained in:
tanghc
2019-07-28 10:55:23 +08:00
parent fdf9f341fd
commit 33f00bbc62
9 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sop-admin/sop-admin-server/pom.xml
View File

@@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-registry-api</artifactId> <artifactId>sop-registry-api</artifactId>
<version>1.13.3-SNAPSHOT</version> <version>1.13.4-SNAPSHOT</version>
</dependency> </dependency>
<!-- easyopen starter --> <!-- easyopen starter -->

2
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvInfoVO.java
View File

@@ -7,7 +7,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @author thc * @author tanghc
*/ */
@Data @Data
public class IsvInfoVO { public class IsvInfoVO {

2
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/IsvKeysVO.java
View File

@@ -4,7 +4,7 @@ import com.gitee.easyopen.doc.annotation.ApiDocField;
import lombok.Data; import lombok.Data;
/** /**
* @author thc * @author tanghc
*/ */
@Data @Data
public class IsvKeysVO { public class IsvKeysVO {

2
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/isv/result/RoleVO.java
View File

@@ -6,7 +6,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
/** /**
* @author thc * @author tanghc
*/ */
@Data @Data
public class RoleVO { public class RoleVO {

14
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/result/ServiceInstanceVO.java
View File

@@ -1,11 +1,7 @@
package com.gitee.sop.adminserver.api.service.result; package com.gitee.sop.adminserver.api.service.result;
import com.alibaba.fastjson.annotation.JSONField;
import com.gitee.easyopen.doc.annotation.ApiDocField; import com.gitee.easyopen.doc.annotation.ApiDocField;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang.StringUtils;
import java.util.Date;
/** /**
* @author tanghc * @author tanghc
@@ -34,19 +30,11 @@ public class ServiceInstanceVO {
private String status; private String status;
@ApiDocField(description = "最后更新时间") @ApiDocField(description = "最后更新时间")
private String lastUpdatedTimestamp; private String updateTime;
@ApiDocField(description = "parentId") @ApiDocField(description = "parentId")
private Integer 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() { public String getIpPort() {
return ip != null && port > 0 ? ip + ":" + port : ""; return ip != null && port > 0 ? ip + ":" + port : "";
} }

2
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/GatewayPredicateDefinition.java
View File

@@ -8,7 +8,7 @@ import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
/** /**
* @author thc * @author tanghc
*/ */
@Data @Data
public class GatewayPredicateDefinition { public class GatewayPredicateDefinition {

2
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/ServiceRouteInfo.java
View File

@@ -7,7 +7,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* @author thc * @author tanghc
*/ */
@Data @Data
public class ServiceRouteInfo { public class ServiceRouteInfo {

2
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/config/WebConfig.java
View File

@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
/** /**
* @author thc * @author tanghc
*/ */
@Configuration @Configuration
public class WebConfig { public class WebConfig {

2
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/RoutePermissionService.java
View File

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
/** /**
* 路由权限业务类 * 路由权限业务类
* *
* @author thc * @author tanghc
*/ */
@Service @Service
@Slf4j @Slf4j