Let's use AI to Earn!
TypeScript auto-publishdouyindouyin-apielectron-appelectron-reactkuaishoukwaipublishedshipinhaotoolxiaohongshu
feat: 更改微信回调处理逻辑
Nevina787a456d724
diff --git a/aitoearn_web/server/aitoearn-gateway/src/core/plat/wxGzh/dto/wxGzh.dto.ts b/aitoearn_web/server/aitoearn-gateway/src/core/plat/wxGzh/dto/wxGzh.dto.tsindex f39e17f0..45800bfc 100644--- a/aitoearn_web/server/aitoearn-gateway/src/core/plat/wxGzh/dto/wxGzh.dto.ts+++ b/aitoearn_web/server/aitoearn-gateway/src/core/plat/wxGzh/dto/wxGzh.dto.ts@@ -178,6 +178,10 @@ export class GetUserCumulateData extends AccountIdDto {}export class AuthBackQueryDto {+ @IsString({ message: ' 透传数据(任务ID)' })+ @Expose()+ readonly stat: string+@IsString({ message: '授权码' })@Expose()readonly auth_code: stringdiff --git a/aitoearn_web/server/aitoearn-gateway/src/core/plat/wxGzh/wxPlat.controller.ts b/aitoearn_web/server/aitoearn-gateway/src/core/plat/wxGzh/wxPlat.controller.tsindex 722ae967..9ff9dc75 100644--- a/aitoearn_web/server/aitoearn-gateway/src/core/plat/wxGzh/wxPlat.controller.ts+++ b/aitoearn_web/server/aitoearn-gateway/src/core/plat/wxGzh/wxPlat.controller.ts@@ -1,4 +1,4 @@-import { Body, Controller, Get, Param, Query, UseGuards } from '@nestjs/common'+import { Body, Controller, Get, Param, Post, Query, UseGuards } from '@nestjs/common'import { OrgGuard } from '@/common/interceptor/transform.interceptor'import { PlatWxGzhNatsApi } from '@/transports/channel/wxGzh.natsApi'import { CallbackMsgData } from './common'@@ -17,16 +17,15 @@ export class WxPlatController {* @returns*/@UseGuards(OrgGuard)- @Get('auth/back/:taskId')+ @Post('auth/back')async authBackGet(- @Param('taskId') taskId: string,@Query() query: AuthBackQueryDto,) {- await this.platWxGzhNatsApi.createAccountAndSetAccessToken(- taskId,- query,- )-+ await this.platWxGzhNatsApi.createAccountAndSetAccessToken({+ taskId: query.stat,+ auth_code: query.auth_code,+ expires_in: query.expires_in,+ })return 'success'}@@ -36,7 +35,7 @@ export class WxPlatController {* @returns*/@UseGuards(OrgGuard)- @Get('callback/msg')+ @Post('callback/msg')async callbackMsg(@Body() body: CallbackMsgData,) {diff --git a/aitoearn_web/server/aitoearn-gateway/src/transports/channel/wxGzh.natsApi.ts b/aitoearn_web/server/aitoearn-gateway/src/transports/channel/wxGzh.natsApi.tsindex f45afaad..b7e20303 100644--- a/aitoearn_web/server/aitoearn-gateway/src/transports/channel/wxGzh.natsApi.ts+++ b/aitoearn_web/server/aitoearn-gateway/src/transports/channel/wxGzh.natsApi.ts@@ -43,13 +43,14 @@ export class PlatWxGzhNatsApi {return res}- async createAccountAndSetAccessToken(taskId: string, query: AuthBackQueryDto) {+ async createAccountAndSetAccessToken(query: {+ taskId: string+ auth_code: string+ expires_in: number+ }) {const res = await this.natsService.sendMessage<null>(NatsApi.plat.wxGzh.createAccountAndSetAccessToken,- {- taskId,- ...query,- },+ query,)return resdiff --git a/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/dto/wxPlat.dto.ts b/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/dto/wxPlat.dto.tsindex dc136346..d829e984 100644--- a/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/dto/wxPlat.dto.ts+++ b/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/dto/wxPlat.dto.ts@@ -9,6 +9,15 @@ export class GetAuthUrlDto {@IsString({ message: '类型 pc h5' })@Expose()readonly type: 'pc' | 'h5'++ @IsString({ message: '应用标识' })+ @Expose()+ readonly key: string++ @IsString({ message: '透传数据' })+ @IsOptional()+ @Expose()+ readonly stat?: string}export class DisposeAuthTaskDto {diff --git a/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/server.service.ts b/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/server.service.tsindex ec3ea394..4033d5ee 100644--- a/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/server.service.ts+++ b/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/server.service.ts@@ -37,16 +37,18 @@ export class ServerService {* 给服务发送授权消息* @returns*/- async sendAuthBack(url: string, query: AuthBackQueryDto) {+ async sendAuthBack(url: string, data: AuthBackQueryDto & {+ stat: string+ }) {try {- const result = await axios.post<string>(url, query)+ const result = await axios.post<string>(url, data)- Logger.debug('getComponentAccessToken---result', result.data)+ Logger.debug('sendAuthBack---result', result.data)return result.data}catch (error) {Logger.error(- '------ Error wxPlat sendCallbackMsg: ------',+ '------ Error wxPlat sendAuthBack: ------',error,)return nulldiff --git a/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/wxPlat.controller.ts b/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/wxPlat.controller.tsindex 850bbedb..5c1d6be8 100644--- a/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/wxPlat.controller.ts+++ b/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/wxPlat.controller.ts@@ -7,7 +7,7 @@ import {Param,Post,Query,- Render,+ Res,UseGuards,UseInterceptors,} from '@nestjs/common';@@ -26,7 +26,7 @@ import {} from './dto/wxPlat.dto';import { ServerService } from './server.service';import { WxPlatService } from './wxPlat.service';-+import { Response } from 'express';@Controller('wxPlat')export class WxPlatController {logger = new Logger(WxPlatController.name);@@ -123,59 +123,48 @@ export class WxPlatController {*/@HttpCode(200)@UseGuards(OrgGuard)- @Get('auth/back/:key')+ @Get('auth/back/:key/:stat')async authBackGet(@Param('key') key: string,+ @Param('stat') stat: string,@Query() query: AuthBackQueryDto,) {const { authUrlMap } = config;const url = authUrlMap[key];if (!url)return 'success'- return await this.serverService.sendAuthBack(authUrlMap[key], query);+ return await this.serverService.sendAuthBack(authUrlMap[key], {+ ...query,+ stat+ });}// -------- 接收回调 END --------/*** 获取授权URL*/- @Get('auth/url/:key')+ @Get('auth/url')async getAuthUrl(- @Param('key') key: string,@Query() query: GetAuthUrlDto,) {- const outUrl = `${config.wxPlat.authBackHost}/wxPlat/auth/page/${query.type}/${key}`;- return outUrl;+ return `${config.wxPlat.authBackHost}/wxPlat/auth/page?stat=${query.stat}&key=${query.key}&type=${query.type}`;}/*** 获取授权页面*/- @Get('auth/page/pc/:key')- @UseGuards(OrgGuard)- @Render('auth/pc')- async getAuthPagePc(- @Param('key') key: string,- ) {- const authUrl = await this.wxPlatService.getAuthPageUrl(key, 'pc');- // 处理url,转base64- return {- url: authUrl,- }- }-- /**- * 获取授权页面- */- @Get('auth/page/h5/:key')- @Render('auth/h5')- async getAuthPageH5(- @Param('key') key: string,+ @Get('auth/page')+ async getAuthPage(+ @Query() query: GetAuthUrlDto,+ @Res() res: Response) {- const authUrl = await this.wxPlatService.getAuthPageUrl(key, 'h5');- return {- url: authUrl,- }+ const redirectUri = `${config.wxPlat.authBackHost}/wxPlat/auth/back/${query.key}/${query.stat}`;+ const authUrl = await this.wxPlatService.getAuthPageUrl(redirectUri, query.type);++ return res.render(+ `auth/${query.type}`,+ { url: authUrl },+ );}/**diff --git a/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/wxPlat.service.ts b/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/wxPlat.service.tsindex 5dfb86b3..482655d4 100644--- a/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/wxPlat.service.ts+++ b/aitoearn_web/server/aitoearn-wxplat/src/core/wxPlat/wxPlat.service.ts@@ -15,7 +15,6 @@ import { decode } from './WXMsgCrypto';@Injectable()export class WxPlatService {- private authBackHost = '';private encodingAESKey = '';private componentAccessTokenCacheKey = 'wxPlat:component_access_token';@@ -24,7 +23,6 @@ export class WxPlatService {private readonly wxPlatApiService: WxPlatApiService,) {this.encodingAESKey = config.wxPlat.encodingAESKey;- this.authBackHost = config.wxPlat.authBackHost;}decryptWXData(data: string) {@@ -94,16 +92,15 @@ export class WxPlatService {/*** 获取授权页面链接- * @param key+ * @param redirectUri* @param type* @returns*/- async getAuthPageUrl(key: string, type: 'h5' | 'pc'): Promise<string> {+ async getAuthPageUrl(redirectUri: string, type: 'h5' | 'pc'): Promise<string> {const componentAccessToken = await this.getComponentAccessToken();if (!componentAccessToken)throw new AppException(ExceptionCode.File, '不存在平台授权令牌');- const redirectUri = `${this.authBackHost}/wxPlat/auth/back/${key}`;const res= await this.wxPlatApiService.getPreAuthCode(componentAccessToken);