Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

.gitignore

@@ -115,4 +115,121 @@ Thumbs.db
 /jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
 /jyzb-boot/src/main/resources/application-local.yml
 /jyzb-boot/src/main/resources/application-local.yml
+/jyzb-process/target
+/jyzb-api/target/
+/jyzb-biz/target/
+##ignore this file##
+/target/
+
+.classpath
+.project
+/.settings/
+ ##filter databfile、sln file##
+*.mdb
+*.ldb
+*.sln
+##class file##
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+# compression file
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.via
+*.tmp
+*.err
+# OS generated files #
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+/*/target/*
+/.idea/misc.xml
+/.idea/jyzb_platformV2.iml
+/.idea/artifacts/jyzb3.xml
+/jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
+/jyzb-mq/jyzb-mq-producer/target/classes/application.yml
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-boot/src/main/resources/application.yml
+/jyzb-boot/pom.xml
+/.idea/encodings.xml
+/jyzb-api/jyzb-api.iml
+/jyzb-boot/pom.xml
+/jyzb-boot/src/main/resources/application-local.yml
+/.idea/modules.xml
+/.idea/modules.xml
+/jyzb-biz/jyzb-biz.iml
+/.idea/modules.xml
+/jyzb-boot/jyzb-boot.iml
+/jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml
+/jyzb-mq/jyzb-mq-consumer/jyzb-mq-consumer.iml
+/.idea/modules.xml
+/.idea/compiler.xml
+/.idea/modules.xml
+/.idea/dataSources.xml
+/.idea/mybatisx/templates.xml
+/.idea/dataSources.xml
+/pom.xml
+/.idea/compiler.xml
+/.idea/modules.xml
+/pom.xml
+/jyzb-biz/jyzb-biz.iml
+/jyzb-biz/jyzb-biz.iml
+/jyzb-mq/jyzb-mq-producer/pom.xml
+/jyzb-biz/jyzb-biz.iml
+/jyzb-mq/pom.xml
+/jyzb-mq/jyzb-mq.iml
+/jyzb-mq/jyzb-mq-consumer/pom.xml
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectRabbitConfig.java
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java.orig
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/controller/SendMsgController.java
+/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/MqConsumerApplication.java
+/jyzb-mq/jyzb-mq-consumer/src/main/resources/application.yml
+/jyzb-mq/jyzb-mq-consumer/target/maven-archiver/pom.properties
+/jyzb-mq/jyzb-mq-producer/src/main/java/com/junmp/jyzb/config/DirectRabbitConfig.java
+/jyzb-mq/jyzb-mq-producer/src/main/java/com/junmp/jyzb/controller/SendMsgController.java
+/jyzb-mq/jyzb-mq-producer/src/main/java/com/junmp/jyzb/MqProducerApplication.java
+/jyzb-mq/jyzb-mq-producer/src/main/resources/application.yml
+/jyzb-mq/jyzb-mq-producer/target/maven-archiver/pom.properties
+/jyzb-biz/jyzb-biz.iml
+/jyzb-biz/src/main/java/com/junmp/jyzb/config/rabbitMQ/RabbitmqConfig.java
+/jyzb-boot/src/main/resources/application.yml
+/jyzb-boot/src/main/resources/application-local.yml
+/jyzb-boot/src/main/resources/application.yml
+/jyzb-boot/src/main/resources/application-local.yml
+/jyzb-boot/src/main/resources/application.yml
+/jyzb-boot/src/main/resources/application-local.yml
+/pom.xml
+/pom.xml
+/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java.orig
+/jyzb-biz/pom.xml
+/.idea/compiler.xml
+/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
+/jyzb-boot/src/main/resources/application-local.yml
 /jyzb-boot/src/main/resources/application-local.yml
+/jyzb-biz/jyzb-biz.iml

.gitignore.orig

-/jyzb-process/target
-/jyzb-api/target/
-/jyzb-biz/target/
-##ignore this file##
-/target/
-
-.classpath
-.project
-/.settings/
- ##filter databfile、sln file##
-*.mdb
-*.ldb
-*.sln
-##class file##
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-# compression file
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.via
-*.tmp
-*.err
-# OS generated files #
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
-/*/target/*
-/.idea/misc.xml
-/.idea/jyzb_platformV2.iml
-/.idea/artifacts/jyzb3.xml
-/jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
-/jyzb-mq/jyzb-mq-producer/target/classes/application.yml
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
-/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
-/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
-/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
-/jyzb-boot/src/main/resources/application.yml
-/jyzb-boot/pom.xml
-/.idea/encodings.xml
-<<<<<<< HEAD
-/jyzb-boot/src/main/resources/application.yml
-=======
-/jyzb-api/jyzb-api.iml
-/jyzb-api/jyzb-api.iml
->>>>>>> develop