update

eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java

@@ -37,24 +37,24 @@ public class DeployHistory implements Serializable {
 
     @Id
     @Column(name = "history_id")
-	@ApiModelProperty(value = "ID", hidden = true)
+    @ApiModelProperty(value = "ID", hidden = true)
     private String id;
 
     @ApiModelProperty(value = "应用名称")
     private String appName;
 
-	@ApiModelProperty(value = "IP")
+    @ApiModelProperty(value = "IP")
     private String ip;
 
-	@CreationTimestamp
+    @CreationTimestamp
-	@ApiModelProperty(value = "部署时间")
+    @ApiModelProperty(value = "部署时间")
     private Timestamp deployDate;
 
-	@ApiModelProperty(value = "部署者")
+    @ApiModelProperty(value = "部署者")
     private String deployUser;
 
-	@ApiModelProperty(value = "部署ID")
+    @ApiModelProperty(value = "部署ID")
-	private Long deployId;
+    private Long deployId;
 
     public void copy(DeployHistory source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java

@@ -55,7 +55,7 @@ public class AppController {
 
     @ApiOperation(value = "查询应用")
     @GetMapping
-	@PreAuthorize("@el.check('app:list')")
+    @PreAuthorize("@el.check('app:list')")
     public ResponseEntity<PageResult<AppDto>> queryApp(AppQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(appService.queryAll(criteria,pageable),HttpStatus.OK);
     }
@@ -63,7 +63,7 @@ public class AppController {
     @Log("新增应用")
     @ApiOperation(value = "新增应用")
     @PostMapping
-	@PreAuthorize("@el.check('app:add')")
+    @PreAuthorize("@el.check('app:add')")
     public ResponseEntity<Object> createApp(@Validated @RequestBody App resources){
         appService.create(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -72,7 +72,7 @@ public class AppController {
     @Log("修改应用")
     @ApiOperation(value = "修改应用")
     @PutMapping
-	@PreAuthorize("@el.check('app:edit')")
+    @PreAuthorize("@el.check('app:edit')")
     public ResponseEntity<Object> updateApp(@Validated @RequestBody App resources){
         appService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -80,8 +80,8 @@ public class AppController {
 
     @Log("删除应用")
     @ApiOperation(value = "删除应用")
-	@DeleteMapping
+    @DeleteMapping
-	@PreAuthorize("@el.check('app:del')")
+    @PreAuthorize("@el.check('app:del')")
     public ResponseEntity<Object> deleteApp(@RequestBody Set<Long> ids){
         appService.delete(ids);
         return new ResponseEntity<>(HttpStatus.OK);

eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java

@@ -53,14 +53,14 @@ public class DeployHistoryController {
 
     @ApiOperation(value = "查询部署历史")
     @GetMapping
-	@PreAuthorize("@el.check('deployHistory:list')")
+    @PreAuthorize("@el.check('deployHistory:list')")
     public ResponseEntity<PageResult<DeployHistoryDto>> queryDeployHistory(DeployHistoryQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(deployhistoryService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
     @Log("删除DeployHistory")
     @ApiOperation(value = "删除部署历史")
-	@DeleteMapping
+    @DeleteMapping
     @PreAuthorize("@el.check('deployHistory:del')")
     public ResponseEntity<Object> deleteDeployHistory(@RequestBody Set<String> ids){
         deployhistoryService.delete(ids);

eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerDeployController.java

@@ -55,15 +55,15 @@ public class ServerDeployController {
 
     @ApiOperation(value = "查询服务器")
     @GetMapping
-	@PreAuthorize("@el.check('serverDeploy:list')")
+    @PreAuthorize("@el.check('serverDeploy:list')")
     public ResponseEntity<PageResult<ServerDeployDto>> queryServerDeploy(ServerDeployQueryCriteria criteria, Pageable pageable){
-    	return new ResponseEntity<>(serverDeployService.queryAll(criteria,pageable),HttpStatus.OK);
+        return new ResponseEntity<>(serverDeployService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
     @Log("新增服务器")
     @ApiOperation(value = "新增服务器")
     @PostMapping
-	@PreAuthorize("@el.check('serverDeploy:add')")
+    @PreAuthorize("@el.check('serverDeploy:add')")
     public ResponseEntity<Object> createServerDeploy(@Validated @RequestBody ServerDeploy resources){
         serverDeployService.create(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -72,7 +72,7 @@ public class ServerDeployController {
     @Log("修改服务器")
     @ApiOperation(value = "修改服务器")
     @PutMapping
-	@PreAuthorize("@el.check('serverDeploy:edit')")
+    @PreAuthorize("@el.check('serverDeploy:edit')")
     public ResponseEntity<Object> updateServerDeploy(@Validated @RequestBody ServerDeploy resources){
         serverDeployService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -80,18 +80,18 @@ public class ServerDeployController {
 
     @Log("删除服务器")
     @ApiOperation(value = "删除Server")
-	@DeleteMapping
+    @DeleteMapping
-	@PreAuthorize("@el.check('serverDeploy:del')")
+    @PreAuthorize("@el.check('serverDeploy:del')")
     public ResponseEntity<Object> deleteServerDeploy(@RequestBody Set<Long> ids){
         serverDeployService.delete(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-	@Log("测试连接服务器")
+    @Log("测试连接服务器")
-	@ApiOperation(value = "测试连接服务器")
+    @ApiOperation(value = "测试连接服务器")
-	@PostMapping("/testConnect")
+    @PostMapping("/testConnect")
-	@PreAuthorize("@el.check('serverDeploy:add')")
+    @PreAuthorize("@el.check('serverDeploy:add')")
-	public ResponseEntity<Object> testConnectServerDeploy(@Validated @RequestBody ServerDeploy resources){
+    public ResponseEntity<Object> testConnectServerDeploy(@Validated @RequestBody ServerDeploy resources){
-		return new ResponseEntity<>(serverDeployService.testConnect(resources),HttpStatus.CREATED);
+        return new ResponseEntity<>(serverDeployService.testConnect(resources),HttpStatus.CREATED);
-	}
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java

@@ -67,22 +67,22 @@ public class ServerDeployServiceImpl implements ServerDeployService {
         return serverDeployMapper.toDto(deploy);
     }
 
-	@Override
+    @Override
-	public Boolean testConnect(ServerDeploy resources) {
+    public Boolean testConnect(ServerDeploy resources) {
-		ExecuteShellUtil executeShellUtil = null;
+        ExecuteShellUtil executeShellUtil = null;
-		try {
+        try {
-			executeShellUtil = new ExecuteShellUtil(resources.getIp(), resources.getAccount(), resources.getPassword(),resources.getPort());
+            executeShellUtil = new ExecuteShellUtil(resources.getIp(), resources.getAccount(), resources.getPassword(),resources.getPort());
-			return executeShellUtil.execute("ls")==0;
+            return executeShellUtil.execute("ls")==0;
-		} catch (Exception e) {
+        } catch (Exception e) {
-			return false;
+            return false;
-		}finally {
+        }finally {
-			if (executeShellUtil != null) {
+            if (executeShellUtil != null) {
-				executeShellUtil.close();
+                executeShellUtil.close();
-			}
+            }
-		}
+        }
-	}
+    }
 
-	@Override
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(ServerDeploy resources) {
 		serverDeployRepository.save(resources);
@@ -93,7 +93,7 @@ public class ServerDeployServiceImpl implements ServerDeployService {
     public void update(ServerDeploy resources) {
         ServerDeploy serverDeploy = serverDeployRepository.findById(resources.getId()).orElseGet(ServerDeploy::new);
         ValidationUtil.isNull( serverDeploy.getId(),"ServerDeploy","id",resources.getId());
-		serverDeploy.copy(resources);
+        serverDeploy.copy(resources);
         serverDeployRepository.save(serverDeploy);
     }