优化app_id

FrontService/src/main/java/com/java110/front/controller/ComplaintController.java

@@ -5,6 +5,7 @@ import com.java110.core.base.controller.BaseController;
 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;
@@ -41,9 +42,13 @@ public class ComplaintController extends BaseController {
 
         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 saveComplaintSMOImpl.save(newPd);
     }

FrontService/src/main/java/com/java110/front/controller/OwnerAppLoginController.java

@@ -6,6 +6,7 @@ import com.java110.core.base.controller.BaseController;
 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;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.thymeleaf.util.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -39,16 +41,20 @@ public class OwnerAppLoginController extends BaseController {
     @RequestMapping(path = "/loginOwner", method = RequestMethod.POST)
     public ResponseEntity<String> loginOwner(@RequestBody String postInfo, HttpServletRequest request) {
         /*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 pd = PageData.newInstance().builder("", "", "", postInfo,
-                "login", "", "", "",
-                request.getHeader("APP_ID"));
+                "login", "", "", "", appId
+        );
         ResponseEntity<String> responseEntity = ownerAppLoginSMOImpl.doLogin(pd);
-        if(responseEntity.getStatusCode() != HttpStatus.OK){
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
             return responseEntity;
         }
         JSONObject outParam = JSONObject.parseObject(responseEntity.getBody());
         pd.setToken(outParam.getString("token"));
-        request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA,pd);
+        request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA, pd);
         return responseEntity;
     }
 

FrontService/src/main/java/com/java110/front/controller/PaymentController.java

@@ -7,6 +7,7 @@ import com.java110.core.base.controller.BaseController;
 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 class PaymentController extends BaseController {
     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 class PaymentController extends BaseController {
     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);
     }
 

FrontService/src/main/java/com/java110/front/controller/PropertyAppLoginController.java

@@ -6,6 +6,7 @@ import com.java110.core.base.controller.BaseController;
 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;
@@ -39,9 +40,13 @@ public class PropertyAppLoginController extends BaseController {
     @RequestMapping(path = "/loginProperty", method = RequestMethod.POST)
     public ResponseEntity<String> loginProperty(@RequestBody String postInfo, HttpServletRequest request) {
         /*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 pd = PageData.newInstance().builder("", "", "", postInfo,
                 "login", "", "", "",
-                request.getHeader("APP_ID"));
+                appId);
         ResponseEntity<String> responseEntity = propertyAppLoginSMOImpl.doLogin(pd);
         if(responseEntity.getStatusCode() != HttpStatus.OK){
             return responseEntity;

FrontService/src/main/java/com/java110/front/controller/WxLoginController.java

@@ -5,6 +5,7 @@ import com.java110.front.smo.wxLogin.IWxLoginSMO;
 import com.java110.core.base.controller.BaseController;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,9 +49,13 @@ public class WxLoginController extends BaseController {
         }
 
         /*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 pd = PageData.newInstance().builder("", "","", postInfo,
                 "", "", "", "",
-                request.getHeader("APP_ID"));
+                appId);
 
         return wxLoginSMOImpl.doLogin(pd);
     }