sync

harrier-alarm/src/main/java/cn/spdb/harrier/alarm/rpc/transport/AlarmTransportService.java

@@ -10,8 +10,8 @@
 @RpcServiceHandler("AlarmTransportServerInterfasce")
 public class AlarmTransportService implements AlarmTransportServerInterfasce {
 
-	private AlarmManger alarmManger = BeanContext.getBean(AlarmManger.class);
-	private AlarmSendManger alarmSendManger = BeanContext.getBean(AlarmSendManger.class);
+	private static AlarmManger alarmManger = BeanContext.getBean(AlarmManger.class);
+	private static AlarmSendManger alarmSendManger = BeanContext.getBean(AlarmSendManger.class);
 
 	@Override
 	public Boolean createAlarm(MAlarm alarm) {

harrier-api/src/main/java/cn/spdb/harrier/api/controller/develop/JobArrangeController.java

@@ -11,17 +11,15 @@
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -55,6 +53,8 @@ public class JobArrangeController {
 	private IYamlManagerService yamlManagerService;
 	@Autowired
 	private IJobConfigChangeService jobConfigChangeService;
+	@Autowired
+	public Environment env;
 
 	/**
 	 * 分页查询作业编排表记录
@@ -203,7 +203,7 @@ public Integer update(@PathVariable(value = "id") Long id, DyJobArrange dyJobArr
 	public void download(String platform, String systems, String job, Integer version, HttpServletRequest request,
 			HttpServletResponse response) throws IOException {
 		// 判断job工程目录是否存在，不存在则创建
-		File uploadFile = new File(JobDeployPath.UPLOAD_SCRIPT_PATH.getValue());
+		File uploadFile = new File(Objects.requireNonNull(env.getProperty("UPLOAD_SCRIPT_PATH")));
 		if (!uploadFile.exists()) {
 			uploadFile.mkdirs();
 		}
@@ -216,7 +216,7 @@ public void download(String platform, String systems, String job, Integer versio
 		}
 
 		// path是指欲下载的文件的路径
-		File compressFile = new File(JobDeployPath.COMPRESS_TEMP_PATH.getValue());
+		File compressFile = new File(Objects.requireNonNull(env.getProperty("COMPRESS_TEMP_PATH")));
 		if (!compressFile.exists()) {
 			compressFile.mkdirs();
 		}

harrier-api/src/main/java/cn/spdb/harrier/api/controller/develop/JobAttributesController.java

@@ -4,15 +4,12 @@
 import java.io.IOException;
 import java.text.ParseException;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -49,6 +46,8 @@ public class JobAttributesController {
 	private IYamlManagerService yamlManagerService;
 	@Autowired
 	private IJobArrangeService jobArrangeService;
+	@Autowired
+	public Environment env;
 
 	/**
 	 * 根据id查询
@@ -162,9 +161,7 @@ public String add(@RequestBody Map<String, String> map) {
 
 	/**
 	 * 更新作业属性信息
-	 * 
-	 * @param id
-	 * @param dyJobAttributes
+	 * @param map
 	 * @return
 	 */
 	@PutMapping("/update")
@@ -214,18 +211,22 @@ public String update(@RequestBody Map<String, String> map) {
 
 	/**
 	 * 上传脚本文件
-	 * 
-	 * @param req
-	 * @param resp
 	 * @param files
+	 * @param fileType
+	 * @param platform
+	 * @param systems
+	 * @param job
+	 * @param version
 	 * @return
 	 * @throws Exception
 	 */
 	@PostMapping("/upload")
 	@AccessLogAnnotation(isDbInstall = true, ignoreRequestArgs = { "files" })
 	public Map<String, Object> upload(@RequestParam("file") MultipartFile[] files, String fileType, String platform,
 			String systems, String job, Integer version) throws Exception {
-		return FileUtils.uploadFile(files, fileType, platform, systems, job, version);
+		// 上传路径
+		String uploadPath = Objects.requireNonNull(env.getProperty("UPLOAD_SCRIPT_PATH"));
+		return FileUtils.uploadFile(files, fileType, platform, systems, job, version, uploadPath);
 	}
 
 	/**
@@ -243,8 +244,9 @@ public Map<String, Object> parseProject(@RequestParam("file") MultipartFile file
 			throws Exception {
 		// 返回结果
 		Map<String, Object> res = new HashMap<String, Object>();
-		// 文件上传
-		File srcfile = FileUtils.uploadTar(file, fileType);
+		// 文件上传临时路径
+		String uploadDeployTempPath = Objects.requireNonNull(env.getProperty("UPLOAD_DEPLOY_TEMP_PATH"));
+		File srcfile = FileUtils.uploadTar(file, fileType, uploadDeployTempPath);
 		// 解压
 		String destpath = srcfile.getParent();
 		String password = "";

harrier-api/src/main/java/cn/spdb/harrier/api/controller/develop/JobDevelopController.java

@@ -1,5 +1,6 @@
 package cn.spdb.harrier.api.controller.develop;
 
+import cn.spdb.harrier.api.service.develop.IDeployScriptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +19,8 @@ public class JobDevelopController {
 	private IJobArrangeService jobArrangeService;
 	@Autowired
 	private IDeploySqlService deploySqlService;
+	@Autowired
+	private IDeployScriptService deployScriptService;
 
 	/**
 	 * 部署
@@ -26,21 +29,26 @@ public class JobDevelopController {
 	 */
 	@PostMapping("/deploy")
 	public boolean deploy(DyJobArrange dyJobArrange) {
+		boolean deployStatus = false;
 		if(dyJobArrange != null) {
-			// 生成sql，执行部署
-			boolean isDeploySuccess = deploySqlService.deploySqlGenerate(dyJobArrange);
-			if(isDeploySuccess) {
+			// 生成sql，执行知识库部署
+			boolean isDeploySqlSuccess = deploySqlService.deploySqlGenerate(dyJobArrange);
+			// 脚本文件部署
+			boolean isDeployScriptSuccess = deployScriptService.deployScript(dyJobArrange);
+			if(isDeploySqlSuccess && isDeployScriptSuccess) {
 				// 修改部署状态为部署成功
 				dyJobArrange.setProcessStatus(JobDeployStatus.PROCESS_SUCCESS.getValue());
 				jobArrangeService.updateJobArrange(dyJobArrange);
+				deployStatus = true;
 			}else {
 				// 修改部署状态为部署失败
+				deploySqlService.rollBack(dyJobArrange);
 				dyJobArrange.setProcessStatus(JobDeployStatus.PROCESS_FAILED.getValue());
 				jobArrangeService.updateJobArrange(dyJobArrange);
+				deployStatus = false;
 			}
-			return isDeploySuccess;
 		}
-		return false;
+		return deployStatus;
 	}
 
 	/**

harrier-api/src/main/java/cn/spdb/harrier/api/controller/job/UdsJobController.java

@@ -78,6 +78,11 @@ public Map<String, Object> selectAll(Page<UdsJobMenu> page, String platform, Str
 		result.put("total", pageinfo.getTotal());
 		return result;
 	}
+
+	@GetMapping("/selectJobList")
+	public List<UdsJob> selectJobList(String platform, String systems) {
+		return service.selectJobList(platform,systems);
+	}
 
 	/**
 	 * 作业列表-查询作业详情

harrier-api/src/main/java/cn/spdb/harrier/api/controller/system/SysFileController.java

@@ -45,20 +45,17 @@ public Boolean createDir(String uri) {
 	}
 
 	@RequestMapping(path = "selectFile", method = RequestMethod.GET)
-	public List<FileAtt> selectFile(String uri, String fileName, String order) {
+	public List<FileAtt> selectFile(String uri,String fileName,String order) {
 		return fileDisposeService.selectFile(URI.valueOf(uri), fileName, order);
 	}
 
-	@AccessLogAnnotation(isDbInstall = true, ignoreRequestArgs = { "request", "response" })
+	@AccessLogAnnotation(isDbInstall = true, ignoreRequestArgs = {"request", "response"})
 	@RequestMapping(path = "loadFile", method = RequestMethod.GET)
-	public void loadFile(HttpServletRequest request, HttpServletResponse response, String uri, Long streamId, Long pos,
-			Long size, String filename) {
-
+	public void loadFile(HttpServletRequest request, HttpServletResponse response,String uri, Long streamId, Long pos, Long size, String filename) {
 		streamId = new AtomicLong(1).incrementAndGet();
 		pos = 0L;
 		size = Constants.LOAD_BUFFER_SIZE;
 		FileMessage fileMessage = fileDisposeService.loadFile(URI.valueOf(uri), streamId, pos, size);
-
 		try {
 			response.reset();
 			response.addHeader("Access-Control-Allow-Credentials", "true");
@@ -69,7 +66,6 @@ public void loadFile(HttpServletRequest request, HttpServletResponse response, S
 		} catch (UnsupportedEncodingException e1) {
 			e1.printStackTrace();
 		}
-
 		try (OutputStream outputStream4Client = new BufferedOutputStream(response.getOutputStream())) {
 			outputStream4Client.write(fileMessage.getData());
 			outputStream4Client.flush();
@@ -81,8 +77,7 @@ public void loadFile(HttpServletRequest request, HttpServletResponse response, S
 
 	@AccessLogAnnotation(isDbInstall = true, ignoreRequestArgs = { "files" })
 	@RequestMapping(path = "uploadFile", method = RequestMethod.POST)
-	public FileMessage uploadFile(String uri, String path, Long streamId, Long pos,
-			@RequestParam("file") MultipartFile[] files) {
+	public FileMessage uploadFile(String uri, String path, Long streamId, Long pos, @RequestParam("file") MultipartFile[] files) {
 		streamId = new AtomicLong(1).incrementAndGet();
 		pos = 0L;
 		byte[] data = null;

harrier-api/src/main/java/cn/spdb/harrier/api/controller/system/SysUserController.java

@@ -271,4 +271,23 @@ public boolean sendRegistervaricode(String userCode, String userEmail) {
 	public String forgotPwd(Long userId, String userCode, String newPassword, String code) throws Exception {
 		return userInfoService.forgotPwd(userId, userCode, newPassword, code);
 	}
+
+	/**
+	 * 更新用户状态.
+	 */
+	@PostMapping(path = "{ids}/updateEnable")
+	@AccessLogAnnotation(isDbInstall = true)
+	public int updateEnable(@PathVariable(value = "ids") Long[] userIds, Boolean isEnable) throws Exception {
+		return userInfoService.updateEnable(userIds, isEnable);
+	}
+
+	/**
+	 * 重置密码.
+	 * 
+	 */
+	@PostMapping("/resetPwd")
+	@AccessLogAnnotation
+	public int resetPwd(Long[] userIds) throws Exception {
+		return userInfoService.resetPwd(userIds);
+	}
 }

harrier-api/src/main/java/cn/spdb/harrier/api/service/develop/IDeployScriptService.java

@@ -0,0 +1,7 @@
+package cn.spdb.harrier.api.service.develop;
+
+import cn.spdb.harrier.dao.entity.DyJobArrange;
+
+public interface IDeployScriptService {
+    boolean deployScript(DyJobArrange dyJobArrange);
+}