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

pom.xml

@@ -73,7 +73,7 @@
		<dependency>
			<groupId>org.apache.hadoop</groupId>
			<artifactId>hadoop-client</artifactId>
			<version>3.0.3</version>
			<version>2.9.2</version>
		</dependency>
<!-- 		<dependency>
			<groupId>org.apache.hadoop</groupId>

src/main/java/com/ekexiu/project/hdfs/HdfsService.java

@@ -26,8 +26,10 @@ public class HdfsService {
	public void setRemoteUrl(String remoteUrl) {
		System.setProperty("HADOOP_USER_NAME", "hadoop");
		this.remoteUrl = remoteUrl;
		configuration.set("fs.default.name", this.remoteUrl);
		configuration.set("dfs.client.use.datanode.hostname", "true");
		try {
			dfs = (DistributedFileSystem) FileSystem.get(configuration);
		} catch (IOException e) {
@@ -36,17 +38,37 @@ public class HdfsService {
	}
	
	public void upload(String path,File src) throws IOException{
//		byte[] buffer = new byte[8192];
		Path dstPath = new Path(root,path);
		if(src.exists() && src.isDirectory()){
			Path dst  =  new Path(root,path);
			if(this.dfs.exists(dst)){
				if(!this.dfs.delete(dst,true)){
					throw new IOException("delete "+configuration.get("fs.default.name")+path.toString()+" error");
			if(!this.dfs.exists(dstPath)){
				if(!this.dfs.mkdirs(dstPath)){
					throw new IOException("mkdir "+configuration.get("fs.default.name")+"/"+path+" error");
				}
			}
			if(!this.dfs.mkdirs(dst)){
				throw new IOException("mkdir "+configuration.get("fs.default.name")+path.toString()+" error");
			
			
			for(File file:src.listFiles()){
				Path dst = new Path(dstPath,file.getName());
				if(this.dfs.exists(dst)){
					if(!this.dfs.delete(dst,true)){
						throw new IOException("delete "+configuration.get("fs.default.name")+"/"+path+"/"+file.getName()+" error");
					}
				}
				this.dfs.copyFromLocalFile(new Path(file.getAbsolutePath()), dst);
				
//				FSDataOutputStream outStream = dfs.create(dst);
//				try {
//					InputStream in = new FileInputStream(file);
//					try {
//						IoUtil.copy(in, outStream, buffer);
//					}finally {
//						in.close();
//					}
//				}finally {
//					outStream.close();
//				}
			}
			this.dfs.copyFromLocalFile(new Path(src.getAbsolutePath()), dst);
		}
		
	}
@@ -55,7 +77,9 @@ public class HdfsService {
	public static void main(String args[]) throws Exception{
		HdfsService service = new HdfsService();
		service.setRemoteUrl("hdfs://39.97.161.48:9000");
		service.upload("11",new File("/ekexiu/storage_asd/dst/a"));
		service.upload("22",new File("/home/java1/test"));
		
		System.out.println("11111111111111111111111111111111");
	}
}

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

@@ -32,7 +32,7 @@ public class AiCleanTask implements Runnable{
		File file = new File(aiTaskService.getDstPath(), taskId);
		file = new File(file,"data");
			try {
				URL u = new URL("http://127.0.0.1:5001//desensitize?pi=" + file.getAbsolutePath());
				URL u = new URL("http://127.0.0.1:5001/desensitize?pi=" + file.getAbsolutePath());
				HttpURLConnection httpURLConnection = (HttpURLConnection) u.openConnection();
				if (httpURLConnection.getResponseCode() == 200) {
					InputStream in = httpURLConnection.getInputStream();