From 3cd6ffbc5ec41551a69507e5e0c06aebf5ddc7dd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 26 四月 2020 23:09:48 +0800
Subject: [PATCH] 优化app_id

---
 FrontService/src/main/java/com/java110/front/controller/PaymentController.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/FrontService/src/main/java/com/java110/front/controller/PaymentController.java b/FrontService/src/main/java/com/java110/front/controller/PaymentController.java
index e89c568..9d4dda8 100644
--- a/FrontService/src/main/java/com/java110/front/controller/PaymentController.java
+++ b/FrontService/src/main/java/com/java110/front/controller/PaymentController.java
@@ -7,6 +7,7 @@
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
 import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,9 +46,14 @@
     public ResponseEntity<String> toPay(@RequestBody String postInfo, HttpServletRequest request) {
         IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
         /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
+       String appId = request.getHeader("APP_ID");
+        if(StringUtil.isEmpty(appId)){
+            appId = request.getHeader("APP-ID");
+        }
+
         IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
                 "", "", "", pd.getSessionId(),
-                request.getHeader("APP_ID"));
+                appId);
         return toPaySMOImpl.toPay(newPd);
     }
 
@@ -61,9 +67,13 @@
     public ResponseEntity<String> toPayTempCarInout(@RequestBody String postInfo, HttpServletRequest request) {
         IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
         /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
+        String appId = request.getHeader("APP_ID");
+        if(StringUtil.isEmpty(appId)){
+            appId = request.getHeader("APP-ID");
+        }
         IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
                 "", "", "", pd.getSessionId(),
-                request.getHeader("APP_ID"));
+                appId);
         return toPayTempCarInoutSMOImpl.toPay(newPd);
     }
 

--
Gitblit v1.8.0