提交代码

3 years ago · 8288e62357
parent 23215294cf
commit 8288e62357
17 changed files with 1 additions and 44 deletions
--- a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
--- a/hai-msg/target/classes/com/msg/config/AuthConfig$1.class
+++ b/hai-msg/target/classes/com/msg/config/AuthConfig$1.class
--- a/hai-msg/target/classes/com/msg/config/AuthConfig.class
+++ b/hai-msg/target/classes/com/msg/config/AuthConfig.class
--- a/hai-msg/target/classes/com/msg/config/ConfigListener.class
+++ b/hai-msg/target/classes/com/msg/config/ConfigListener.class
--- a/hai-msg/target/classes/com/msg/config/CorsConfig.class
+++ b/hai-msg/target/classes/com/msg/config/CorsConfig.class
--- a/hai-msg/target/classes/com/msg/config/MultipartConfig.class
+++ b/hai-msg/target/classes/com/msg/config/MultipartConfig.class
--- a/hai-msg/target/classes/com/msg/config/RedisConfig.class
+++ b/hai-msg/target/classes/com/msg/config/RedisConfig.class
--- a/hai-msg/target/classes/com/msg/config/SwaggerConfig.class
+++ b/hai-msg/target/classes/com/msg/config/SwaggerConfig.class
--- a/hai-msg/target/classes/com/msg/config/SysConfig.class
+++ b/hai-msg/target/classes/com/msg/config/SysConfig.class
--- a/hai-msg/target/classes/com/msg/config/SysConst.class
+++ b/hai-msg/target/classes/com/msg/config/SysConst.class
--- a/hai-msg/target/classes/com/msg/controller/HighMegController.class
+++ b/hai-msg/target/classes/com/msg/controller/HighMegController.class
--- a/hai-msg/target/hai-msg-1.0-SNAPSHOT.jar
+++ b/hai-msg/target/hai-msg-1.0-SNAPSHOT.jar
--- a/hai-msg/target/hai-msg-1.0-SNAPSHOT.jar.original
+++ b/hai-msg/target/hai-msg-1.0-SNAPSHOT.jar.original
--- a/hai-msg/target/maven-archiver/pom.properties
+++ b/hai-msg/target/maven-archiver/pom.properties
@ -1,8 +0,0 @@
-<<<<<<< HEAD
-#Created by Apache Maven 3.6.3
-=======
-#Created by Apache Maven 3.8.2
->>>>>>> b24855a980ebeb66e6552653e757c54d5ad638f4
-version=1.0-SNAPSHOT
-groupId=com.hgj
-artifactId=hai-msg
--- a/hai-msg/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/hai-msg/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@ -1,16 +0,0 @@
-<<<<<<< HEAD
-com\msg\controller\HighMegController.class
-com\MsgApplication.class
-=======
-com/msg/config/RedisConfig.class
-com/msg/config/MultipartConfig.class
-com/msg/config/AuthConfig.class
-com/msg/config/SysConst.class
-com/MsgApplication.class
-com/msg/config/SysConfig.class
-com/msg/controller/HighMegController.class
-com/msg/config/SwaggerConfig.class
-com/msg/config/AuthConfig$1.class
-com/msg/config/ConfigListener.class
-com/msg/config/CorsConfig.class
->>>>>>> b24855a980ebeb66e6552653e757c54d5ad638f4
--- a/hai-msg/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/hai-msg/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@ -1,15 +0,0 @@
-<<<<<<< HEAD
-D:\hurui\huifu\hai-server\hai-msg\src\main\java\com\MsgApplication.java
-D:\hurui\huifu\hai-server\hai-msg\src\main\java\com\msg\controller\HighMegController.java
-=======
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/controller/HighMegController.java
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/SysConst.java
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/CorsConfig.java
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/RedisConfig.java
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/SwaggerConfig.java
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/ConfigListener.java
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/SysConfig.java
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/MultipartConfig.java
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/msg/config/AuthConfig.java
-/Volumes/work/code/high-work/high-service/hai-msg/src/main/java/com/MsgApplication.java
->>>>>>> b24855a980ebeb66e6552653e757c54d5ad638f4
--- a/hai-msg/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/hai-msg/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst