Browse Source

作废订单规划,支持同步作废,和activemq 异步作废两种情况

wuxw7 9 years ago
parent
commit
62b6e7f4a1
56 changed files with 1445 additions and 418 deletions
  1. 13 0
      .idea/libraries/Maven__commons_net_commons_net_3_1.xml
  2. 13 0
      .idea/libraries/Maven__commons_pool_commons_pool_1_6.xml
  3. 13 0
      .idea/libraries/Maven__org_apache_activemq_activemq_core_5_7_0.xml
  4. 13 0
      .idea/libraries/Maven__org_apache_activemq_activemq_pool_5_7_0.xml
  5. 13 0
      .idea/libraries/Maven__org_apache_activemq_kahadb_5_7_0.xml
  6. 13 0
      .idea/libraries/Maven__org_apache_activemq_protobuf_activemq_protobuf_1_1.xml
  7. 13 0
      .idea/libraries/Maven__org_apache_geronimo_specs_geronimo_j2ee_management_1_1_spec_1_0_1.xml
  8. 13 0
      .idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jms_1_1_spec_1_1_1.xml
  9. 13 0
      .idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_0_1B_spec_1_0_1.xml
  10. 13 0
      .idea/libraries/Maven__org_fusesource_hawtbuf_hawtbuf_1_9.xml
  11. 13 0
      .idea/libraries/Maven__org_fusesource_hawtdispatch_hawtdispatch_1_11.xml
  12. 13 0
      .idea/libraries/Maven__org_fusesource_hawtdispatch_hawtdispatch_transport_1_11.xml
  13. 13 0
      .idea/libraries/Maven__org_fusesource_mqtt_client_mqtt_client_1_3.xml
  14. 13 0
      .idea/libraries/Maven__org_jasypt_jasypt_1_9_0.xml
  15. 13 0
      .idea/libraries/Maven__org_springframework_spring_jms_4_3_2_RELEASE.xml
  16. 13 0
      .idea/libraries/Maven__org_springframework_spring_messaging_4_3_2_RELEASE.xml
  17. 531 385
      .idea/workspace.xml
  18. 21 5
      BaseService/BaseService.iml
  19. 21 5
      OrderService/OrderService.iml
  20. 1 0
      OrderService/src/main/java/com/java110/order/AppSpringBootApplication.java
  21. 33 0
      OrderService/src/main/java/com/java110/order/mq/DeleteOrderInfoProducer.java
  22. 155 0
      OrderService/src/main/java/com/java110/order/mq/MqConfig.java
  23. 130 0
      OrderService/src/main/java/com/java110/order/rest/OrderServiceRest.java
  24. 51 0
      OrderService/src/main/java/com/java110/order/smo/IOrderServiceSMO.java
  25. 54 0
      OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java
  26. 5 0
      OrderService/src/main/resources/application.yml
  27. 55 0
      OrderService/target/classes/META-INF/spring-configuration-metadata.json
  28. BIN
      OrderService/target/classes/com/java110/order/AppSpringBootApplication.class
  29. BIN
      OrderService/target/classes/com/java110/order/dao/IOrderServiceDao.class
  30. BIN
      OrderService/target/classes/com/java110/order/dao/impl/OrderServiceDaoImpl.class
  31. BIN
      OrderService/target/classes/com/java110/order/listener/CustDispatchListener.class
  32. BIN
      OrderService/target/classes/com/java110/order/mq/DeleteOrderInfoProducer.class
  33. BIN
      OrderService/target/classes/com/java110/order/mq/MqConfig.class
  34. BIN
      OrderService/target/classes/com/java110/order/rest/OrderServiceRest.class
  35. BIN
      OrderService/target/classes/com/java110/order/smo/IOrderServiceSMO.class
  36. BIN
      OrderService/target/classes/com/java110/order/smo/impl/OrderServiceSMOImpl.class
  37. 21 5
      UserService/UserService.iml
  38. 20 0
      UserService/src/main/java/com/java110/user/mq/DeleteCustInfoConsumer.java
  39. 4 0
      UserService/src/main/resources/application.yml
  40. BIN
      bean/target/classes/com/java110/entity/order/BusiOrder.class
  41. BIN
      bean/target/classes/com/java110/entity/order/BusiOrderAttr.class
  42. BIN
      bean/target/classes/com/java110/entity/order/OrderList.class
  43. BIN
      bean/target/classes/com/java110/entity/order/OrderListAttr.class
  44. 8 0
      config/src/main/resources/mq/mq.properties
  45. 4 1
      config/target/classes/config/event.properties
  46. 68 0
      config/target/classes/mapper/order/OrderServiceDaoImplMapper.xml
  47. 8 0
      config/target/classes/mq/mq.properties
  48. 1 1
      core/core.iml
  49. BIN
      core/target/classes/com/java110/core/SystemStartUpInit.class
  50. BIN
      core/target/classes/com/java110/core/event/AppEventPublishing$1.class
  51. BIN
      core/target/classes/com/java110/core/event/AppEventPublishing.class
  52. 6 0
      pom.xml
  53. 15 0
      service/pom.xml
  54. 23 7
      service/service.iml
  55. 2 9
      service/src/main/java/com/java110/service/MyBatisConfig.java
  56. BIN
      service/target/classes/com/java110/service/MyBatisConfig.class

+ 13 - 0
.idea/libraries/Maven__commons_net_commons_net_3_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-net:commons-net:3.1">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/commons-net/commons-net/3.1/commons-net-3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/commons-net/commons-net/3.1/commons-net-3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/commons-net/commons-net/3.1/commons-net-3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__commons_pool_commons_pool_1_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-pool:commons-pool:1.6">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/commons-pool/commons-pool/1.6/commons-pool-1.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/commons-pool/commons-pool/1.6/commons-pool-1.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/commons-pool/commons-pool/1.6/commons-pool-1.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_activemq_activemq_core_5_7_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.activemq:activemq-core:5.7.0">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/apache/activemq/activemq-core/5.7.0/activemq-core-5.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/apache/activemq/activemq-core/5.7.0/activemq-core-5.7.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/apache/activemq/activemq-core/5.7.0/activemq-core-5.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_activemq_activemq_pool_5_7_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.activemq:activemq-pool:5.7.0">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/apache/activemq/activemq-pool/5.7.0/activemq-pool-5.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/apache/activemq/activemq-pool/5.7.0/activemq-pool-5.7.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/apache/activemq/activemq-pool/5.7.0/activemq-pool-5.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_activemq_kahadb_5_7_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.activemq:kahadb:5.7.0">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/apache/activemq/kahadb/5.7.0/kahadb-5.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/apache/activemq/kahadb/5.7.0/kahadb-5.7.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/apache/activemq/kahadb/5.7.0/kahadb-5.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_activemq_protobuf_activemq_protobuf_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.activemq.protobuf:activemq-protobuf:1.1">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/apache/activemq/protobuf/activemq-protobuf/1.1/activemq-protobuf-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/apache/activemq/protobuf/activemq-protobuf/1.1/activemq-protobuf-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/apache/activemq/protobuf/activemq-protobuf/1.1/activemq-protobuf-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_j2ee_management_1_1_spec_1_0_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/apache/geronimo/specs/geronimo-j2ee-management_1.1_spec/1.0.1/geronimo-j2ee-management_1.1_spec-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/apache/geronimo/specs/geronimo-j2ee-management_1.1_spec/1.0.1/geronimo-j2ee-management_1.1_spec-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/apache/geronimo/specs/geronimo-j2ee-management_1.1_spec/1.0.1/geronimo-j2ee-management_1.1_spec-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jms_1_1_spec_1_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_0_1B_spec_1_0_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_fusesource_hawtbuf_hawtbuf_1_9.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.fusesource.hawtbuf:hawtbuf:1.9">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/fusesource/hawtbuf/hawtbuf/1.9/hawtbuf-1.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/fusesource/hawtbuf/hawtbuf/1.9/hawtbuf-1.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/fusesource/hawtbuf/hawtbuf/1.9/hawtbuf-1.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_fusesource_hawtdispatch_hawtdispatch_1_11.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.fusesource.hawtdispatch:hawtdispatch:1.11">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/fusesource/hawtdispatch/hawtdispatch/1.11/hawtdispatch-1.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/fusesource/hawtdispatch/hawtdispatch/1.11/hawtdispatch-1.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/fusesource/hawtdispatch/hawtdispatch/1.11/hawtdispatch-1.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_fusesource_hawtdispatch_hawtdispatch_transport_1_11.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.fusesource.hawtdispatch:hawtdispatch-transport:1.11">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/fusesource/hawtdispatch/hawtdispatch-transport/1.11/hawtdispatch-transport-1.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/fusesource/hawtdispatch/hawtdispatch-transport/1.11/hawtdispatch-transport-1.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/fusesource/hawtdispatch/hawtdispatch-transport/1.11/hawtdispatch-transport-1.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_fusesource_mqtt_client_mqtt_client_1_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.fusesource.mqtt-client:mqtt-client:1.3">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/fusesource/mqtt-client/mqtt-client/1.3/mqtt-client-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/fusesource/mqtt-client/mqtt-client/1.3/mqtt-client-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/fusesource/mqtt-client/mqtt-client/1.3/mqtt-client-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_jasypt_jasypt_1_9_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jasypt:jasypt:1.9.0">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/jasypt/jasypt/1.9.0/jasypt-1.9.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/jasypt/jasypt/1.9.0/jasypt-1.9.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/jasypt/jasypt/1.9.0/jasypt-1.9.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_jms_4_3_2_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jms:4.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/springframework/spring-jms/4.3.2.RELEASE/spring-jms-4.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/springframework/spring-jms/4.3.2.RELEASE/spring-jms-4.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/springframework/spring-jms/4.3.2.RELEASE/spring-jms-4.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_messaging_4_3_2_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-messaging:4.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$M2_REPO$/org/springframework/spring-messaging/4.3.2.RELEASE/spring-messaging-4.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$M2_REPO$/org/springframework/spring-messaging/4.3.2.RELEASE/spring-messaging-4.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$M2_REPO$/org/springframework/spring-messaging/4.3.2.RELEASE/spring-messaging-4.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

File diff suppressed because it is too large
+ 531 - 385
.idea/workspace.xml


+ 21 - 5
BaseService/BaseService.iml

@@ -37,7 +37,6 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.18" level="project" />
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
@@ -133,6 +132,27 @@
     <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
     <orderEntry type="module" module-name="feign" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-pool:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-core:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:kahadb:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq.protobuf:activemq-protobuf:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.mqtt-client:mqtt-client:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch-transport:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.0.RELEASE" level="project" />
@@ -155,9 +175,6 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
@@ -166,7 +183,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />

+ 21 - 5
OrderService/OrderService.iml

@@ -36,7 +36,6 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.18" level="project" />
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
@@ -132,6 +131,27 @@
     <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
     <orderEntry type="module" module-name="feign" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-pool:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-core:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:kahadb:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq.protobuf:activemq-protobuf:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.mqtt-client:mqtt-client:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch-transport:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
     <orderEntry type="module" module-name="config" scope="PROVIDED" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
@@ -155,9 +175,6 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
@@ -166,7 +183,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />

+ 1 - 0
OrderService/src/main/java/com/java110/order/AppSpringBootApplication.java

@@ -6,6 +6,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.PropertySource;
 
 
 /**

+ 33 - 0
OrderService/src/main/java/com/java110/order/mq/DeleteOrderInfoProducer.java

@@ -0,0 +1,33 @@
+package com.java110.order.mq;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.core.JmsMessagingTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+
+/**
+ * 作废订单信息
+ *
+ * Created by wuxw on 2017/4/17.
+ */
+@Component
+public class DeleteOrderInfoProducer {
+
+    @Autowired
+    private JmsMessagingTemplate jmsMessagingTemplate;
+
+    @Autowired
+    private Topic deleteOrderTopic;
+
+
+    /**
+     * 发布消息
+     * @param msg
+     */
+    public void send(String msg) {
+        this.jmsMessagingTemplate.convertAndSend(deleteOrderTopic, msg);
+    }
+}

+ 155 - 0
OrderService/src/main/java/com/java110/order/mq/MqConfig.java

@@ -0,0 +1,155 @@
+package com.java110.order.mq;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.pool.PooledConnectionFactory;
+import org.apache.commons.lang.math.NumberUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.jms.core.JmsTemplate;
+
+import javax.jms.ConnectionFactory;
+
+/**
+ * Created by wuxw on 2017/4/17.
+ */
+@ConfigurationProperties(prefix = "mq.queue.name",locations="classpath:mq/mq.properties")
+public class MqConfig {
+
+    @Autowired
+    ConnectionFactory mqConnectionFactory;
+
+    @Autowired
+    PooledConnectionFactory pooledConnectionFactory;
+
+    @Value("user")
+    private String userQueueName;
+
+    @Value("deleteOrderQueue")
+    private String deleteOrderQueueName;
+    @Value("deleteOrderTopic")
+    private String deleteOrderTopicName;
+
+    private String brokerUrl;
+
+    private String username;
+
+    private String password;
+
+    private String maxConnection;
+
+    /**
+     * 默认最大链接数
+     */
+    private final static int DEFAULT_MAX_CONNECTION = 50;
+
+
+    /**
+     * activemq 链接工厂
+     * 真正可以产生Connection的ConnectionFactory,由对应的 JMS服务厂商提供
+     * @return
+     */
+    @Bean(name="mqConnectionFactory")
+    public ConnectionFactory mqConnectionFactory(){
+        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory();
+        connectionFactory.setBrokerURL(brokerUrl);
+        connectionFactory.setUserName(username);
+        connectionFactory.setPassword(password);
+        return connectionFactory;
+    }
+
+    /**
+     * 池链接
+     * ActiveMQ为我们提供了一个PooledConnectionFactory,通过往里面注入一个ActiveMQConnectionFactory
+     可以用来将Connection、Session和MessageProducer池化,这样可以大大的减少我们的资源消耗。 要依赖于 activemq-pool包
+     * @return
+     */
+    @Bean(name="pooledConnectionFactory")
+    public PooledConnectionFactory pooledConnectionFactory(){
+
+        PooledConnectionFactory connectionFactory = new PooledConnectionFactory();
+        connectionFactory.setConnectionFactory(mqConnectionFactory);
+        connectionFactory.setMaxConnections(NumberUtils.isNumber(maxConnection)?NumberUtils.toInt(maxConnection):DEFAULT_MAX_CONNECTION);
+        return connectionFactory;
+    }
+
+    @Bean(name="deleteOrderQueueJmsTemplate")
+    public JmsTemplate deleteOrderQueueJmsTemplate(){
+        JmsTemplate jmsTemplate = new JmsTemplate();
+        jmsTemplate.setConnectionFactory(pooledConnectionFactory);
+        jmsTemplate.setDefaultDestinationName(deleteOrderQueueName);
+        return jmsTemplate;
+    }
+    public String getUserQueueName() {
+        return userQueueName;
+    }
+
+    public void setUserQueueName(String userQueueName) {
+        this.userQueueName = userQueueName;
+    }
+
+    public String getDeleteOrderQueueName() {
+        return deleteOrderQueueName;
+    }
+
+    public void setDeleteOrderQueueName(String deleteOrderQueueName) {
+        this.deleteOrderQueueName = deleteOrderQueueName;
+    }
+
+    public String getDeleteOrderTopicName() {
+        return deleteOrderTopicName;
+    }
+
+    public void setDeleteOrderTopicName(String deleteOrderTopicName) {
+        this.deleteOrderTopicName = deleteOrderTopicName;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getBrokerUrl() {
+        return brokerUrl;
+    }
+
+    public void setBrokerUrl(String brokerUrl) {
+        this.brokerUrl = brokerUrl;
+    }
+
+    public ConnectionFactory getMqConnectionFactory() {
+        return mqConnectionFactory;
+    }
+
+    public void setMqConnectionFactory(ConnectionFactory mqConnectionFactory) {
+        this.mqConnectionFactory = mqConnectionFactory;
+    }
+
+    public String getMaxConnection() {
+        return maxConnection;
+    }
+
+    public void setMaxConnection(String maxConnection) {
+        this.maxConnection = maxConnection;
+    }
+
+    public PooledConnectionFactory getPooledConnectionFactory() {
+        return pooledConnectionFactory;
+    }
+
+    public void setPooledConnectionFactory(PooledConnectionFactory pooledConnectionFactory) {
+        this.pooledConnectionFactory = pooledConnectionFactory;
+    }
+}

+ 130 - 0
OrderService/src/main/java/com/java110/order/rest/OrderServiceRest.java

@@ -245,6 +245,136 @@ public class OrderServiceRest extends BaseController {
 
     }
 
+    /**
+     * 作废订单时,order_list busi_order 和bo_开头数据不影响,只是作废实例数据,如作废客户信息,只作废 cust 和cust_attr 表中的数据
+     * 作废订单依然会创建order_list 和busi_order 数据
+     * 作废指定动作的信息
+     * 请求协议:
+     * {
+     *     "orderList":{
+     *     "transactionId": "1000000200201704113137002690",
+             "channelId": "700212896",
+             "remarks": "",
+             "custId": "701008023904",
+             "statusCd": "S",
+             "reqTime": "20170411163709",
+             "extSystemId": "310013698777",
+             "olTypeCd": "15",
+     *        "oldOlId":"123456789",
+     *        "asyn":"S"
+     *     },
+     *     "busiOrder":[{
+     *         "actionTypeCd":"ALL"
+     *     }]
+     * }
+     *
+     * 说明
+     * oldOlId 购物车ID,对应表order_list
+     * asyn 处理方式,S 同步 A 异步
+     *
+     * 注意这里busiOrder 的{} 只能有一个,有多个,只能会处理第一个
+     *
+     * actionTypeCd All标识 作废所有订单订单  C2 作废客户信息,。。。
+     *
+     * transactionId 交易流水
+     *
+     * channelId 渠道ID,对应channel表,可以自定义一个
+     *
+     * remarks 备注,不能超过200个,如果超过200个会截取200个字
+     *
+     * custId 操作者ID,可能客户本身,很有很可能商家,或管理员
+     *
+     * statusCd S表示这个购物车有效,
+     *
+     * reqTime 请求时间
+     *
+     * extSystemId 外部系统关联ID
+     *
+     * olTypeCd 购物车类型,如 微信创建的购物车 1 APP创建的2 PC网站创建 3
+     *
+     * asyn 处理方式,S 同步 A 异步
+     *
+     * 作废指定订单项的信息
+     * 请求协议:
+     * {
+     *     "orderList":{
+     *         "transactionId": "1000000200201704113137002690",
+                 "channelId": "700212896",
+                 "remarks": "",
+                 "custId": "701008023904",
+                 "statusCd": "S",
+                 "reqTime": "20170411163709",
+                 "extSystemId": "310013698777",
+                 "olTypeCd": "15",
+                 "asyn":"A"
+     *     },
+     *     "busiOrder":[{
+     *          "oldBoId":"123456789"
+     *     },
+     *     {
+     *          "oldBoId":"123456799"
+     *     }]
+     * }
+     * oldBoId 为作废单个 要作废的订单项 对应busi_order 的 boId
+     *
+     * transactionId 交易流水
+     *
+     * channelId 渠道ID,对应channel表,可以自定义一个
+     *
+     * remarks 备注,不能超过200个,如果超过200个会截取200个字
+     *
+     * custId 操作者ID,可能客户本身,很有很可能商家,或管理员
+     *
+     * statusCd S表示这个购物车有效,
+     *
+     * reqTime 请求时间
+     *
+     * extSystemId 外部系统关联ID
+     *
+     * olTypeCd 购物车类型,如 微信创建的购物车 1 APP创建的2 PC网站创建 3
+     *
+     * asyn 处理方式,S 同步 A 异步
+     *
+     *
+     * 统一返回协议:
+     * {
+     "RESULT_CODE": "0000",
+     "RESULT_MSG": "成功",
+     "RESULT_INFO": {"oldOrder":"1234567","oldBoId":"7000123,718881991"}
+     }
+     * RESULT_CODE 0000 成功,1999 失败, 失败原因为 RESULT_MSG
+     *
+     * RESULT_INFO 成功时返回作废 的购物车 olId 和 boId
+     * @param orderInfo
+     * @return
+     */
+    @RequestMapping("/orderService/deleteOrderInfo")
+    public String deleteOrderInfo(@RequestParam("orderInfo") String orderInfo){
+
+        LoggerEngine.debug("deleteOrderInfo入参:" + orderInfo);
+        String resultUserInfo = null;
+
+        JSONObject reqOrderJSON = null;
+
+        try{
+
+            reqOrderJSON = this.simpleValidateJSON(orderInfo);
+
+            if(reqOrderJSON == null || !reqOrderJSON.containsKey("orderList")){
+                throw new IllegalArgumentException("请求参数为空 reqOrderJSON :"+reqOrderJSON);
+            }
+
+            resultUserInfo = iOrderServiceSMO.orderDispatch(reqOrderJSON.getJSONObject("orderList"));
+
+        }catch (Exception e){
+            LoggerEngine.error("订单受理出现异常:", e);
+            resultUserInfo = ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_ERROR,"订单受理出现异常,"+e,null);
+        }finally {
+            return resultUserInfo;
+        }
+
+    }
+
 
     public IOrderServiceSMO getiOrderServiceSMO() {
         return iOrderServiceSMO;

+ 51 - 0
OrderService/src/main/java/com/java110/order/smo/IOrderServiceSMO.java

@@ -29,5 +29,56 @@ public interface IOrderServiceSMO {
      */
     public String orderDispatch(JSONObject orderInfo) throws Exception;
 
+    /**
+     * 作废订单
+     * 根据业务动作作废
+     * 请求协议:
+     * {
+     *     "orderList":{
+     *     "transactionId": "1000000200201704113137002690",
+     "channelId": "700212896",
+     "remarks": "",
+     "custId": "701008023904",
+     "statusCd": "S",
+     "reqTime": "20170411163709",
+     "extSystemId": "310013698777",
+     "olTypeCd": "15",
+     *        "oldOlId":"123456789",
+     *        "asyn":"S"
+     *     },
+     *     "busiOrder":[{
+     *         "actionTypeCd":"ALL"
+     *     }]
+     * }
+     *
+     * ,
+     *
+     * 根据 订单项ID作废
+     *
+     * {
+     *     "orderList":{
+     *         "transactionId": "1000000200201704113137002690",
+     "channelId": "700212896",
+     "remarks": "",
+     "custId": "701008023904",
+     "statusCd": "S",
+     "reqTime": "20170411163709",
+     "extSystemId": "310013698777",
+     "olTypeCd": "15",
+     "asyn":"A"
+     *     },
+     *     "busiOrder":[{
+     *          "oldBoId":"123456789"
+     *     },
+     *     {
+     *          "oldBoId":"123456799"
+     *     }]
+     * }
+     * @param orderInfo
+     * @return
+     * @throws Exception
+     */
+    public String deleteOrder(JSONObject orderInfo) throws Exception;
+
 
 }

+ 54 - 0
OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java

@@ -203,6 +203,60 @@ public class OrderServiceSMOImpl extends BaseServiceSMO implements IOrderService
         return ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_SUCCESS,"成功",JSONObject.parseObject(JSONObject.toJSONString(orderList)));
     }
 
+    /**
+     * 作废订单
+     * 根据业务动作作废
+     * 请求协议:
+     * {
+     *     "orderList":{
+     *     "transactionId": "1000000200201704113137002690",
+             "channelId": "700212896",
+             "remarks": "",
+             "custId": "701008023904",
+             "statusCd": "S",
+             "reqTime": "20170411163709",
+             "extSystemId": "310013698777",
+             "olTypeCd": "15",
+     *        "oldOlId":"123456789",
+     *        "asyn":"S"
+     *     },
+     *     "busiOrder":[{
+     *         "actionTypeCd":"ALL"
+     *     }]
+     * }
+     *
+     * ,
+     *
+     * 根据 订单项ID作废
+     *
+     * {
+     *     "orderList":{
+     *         "transactionId": "1000000200201704113137002690",
+     "channelId": "700212896",
+     "remarks": "",
+     "custId": "701008023904",
+     "statusCd": "S",
+     "reqTime": "20170411163709",
+     "extSystemId": "310013698777",
+     "olTypeCd": "15",
+     "asyn":"A"
+     *     },
+     *     "busiOrder":[{
+     *          "oldBoId":"123456789"
+     *     },
+     *     {
+     *          "oldBoId":"123456799"
+     *     }]
+     * }
+     * @param orderInfo
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public String deleteOrder(JSONObject orderInfo) throws Exception {
+        return null;
+    }
+
     public IPrimaryKeyService getiPrimaryKeyService() {
         return iPrimaryKeyService;
     }

+ 5 - 0
OrderService/src/main/resources/application.yml

@@ -0,0 +1,5 @@
+spring:
+  activemq:
+    broker-url: tcp://localhost:61616
+    in-memory: true
+    enabled: false

+ 55 - 0
OrderService/target/classes/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,55 @@
+{
+  "groups": [{
+    "name": "mq.queue.name",
+    "type": "com.java110.order.mq.MqConfig",
+    "sourceType": "com.java110.order.mq.MqConfig"
+  }],
+  "properties": [
+    {
+      "name": "mq.queue.name.broker-url",
+      "type": "java.lang.String",
+      "sourceType": "com.java110.order.mq.MqConfig"
+    },
+    {
+      "name": "mq.queue.name.delete-order-queue-name",
+      "type": "java.lang.String",
+      "sourceType": "com.java110.order.mq.MqConfig"
+    },
+    {
+      "name": "mq.queue.name.delete-order-topic-name",
+      "type": "java.lang.String",
+      "sourceType": "com.java110.order.mq.MqConfig"
+    },
+    {
+      "name": "mq.queue.name.max-connection",
+      "type": "java.lang.String",
+      "sourceType": "com.java110.order.mq.MqConfig"
+    },
+    {
+      "name": "mq.queue.name.mq-connection-factory",
+      "type": "javax.jms.ConnectionFactory",
+      "sourceType": "com.java110.order.mq.MqConfig"
+    },
+    {
+      "name": "mq.queue.name.password",
+      "type": "java.lang.String",
+      "sourceType": "com.java110.order.mq.MqConfig"
+    },
+    {
+      "name": "mq.queue.name.pooled-connection-factory",
+      "type": "org.apache.activemq.pool.PooledConnectionFactory",
+      "sourceType": "com.java110.order.mq.MqConfig"
+    },
+    {
+      "name": "mq.queue.name.user-queue-name",
+      "type": "java.lang.String",
+      "sourceType": "com.java110.order.mq.MqConfig"
+    },
+    {
+      "name": "mq.queue.name.username",
+      "type": "java.lang.String",
+      "sourceType": "com.java110.order.mq.MqConfig"
+    }
+  ],
+  "hints": []
+}

BIN
OrderService/target/classes/com/java110/order/AppSpringBootApplication.class


BIN
OrderService/target/classes/com/java110/order/dao/IOrderServiceDao.class


BIN
OrderService/target/classes/com/java110/order/dao/impl/OrderServiceDaoImpl.class


BIN
OrderService/target/classes/com/java110/order/listener/CustDispatchListener.class


BIN
OrderService/target/classes/com/java110/order/mq/DeleteOrderInfoProducer.class


BIN
OrderService/target/classes/com/java110/order/mq/MqConfig.class


BIN
OrderService/target/classes/com/java110/order/rest/OrderServiceRest.class


BIN
OrderService/target/classes/com/java110/order/smo/IOrderServiceSMO.class


BIN
OrderService/target/classes/com/java110/order/smo/impl/OrderServiceSMOImpl.class


+ 21 - 5
UserService/UserService.iml

@@ -37,7 +37,6 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.18" level="project" />
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
@@ -133,6 +132,27 @@
     <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
     <orderEntry type="module" module-name="feign" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-pool:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-core:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:kahadb:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq.protobuf:activemq-protobuf:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.mqtt-client:mqtt-client:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch-transport:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.0.RELEASE" level="project" />
@@ -155,9 +175,6 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
@@ -166,7 +183,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />

+ 20 - 0
UserService/src/main/java/com/java110/user/mq/DeleteCustInfoConsumer.java

@@ -0,0 +1,20 @@
+package com.java110.user.mq;
+
+import com.java110.common.log.LoggerEngine;
+import org.springframework.jms.annotation.JmsListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * 作废 客户信息
+ * Created by wuxw on 2017/4/17.
+ */
+@Component
+public class DeleteCustInfoConsumer {
+
+    @JmsListener(destination = "sample.queue")
+    public void receiveQueue(String text){
+        LoggerEngine.debug("消息队列内容:"+text);
+    }
+
+
+}

+ 4 - 0
UserService/src/main/resources/application.yml

@@ -24,6 +24,10 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
+  activemq:
+    in-memory: true
+    pool:
+      enabled: false
 logging:
   file: ./UserService/logs/UserService.log
   level:

BIN
bean/target/classes/com/java110/entity/order/BusiOrder.class


BIN
bean/target/classes/com/java110/entity/order/BusiOrderAttr.class


BIN
bean/target/classes/com/java110/entity/order/OrderList.class


BIN
bean/target/classes/com/java110/entity/order/OrderListAttr.class


+ 8 - 0
config/src/main/resources/mq/mq.properties

@@ -0,0 +1,8 @@
+mq.queue.user=user_queue
+mq.queue.deleteOrderQueue=delete_order_queue
+mq.topic.deleteOrderTopic=delete_order_topic
+
+mq.brokerUrl=tcp://localhost:61616
+mq.username=admin
+mq.password=admin
+mq.maxConnection=50

+ 4 - 1
config/target/classes/config/event.properties

@@ -1,3 +1,6 @@
 java110.event.properties.orderDispatchListener=\
   com.java110.order.listener.CustDispatchListener,\
-  com.java110.order.listener.MerchantDispatchListener
+  com.java110.order.listener.MerchantDispatchListener
+
+java110.event.properties.orderDispatchEvent=\
+  C1::com.java110.order.type.AppCustEvent

+ 68 - 0
config/target/classes/mapper/order/OrderServiceDaoImplMapper.xml

@@ -4,6 +4,44 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="orderServiceDaoImpl">
 
+    <!--order_list order_list_attr  返回结果封装-->
+    <resultMap type="com.java110.entity.order.OrderList" id="orderListMap">
+        <id column="olId" jdbcType="VARCHAR" property="olId"/>
+        <result column="channelId" jdbcType="VARCHAR" property="channelId"/>
+        <result column="custId" jdbcType="VARCHAR" property="custId"/>
+        <result column="olTypeCd" jdbcType="VARCHAR" property="olTypeCd"/>
+        <result column="extSystemId" jdbcType="VARCHAR" property="extSystemId"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="create_dt" jdbcType="TIMESTAMP" property="create_dt"/>
+        <result column="status_cd" jdbcType="VARCHAR" property="status_cd"/>
+        <!-- 一对多关系 -->
+        <collection property="orderListAttrs" javaType="com.java110.entity.order.OrderListAttr">
+            <id property="olId" column="olId"/>
+            <result property="attrCd" column="attrCd"/>
+            <result property="value" column="value"/>
+            <result property="name" column="name"/>
+        </collection>
+    </resultMap>
+
+    <!--order_list order_list_attr  返回结果封装-->
+    <resultMap type="com.java110.entity.order.BusiOrder" id="busiOrderMap">
+        <id column="olId" jdbcType="VARCHAR" property="olId"/>
+        <result column="boId" jdbcType="VARCHAR" property="boId"/>
+        <result column="actionTypeCd" jdbcType="VARCHAR" property="actionTypeCd"/>
+        <result column="status_cd" jdbcType="VARCHAR" property="status_cd"/>
+        <result column="create_dt" jdbcType="TIMESTAMP" property="create_dt"/>
+        <result column="start_dt" jdbcType="TIMESTAMP" property="start_dt"/>
+        <result column="end_dt" jdbcType="TIMESTAMP" property="end_dt"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <!-- 一对多关系 -->
+        <collection property="busiOrderAttrs" javaType="com.java110.entity.order.BusiOrderAttr">
+            <id property="boId" column="boId"/>
+            <result property="attrCd" column="attrCd"/>
+            <result property="value" column="value"/>
+            <result property="name" column="name"/>
+        </collection>
+    </resultMap>
+
     <!--保存数据至过程表 bo_cust 中 -->
     <insert id="saveDataToBoOrderList" parameterType="com.java110.entity.order.OrderList">
         <![CDATA[
@@ -32,5 +70,35 @@
             values(#{boId},#{attrCd},#{value})
         ]]>
     </insert>
+    <!-- 查询订单信息(order_list order_list_attr) {'olId':'71234567','extSystemId':'','custId':'','channelId':''} -->
+    <select id="queryOrderListAndAttr" parameterType="com.java110.entity.order.OrderList" resultMap="orderListMap">
+            select ol.olId,ol.channelId,ol.custId,ol.olTypeCd,ol.extSystemId,ol.remark,ol.create_dt,ol.status_cd,ola.attrCd,ola.value,
+            (select ac.name from attr ac where ac.attrCd = ola.attrCd limit 0) name
+            from order_list ol , order_list_attr ola where ol.olId = ola.olId and ol.status_cd in ('0')
+        <if test="olId != null and olId != ''">
+           and ol.olId = #{olId}
+        </if>
+
+        <if test="extSystemId != null and extSystemId != ''">
+            and ol.extSystemId = #{extSystemId}
+        </if>
+
+        <if test="custId != null and custId != ''">
+            and ol.channelId = #{channelId}
+        </if>
+
+    </select>
+    <!-- 查询订单信息 busi_order busi_order_attr-->
+    <select id="queryBusiOrderAndAttr" parameterType="com.java110.entity.order.BusiOrder" resultMap="busiOrderMap">
+        select bo.boId,bo.olId,bo.actionTypeCd,bo.status_cd,bo.start_dt,bo.end_dt,bo.remark,boa.attrCd,value,
+        (select ac.name from attr ac where ac.attrCd = ola.attrCd limit 0) name
+        from busi_order bo,busi_order_attr boa where bo.boId = boa.boId and bo.status_cd in ('0')
+        <if test="olId != null and olId != ''">
+            and bo.olId = #{olId}
+        </if>
+        <if test="boId != null and boId != ''">
+            and bo.boId = #{boId}
+        </if>
+    </select>
 
 </mapper>

+ 8 - 0
config/target/classes/mq/mq.properties

@@ -0,0 +1,8 @@
+mq.queue.user=user_queue
+mq.queue.deleteOrderQueue=delete_order_queue
+mq.topic.deleteOrderTopic=delete_order_topic
+
+mq.brokerUrl=tcp://localhost:61616
+mq.username=admin
+mq.password=admin
+mq.maxConnection=50

+ 1 - 1
core/core.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

BIN
core/target/classes/com/java110/core/SystemStartUpInit.class


BIN
core/target/classes/com/java110/core/event/AppEventPublishing$1.class


BIN
core/target/classes/com/java110/core/event/AppEventPublishing.class


+ 6 - 0
pom.xml

@@ -61,6 +61,7 @@
         <xbean.version>3.18</xbean.version>
         <axis.version>1.4</axis.version>
         <httpclient.verion>3.1</httpclient.verion>
+        <spring.version>4.3.2.RELEASE</spring.version>
     </properties>
 
     <dependencyManagement>
@@ -173,6 +174,11 @@
                 <version>${activemq.version}</version>
             </dependency>
 
+                        <dependency>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-jms</artifactId>
+                            <version>${spring.version}</version>
+                        </dependency>
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-spring</artifactId>

+ 15 - 0
service/pom.xml

@@ -71,5 +71,20 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-pool</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.7.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jms</artifactId>
+        </dependency>
     </dependencies>
 </project>

+ 23 - 7
service/service.iml

@@ -23,7 +23,6 @@
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-access:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
@@ -38,7 +37,6 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.18" level="project" />
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
@@ -143,6 +141,29 @@
     <orderEntry type="module" module-name="feign" />
     <orderEntry type="module" module-name="config" scope="PROVIDED" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-pool:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-core:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq:kahadb:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.activemq.protobuf:activemq-protobuf:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.mqtt-client:mqtt-client:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch-transport:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
@@ -155,11 +176,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />
@@ -172,7 +189,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:1.4.0.RELEASE" level="project" />

+ 2 - 9
service/src/main/java/com/java110/service/MyBatisConfig.java

@@ -1,21 +1,13 @@
 package com.java110.service;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.PathResource;
-import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
@@ -24,7 +16,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.TransactionManagementConfigurer;
 
 import javax.sql.DataSource;
-import java.util.Properties;
 
 /**
  * MyBatis基础配置
@@ -75,4 +66,6 @@ public class MyBatisConfig implements TransactionManagementConfigurer {
     public PlatformTransactionManager annotationDrivenTransactionManager() {
         return new DataSourceTransactionManager(dataSource);
     }
+
+
 }

BIN
service/target/classes/com/java110/service/MyBatisConfig.class