修复bug

2227324689 · 2227324689 · commit 9cde4c628e45 · 2019-09-03T01:10:55.000+08:00
diff --git a/comment-service/comment-provider/pom.xml b/comment-service/comment-provider/pom.xml
@@ -131,10 +131,10 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+           <!-- <plugin>
                 <groupId>org.mybatis.generator</groupId>
                 <artifactId>mybatis-generator-maven-plugin</artifactId>
-            </plugin>
+            </plugin>-->
         </plugins>
         <resources>
             <resource>
diff --git a/comment-service/comment-provider/src/main/resources/application-dev.yml b/comment-service/comment-provider/src/main/resources/application-dev.yml
@@ -34,7 +34,7 @@ dubbo:
     owner: Heps
   protocol:
     name: dubbo
-    port: 20885
+    port: 20886
   registry:
     address: zookeeper://zk.gpmall.com:2181
     check: true
diff --git a/comment-service/comment-provider/src/main/resources/application-prod.yml b/comment-service/comment-provider/src/main/resources/application-prod.yml
@@ -34,7 +34,7 @@ dubbo:
     owner: Heps
   protocol:
     name: dubbo
-    port: 20880
+    port: 20886
   registry:
     address: zookeeper://localhost:2181
     check: true
diff --git a/comment-service/comment-provider/src/main/resources/application.yml b/comment-service/comment-provider/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
 mybatis:
   mapper-locations: classpath*:com/gpmall/comment/dal/persistence/*Mapper.xml"
   type-aliases-package: com.gpmall.comment.dal.entitys
diff --git a/gpmall-front/src.zip b/gpmall-front/src.zip
diff --git a/gpmall-shopping/src/main/resources/application.yml b/gpmall-shopping/src/main/resources/application.yml
@@ -2,7 +2,7 @@ spring:
   application:
     name: gpmall-shopping
   profiles:
-      active: dev
+      active: prod
 server:
   port: 8081
 
diff --git a/order-services/order-provider/pom.xml b/order-services/order-provider/pom.xml
@@ -128,34 +128,6 @@
                 <groupId>org.mybatis.generator</groupId>
                 <artifactId>mybatis-generator-maven-plugin</artifactId>
             </plugin>-->
-            <plugin>
-                <groupId>org.mybatis.generator</groupId>
-                <artifactId>mybatis-generator-maven-plugin</artifactId>
-                <configuration>
-                    <configurationFile>${basedir}/src/main/resources/mybatis-generater.xml</configurationFile>
-                    <!--<configurationFile>${basedir}/src/main/resources/generator/generatorConfigOracle.xml</configurationFile>-->
-                    <overwrite>true</overwrite>
-                    <verbose>true</verbose>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.github.drtrang</groupId>
-                        <artifactId>mybatis-generator-extension</artifactId>
-                        <version>0.0.4</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>mysql</groupId>
-                        <artifactId>mysql-connector-java</artifactId>
-                        <version>5.1.44</version>
-                    </dependency>
-
-                    <dependency>
-                        <groupId>tk.mybatis</groupId>
-                        <artifactId>mapper</artifactId>
-                        <version>3.4.2</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
         </plugins>
         <resources>
             <resource>
diff --git a/order-services/order-provider/src/test/java/com/gpmall/order/bootstrap/OrderProviderApplicationTests.java b/order-services/order-provider/src/test/java/com/gpmall/order/bootstrap/OrderProviderApplicationTests.java
@@ -1,41 +1,16 @@
 package com.gpmall.order.bootstrap;
 
-import com.gpmall.order.dal.entitys.OrderItem;
-import com.gpmall.order.dal.persistence.OrderItemMapper;
-import com.gpmall.order.dal.persistence.OrderMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.redisson.api.RScript;
-import org.redisson.api.RedissonClient;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.Collections;
-import java.util.List;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class OrderProviderApplicationTests {
 
-
-
     @Test
     public void contextLoads() {
     }
 
-    @Autowired
-    OrderMapper orderMapper;
-    @Autowired
-    OrderItemMapper orderItemMapper;
-    @Test
-    public void mapperTest(){
-        Long aLong = orderMapper.countAll();
-        System.out.println("aLong = " + aLong);
-        List<OrderItem> orderItems = orderItemMapper.queryByOrderId("121");
-        for (OrderItem orderItem : orderItems) {
-            System.out.println("orderItem = " + orderItem);
-        }
-    }
-
 }
diff --git a/pay-service/pay-provider/src/main/resources/application-prod.yml b/pay-service/pay-provider/src/main/resources/application-prod.yml
@@ -2,7 +2,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/gpmall?useUnicode=true&characterEncoding=utf8&useOldAliasMetadataBehavior=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
     username: root
-    password: 123456
+    password: Admin@123
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     initialSize: 2
diff --git a/pay-service/pay-provider/src/main/resources/application.yml b/pay-service/pay-provider/src/main/resources/application.yml
@@ -8,16 +8,16 @@ mybatis:
 
 ali:
   ali_service: create_direct_pay_by_user
-  ali_partner: 2088721158773470
+  ali_partner:
   input_charset: utf-8
   sign_type: MD5
   notify_url: http://demo.gupaoedu.cn/pay/alipayNotify
   return_url: http://demo.gupaoedu.cn/pay/syncResult
-  seller_id: 2088721158773470
-  seller_email: 641437529@qq.com
+  seller_id:
+  seller_email:
   pay_gateway_new: https://mapi.alipay.com/gateway.do?
   it_b_pay: 1h
-  private_key: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCKBlUHGVcK9MrPSub88sE78Q3CNkgBxCFiSQ0bIwpATozXk/MvibFwDWnCX0Z0hqK8qxPsereZc5TZ11g3mfj6SvKzHRCRUeeSUvLJrlOA3LffKvRb5vqwx1fsZF+pic/rEfspEvuG/hLOn8TrYeKKlJn9D0GTrRv3QaqCIbPWvDW0yQS++Z42JERyf7210kKZqq9BZ602C0qqciI2JYXdXzvHbe7qzvzSWJE/g7/4bcqhrS7zI7uo1P/4XFcZD4W9PyY2unSr5CZqyXBcb8DBcmiQej7Ppf9WYi0bta6cRcfqgE9dP0Md5S+U9ja1mDzMfr3vMSWSd35F+4RaGbcTAgMBAAECggEAXPr5Cqg6Z+oSOeTWiK4sGGpB/4Q7q9zpNGHLz20iecGwxYUofOzAOKEAju1J9DPCq2CAMn1U863WJ44XIpW6ETquFpVM1OidHIh+f/jMzfFieJdiOAr49F/Fzjyr6PUquMvLK5dbFExSdRlSOdMeHocO2VgOsCIcxctZxwJXOR9aPzhsR/stw7+Kr2R2eSr7uj10A/64/DSycKl+ipawySe3xjgNaJBYgLqfp6i5j/DRLOt28C/c0R5/sRXcgqN/iWePVK9Kw2J5MBY4Hif4FSiWJPx3Sz+6/Km19ZlQGXDHkYUM2WZ+HdtOkipkVYizWme8DUgJLnxwqjtv7Hy8sQKBgQDvguLzgi4OO2gkawy9sxJmu32vFyU84AJVaRR7aK3Ta+k0aM5OnkM+fC9lev33BSyyNjSXu/vESAZbINNB6n+jxKf7zljgmnPJAJlEFPYmL3An1cZgoA+EVPk19L15ozlkS+iTbHM1kCGc0tlJKZGPSoQ+8LUpugFTti/KR0LBmQKBgQCThtxkd6vCRUj1Kqg5xa6sLekZIwZC+XaKfwijTjwKGEy4aUPO8F4pJrF1L+1GsBTr4HzgaxbL+2CQvyBOLEKNYecy30hUNG6I+GC0orht/Yn4y4bFYCUKy6pA4n4yF6dg4AOdK8E06A50BfHRkcWxsZQIej3+oDZLXbCimIEBiwKBgAriJbHu/mzDIk5VVvTfyDxG1MU6BgUoILME3VtmPE/ZHXW2NXm5E1Epj3XLCvNIlulaMTWb4yreIvvNGAxsvXQRoZh9nehG3HALyOshELZXfX8x5ZvKaioXOmPLRTjbw+Xc1SqtyOZsMDrSEfGTI/wg5LV/dpv4ycqmArHsXwoxAoGABcM+2K3UB8KtFuaTq64NJKymblTv6a3U85QCwl5L+hj45js2at74zqK0S9+TZS97obsjJaEJQu6O1xigKm2QK/WnElWmfaOOrcsF/AhfK+y7dvx8Rzl6OPG7tM0kINDLuP0HJxyOb4KhDectiwImtso4/hvIUCnx9P+z5qYOZAECgYB7egX4vUMnZSBs0d2hhfKK9P0e7paV2NET9oMy5g9Q6Y+vY+hwFcDMFmJnyZ2tyrHNOAVoZAV+LZhrXn0toINlwTvuP7vofWLnLfhVMsUVeaePAVDjgOb1EFSwMW8bOub9ywBSe65FeWHmFjTOP4PnOIuv/VVynbpOT0i9Fpo9sw==
+  private_key:
   public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAigZVBxlXCvTKz0rm/PLBO/ENwjZIAcQhYkkNGyMKQE6M15PzL4mxcA1pwl9GdIaivKsT7Hq3mXOU2ddYN5n4+krysx0QkVHnklLyya5TgNy33yr0W+b6sMdX7GRfqYnP6xH7KRL7hv4Szp/E62HiipSZ/Q9Bk60b90GqgiGz1rw1tMkEvvmeNiREcn+9tdJCmaqvQWetNgtKqnIiNiWF3V87x23u6s780liRP4O/+G3Koa0u8yO7qNT/+FxXGQ+FvT8mNrp0q+QmaslwXG/AwXJokHo+z6X/VmItG7WunEXH6oBPXT9DHeUvlPY2tZg8zH697zElknd+RfuEWhm3EwIDAQAB
   pay_open_gateway: https://openapi.alipay.com/gateway.do
   #退款接口名
diff --git a/search-service/search-provider/src/main/resources/application-prod.yml b/search-service/search-provider/src/main/resources/application-prod.yml
@@ -2,7 +2,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/gpmall?useUnicode=true&characterEncoding=utf8&useOldAliasMetadataBehavior=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
     username: root
-    password: 123456
+    password: Admin@123
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     initialSize: 2
@@ -20,22 +20,23 @@ spring:
     connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
     useGlobalDataSourceStat: true
   redisson:
-      address: localhost:6379
-      timeout: 3000
-      database: 0
-      pool:
-        max-active: 20
-        max-idle: 10
-        max-wait: 3000
-        min-idle: 4
+    address: localhost:6379
+    timeout: 3000
+    database: 0
+    pool:
+      max-active: 20
+      max-idle: 10
+      max-wait: 3000
+      min-idle: 4
   data:
     elasticsearch:
-      cluster-name: docker-cluster
-      cluster-nodes: es.gupaoedu.com:9300
+      cluster-name: elasticsearch
+      cluster-nodes: localhost:9300
+
 dubbo:
   application:
-    name: pay-services
-    owner: Mic
+    name: search-services
+    owner: gp-search
   protocol:
     name: dubbo
     port: 20884
@@ -50,8 +51,4 @@ dubbo:
     cycle-report: false
     group: dubbo-dev
   scan:
-    base-packages: com.gpmall.pay.services
-
-
-
-
+    base-packages: com.gpmall.search.services
diff --git a/search-service/search-provider/src/main/resources/logback.xml b/search-service/search-provider/src/main/resources/logback.xml
