Bläddra i källkod

修改代码 oss阿里云上传

fuyu 6 år sedan
förälder
incheckning
f5ed241775
24 ändrade filer med 445 tillägg och 4 borttagningar
  1. 2 2
      dicom_monitor/.classpath
  2. 5 0
      dicom_monitor/logs/sys.log
  3. 23 2
      dicom_monitor/pom.xml
  4. 28 0
      dicom_monitor/src/main/java/com/zskk/dicom/config/NetCodeConfig.java
  5. 9 0
      dicom_monitor/src/main/java/com/zskk/dicom/config/OSSConfig.java
  6. 8 0
      dicom_monitor/src/main/java/com/zskk/dicom/oss/BaseOSSHleper.java
  7. 95 0
      dicom_monitor/src/main/java/com/zskk/dicom/oss/OSSFileHleper.java
  8. 60 0
      dicom_monitor/src/main/java/com/zskk/dicom/response/BaseResponse.java
  9. 10 0
      dicom_monitor/src/main/java/com/zskk/dicom/response/FileUploadChcekResponse.java
  10. 31 0
      dicom_monitor/src/main/java/com/zskk/dicom/response/ZskkResponseFactory.java
  11. 5 0
      dicom_monitor/src/main/java/com/zskk/dicom/response/bean/BaseResponseBean.java
  12. 12 0
      dicom_monitor/src/main/java/com/zskk/dicom/response/bean/FileUploadChcekResponseBean.java
  13. 12 0
      dicom_monitor/src/test/java/dicom_monitor/OSSTest.java
  14. 2 0
      dicom_monitor/target/.gitignore
  15. 5 0
      dicom_monitor/target/maven-archiver/pom.properties
  16. 39 0
      dicom_monitor/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  17. 31 0
      dicom_monitor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  18. 1 0
      dicom_monitor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  19. 1 0
      dicom_monitor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  20. 62 0
      dicom_monitor/target/surefire-reports/TEST-dicom_monitor.OSSTest.xml
  21. 4 0
      dicom_monitor/target/surefire-reports/dicom_monitor.OSSTest.txt
  22. BIN
      dicom_monitor/target/zskk-dicom-monitor-jar-with-dependencies.jar
  23. BIN
      dicom_monitor/target/zskk-dicom-monitor.jar
  24. BIN
      dicom_monitor/target/zskk-dicom-monitor.jar.original

+ 2 - 2
dicom_monitor/.classpath

@@ -22,11 +22,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_161"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_131]"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

+ 5 - 0
dicom_monitor/logs/sys.log

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

+ 23 - 2
dicom_monitor/pom.xml

@@ -13,7 +13,13 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 	</properties>
-
+	<repositories>
+		    <repository>
+		      <id>org.dcm4che</id>
+		      <name>dcm4che DICOM toolkit and utilities</name>
+		      <url>http://github.com/dcm4che/dcm4che</url>
+		    </repository>
+	  </repositories>
 	<build>
 		<finalName>zskk-dicom-monitor</finalName>
 		<defaultGoal>compile</defaultGoal>
@@ -133,7 +139,22 @@
 			<artifactId>spring-boot</artifactId>
 			<version>2.0.4.RELEASE</version>
 		</dependency>
-
+	  	<dependency>
+	    	<groupId>com.aliyun.oss</groupId>
+	    	<artifactId>aliyun-sdk-oss</artifactId>
+	    	<version>2.8.3</version>
+	   	</dependency>
+	   	
+  	 	<dependency>
+	      <groupId>org.dcm4che</groupId>
+	      <artifactId>dcm4che-core</artifactId>
+	      <version>5.15.0</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.dcm4che.tool</groupId>
+	      <artifactId>dcm4che-tool-common</artifactId>
+	      <version>5.15.0</version>
+	    </dependency>
 	</dependencies>
 
 </project>

+ 28 - 0
dicom_monitor/src/main/java/com/zskk/dicom/config/NetCodeConfig.java

@@ -0,0 +1,28 @@
+package com.zskk.dicom.config;
+
+import com.zskk.dicom.response.BaseResponse;
+import com.zskk.dicom.response.ZskkResponseFactory;
+
+public class NetCodeConfig {
+	public static String SUCCESS = "0";
+	private static String FILE_PATH_IS_NULL_CODE = "1001";
+	private static String FILE_PATH_IS_NULL_MSG = "文件路径为空";
+	private static String FILE_IS_NOT_FOUND_CODE = "1002";
+	private static String FILE_IS_NOT_FOUND_MSG = "文件路径为找到";
+	private static String FILE_IS_NOT_FILE_CODE = "1003";
+	private static String FILE_IS_NOT_FILE_MSG = "传入的路径不是文件路径";
+	private static String FILE_RUNTIME_CODE = "2001";
+	private static String FILE_RUNTIME_MSG = "文件读取runtime异常具体信息请查看Exception信息";
+	private static String FILE_ALIOSS_UPLOAD_CODE = "2002";
+	private static String FILE_ALIOSS_UPLOAD_MSG = "阿里云文件上传出错";
+	private static String FILE_ALIOSS_FILE_ALREADY_CODE = "2003";
+	private static String FILE_ALIOSS_FILE_ALREADY_MSG = "阿里云文件已存在";
+
+	
+	public static BaseResponse FILE_PATH_IS_NULL = ZskkResponseFactory.getInstance().generate(FILE_PATH_IS_NULL_CODE, FILE_PATH_IS_NULL_MSG);
+	public static BaseResponse FILE_IS_NOT_FOUND = ZskkResponseFactory.getInstance().generate(FILE_IS_NOT_FOUND_CODE, FILE_IS_NOT_FOUND_MSG);
+	public static BaseResponse FILE_IS_NOT_FILE = ZskkResponseFactory.getInstance().generate(FILE_IS_NOT_FILE_CODE, FILE_IS_NOT_FILE_MSG);
+	public static BaseResponse FILE_RUNTIME = ZskkResponseFactory.getInstance().generate(FILE_RUNTIME_CODE, FILE_RUNTIME_MSG);
+	public static BaseResponse FILE_ALIOSS_FILE_ALREADY = ZskkResponseFactory.getInstance().generate(FILE_ALIOSS_FILE_ALREADY_CODE, FILE_ALIOSS_FILE_ALREADY_MSG);
+	public static BaseResponse FILE_ALIOSS_UPLOAD = ZskkResponseFactory.getInstance().generate(FILE_ALIOSS_UPLOAD_CODE, FILE_ALIOSS_UPLOAD_MSG);
+}

+ 9 - 0
dicom_monitor/src/main/java/com/zskk/dicom/config/OSSConfig.java

@@ -0,0 +1,9 @@
+package com.zskk.dicom.config;
+
+public class OSSConfig {
+	public static String ENDPOINT = "oss-cn-beijing.aliyuncs.com";
+	// 阿里云主账号AccessKey拥有所有API的访问权限,风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维,请登录 https://ram.console.aliyun.com 创建RAM账号。
+	public static String ACCESS_KEY_ID = "LTAImzRGKfWaL7Vi";
+	public static String ACCESS_KEY_SECRET = "GjWdd2cdHtbQkhhnhSxNbw0QChKD98";
+	public static String BUCKET_NAME = "zskk";
+}

+ 8 - 0
dicom_monitor/src/main/java/com/zskk/dicom/oss/BaseOSSHleper.java

@@ -0,0 +1,8 @@
+package com.zskk.dicom.oss;
+
+import com.zskk.dicom.response.BaseResponse;
+
+public interface BaseOSSHleper {
+	BaseResponse upload(String filePath);
+	BaseResponse check(String filePath);
+}

+ 95 - 0
dicom_monitor/src/main/java/com/zskk/dicom/oss/OSSFileHleper.java

@@ -0,0 +1,95 @@
+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.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);
+		System.out.println(response.getCode());
+		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();
+	}
+}

+ 60 - 0
dicom_monitor/src/main/java/com/zskk/dicom/response/BaseResponse.java

@@ -0,0 +1,60 @@
+package com.zskk.dicom.response;
+
+import com.zskk.dicom.config.NetCodeConfig;
+import com.zskk.dicom.response.bean.BaseResponseBean;
+
+public class BaseResponse<T extends BaseResponseBean>{
+	private String code;
+	private String msg;
+	private Exception error;
+	private T data;
+	public BaseResponse(String code, String msg , Exception e) {
+		this.code = code;
+		this.msg = msg;
+		this.error = e;
+	}
+	
+	public String getCode() {
+		return this.code;
+	}
+	
+	public String getMsg() {
+		return this.msg;
+	}
+	
+	public Exception getError() {
+		return this.error;
+	}
+	
+	public BaseResponse setCode(String code) {
+		this.code = code;
+		return this;
+	}
+	
+	public BaseResponse setMsg(String msg) {
+		this.msg = msg;
+		return this;
+	}
+	
+	public BaseResponse setError(Exception e) {
+		this.error = e;
+		return this;
+	}
+	
+	public BaseResponse setData(T data) {
+		this.data = data;
+		return this;
+	}
+	
+	public T getData() {
+		return this.data;
+	}
+	
+	public boolean isError() {
+		return !isSuccess();
+	}
+	
+	public boolean isSuccess() {
+		return NetCodeConfig.SUCCESS.equals(this.getCode());
+	}
+}

+ 10 - 0
dicom_monitor/src/main/java/com/zskk/dicom/response/FileUploadChcekResponse.java

@@ -0,0 +1,10 @@
+package com.zskk.dicom.response;
+
+public class FileUploadChcekResponse extends BaseResponse {
+
+	public FileUploadChcekResponse(String code, String msg, Exception e) {
+		super(code, msg, e);
+	}
+
+	
+}

+ 31 - 0
dicom_monitor/src/main/java/com/zskk/dicom/response/ZskkResponseFactory.java

@@ -0,0 +1,31 @@
+package com.zskk.dicom.response;
+
+import com.zskk.dicom.config.NetCodeConfig;
+
+public class ZskkResponseFactory {
+	private static class ZskkExceptionFactoryHoler {
+		private static ZskkResponseFactory INSTANCE = new ZskkResponseFactory();
+	}
+	public static ZskkResponseFactory getInstance() {
+		return ZskkExceptionFactoryHoler.INSTANCE;
+	}
+	private ZskkResponseFactory instance;
+	private ZskkResponseFactory() {	
+		
+	}
+	public BaseResponse generateSuccess() {
+		return this.generate(NetCodeConfig.SUCCESS,null,null);
+	}
+	
+	public BaseResponse generate(String code) {
+		return this.generate(code,null,null);
+	}
+	
+	public BaseResponse generate(String code,String msg) {
+		return this.generate(code,msg,null);
+	}
+	
+	public BaseResponse generate(String code,String msg, Exception e) {
+		return new BaseResponse(code, msg, e);
+	}
+}

+ 5 - 0
dicom_monitor/src/main/java/com/zskk/dicom/response/bean/BaseResponseBean.java

@@ -0,0 +1,5 @@
+package com.zskk.dicom.response.bean;
+
+public class BaseResponseBean {
+	
+}

+ 12 - 0
dicom_monitor/src/main/java/com/zskk/dicom/response/bean/FileUploadChcekResponseBean.java

@@ -0,0 +1,12 @@
+package com.zskk.dicom.response.bean;
+
+import java.io.File;
+
+public class FileUploadChcekResponseBean extends BaseResponseBean{
+	public String filename;
+	public File file;
+	public FileUploadChcekResponseBean(String filename,File file) {
+		this.filename = filename;
+		this.file = file;
+	}
+}

+ 12 - 0
dicom_monitor/src/test/java/dicom_monitor/OSSTest.java

@@ -0,0 +1,12 @@
+package dicom_monitor;
+
+import com.zskk.dicom.oss.OSSFileHleper;
+import com.zskk.dicom.response.BaseResponse;
+
+public class OSSTest {
+	public static void main(String[] args) {
+		BaseResponse response = OSSFileHleper.getInstance().upload("/Users/fuyu/Desktop/test/test");
+		System.out.println(response.getMsg());
+		System.out.println(response.getError());
+	}
+}

+ 2 - 0
dicom_monitor/target/.gitignore

@@ -0,0 +1,2 @@
+/classes/
+/test-classes/

+ 5 - 0
dicom_monitor/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Mon Nov 05 18:00:43 CST 2018
+version=0.0.1-SNAPSHOT
+groupId=dicom_monitor
+artifactId=dicom_monitor

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

@@ -0,0 +1,39 @@
+com/zskk/dicom/monitor/monitors/FileChangeProc$1.class
+com/zskk/dicom/oss/BaseOSSHleper.class
+com/zskk/dicom/monitor/monitors/FileChangeProc$1$1.class
+com/zskk/dicom/response/FileUploadChcekResponse.class
+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/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
+com/zskk/dicom/monitor/monitors/FileChangeProc.class
+com/zskk/dicom/monitor/config/Constants.class
+com/zskk/dicom/monitor/schedules/StatTimer.class
+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
+com/zskk/dicom/monitor/uploader/UploadsQueue.class
+com/zskk/dicom/monitor/schedules/DirMonitor.class
+com/zskk/dicom/monitor/utils/LogEnginer.class
+com/zskk/dicom/monitor/uploader/FileUploader.class
+com/zskk/dicom/monitor/config/Configs.class
+com/zskk/dicom/monitor/monitors/InitMonitor.class
+META-INF/spring-autoconfigure-metadata.properties
+com/zskk/dicom/monitor/utils/MailerUtil.class
+com/zskk/dicom/monitor/report/ErrReporterSender.class
+com/zskk/dicom/monitor/schedules/StatRunner.class

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

@@ -0,0 +1,31 @@
+/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
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/monitors/FileAction.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/config/Configs.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/response/bean/BaseResponseBean.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/monitors/InitMonitor.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/schedules/StatTimer.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/utils/LogEnginer.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/response/bean/FileUploadChcekResponseBean.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/monitor/report/ErrReporterSender.java
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/main/java/com/zskk/dicom/WebStarts.java
+/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/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/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

+ 1 - 0
dicom_monitor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -0,0 +1 @@
+dicom_monitor/OSSTest.class

+ 1 - 0
dicom_monitor/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -0,0 +1 @@
+/Users/fuyu/java/zskk_uploader/dicom_monitor/src/test/java/dicom_monitor/OSSTest.java

+ 62 - 0
dicom_monitor/target/surefire-reports/TEST-dicom_monitor.OSSTest.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite tests="0" failures="0" name="dicom_monitor.OSSTest" time="0" errors="0" skipped="0">
+  <properties>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib"/>
+    <property name="java.vm.version" value="25.131-b11"/>
+    <property name="gopherProxySet" value="false"/>
+    <property name="java.vm.vendor" value="Oracle Corporation"/>
+    <property name="maven.multiModuleProjectDirectory" value="/Users/fuyu/java/zskk_uploader/dicom_monitor"/>
+    <property name="java.vendor.url" value="http://java.oracle.com/"/>
+    <property name="path.separator" value=":"/>
+    <property name="guice.disable.misplaced.annotation.check" value="true"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="user.country" value="CN"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="user.dir" value="/Users/fuyu/java/zskk_uploader/dicom_monitor"/>
+    <property name="java.runtime.version" value="1.8.0_131-b11"/>
+    <property name="java.awt.graphicsenv" value="sun.awt.CGraphicsEnvironment"/>
+    <property name="java.endorsed.dirs" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib/endorsed"/>
+    <property name="os.arch" value="x86_64"/>
+    <property name="java.io.tmpdir" value="/var/folders/vl/7z9jqsh93wb5py212ngl40v00000gn/T/"/>
+    <property name="line.separator" value="
+"/>
+    <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="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"/>
+    <property name="java.class.version" value="52.0"/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="os.version" value="10.13.6"/>
+    <property name="user.home" value="/Users/fuyu"/>
+    <property name="user.timezone" value="Asia/Shanghai"/>
+    <property name="java.awt.printerjob" value="sun.lwawt.macosx.CPrinterJob"/>
+    <property name="java.specification.version" value="1.8"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="user.name" value="fuyu"/>
+    <property name="java.class.path" value="/Applications/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.m2e.maven.runtime_1.7.0.20160603-1931/jars/plexus-classworlds-2.5.2.jar"/>
+    <property name="java.vm.specification.version" value="1.8"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="java.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre"/>
+    <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher -B install"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="user.language" value="zh"/>
+    <property name="awt.toolkit" value="sun.lwawt.macosx.LWCToolkit"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="java.version" value="1.8.0_131"/>
+    <property name="java.ext.dirs" value="/Users/fuyu/Library/Java/Extensions:/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java"/>
+    <property name="sun.boot.class.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib/resources.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib/rt.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib/sunrsasign.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib/jsse.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib/jce.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib/charsets.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/lib/jfr.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/classes"/>
+    <property name="java.vendor" value="Oracle Corporation"/>
+    <property name="maven.home" value="/Users/fuyu/java/zskk_uploader/dicom_monitor/EMBEDDED"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeBig"/>
+    <property name="sun.cpu.isalist" value=""/>
+  </properties>
+</testsuite>

+ 4 - 0
dicom_monitor/target/surefire-reports/dicom_monitor.OSSTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: dicom_monitor.OSSTest
+-------------------------------------------------------------------------------
+Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec

BIN
dicom_monitor/target/zskk-dicom-monitor-jar-with-dependencies.jar


BIN
dicom_monitor/target/zskk-dicom-monitor.jar


BIN
dicom_monitor/target/zskk-dicom-monitor.jar.original