wdy

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

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
-F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\AliossJavaApplication.java
-F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\uploadossapi.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\uploadossapi.java
+D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\utilupload.java
+D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\testuploadossapi.java
+D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\AliossJavaApplication.java

alioss-java/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

+com\example\aliossjava\AliossJavaApplicationTests.class

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

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