Browse Source

保存\删除热点 修改tags字段

dengsixing 3 năm trước cách đây
mục cha
commit
4630445fc1

+ 1 - 2
4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/PayOrderService.java

@@ -8,7 +8,6 @@ import com.alipay.api.domain.AlipayTradeWapPayModel;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.OrderConstant;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.MD5;
 import com.fdkankan.pay.alipay.AlipayDefaultConfig;
@@ -153,7 +152,7 @@ public class PayOrderService {
                 return j;
             }
         }
-        throw new BusinessException(OrderConstant.FAILURE_CODE_8002, OrderConstant.FAILURE_MSG_8002);
+        throw new BusinessException(ErrorCode.FAILURE_CODE_8002);
     }
 
     public JSONObject wechatScanPay(String orderSn, String subject, String body, BigDecimal totalFee) throws Exception {

+ 3 - 3
4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/factory/impl/AlipayCommerce.java

@@ -2,7 +2,7 @@ package com.fdkankan.platform.user.factory.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.Constant;
-import com.fdkankan.common.constant.OrderConstant;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.pay.alipay.sdk.AlipayGoodsDetail;
 import com.fdkankan.platform.order.entity.CommerceOrder;
@@ -28,7 +28,7 @@ public class AlipayCommerce implements Commerce {
     public JSONObject scanPay(RequestPlaceOrder order) throws Exception {
         CommerceOrder commerce = commerceOrderService.getById(order.getOrderId());
         if (commerce == null){
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8001, OrderConstant.FAILURE_MSG_8001);
+            throw new BusinessException(ErrorCode.FAILURE_CODE_8001);
         }
         String subject = Constant.COMMERCE_SUBJECT;
         List<AlipayGoodsDetail> goodsDetailList = new ArrayList<>();
@@ -43,7 +43,7 @@ public class AlipayCommerce implements Commerce {
     public JSONObject h5Pay(RequestPlaceOrder order, String ip) throws Exception {
         CommerceOrder commerce = commerceOrderService.getById(order.getOrderId());
         if (commerce == null){
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8001, OrderConstant.FAILURE_MSG_8001);
+            throw new BusinessException(ErrorCode.FAILURE_CODE_8001);
         }
         String subject = Constant.COMMERCE_SUBJECT;
         String orderSn = commerce.getOrderSn();

+ 2 - 2
4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/factory/impl/PaypalCommerce.java

@@ -2,7 +2,7 @@ package com.fdkankan.platform.user.factory.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.Constant;
-import com.fdkankan.common.constant.OrderConstant;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.pay.paypal.PayPalDefaultConfig;
 import com.fdkankan.platform.order.entity.CommerceOrder;
@@ -40,7 +40,7 @@ public class PaypalCommerce implements Commerce {
     private JSONObject getResult(RequestPlaceOrder order, String successUrl, String cancelUrl) throws Exception {
         CommerceOrder commerce = commerceOrderService.getById(order.getOrderId());
         if (commerce == null) {
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8001, OrderConstant.FAILURE_MSG_8001);
+            throw new BusinessException(ErrorCode.FAILURE_CODE_8001);
         }
         String subject = Constant.COMMERCE_SUBJECT;
         String orderSn = commerce.getOrderSn();

+ 3 - 3
4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/factory/impl/WechatCommerce.java

@@ -2,7 +2,7 @@ package com.fdkankan.platform.user.factory.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.Constant;
-import com.fdkankan.common.constant.OrderConstant;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.platform.order.entity.CommerceOrder;
 import com.fdkankan.platform.order.request.RequestPlaceOrder;
@@ -26,7 +26,7 @@ public class WechatCommerce implements Commerce {
     public JSONObject scanPay(RequestPlaceOrder order) throws Exception {
         CommerceOrder commerce = commerceOrderService.getById(order.getOrderId());
         if (commerce == null){
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8001, OrderConstant.FAILURE_MSG_8001);
+            throw new BusinessException(ErrorCode.FAILURE_CODE_8001);
         }
         String subject = Constant.COMMERCE_SUBJECT;
         BigDecimal totalFee = commerce.getAmount().multiply(new BigDecimal(100));
@@ -39,7 +39,7 @@ public class WechatCommerce implements Commerce {
     public JSONObject h5Pay(RequestPlaceOrder order, String ip) throws Exception {
         CommerceOrder commerce = commerceOrderService.getById(order.getOrderId());
         if (commerce == null){
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8001, OrderConstant.FAILURE_MSG_8001);
+            throw new BusinessException(ErrorCode.FAILURE_CODE_8001);
         }
         String subject = Constant.COMMERCE_SUBJECT;
         BigDecimal totalFee = commerce.getAmount().multiply(new BigDecimal(100));

+ 11 - 1
4dkankan-center-scene/src/main/resources/bootstrap-test.yml

@@ -1,3 +1,4 @@
+
 spring:
 #  jackson:
 #    serialization:
@@ -51,7 +52,7 @@ spring:
             refresh: true
       discovery:
         server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-test
+        namespace: 4dkankan-dev
     sentinel:
       transport:
         dashboard: 120.24.144.164:8888
@@ -90,6 +91,15 @@ feign:
   httpclient:
     connection-timeout: 200000
 
+server:
+  tomcat:
+    threads:
+      min-spare: 100  #最小工作线程数
+      max: 1000       #最大工作线程数,建议配置为cpu核心数的200~250倍
+    accept-count: 1000   #能够接受的最大等待数,默认100。如果等待队列也被放满了,新的请求会被tomcat拒绝(connection refused)
+    max-connections: 2000   #同一时间,tomcat能够接受的最大连接数。一般这个值要大于(max-threads)+(accept-count)
+    connection-timeout: 3000  #连接建立超时时间
+