|
|
@@ -7,6 +7,7 @@ import com.sxtvs.open.api.odata.dto.weibo.WeiboCallbackDto;
|
|
|
import com.sxtvs.open.api.odata.dto.wx.WxApiCreatePreAuthCodeResponse;
|
|
|
import com.sxtvs.open.api.odata.entity.WxTicket;
|
|
|
import com.sxtvs.open.api.odata.service.OauthService;
|
|
|
+import com.sxtvs.open.api.odata.service.WxRestService;
|
|
|
import com.sxtvs.open.api.odata.service.WxTicketService;
|
|
|
import com.sxtvs.open.api.odata.wxutil.WxCrypt;
|
|
|
import com.sxtvs.open.api.odata.wxutil.WxXmlUtil;
|
|
|
@@ -15,6 +16,7 @@ import com.sxtvs.open.core.auth.HttpContextUtil;
|
|
|
import com.sxtvs.open.core.auth.LoginRequired;
|
|
|
import com.sxtvs.open.core.conf.OauthConfig;
|
|
|
import com.sxtvs.open.core.sls.AliyunLogger;
|
|
|
+import jakarta.annotation.Resource;
|
|
|
import jakarta.servlet.http.HttpServletRequest;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
@@ -132,12 +134,16 @@ public class OauthRestController {
|
|
|
"&return_url=https%3A%2F%2Fimport.smcic.net%2Fbilibili%2Fcallback-open&response_type=code&state=" + state);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ @Resource
|
|
|
+ private WxRestService wxRestService;
|
|
|
+
|
|
|
@RequestMapping("weixin/code")
|
|
|
@LoginRequired
|
|
|
public RedirectDto weixinQrCode() {
|
|
|
var token = HttpContextUtil.mustToken();
|
|
|
logger.info("key", "oauth/weixin/code", "token", token);
|
|
|
- WxApiCreatePreAuthCodeResponse preAuthCodeResponse = oauthService.createPreAuthCodeResponse();
|
|
|
+ WxApiCreatePreAuthCodeResponse preAuthCodeResponse = wxRestService.createPreAuthCodeResponse();
|
|
|
// 这里使用预授权码跟用户token做一个映射
|
|
|
var preAuthCode = preAuthCodeResponse.getPreAuthCode();
|
|
|
oauthService.saveStateMapping(token, preAuthCode);
|
