diff --git a/microservices-gateway/src/main/java/com/microservices/gateway/filter/GlobalResponseFilter.java b/microservices-gateway/src/main/java/com/microservices/gateway/filter/GlobalResponseFilter.java index 2c50f2de7..73c1f025b 100644 --- a/microservices-gateway/src/main/java/com/microservices/gateway/filter/GlobalResponseFilter.java +++ b/microservices-gateway/src/main/java/com/microservices/gateway/filter/GlobalResponseFilter.java @@ -161,7 +161,7 @@ public class GlobalResponseFilter implements GlobalFilter, Ordered { ServerHttpResponseDecorator decoratedResponse = new ServerHttpResponseDecorator(originalResponse) { @Override public Mono writeWith(Publisher body) { - HttpStatus status = getStatusCode() != null ? getStatusCode() : HttpStatus.INTERNAL_SERVER_ERROR; + HttpStatus status = getStatusCode(); if (!status.isError()) { return super.writeWith(body); } diff --git a/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java index 07981f8fd..72f027098 100644 --- a/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java +++ b/microservices-modules/microservices-modules-mon/src/main/java/com/microservices/mon/k8s/service/impl/MicroManagementServiceImpl.java @@ -203,7 +203,8 @@ public class MicroManagementServiceImpl extends CommonService implements IMicroM if (annotationsTemplateJson == null) { annotationsTemplateJson = new JSONObject(); } - annotationsTemplateJson.put("creationTimestamp", null); + + annotationsTemplateJson.put("kubectl.kubernetes.io/restartedAt", DateUtils.getNowDate()); metadataTemplateJson.put("annotations", annotationsTemplateJson); templateJson.put("metadata", metadataTemplateJson); applicationSpecJson.put("template", templateJson); @@ -265,7 +266,7 @@ public class MicroManagementServiceImpl extends CommonService implements IMicroM public Boolean editApplication(String kind, String namespace, String applicationName, String yamlContent) { ApplicationType applicationType = ApplicationType.getApplicationTypeByKey(kind); try (Response response = remoteRancherService.editK8sApplication(applicationType.getFullName(), namespace, applicationName, yamlContent, SecurityContextHolder.getUserKey())) { - return RancherResponseHandler.handleBoolean(response, "启动应用"); + return RancherResponseHandler.handleBoolean(response, "编辑应用"); } }