修改代码

dicom_monitor/logs/2018-11-05/sys-2018-11-05.0.log

@@ -0,0 +1,5 @@
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\testmr
+--------------------------------------------------
+

dicom_monitor/logs/sys.log

@@ -3,3 +3,11 @@ Dicom dir monitor...
 Monitoring directory:D:\testmr
 --------------------------------------------------
 
+error:
+OSS回调失败:md504731d593a355462060e7382d6b470d1返回结果code :1002
+msg:阿里云OSS回调url已存在
+error:null
+error:
+OSS回调失败:md504731d593a355462060e7382d6b470d1返回结果code :1002
+msg:阿里云OSS回调url已存在
+error:null

dicom_monitor/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java

@@ -19,6 +19,7 @@ import com.zskk.dicom.monitor.config.Configs;
 import com.zskk.dicom.monitor.report.ErrReporter;
 import com.zskk.dicom.monitor.utils.ExceptionUtil;
 import com.zskk.dicom.monitor.utils.MonitorFileUtils;
+import com.zskk.dicom.oss.OSSFileAndCallbackHleper;
 
 public class FileUploader {
 
@@ -29,7 +30,8 @@ public class FileUploader {
 			String boundaryKey = UUID.randomUUID().toString().replaceAll("-", "").substring(8, 24);
 			String content = "\r\n----" + boundaryKey + "\r\n" + "Content-Type: application/octet-stream\r\n" + "Content-Disposition: form-data; name=\"" + renameFileName(file.getName()) + "\"; filename=\"" + renameFileName(file.getName()) + "\"\r\n" + "Content-Transfer-Encoding: binary\r\n\r\n";
 			String postUrl = "http://" + Configs.postHost + ":" + Configs.postPort + Configs.postUri;
-			Boolean uploadResult = uploadToUrl(postUrl, boundaryKey, content, "", file);
+//			Boolean uploadResult = uploadToUrl(postUrl, boundaryKey, content, "", file);
+			Boolean uploadResult = OSSFileAndCallbackHleper.getInstance().upload(file);
 			if (uploadResult == true) {
 				// 创建目录
 				String targetFileStr = MonitorFileUtils.touchBackDir(file);

dicom_monitor/src/main/java/com/zskk/dicom/oss/BaseOSSHleper.java

@@ -1,8 +1,10 @@
 package com.zskk.dicom.oss;
 
+import java.io.File;
+
 import com.zskk.dicom.response.BaseResponse;
 
 public interface BaseOSSHleper {
-	BaseResponse upload(String filePath);
-	BaseResponse check(String filePath);
+	boolean upload(File file);
+	boolean exist(String md5);
 }

dicom_monitor/src/main/java/com/zskk/dicom/oss/OSSFileHleper.java

@@ -1,95 +0,0 @@
-package com.zskk.dicom.oss;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.io.FileUtils;
-import org.apache.http.util.TextUtils;
-
-import com.aliyun.oss.OSSClient;
-import com.aliyun.oss.common.utils.IOUtils;
-import com.aliyun.oss.model.PutObjectRequest;
-import com.aliyun.oss.model.PutObjectResult;
-import com.zskk.dicom.config.NetCodeConfig;
-import com.zskk.dicom.config.OSSConfig;
-import com.zskk.dicom.response.BaseResponse;
-import com.zskk.dicom.response.FileUploadChcekResponse;
-import com.zskk.dicom.response.ZskkResponseFactory;
-import com.zskk.dicom.response.bean.FileUploadChcekResponseBean;
-
-import sun.security.provider.MD5;
-
-public class OSSFileHleper implements BaseOSSHleper {
-
-	private static class OSSHleperHoler {
-		private static OSSFileHleper INSTANCE = new OSSFileHleper();
-	}
-	public static OSSFileHleper getInstance() {
-		return OSSHleperHoler.INSTANCE;
-	}
-	private OSSClient instance;
-	private OSSFileHleper() {
-		instance = new OSSClient(OSSConfig.ENDPOINT, OSSConfig.ACCESS_KEY_ID, OSSConfig.ACCESS_KEY_SECRET);
-	}
-	@Override
-	public BaseResponse check(String filePath) {
-		BaseResponse exception = null;
-		if(TextUtils.isEmpty(filePath)) {
-			return NetCodeConfig.FILE_PATH_IS_NULL;
-		}
-		File file = new File(filePath);
-		if(!file.exists()) {
-			return NetCodeConfig.FILE_IS_NOT_FOUND;
-		}
-		if(!file.isFile()) {
-			return NetCodeConfig.FILE_IS_NOT_FILE;
-		}
-		FileInputStream fis = null;
-		String md5 = null;
-		Exception error = null;
-		try {
-			fis = new FileInputStream(file);
-			md5 = DigestUtils.md5Hex(IOUtils.readStreamAsByteArray(fis));
-			fis.close();
-		} catch (IOException e) {
-			error = e;
-		} 
-		if(error != null) {
-			return NetCodeConfig.FILE_RUNTIME.setError(error);
-		}
-		boolean isExist = instance.doesObjectExist(OSSConfig.BUCKET_NAME, md5);
-		if(isExist) {
-			return NetCodeConfig.FILE_ALIOSS_FILE_ALREADY;
-		}
-		return ZskkResponseFactory.getInstance().generateSuccess().setData(new FileUploadChcekResponseBean(md5,file));
-	}
-	
-	@Override
-	public BaseResponse upload(String filePath) {
-		BaseResponse<FileUploadChcekResponseBean> response = check(filePath);
-		if(response.isError()) {
-			return response;
-		}
-		FileUploadChcekResponseBean data = response.getData();
-		String md5 = data.filename;
-		File file = data.file;
-		Exception error = null;
-		try {
-			instance.putObject(OSSConfig.BUCKET_NAME, md5, file);
-		} catch (Exception e) {
-			error = e;
-		} finally {
-			if(instance != null) {
-				instance.shutdown();
-			}
-		}
-		if(error != null) {
-			return NetCodeConfig.FILE_ALIOSS_UPLOAD.setError(error);
-		}
-		return ZskkResponseFactory.getInstance().generateSuccess();
-	}
-}

dicom_monitor/src/main/java/com/zskk/dicom/response/bean/FileUploadResponseBean.java

@@ -12,4 +12,10 @@ public class FileUploadResponseBean extends BaseResponseBean implements Serializ
 		this.msg   = msg;
 		this.error = error;
 	}
+	
+	@Override
+	public String toString() {
+		// TODO Auto-generated method stub
+		return "code :" + code + "\r\nmsg:" + msg + "\r\nerror:"+error;
+	}
 }

dicom_monitor/src/main/resources/project.properties

@@ -1,4 +1,4 @@
-monitor.monitorDir=D:\\testmr
+monitor.monitorDir=/Users/fuyu/Desktop/image/test
 monitor.hospitalId=11000001
 monitor.postHost=api.pacsonline.cn
 monitor.postPort=80

dicom_monitor/src/test/java/dicom_monitor/OSSTest.java

@@ -1,20 +1,21 @@
 package dicom_monitor;
 
+import java.io.File;
+
 import com.zskk.dicom.oss.OSSFileAndCallbackHleper;
-import com.zskk.dicom.oss.OSSFileHleper;
 import com.zskk.dicom.response.BaseResponse;
 import com.zskk.dicom.response.bean.FileUploadResponseBean;
 
 public class OSSTest {
 	public static void main(String[] args) {
-		BaseResponse response = OSSFileAndCallbackHleper.getInstance().upload("/Users/fuyu/Desktop/image/2");
-		System.out.println(response.getMsg());
-		System.out.println(response.getError());
-		System.out.println(response.getData());
-		FileUploadResponseBean data = (FileUploadResponseBean) response.getData();
-		System.out.println(data.code);
-		System.out.println(data.msg);
-		System.out.println(data.error);
+		boolean flag = OSSFileAndCallbackHleper.getInstance().upload(new File("/Users/fuyu/Desktop/image/2"));
+		System.out.println(flag);
+//		System.out.println(response.getError());
+//		System.out.println(response.getData());
+//		FileUploadResponseBean data = (FileUploadResponseBean) response.getData();
+//		System.out.println(data.code);//0 成功
+//		System.out.println(data.msg);
+//		System.out.println(data.error);
 
 	}
 }

dicom_monitor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -6,13 +6,12 @@ com/zskk/dicom/monitor/report/ErrReporter.class
 com/zskk/dicom/response/BaseResponse.class
 com/zskk/dicom/response/bean/BaseResponseBean.class
 com/zskk/dicom/monitor/monitors/FileAction.class
-com/zskk/dicom/oss/OSSFileHleper.class
 com/zskk/dicom/monitor/monitors/FileActionCallback.class
 com/zskk/dicom/response/bean/FileUploadChcekResponseBean.class
 com/zskk/dicom/response/ZskkResponseFactory$ZskkExceptionFactoryHoler.class
 com/zskk/dicom/response/ZskkResponseFactory$1.class
+com/zskk/dicom/oss/OSSFileAndCallbackHleper$1.class
 com/zskk/dicom/config/OSSConfig.class
-com/zskk/dicom/oss/OSSFileHleper$OSSHleperHoler.class
 com/zskk/dicom/config/NetCodeConfig.class
 com/zskk/dicom/monitor/monitors/WatchDir.class
 com/zskk/dicom/response/ZskkResponseFactory.class
@@ -23,7 +22,6 @@ com/zskk/dicom/monitor/uploader/UploadRunner.class
 com/zskk/dicom/monitor/uploader/FileMover.class
 com/zskk/dicom/monitor/utils/FileHashUtil.class
 com/zskk/dicom/monitor/monitors/WatchDir$1.class
-com/zskk/dicom/oss/OSSFileHleper$1.class
 com/zskk/dicom/monitor/utils/MonitorFileUtils.class
 com/zskk/dicom/monitor/utils/ExceptionUtil.class
 com/zskk/dicom/WebStarts.class

dicom_monitor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,7 +1,6 @@
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/monitors/FileChangeProc.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/utils/MailerUtil.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/config/Constants.java
-/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/oss/OSSFileHleper.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/report/ErrReporter.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/uploader/UploadsQueue.java
@@ -20,12 +19,15 @@
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/config/NetCodeConfig.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/config/OSSConfig.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/request/bean/ALiYunOSSCallbackBodyBean.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/response/ZskkResponseFactory.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/uploader/UploadRunner.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/oss/BaseOSSHleper.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/response/BaseResponse.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/oss/OSSFileAndCallbackHleper.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/utils/FileHashUtil.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/monitors/WatchDir.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/response/FileUploadChcekResponse.java
 /Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/utils/ExceptionUtil.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/response/bean/FileUploadResponseBean.java

dicom_monitor/target/surefire-reports/TEST-dicom_monitor.OSSTest.xml

@@ -26,7 +26,7 @@
 "/>
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="os.name" value="Mac OS X"/>
-    <property name="classworlds.conf" value="/Users/fuyu/Documents/workspace/.metadata/.plugins/org.eclipse.m2e.launching/launches/m2conf2781945525928411293.tmp"/>
+    <property name="classworlds.conf" value="/Users/fuyu/Documents/workspace/.metadata/.plugins/org.eclipse.m2e.launching/launches/m2conf6852323139724241442.tmp"/>
     <property name="sun.jnu.encoding" value="UTF-8"/>
     <property name="java.library.path" value="/Users/fuyu/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:."/>
     <property name="java.specification.name" value="Java Platform API Specification"/>