合并代码

2019-05-31 18:38:02 +08:00
parent d008e92baa
commit 7f092ce6c8
155 changed files with 9832 additions and 13 deletions
--- a/order/order-service-impl/target/classes/config/application-test.yaml
+++ b/order/order-service-impl/target/classes/config/application-test.yaml
@@ -0,0 +1,7 @@
+spring:
+  # datasource
+  datasource:
+    url: jdbc:mysql://192.168.88.14:3306/mall_order?useSSL=false&useUnicode=true&characterEncoding=UTF-8
+    driver-class-name: com.mysql.jdbc.Driver
+    username: root
+    password: ${MALL_MYSQL_PASSWORD}
--- a/order/order-service-impl/target/classes/config/application.yaml
+++ b/order/order-service-impl/target/classes/config/application.yaml
@@ -43,8 +43,11 @@ dubbo:
      version: 1.0.0
    OrderLogisticsService:
      version: 1.0.0
+<<<<<<< Updated upstream
    OrderCommentService:
      version: 1.0.0
+=======
+>>>>>>> Stashed changes
  consumer:
    timeout: 120000 # 设置长一点，方便调试代码
    ProductSpuService: