wdy

6fd63b88 · v_vdywang · 291e6037 · 2862ef1f · 6fd63b88 · 6fd63b88
Commit 6fd63b88 authored Sep 09, 2020 by v_vdywang
9 changed files
--- a/alioss-java/target/classes/com/example/aliossjava/AliossJavaApplication.class
+++ b/alioss-java/target/classes/com/example/aliossjava/AliossJavaApplication.class
--- a/alioss-java/target/classes/com/example/aliossjava/testuploadossapi.class
+++ b/alioss-java/target/classes/com/example/aliossjava/testuploadossapi.class
--- a/alioss-java/target/classes/com/example/aliossjava/uploadossapi.class
+++ b/alioss-java/target/classes/com/example/aliossjava/uploadossapi.class
--- a/alioss-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/alioss-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+com\example\aliossjava\AliossJavaApplication.class
 com\example\aliossjava\testuploadossapi.class
+com\example\aliossjava\uploadossapi.class
+com\example\aliossjava\utilupload.class
--- a/alioss-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/alioss-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
-F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\testuploadossapi.java
+D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\uploadossapi.java
-F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\AliossJavaApplication.java
+D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\utilupload.java
-F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\uploadossapi.java
+D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\testuploadossapi.java
-F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\utilupload.java
+D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\AliossJavaApplication.java
--- a/alioss-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/alioss-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+com\example\aliossjava\AliossJavaApplicationTests.class
--- a/alioss-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/alioss-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
-F:\新建文件夹\alioss-java\zhichan\alioss-java\src\test\java\com\example\aliossjava\AliossJavaApplicationTests.java
+D:\alidemo\zhichan\alioss-java\src\test\java\com\example\aliossjava\AliossJavaApplicationTests.java
--- a/alioss-java/target/surefire-reports/TEST-com.example.aliossjava.AliossJavaApplicationTests.xml
+++ b/alioss-java/target/surefire-reports/TEST-com.example.aliossjava.AliossJavaApplicationTests.xml
 <?xml version="1.0" encoding="UTF-8"?>
+<<<<<<< HEAD
 <testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.example.aliossjava.AliossJavaApplicationTests" time="3.428" tests="1" errors="0" skipped="0" failures="0">
+=======
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.example.aliossjava.AliossJavaApplicationTests" time="2.933" tests="1" errors="0" skipped="0" failures="0">
+>>>>>>> 2862ef1fdb112a293158fc3a4e90950cf5be1ece
  <properties>
    <property name="sun.desktop" value="windows"/>
    <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/>
@@ -7,59 +11,79 @@
    <property name="java.specification.version" value="1.8"/>
    <property name="sun.cpu.isalist" value="amd64"/>
    <property name="sun.jnu.encoding" value="GBK"/>
-    <property name="java.class.path" value="F:\新建文件夹\alioss-java\zhichan\alioss-java\target\test-classes;F:\新建文件夹\alioss-java\zhichan\alioss-java\target\classes;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-web\2.2.6.RELEASE\spring-boot-starter-web-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter\2.2.6.RELEASE\spring-boot-starter-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot\2.2.6.RELEASE\spring-boot-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\2.2.6.RELEASE\spring-boot-autoconfigure-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-logging\2.2.6.RELEASE\spring-boot-starter-logging-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\ch\qos\logback\logback-classic\1.2.3\logback-classic-1.2.3.jar;C:\Users\wdy\.m2\repository\ch\qos\logback\logback-core\1.2.3\logback-core-1.2.3.jar;C:\Users\wdy\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.12.1\log4j-to-slf4j-2.12.1.jar;C:\Users\wdy\.m2\repository\org\apache\logging\log4j\log4j-api\2.12.1\log4j-api-2.12.1.jar;C:\Users\wdy\.m2\repository\org\slf4j\jul-to-slf4j\1.7.30\jul-to-slf4j-1.7.30.jar;C:\Users\wdy\.m2\repository\jakarta\annotation\jakarta.annotation-api\1.3.5\jakarta.annotation-api-1.3.5.jar;C:\Users\wdy\.m2\repository\org\yaml\snakeyaml\1.25\snakeyaml-1.25.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-json\2.2.6.RELEASE\spring-boot-starter-json-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.10.3\jackson-databind-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.10.3\jackson-annotations-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.10.3\jackson-core-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jdk8\2.10.3\jackson-datatype-jdk8-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jsr310\2.10.3\jackson-datatype-jsr310-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\module\jackson-module-parameter-names\2.10.3\jackson-module-parameter-names-2.10.3.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\2.2.6.RELEASE\spring-boot-starter-tomcat-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\9.0.33\tomcat-embed-core-9.0.33.jar;C:\Users\wdy\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\9.0.33\tomcat-embed-el-9.0.33.jar;C:\Users\wdy\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\9.0.33\tomcat-embed-websocket-9.0.33.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-validation\2.2.6.RELEASE\spring-boot-starter-validation-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\jakarta\validation\jakarta.validation-api\2.0.2\jakarta.validation-api-2.0.2.jar;C:\Users\wdy\.m2\repository\org\hibernate\validator\hibernate-validator\6.0.18.Final\hibernate-validator-6.0.18.Final.jar;C:\Users\wdy\.m2\repository\org\jboss\logging\jboss-logging\3.4.1.Final\jboss-logging-3.4.1.Final.jar;C:\Users\wdy\.m2\repository\com\fasterxml\classmate\1.5.1\classmate-1.5.1.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-web\5.2.5.RELEASE\spring-web-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-beans\5.2.5.RELEASE\spring-beans-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-webmvc\5.2.5.RELEASE\spring-webmvc-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-aop\5.2.5.RELEASE\spring-aop-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-context\5.2.5.RELEASE\spring-context-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-expression\5.2.5.RELEASE\spring-expression-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\com\alibaba\fastjson\1.2.9\fastjson-1.2.9.jar;C:\Users\wdy\.m2\repository\commons-io\commons-io\2.4\commons-io-2.4.jar;C:\Users\wdy\.m2\repository\commons-fileupload\commons-fileupload\1.3.3\commons-fileupload-1.3.3.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-test\2.2.6.RELEASE\spring-boot-starter-test-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-test\2.2.6.RELEASE\spring-boot-test-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\2.2.6.RELEASE\spring-boot-test-autoconfigure-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\com\jayway\jsonpath\json-path\2.4.0\json-path-2.4.0.jar;C:\Users\wdy\.m2\repository\net\minidev\json-smart\2.3\json-smart-2.3.jar;C:\Users\wdy\.m2\repository\net\minidev\accessors-smart\1.2\accessors-smart-1.2.jar;C:\Users\wdy\.m2\repository\org\ow2\asm\asm\5.0.4\asm-5.0.4.jar;C:\Users\wdy\.m2\repository\org\slf4j\slf4j-api\1.7.30\slf4j-api-1.7.30.jar;C:\Users\wdy\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\2.3.3\jakarta.xml.bind-api-2.3.3.jar;C:\Users\wdy\.m2\repository\jakarta\activation\jakarta.activation-api\1.2.2\jakarta.activation-api-1.2.2.jar;C:\Users\wdy\.m2\repository\org\junit\jupiter\junit-jupiter\5.5.2\junit-jupiter-5.5.2.jar;C:\Users\wdy\.m2\repository\org\junit\jupiter\junit-jupiter-api\5.5.2\junit-jupiter-api-5.5.2.jar;C:\Users\wdy\.m2\repository\org\apiguardian\apiguardian-api\1.1.0\apiguardian-api-1.1.0.jar;C:\Users\wdy\.m2\repository\org\opentest4j\opentest4j\1.2.0\opentest4j-1.2.0.jar;C:\Users\wdy\.m2\repository\org\junit\platform\junit-platform-commons\1.5.2\junit-platform-commons-1.5.2.jar;C:\Users\wdy\.m2\repository\org\junit\jupiter\junit-jupiter-params\5.5.2\junit-jupiter-params-5.5.2.jar;C:\Users\wdy\.m2\repository\org\junit\jupiter\junit-jupiter-engine\5.5.2\junit-jupiter-engine-5.5.2.jar;C:\Users\wdy\.m2\repository\org\junit\platform\junit-platform-engine\1.5.2\junit-platform-engine-1.5.2.jar;C:\Users\wdy\.m2\repository\org\mockito\mockito-junit-jupiter\3.1.0\mockito-junit-jupiter-3.1.0.jar;C:\Users\wdy\.m2\repository\org\assertj\assertj-core\3.13.2\assertj-core-3.13.2.jar;C:\Users\wdy\.m2\repository\org\hamcrest\hamcrest\2.1\hamcrest-2.1.jar;C:\Users\wdy\.m2\repository\org\mockito\mockito-core\3.1.0\mockito-core-3.1.0.jar;C:\Users\wdy\.m2\repository\net\bytebuddy\byte-buddy\1.10.8\byte-buddy-1.10.8.jar;C:\Users\wdy\.m2\repository\net\bytebuddy\byte-buddy-agent\1.10.8\byte-buddy-agent-1.10.8.jar;C:\Users\wdy\.m2\repository\org\objenesis\objenesis\2.6\objenesis-2.6.jar;C:\Users\wdy\.m2\repository\org\skyscreamer\jsonassert\1.5.0\jsonassert-1.5.0.jar;C:\Users\wdy\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-core\5.2.5.RELEASE\spring-core-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-jcl\5.2.5.RELEASE\spring-jcl-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-test\5.2.5.RELEASE\spring-test-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\xmlunit\xmlunit-core\2.6.4\xmlunit-core-2.6.4.jar;"/>
+    <property name="java.class.path" value="D:\alidemo\zhichan\alioss-java\target\test-classes;D:\alidemo\zhichan\alioss-java\target\classes;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-web\2.2.6.RELEASE\spring-boot-starter-web-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter\2.2.6.RELEASE\spring-boot-starter-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot\2.2.6.RELEASE\spring-boot-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-autoconfigure\2.2.6.RELEASE\spring-boot-autoconfigure-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-logging\2.2.6.RELEASE\spring-boot-starter-logging-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\ch\qos\logback\logback-classic\1.2.3\logback-classic-1.2.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\ch\qos\logback\logback-core\1.2.3\logback-core-1.2.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\logging\log4j\log4j-to-slf4j\2.12.1\log4j-to-slf4j-2.12.1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\logging\log4j\log4j-api\2.12.1\log4j-api-2.12.1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\slf4j\jul-to-slf4j\1.7.30\jul-to-slf4j-1.7.30.jar;D:\RnunJavaHome\dev\mavenlocalrepository\jakarta\annotation\jakarta.annotation-api\1.3.5\jakarta.annotation-api-1.3.5.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\yaml\snakeyaml\1.25\snakeyaml-1.25.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-json\2.2.6.RELEASE\spring-boot-starter-json-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\core\jackson-databind\2.10.3\jackson-databind-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\core\jackson-annotations\2.10.3\jackson-annotations-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\core\jackson-core\2.10.3\jackson-core-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\datatype\jackson-datatype-jdk8\2.10.3\jackson-datatype-jdk8-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\datatype\jackson-datatype-jsr310\2.10.3\jackson-datatype-jsr310-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\module\jackson-module-parameter-names\2.10.3\jackson-module-parameter-names-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-tomcat\2.2.6.RELEASE\spring-boot-starter-tomcat-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\tomcat\embed\tomcat-embed-core\9.0.33\tomcat-embed-core-9.0.33.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\tomcat\embed\tomcat-embed-el\9.0.33\tomcat-embed-el-9.0.33.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\tomcat\embed\tomcat-embed-websocket\9.0.33\tomcat-embed-websocket-9.0.33.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-validation\2.2.6.RELEASE\spring-boot-starter-validation-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\jakarta\validation\jakarta.validation-api\2.0.2\jakarta.validation-api-2.0.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\hibernate\validator\hibernate-validator\6.0.18.Final\hibernate-validator-6.0.18.Final.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\jboss\logging\jboss-logging\3.4.1.Final\jboss-logging-3.4.1.Final.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\classmate\1.5.1\classmate-1.5.1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-web\5.2.5.RELEASE\spring-web-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-beans\5.2.5.RELEASE\spring-beans-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-webmvc\5.2.5.RELEASE\spring-webmvc-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-aop\5.2.5.RELEASE\spring-aop-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-context\5.2.5.RELEASE\spring-context-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-expression\5.2.5.RELEASE\spring-expression-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\alibaba\fastjson\1.2.9\fastjson-1.2.9.jar;D:\RnunJavaHome\dev\mavenlocalrepository\commons-io\commons-io\2.4\commons-io-2.4.jar;D:\RnunJavaHome\dev\mavenlocalrepository\commons-fileupload\commons-fileupload\1.3.3\commons-fileupload-1.3.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-test\2.2.6.RELEASE\spring-boot-starter-test-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-test\2.2.6.RELEASE\spring-boot-test-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-test-autoconfigure\2.2.6.RELEASE\spring-boot-test-autoconfigure-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\jayway\jsonpath\json-path\2.4.0\json-path-2.4.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\net\minidev\json-smart\2.3\json-smart-2.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\net\minidev\accessors-smart\1.2\accessors-smart-1.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\ow2\asm\asm\5.0.4\asm-5.0.4.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\slf4j\slf4j-api\1.7.30\slf4j-api-1.7.30.jar;D:\RnunJavaHome\dev\mavenlocalrepository\jakarta\xml\bind\jakarta.xml.bind-api\2.3.3\jakarta.xml.bind-api-2.3.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\jakarta\activation\jakarta.activation-api\1.2.2\jakarta.activation-api-1.2.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\jupiter\junit-jupiter\5.5.2\junit-jupiter-5.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\jupiter\junit-jupiter-api\5.5.2\junit-jupiter-api-5.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apiguardian\apiguardian-api\1.1.0\apiguardian-api-1.1.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\opentest4j\opentest4j\1.2.0\opentest4j-1.2.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\platform\junit-platform-commons\1.5.2\junit-platform-commons-1.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\jupiter\junit-jupiter-params\5.5.2\junit-jupiter-params-5.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\jupiter\junit-jupiter-engine\5.5.2\junit-jupiter-engine-5.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\platform\junit-platform-engine\1.5.2\junit-platform-engine-1.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\mockito\mockito-junit-jupiter\3.1.0\mockito-junit-jupiter-3.1.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\assertj\assertj-core\3.13.2\assertj-core-3.13.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\hamcrest\hamcrest\2.1\hamcrest-2.1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\mockito\mockito-core\3.1.0\mockito-core-3.1.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\net\bytebuddy\byte-buddy\1.10.8\byte-buddy-1.10.8.jar;D:\RnunJavaHome\dev\mavenlocalrepository\net\bytebuddy\byte-buddy-agent\1.10.8\byte-buddy-agent-1.10.8.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\objenesis\objenesis\2.6\objenesis-2.6.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\skyscreamer\jsonassert\1.5.0\jsonassert-1.5.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-core\5.2.5.RELEASE\spring-core-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-jcl\5.2.5.RELEASE\spring-jcl-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-test\5.2.5.RELEASE\spring-test-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\xmlunit\xmlunit-core\2.6.4\xmlunit-core-2.6.4.jar;"/>
    <property name="java.vm.vendor" value="Oracle Corporation"/>
    <property name="sun.arch.data.model" value="64"/>
    <property name="user.variant" value=""/>
    <property name="java.vendor.url" value="http://java.oracle.com/"/>
    <property name="user.timezone" value="Asia/Shanghai"/>
    <property name="java.vm.specification.version" value="1.8"/>
-    <property name="os.name" value="Windows 10"/>
+    <property name="os.name" value="Windows 8.1"/>
    <property name="user.country" value="CN"/>
    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+<<<<<<< HEAD
    <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.8.0_91\jre\bin"/>
    <property name="sun.java.command" value="C:\Users\wdy\AppData\Local\Temp\surefire6516678704315607524\surefirebooter5331245032446660966.jar C:\Users\wdy\AppData\Local\Temp\surefire6516678704315607524 2020-09-09T17-36-18_679-jvmRun1 surefire8062837679567369424tmp surefire_04942008825241610738tmp"/>
    <property name="surefire.test.class.path" value="F:\新建文件夹\alioss-java\zhichan\alioss-java\target\test-classes;F:\新建文件夹\alioss-java\zhichan\alioss-java\target\classes;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-web\2.2.6.RELEASE\spring-boot-starter-web-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter\2.2.6.RELEASE\spring-boot-starter-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot\2.2.6.RELEASE\spring-boot-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\2.2.6.RELEASE\spring-boot-autoconfigure-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-logging\2.2.6.RELEASE\spring-boot-starter-logging-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\ch\qos\logback\logback-classic\1.2.3\logback-classic-1.2.3.jar;C:\Users\wdy\.m2\repository\ch\qos\logback\logback-core\1.2.3\logback-core-1.2.3.jar;C:\Users\wdy\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.12.1\log4j-to-slf4j-2.12.1.jar;C:\Users\wdy\.m2\repository\org\apache\logging\log4j\log4j-api\2.12.1\log4j-api-2.12.1.jar;C:\Users\wdy\.m2\repository\org\slf4j\jul-to-slf4j\1.7.30\jul-to-slf4j-1.7.30.jar;C:\Users\wdy\.m2\repository\jakarta\annotation\jakarta.annotation-api\1.3.5\jakarta.annotation-api-1.3.5.jar;C:\Users\wdy\.m2\repository\org\yaml\snakeyaml\1.25\snakeyaml-1.25.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-json\2.2.6.RELEASE\spring-boot-starter-json-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.10.3\jackson-databind-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.10.3\jackson-annotations-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.10.3\jackson-core-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jdk8\2.10.3\jackson-datatype-jdk8-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jsr310\2.10.3\jackson-datatype-jsr310-2.10.3.jar;C:\Users\wdy\.m2\repository\com\fasterxml\jackson\module\jackson-module-parameter-names\2.10.3\jackson-module-parameter-names-2.10.3.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\2.2.6.RELEASE\spring-boot-starter-tomcat-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\9.0.33\tomcat-embed-core-9.0.33.jar;C:\Users\wdy\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\9.0.33\tomcat-embed-el-9.0.33.jar;C:\Users\wdy\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\9.0.33\tomcat-embed-websocket-9.0.33.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-validation\2.2.6.RELEASE\spring-boot-starter-validation-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\jakarta\validation\jakarta.validation-api\2.0.2\jakarta.validation-api-2.0.2.jar;C:\Users\wdy\.m2\repository\org\hibernate\validator\hibernate-validator\6.0.18.Final\hibernate-validator-6.0.18.Final.jar;C:\Users\wdy\.m2\repository\org\jboss\logging\jboss-logging\3.4.1.Final\jboss-logging-3.4.1.Final.jar;C:\Users\wdy\.m2\repository\com\fasterxml\classmate\1.5.1\classmate-1.5.1.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-web\5.2.5.RELEASE\spring-web-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-beans\5.2.5.RELEASE\spring-beans-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-webmvc\5.2.5.RELEASE\spring-webmvc-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-aop\5.2.5.RELEASE\spring-aop-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-context\5.2.5.RELEASE\spring-context-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-expression\5.2.5.RELEASE\spring-expression-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\com\alibaba\fastjson\1.2.9\fastjson-1.2.9.jar;C:\Users\wdy\.m2\repository\commons-io\commons-io\2.4\commons-io-2.4.jar;C:\Users\wdy\.m2\repository\commons-fileupload\commons-fileupload\1.3.3\commons-fileupload-1.3.3.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-starter-test\2.2.6.RELEASE\spring-boot-starter-test-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-test\2.2.6.RELEASE\spring-boot-test-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\2.2.6.RELEASE\spring-boot-test-autoconfigure-2.2.6.RELEASE.jar;C:\Users\wdy\.m2\repository\com\jayway\jsonpath\json-path\2.4.0\json-path-2.4.0.jar;C:\Users\wdy\.m2\repository\net\minidev\json-smart\2.3\json-smart-2.3.jar;C:\Users\wdy\.m2\repository\net\minidev\accessors-smart\1.2\accessors-smart-1.2.jar;C:\Users\wdy\.m2\repository\org\ow2\asm\asm\5.0.4\asm-5.0.4.jar;C:\Users\wdy\.m2\repository\org\slf4j\slf4j-api\1.7.30\slf4j-api-1.7.30.jar;C:\Users\wdy\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\2.3.3\jakarta.xml.bind-api-2.3.3.jar;C:\Users\wdy\.m2\repository\jakarta\activation\jakarta.activation-api\1.2.2\jakarta.activation-api-1.2.2.jar;C:\Users\wdy\.m2\repository\org\junit\jupiter\junit-jupiter\5.5.2\junit-jupiter-5.5.2.jar;C:\Users\wdy\.m2\repository\org\junit\jupiter\junit-jupiter-api\5.5.2\junit-jupiter-api-5.5.2.jar;C:\Users\wdy\.m2\repository\org\apiguardian\apiguardian-api\1.1.0\apiguardian-api-1.1.0.jar;C:\Users\wdy\.m2\repository\org\opentest4j\opentest4j\1.2.0\opentest4j-1.2.0.jar;C:\Users\wdy\.m2\repository\org\junit\platform\junit-platform-commons\1.5.2\junit-platform-commons-1.5.2.jar;C:\Users\wdy\.m2\repository\org\junit\jupiter\junit-jupiter-params\5.5.2\junit-jupiter-params-5.5.2.jar;C:\Users\wdy\.m2\repository\org\junit\jupiter\junit-jupiter-engine\5.5.2\junit-jupiter-engine-5.5.2.jar;C:\Users\wdy\.m2\repository\org\junit\platform\junit-platform-engine\1.5.2\junit-platform-engine-1.5.2.jar;C:\Users\wdy\.m2\repository\org\mockito\mockito-junit-jupiter\3.1.0\mockito-junit-jupiter-3.1.0.jar;C:\Users\wdy\.m2\repository\org\assertj\assertj-core\3.13.2\assertj-core-3.13.2.jar;C:\Users\wdy\.m2\repository\org\hamcrest\hamcrest\2.1\hamcrest-2.1.jar;C:\Users\wdy\.m2\repository\org\mockito\mockito-core\3.1.0\mockito-core-3.1.0.jar;C:\Users\wdy\.m2\repository\net\bytebuddy\byte-buddy\1.10.8\byte-buddy-1.10.8.jar;C:\Users\wdy\.m2\repository\net\bytebuddy\byte-buddy-agent\1.10.8\byte-buddy-agent-1.10.8.jar;C:\Users\wdy\.m2\repository\org\objenesis\objenesis\2.6\objenesis-2.6.jar;C:\Users\wdy\.m2\repository\org\skyscreamer\jsonassert\1.5.0\jsonassert-1.5.0.jar;C:\Users\wdy\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-core\5.2.5.RELEASE\spring-core-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-jcl\5.2.5.RELEASE\spring-jcl-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\springframework\spring-test\5.2.5.RELEASE\spring-test-5.2.5.RELEASE.jar;C:\Users\wdy\.m2\repository\org\xmlunit\xmlunit-core\2.6.4\xmlunit-core-2.6.4.jar;"/>
+=======
+    <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk1.8.0_40\jre\bin"/>
+    <property name="sun.java.command" value="C:\Users\songyi\AppData\Local\Temp\surefire7688023422082374404\surefirebooter2706562821622167788.jar C:\Users\songyi\AppData\Local\Temp\surefire7688023422082374404 2020-04-09T19-04-01_790-jvmRun1 surefire7373327704889716059tmp surefire_08619270591479012539tmp"/>
+    <property name="surefire.test.class.path" value="D:\alidemo\zhichan\alioss-java\target\test-classes;D:\alidemo\zhichan\alioss-java\target\classes;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-web\2.2.6.RELEASE\spring-boot-starter-web-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter\2.2.6.RELEASE\spring-boot-starter-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot\2.2.6.RELEASE\spring-boot-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-autoconfigure\2.2.6.RELEASE\spring-boot-autoconfigure-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-logging\2.2.6.RELEASE\spring-boot-starter-logging-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\ch\qos\logback\logback-classic\1.2.3\logback-classic-1.2.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\ch\qos\logback\logback-core\1.2.3\logback-core-1.2.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\logging\log4j\log4j-to-slf4j\2.12.1\log4j-to-slf4j-2.12.1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\logging\log4j\log4j-api\2.12.1\log4j-api-2.12.1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\slf4j\jul-to-slf4j\1.7.30\jul-to-slf4j-1.7.30.jar;D:\RnunJavaHome\dev\mavenlocalrepository\jakarta\annotation\jakarta.annotation-api\1.3.5\jakarta.annotation-api-1.3.5.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\yaml\snakeyaml\1.25\snakeyaml-1.25.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-json\2.2.6.RELEASE\spring-boot-starter-json-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\core\jackson-databind\2.10.3\jackson-databind-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\core\jackson-annotations\2.10.3\jackson-annotations-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\core\jackson-core\2.10.3\jackson-core-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\datatype\jackson-datatype-jdk8\2.10.3\jackson-datatype-jdk8-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\datatype\jackson-datatype-jsr310\2.10.3\jackson-datatype-jsr310-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\jackson\module\jackson-module-parameter-names\2.10.3\jackson-module-parameter-names-2.10.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-tomcat\2.2.6.RELEASE\spring-boot-starter-tomcat-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\tomcat\embed\tomcat-embed-core\9.0.33\tomcat-embed-core-9.0.33.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\tomcat\embed\tomcat-embed-el\9.0.33\tomcat-embed-el-9.0.33.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apache\tomcat\embed\tomcat-embed-websocket\9.0.33\tomcat-embed-websocket-9.0.33.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-validation\2.2.6.RELEASE\spring-boot-starter-validation-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\jakarta\validation\jakarta.validation-api\2.0.2\jakarta.validation-api-2.0.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\hibernate\validator\hibernate-validator\6.0.18.Final\hibernate-validator-6.0.18.Final.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\jboss\logging\jboss-logging\3.4.1.Final\jboss-logging-3.4.1.Final.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\fasterxml\classmate\1.5.1\classmate-1.5.1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-web\5.2.5.RELEASE\spring-web-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-beans\5.2.5.RELEASE\spring-beans-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-webmvc\5.2.5.RELEASE\spring-webmvc-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-aop\5.2.5.RELEASE\spring-aop-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-context\5.2.5.RELEASE\spring-context-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-expression\5.2.5.RELEASE\spring-expression-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\alibaba\fastjson\1.2.9\fastjson-1.2.9.jar;D:\RnunJavaHome\dev\mavenlocalrepository\commons-io\commons-io\2.4\commons-io-2.4.jar;D:\RnunJavaHome\dev\mavenlocalrepository\commons-fileupload\commons-fileupload\1.3.3\commons-fileupload-1.3.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-starter-test\2.2.6.RELEASE\spring-boot-starter-test-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-test\2.2.6.RELEASE\spring-boot-test-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\boot\spring-boot-test-autoconfigure\2.2.6.RELEASE\spring-boot-test-autoconfigure-2.2.6.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\jayway\jsonpath\json-path\2.4.0\json-path-2.4.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\net\minidev\json-smart\2.3\json-smart-2.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\net\minidev\accessors-smart\1.2\accessors-smart-1.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\ow2\asm\asm\5.0.4\asm-5.0.4.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\slf4j\slf4j-api\1.7.30\slf4j-api-1.7.30.jar;D:\RnunJavaHome\dev\mavenlocalrepository\jakarta\xml\bind\jakarta.xml.bind-api\2.3.3\jakarta.xml.bind-api-2.3.3.jar;D:\RnunJavaHome\dev\mavenlocalrepository\jakarta\activation\jakarta.activation-api\1.2.2\jakarta.activation-api-1.2.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\jupiter\junit-jupiter\5.5.2\junit-jupiter-5.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\jupiter\junit-jupiter-api\5.5.2\junit-jupiter-api-5.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\apiguardian\apiguardian-api\1.1.0\apiguardian-api-1.1.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\opentest4j\opentest4j\1.2.0\opentest4j-1.2.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\platform\junit-platform-commons\1.5.2\junit-platform-commons-1.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\jupiter\junit-jupiter-params\5.5.2\junit-jupiter-params-5.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\jupiter\junit-jupiter-engine\5.5.2\junit-jupiter-engine-5.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\junit\platform\junit-platform-engine\1.5.2\junit-platform-engine-1.5.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\mockito\mockito-junit-jupiter\3.1.0\mockito-junit-jupiter-3.1.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\assertj\assertj-core\3.13.2\assertj-core-3.13.2.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\hamcrest\hamcrest\2.1\hamcrest-2.1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\mockito\mockito-core\3.1.0\mockito-core-3.1.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\net\bytebuddy\byte-buddy\1.10.8\byte-buddy-1.10.8.jar;D:\RnunJavaHome\dev\mavenlocalrepository\net\bytebuddy\byte-buddy-agent\1.10.8\byte-buddy-agent-1.10.8.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\objenesis\objenesis\2.6\objenesis-2.6.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\skyscreamer\jsonassert\1.5.0\jsonassert-1.5.0.jar;D:\RnunJavaHome\dev\mavenlocalrepository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-core\5.2.5.RELEASE\spring-core-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-jcl\5.2.5.RELEASE\spring-jcl-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\springframework\spring-test\5.2.5.RELEASE\spring-test-5.2.5.RELEASE.jar;D:\RnunJavaHome\dev\mavenlocalrepository\org\xmlunit\xmlunit-core\2.6.4\xmlunit-core-2.6.4.jar;"/>
+>>>>>>> 2862ef1fdb112a293158fc3a4e90950cf5be1ece
    <property name="sun.cpu.endian" value="little"/>
-    <property name="user.home" value="C:\Users\wdy"/>
+    <property name="user.home" value="C:\Users\songyi"/>
    <property name="user.language" value="zh"/>
    <property name="java.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.home" value="C:\Program Files\Java\jdk1.8.0_91\jre"/>
+    <property name="java.home" value="C:\Program Files\Java\jdk1.8.0_40\jre"/>
-    <property name="basedir" value="F:\新建文件夹\alioss-java\zhichan\alioss-java"/>
+    <property name="basedir" value="D:\alidemo\zhichan\alioss-java"/>
    <property name="file.separator" value="\"/>
    <property name="line.separator" value="&#10;"/>
    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
    <property name="java.specification.name" value="Java Platform API Specification"/>
    <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/>
+<<<<<<< HEAD
    <property name="surefire.real.class.path" value="C:\Users\wdy\AppData\Local\Temp\surefire6516678704315607524\surefirebooter5331245032446660966.jar"/>
    <property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.8.0_91\jre\lib\resources.jar;C:\Program Files\Java\jdk1.8.0_91\jre\lib\rt.jar;C:\Program Files\Java\jdk1.8.0_91\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.8.0_91\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.8.0_91\jre\lib\jce.jar;C:\Program Files\Java\jdk1.8.0_91\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.8.0_91\jre\lib\jfr.jar;C:\Program Files\Java\jdk1.8.0_91\jre\classes"/>
+=======
+    <property name="surefire.real.class.path" value="C:\Users\songyi\AppData\Local\Temp\surefire7688023422082374404\surefirebooter2706562821622167788.jar"/>
+    <property name="sun.boot.class.path" value="C:\Program Files\Java\jdk1.8.0_40\jre\lib\resources.jar;C:\Program Files\Java\jdk1.8.0_40\jre\lib\rt.jar;C:\Program Files\Java\jdk1.8.0_40\jre\lib\sunrsasign.jar;C:\Program Files\Java\jdk1.8.0_40\jre\lib\jsse.jar;C:\Program Files\Java\jdk1.8.0_40\jre\lib\jce.jar;C:\Program Files\Java\jdk1.8.0_40\jre\lib\charsets.jar;C:\Program Files\Java\jdk1.8.0_40\jre\lib\jfr.jar;C:\Program Files\Java\jdk1.8.0_40\jre\classes"/>
+>>>>>>> 2862ef1fdb112a293158fc3a4e90950cf5be1ece
    <property name="user.script" value=""/>
    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
-    <property name="java.runtime.version" value="1.8.0_91-b15"/>
+    <property name="java.runtime.version" value="1.8.0_40-b26"/>
-    <property name="user.name" value="wdy"/>
+    <property name="user.name" value="songyi"/>
    <property name="path.separator" value=";"/>
-    <property name="os.version" value="10.0"/>
+    <property name="os.version" value="6.3"/>
-    <property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.8.0_91\jre\lib\endorsed"/>
+    <property name="java.endorsed.dirs" value="C:\Program Files\Java\jdk1.8.0_40\jre\lib\endorsed"/>
    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
    <property name="file.encoding" value="GBK"/>
    <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
-    <property name="localRepository" value="C:\Users\wdy\.m2\repository"/>
+    <property name="localRepository" value="D:\RnunJavaHome\dev\mavenlocalrepository"/>
    <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
-    <property name="java.io.tmpdir" value="C:\Users\wdy\AppData\Local\Temp\"/>
+    <property name="java.io.tmpdir" value="C:\Users\songyi\AppData\Local\Temp\"/>
-    <property name="idea.version" value="2017.2.5"/>
+    <property name="java.version" value="1.8.0_40"/>
-    <property name="java.version" value="1.8.0_91"/>
+    <property name="user.dir" value="D:\alidemo\zhichan\alioss-java"/>
-    <property name="user.dir" value="F:\新建文件夹\alioss-java\zhichan\alioss-java"/>
    <property name="os.arch" value="amd64"/>
    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
    <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/>
    <property name="sun.os.patch.level" value=""/>
+<<<<<<< HEAD
    <property name="java.library.path" value="C:\Program Files\Java\jdk1.8.0_91\jre\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\Java\jdk1.8.0_91\bin;,D:\apache-maven-3.3.9-bin\apache-maven-3.3.9\bin;C:\Program Files\MySQL\MySQL Utilities 1.6\;C:\Program Files\nodejs\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\MySQL\MySQL Server 5.7\bin;D:\gradle-4.5-bin\gradle-4.5\bin;E:\Programs\Python\Python37\;D:\apache-maven-3.3.9-bin\apache-maven-3.3.9\bin;;D:\Microsoft VS Code\bin;E:\Programs\Python\Python37\Scripts\;E:\Programs\Python\Python37\;C:\Users\wdy\AppData\Local\Microsoft\WindowsApps;C:\Users\wdy\AppData\Roaming\npm;;."/>
+=======
+    <property name="idea.version2019.3.3" value="true"/>
+    <property name="java.library.path" value="C:\Program Files\Java\jdk1.8.0_40\jre\bin;C:\Windows\Sun\Java\bin;C:\Windows\system32;C:\Windows;C:\Program Files (x86)\NetSarang\Xftp 6\;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Java\jdk1.8.0_40\bin;C:\Program Files\Java\jdk1.8.0_40\jre\bin;D:\RunTools\gradle\gradle-4.7\bin;D:\RunTools\apache-maven-3.1.1\bin;C:\Program Files\Git\cmd;C:\Program Files\TortoiseGit\bin;C:\Program Files (x86)\MySQL\MySQL Server 5.7\bin;C:\Program Files\nodejs\;C:\Users\songyi\AppData\Local\Programs\Python\Python37;C:\Users\songyi\AppData\Local\Programs\Python\Python37\Scripts;;C:\Program Files\IDM Computer Solutions\UltraEdit;C:\Users\songyi\AppData\Local\Microsoft\WindowsApps;c:\Users\songyi\AppData\Local\Programs\Fiddler;C:\Users\songyi\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\songyi\AppData\Roaming\npm;C:\Users\songyi\AppData\Local\BypassRuntm;C:\Program Files\OpenSSL-Win64\bin;;."/>
+>>>>>>> 2862ef1fdb112a293158fc3a4e90950cf5be1ece
    <property name="java.vm.info" value="mixed mode"/>
    <property name="java.vendor" value="Oracle Corporation"/>
-    <property name="java.vm.version" value="25.91-b15"/>
+    <property name="java.vm.version" value="25.40-b25"/>
-    <property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.8.0_91\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/>
+    <property name="java.ext.dirs" value="C:\Program Files\Java\jdk1.8.0_40\jre\lib\ext;C:\Windows\Sun\Java\lib\ext"/>
    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="maven.repo.local" value="D:\RnunJavaHome\dev\mavenlocalrepository"/>
    <property name="java.class.version" value="52.0"/>
  </properties>
+<<<<<<< HEAD
  <testcase name="contextLoads" classname="com.example.aliossjava.AliossJavaApplicationTests" time="1.109"/>
+=======
+  <testcase name="contextLoads" classname="com.example.aliossjava.AliossJavaApplicationTests" time="0.157"/>
+>>>>>>> 2862ef1fdb112a293158fc3a4e90950cf5be1ece
 </testsuite>
\ No newline at end of file
--- a/alioss-java/target/surefire-reports/com.example.aliossjava.AliossJavaApplicationTests.txt
+++ b/alioss-java/target/surefire-reports/com.example.aliossjava.AliossJavaApplicationTests.txt
 -------------------------------------------------------------------------------
 Test set: com.example.aliossjava.AliossJavaApplicationTests
 -------------------------------------------------------------------------------
+<<<<<<< HEAD
 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.428 s - in com.example.aliossjava.AliossJavaApplicationTests
+=======
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.933 s - in com.example.aliossjava.AliossJavaApplicationTests
+>>>>>>> 2862ef1fdb112a293158fc3a4e90950cf5be1ece