From e97df5b48b525ee0334ec856c7c76b438431bdf1 Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Wed, 14 Feb 2018 17:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E4=B8=AD=E5=BF=83-=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=AE=A1=E7=90=86=E5=BC=80=E5=8F=91=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RestfulEurekaController.java | 32 ++++++++++++------- .../UpmsOrganizationController.java | 5 +-- .../upms/controller/UpmsSystemController.java | 2 +- .../fast/upms/pojo/UpmsOrganization.java | 7 ++++ 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/ms/register-center1/src/main/java/com/micro/fast/eureka/server/controller/RestfulEurekaController.java b/ms/register-center1/src/main/java/com/micro/fast/eureka/server/controller/RestfulEurekaController.java index bd46faa..39b3f27 100644 --- a/ms/register-center1/src/main/java/com/micro/fast/eureka/server/controller/RestfulEurekaController.java +++ b/ms/register-center1/src/main/java/com/micro/fast/eureka/server/controller/RestfulEurekaController.java @@ -57,13 +57,20 @@ public class RestfulEurekaController { @GetMapping("/appsInfo") @ApiOperation("获取所有的服务实例的详细信息") public ServerResponse appsInfos() { + Set instanceInfos = new HashSet<>(10); List sortedApplications = getRegistry().getSortedApplications(); - return ServerResponse.successMsgData("获取所有实例成功", sortedApplications); + for (Application sortedApplication : sortedApplications) { + List instances = sortedApplication.getInstances(); + for (InstanceInfo instance : instances) { + instanceInfos.add(instance); + } + } + return ServerResponse.successMsgData("获取所有实例成功", instanceInfos); } - @GetMapping("/apps/{id}") + @PostMapping("/apps") @ApiOperation("根据id获取实例的信息，模糊查询") - public ServerResponse getInstance(@PathVariable("id") String instanceId) { + public ServerResponse getInstance(@RequestParam("id") String instanceId) { Set instanceInfos = new HashSet<>(10); if (StringUtils.isNotBlank(instanceId)){ List sortedApplications = getRegistry().getSortedApplications(); @@ -85,12 +92,15 @@ public class RestfulEurekaController { @GetMapping("/apps/cluster/{appName}") @ApiOperation("根据appName,也就是application.name查询实例,模糊查询") public ServerResponse getInstancesByAppId(@PathVariable("appName") String appName) { - List instanceInfos = new LinkedList<>(); + List instanceInfos = new LinkedList<>(); if (StringUtils.isNotBlank(appName)){ List sortedApplications = getRegistry().getSortedApplications(); for (Application sortedApplication : sortedApplications) { if (sortedApplication.getName().contains(appName)){ - instanceInfos.add(sortedApplication); + List instances = sortedApplication.getInstances(); + for (InstanceInfo instance : instances) { + instanceInfos.add(instance); + } } } }else { @@ -99,9 +109,9 @@ public class RestfulEurekaController { return ServerResponse.successMsgData("根据appName获取实例信息成功", instanceInfos); } - @GetMapping("/apps/app/{appName}/{id}") + @PostMapping("/apps/app") @ApiOperation("根据appName和id获取服务的信息") - public ServerResponse getApplication(@PathVariable("appName") String appName,@PathVariable("id") String id){ + public ServerResponse getApplication(@RequestParam("appName") String appName,@RequestParam("id") String id){ PeerAwareInstanceRegistry registry = getRegistry(); InstanceInfo instanceByAppAndId = registry.getInstanceByAppAndId(appName, id); return ServerResponse.successData(instanceByAppAndId); @@ -114,9 +124,9 @@ public class RestfulEurekaController { * @param id * @return */ - @DeleteMapping("/{appName}/{id}/{isReplication}") + @DeleteMapping @ApiOperation("下线服务") - public ServerResponse unregister(@PathVariable("appName") String appName,@PathVariable("id") String id,@PathVariable("isReplication") Boolean isReplication){ + public ServerResponse unregister(@RequestParam("appName") String appName,@RequestParam("id") String id,@RequestParam("isReplication") Boolean isReplication){ PeerAwareInstanceRegistry registry = getRegistry(); // 当isReplication是true的时候表示这个实例的信息是从别的eureka复制过来的，eureka不会进行二次传递 boolean cancel = registry.cancel(appName, id, isReplication); @@ -133,9 +143,9 @@ public class RestfulEurekaController { * @param status * @return */ - @PutMapping("/{appName}/{id}/{status}/{isReplication}") + @PutMapping @ApiOperation("调整服务状态") - public ServerResponse updateStatus(@PathVariable("appName") String appName,@PathVariable("id")String id,@PathVariable("status")String status,@PathVariable("isReplication")Boolean isReplication){ + public ServerResponse updateStatus(@RequestParam("appName") String appName,@RequestParam("id")String id,@RequestParam("status")String status,@RequestParam("isReplication")Boolean isReplication){ PeerAwareInstanceRegistry registry = getRegistry(); switch (status){ case "OUT_OF_SERVICE": diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsOrganizationController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsOrganizationController.java index cfdaae8..f5be208 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsOrganizationController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsOrganizationController.java @@ -19,7 +19,7 @@ import java.util.List; * * @author lsy */ -@Api("upmsOrganization") +@Api(description = "权限系统组织管理") @RestController @RequestMapping("/upmsOrganization") public class UpmsOrganizationController { @@ -30,6 +30,7 @@ public class UpmsOrganizationController { @ApiOperation("添加信息") @PostMapping public ServerResponse addUpmsOrganization(@Valid UpmsOrganization upmsOrganization) throws BindException { + upmsOrganization.setCtime(System.currentTimeMillis()); return upmsOrganizationService.add(upmsOrganization); } @@ -51,7 +52,7 @@ public class UpmsOrganizationController { @ApiOperation("修改信息") @PutMapping("/{id}") - public ServerResponse updateUpmsOrganization(UpmsOrganization upmsOrganization, + public ServerResponse updateUpmsOrganization(@Valid UpmsOrganization upmsOrganization, @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ upmsOrganization.setId(Integer.valueOf(id)); return upmsOrganizationService.update(upmsOrganization); diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsSystemController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsSystemController.java index 58a5924..4f4cbea 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsSystemController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsSystemController.java @@ -19,7 +19,7 @@ import java.util.ArrayList; * 系统管理 * @author lsy */ -@Api("系统管理") +@Api(description = "系统管理") @RestController @RequestMapping("/upmsSystem") public class UpmsSystemController { diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsOrganization.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsOrganization.java index 0e96723..42ce9b1 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsOrganization.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsOrganization.java @@ -1,14 +1,21 @@ package com.micro.fast.upms.pojo; +import com.micro.fast.boot.starter.common.response.BaseConst; +import org.hibernate.validator.constraints.NotBlank; + import java.io.Serializable; public class UpmsOrganization implements Serializable { + private Integer id; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请填写上级组织") private Integer pid; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请填写组织名称") private String name; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请填写组织描述") private String description; private Long ctime;