修复bug“

2227324689 · 2227324689 · commit 615d4db79cd2 · 2019-08-19T15:20:10.000+08:00
diff --git a/gpmall-front/config/index.js b/gpmall-front/config/index.js
@@ -29,7 +29,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/user/*': {
-        target: 'http://127.0.0.1:8088'  // 请求本地 需要咕泡商城后台项目 默认127.0.0.1:8082
+        target: 'http://127.0.0.1:8082'  // 请求本地 需要咕泡商城后台项目 默认127.0.0.1:8082
       },
       '/shopping/**': {
         target: 'http://127.0.0.1:8081'  // 请求本地 需要咕泡商城后台项目 默认127.0.0.1:8081
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/dal/persistence/OrderItemMapper.xml b/order-services/order-provider/src/main/java/com/gpmall/order/dal/persistence/OrderItemMapper.xml
@@ -21,7 +21,7 @@
   </sql>
 
   <select id="queryByOrderId" resultMap="BaseResultMap">
-    SELECT * FROM TB_ORDER_ITEM WHERE  ORDER_ID = #{orderId}
+    SELECT * FROM tb_order_item WHERE  ORDER_ID = #{orderId}
   </select>
   
 </mapper>
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/dal/persistence/OrderMapper.xml b/order-services/order-provider/src/main/java/com/gpmall/order/dal/persistence/OrderMapper.xml
@@ -31,6 +31,6 @@
 
 
     <select id="countAll" resultType="long">
-    SELECT  COUNT(*) FROM TB_ORDER
+    SELECT  COUNT(*) FROM tb_order
     </select>
 </mapper>
diff --git a/order-services/order-provider/src/main/resources/application-dev.yml b/order-services/order-provider/src/main/resources/application-dev.yml
@@ -2,7 +2,7 @@ spring:
   datasource:
     url: jdbc:mysql://mysql.gpmall.com:3306/gpmall?useUnicode=true&characterEncoding=utf8&useOldAliasMetadataBehavior=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=UTC
     username: root
-    password: 123
+    password: root
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     initialSize: 2
diff --git a/search-service/search-provider/src/main/resources/application-dev.yml b/search-service/search-provider/src/main/resources/application-dev.yml
@@ -2,7 +2,7 @@ spring:
   datasource:
     url: jdbc:mysql://mysql.gpmall.com:3306/gpmall?useUnicode=true&characterEncoding=utf8&useOldAliasMetadataBehavior=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
     username: root
-    password: 123
+    password: root
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     initialSize: 2
@@ -31,7 +31,7 @@ spring:
   data:
     elasticsearch:
       cluster-name: docker-cluster
-      cluster-nodes: 39.98.240.253:9300
+      cluster-nodes: es.gupaoedu.com:9300
 
 dubbo:
   application:
diff --git a/search-service/search-provider/src/main/resources/application-prod.yml b/search-service/search-provider/src/main/resources/application-prod.yml
@@ -28,6 +28,10 @@ spring:
         max-idle: 10
         max-wait: 3000
         min-idle: 4
+  data:
+    elasticsearch:
+      cluster-name: docker-cluster
+      cluster-nodes: es.gupaoedu.com:9300
 dubbo:
   application:
     name: pay-services
diff --git a/search-service/search-provider/src/main/resources/application-test.yml b/search-service/search-provider/src/main/resources/application-test.yml
@@ -28,6 +28,10 @@ spring:
         max-idle: 10
         max-wait: 3000
         min-idle: 4
+  data:
+    elasticsearch:
+      cluster-name: docker-cluster
+      cluster-nodes: es.gupaoedu.com:9300
 dubbo:
   application:
     name: pay-services
diff --git a/shopping-service/shopping-provider/src/main/java/com/gpmall/shopping/dal/entitys/Panel.java b/shopping-service/shopping-provider/src/main/java/com/gpmall/shopping/dal/entitys/Panel.java
@@ -5,6 +5,7 @@
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -36,6 +37,7 @@ public class Panel implements Serializable {
 
     private List<PanelContentItem> panelContentItems;
 
+    @Transient
     private Long productId;
 
     private static final long serialVersionUID = 1L;
