From d8bc08083504bc5d8ba61513ac21ec0f26ba5c8d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 30 十二月 2020 23:51:23 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java b/service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java
index bbf436a25..dc4b4b6 100644
--- a/service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java
+++ b/service-front/src/main/java/com/java110/front/controller/wechat/LoginOwnerWechatAuthController.java
@@ -1,11 +1,28 @@
+/*
+ * Copyright 2017-2020 鍚村鏂� and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.java110.front.controller.wechat;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.controller.BaseController;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
+import com.java110.core.factory.WechatFactory;
import com.java110.front.smo.ownerLogin.IOwnerAppLoginSMO;
import com.java110.utils.constant.CommonConstant;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +60,7 @@
IPageData pd = PageData.newInstance().builder("", "", "", JSONObject.toJSONString(params),
"login", "", "", "", appId
);
- ResponseEntity responseEntity = ownerAppLoginSMOImpl.getPageAccessToken(pd);
+ ResponseEntity responseEntity = ownerAppLoginSMOImpl.getPageAccessToken(pd,request);
request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA, pd);
return responseEntity;
}
@@ -55,10 +72,20 @@
*/
@RequestMapping(path = "/refreshToken")
public ResponseEntity<String> refreshToken(@RequestParam String redirectUrl,
+ @RequestParam String errorUrl,
+ @RequestParam String loginFlag,
HttpServletRequest request,
HttpServletResponse response) {
- return ownerAppLoginSMOImpl.refreshToken(null, redirectUrl, request, response);
+ IPageData pd = PageData.newInstance().builder("", "", "", "",
+ "login", "", "", "", request.getHeader("app-id")
+ );
+ return ownerAppLoginSMOImpl.refreshToken(pd, redirectUrl,errorUrl,loginFlag, request, response);
}
+ @RequestMapping(path = "/getWId")
+ public ResponseEntity<String> getWId(@RequestParam String appId){
+ return ResultVo.createResponseEntity(WechatFactory.getWId(appId));
+ }
+
}
--
Gitblit v1.8.0