Merge branch 'master' of http://121.42.53.174:3000/XMTT/storage.git

src/main/java/com/ekexiu/project/storage/diacrisis/AiDiacrisisTask.java

@@ -19,7 +19,7 @@ public class AiDiacrisisTask implements Runnable {
	private static Logger LOG = LogFactory.getLog(AiDiacrisisTask.class);
	private static int processing = 2;
	private String urlPrefix = "http://192.168.3.114:5000/test?pi=";
	private String urlPrefix = "http://127.0.0.1:5000/test?pi=";
	private static LinkedList<AiDiacrisisTask> queue = new LinkedList<AiDiacrisisTask>();
	private String taskId;

src/main/java/com/ekexiu/project/storage/diacrisis/AiTaskService.java

@@ -297,7 +297,7 @@ public class AiTaskService {
   public String[] getResult(@PathVar String taskid){
	   File path = new File(dstPath,taskid);
	   if(path.exists() && path.isDirectory()){
		   path = new File(path,"ASD_RESULT");
		   path = new File(path,"RESULT");
		   if(path.exists() && path.isDirectory()){
			   return path.list();
		   }