fix: 增加手动授权后bind的处理

antbuilder/core/store/actions/login.js

@@ -7,8 +7,9 @@ import {
 	getIDNumber,
 } from "../../utils/jsapi";
 import request from "../../utils/request";
+import { ywtAuth } from "../../utils/ywtService";
 import { setStorage } from "../../utils";
-import { userInfoUrl, loginUrl } from "../../utils/constants";
+import { userInfoUrl, loginUrl, gwAppId } from "../../utils/constants";
 
 export default {
 	async checkUserLogin({ commit }) {
@@ -103,6 +104,16 @@ export default {
 		}
 		app.globalData.isUserLogin = true;
 		app.globalData.userInfo = res;
+		if (res) {
+			const [ywtErr, ywtResult] = await ywtAuth({
+				ticket: res.ticket,
+				gwAppId,
+			});
+			if (!ywtErr && ywtResult && ywtResult.token) {
+				app.globalData.ywtToken = "Bearer " + ywtResult.token;
+				app.globalData.ywtUserId = ywtResult.userId;
+			}
+		}
 		commit({
 			userInfo: {
 				isLogin: true,

antbuilder/core/utils/request.js

@@ -38,7 +38,7 @@ export function _request({
 			url: url.startsWith("http") ? url : joinUrl(host, url),
 			method,
 			data: Object.assign(data, {
-				userId: app.globalData.ywtUserIdToken || "",
+				userId: app.globalData.ywtUserId || "",
 				appId: app.globalData.appId || "",
 				terminal,
 			}),
@@ -116,7 +116,7 @@ export function _ywtRequest({
 			url: url.startsWith("http") ? url : joinUrl(ywtRequestUrl, url),
 			method,
 			data: Object.assign(data, {
-				userId: app.globalData.ywtUserIdToken || "",
+				userId: app.globalData.ywtUserId || "",
 				appId: app.globalData.appId || "",
 				terminal,
 			}),

antbuilder/core/utils/service.js

@@ -81,7 +81,7 @@ export async function checkUserInfo() {
 		const [ywtErr, ywtResult] = await ywtAuth({ ticket, gwAppId });
 		if (!ywtErr && ywtResult && ywtResult.token) {
 			app.globalData.ywtToken = "Bearer " + ywtResult.token;
-			app.globalData.ywtUserIdToken = ywtResult.userId;
+			app.globalData.ywtUserId = ywtResult.userId;
 		}
 	}
 	return [null, res];