Codestyle

Author: VancySavoki

moss-extension/src/main/java/org/xujin/moss/controller/extension/InstanceController.java

@@ -101,7 +101,7 @@ public ResultData search(@RequestParam(value = "appName",required = false, defau
         return ResultData.ok(pageResul).build();
     }
 
-    @GetMapping(path = "/instances/{id}")
+    @GetMapping(path = "/instances/{id:.*}")
     public ResultData instance(@PathVariable String id) {
         Instance instance=registry.getInstance(InstanceId.of(id))
                 .filter(Instance::isRegistered).block();
@@ -116,7 +116,7 @@ public ResultData instance(@PathVariable String id) {
      * @param id
      * @return
      */
-    @GetMapping(path = "/instances/events/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(path = "/instances/events/{id:.*}", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResultData eventBInstanceId(@PathVariable String id) {
         List<InstanceEvent> list=ReactorUtils.optional(eventStore.find(InstanceId.of(id))).map(r -> r.stream()).get().collect(Collectors.toList());
         return ResultData.ok(list).build();

moss-service/src/main/java/org/xujin/moss/entity/App.java

@@ -40,7 +40,7 @@ public class App extends BaseEntity{
      * 所属项目Id
      */
     @TableField("project_key")
-    private String projectKey;;
+    private String projectKey;
 
     /**
      * 应用描述

moss-service/src/main/java/org/xujin/moss/service/impl/UserServiceImpl.java

@@ -53,10 +53,7 @@ public UserModel getUserById(Long id) {
     @Override
     public UserModel getUserByUserNameAndPassWord(String userName, String password) {
         User user=userMapper.findUserByUserNameAndPassword(userName,MD5.md5(password));
-        if(null==user){
-            return null;
-        }
-        return BeanMapper.map(user,UserModel.class);
+        return null == user ? null : BeanMapper.map(user,UserModel.class);
     }
 
     @Override