Let's use AI to Earn!
TypeScript auto-publishdouyindouyin-apielectron-appelectron-reactkuaishoukwaipublishedshipinhaotoolxiaohongshu
没选择的情况下头像置灰 - 在授权youtube和twitter的时候,授权成功,但是一直在报错,根本停不下来 -- 因为前端不知道用户是不是取消了。新增最大重试次数 思考跟云浏览器那边协作,
daoyian474d4fd5c79e
diff --git a/@types/resources.d.ts b/@types/resources.d.tsindex 30cc0040..8753e4ac 100644--- a/@types/resources.d.ts+++ b/@types/resources.d.ts@@ -1166,7 +1166,8 @@ interface Resources {},"actions": {"selectMaterial": "选择素材",- "selectDraft": "选择草稿"+ "selectDraft": "选择草稿",+ "cropCover": "裁剪封面"}},"route": {diff --git a/docs/accounts-url-params.md b/docs/accounts-url-params.mdnew file mode 100644index 00000000..f6e56f9f--- /dev/null+++ b/docs/accounts-url-params.md@@ -0,0 +1,106 @@+# Accounts页面URL参数使用说明++## 概述++Accounts页面现在支持通过URL参数直接打开添加账号弹窗并自动触发指定平台的授权流程。++## 支持的参数++### 1. platform (平台类型)+- **类型**: string+- **必填**: 否+- **说明**: 指定要添加的平台类型+- **有效值**:+ - `tiktok` - TikTok+ - `douyin` - 抖音+ - `xhs` - 小红书+ - `wxSph` - 微信视频号+ - `KWAI` - 快手+ - `youtube` - YouTube+ - `bilibili` - B站+ - `twitter` - Twitter+ - `wxGzh` - 微信公众号+ - `facebook` - Facebook+ - `instagram` - Instagram+ - `threads` - Threads+ - `pinterest` - Pinterest++### 2. spaceId (空间ID)+- **类型**: string+- **必填**: 否+- **说明**: 指定要添加账号的目标空间ID+- **注意**: 如果不提供此参数,弹窗会显示空间选择器++## 使用示例++### 示例2: 指定平台类型和空间ID+```+/accounts?platform=bilibili&spaceId=68aff90bba742c232af986f2+```+- 打开添加账号弹窗+- 预选择指定的空间ID+- 自动触发Instagram授权流程++## 功能特性++### 1. 自动弹窗+- 当URL包含相关参数时,页面加载后会自动打开添加账号弹窗++### 2. 参数验证+- 系统会验证平台类型是否有效+- 无效的平台类型会被忽略++### 3. 空间预选择+- 如果提供了有效的spaceId,弹窗会预选择该空间+- 如果没有提供spaceId,会显示空间选择器++### 4. 自动授权触发+- 如果同时提供了有效的platform和spaceId,会自动触发对应平台的授权流程+- 授权流程会在弹窗完全打开后延迟500ms执行++### 5. URL清理+- 当用户关闭弹窗时,URL参数会被自动清除+- 使用`window.history.replaceState`确保URL干净++## 技术实现++### 1. 页面结构+```+/accounts/page.tsx - 接收URL参数+└── /accounts/accountCore.tsx - 处理参数逻辑+ └── AddAccountModal - 执行具体操作+```++### 2. 参数处理流程+1. 页面接收`searchParams`+2. 验证平台类型有效性+3. 设置弹窗状态和参数+4. 打开添加账号弹窗+5. 自动触发平台授权(如果条件满足)++### 3. 状态管理+- 使用React hooks管理弹窗状态+- 使用Zustand store管理账号数据+- 参数状态在组件内部管理++## 注意事项++1. **平台类型大小写敏感**: 请确保使用正确的平台类型值+2. **空间ID有效性**: 系统不会验证spaceId是否存在,请确保提供有效的ID+3. **授权流程**: 自动授权需要用户手动完成授权流程+4. **浏览器兼容性**: URL清理功能需要现代浏览器支持+5. **SSR兼容**: 参数处理在客户端执行,确保SSR兼容性++## 错误处理++- 无效的平台类型会被忽略,不会影响其他功能+- 网络错误或授权失败会显示相应的错误信息+- 弹窗关闭时会清理URL参数,避免重复触发++## 扩展性++该功能设计具有良好的扩展性:+- 可以轻松添加新的平台类型+- 可以扩展更多URL参数+- 可以自定义参数验证逻辑+- 可以添加更多的自动触发行为diff --git a/docs/test-urls.md b/docs/test-urls.mdnew file mode 100644index 00000000..2a79856d--- /dev/null+++ b/docs/test-urls.md@@ -0,0 +1,81 @@+# 测试URL列表++## 功能测试链接++### 1. 只指定平台类型+- [Facebook授权](http://localhost:3000/accounts?platform=facebook)+- [Instagram授权](http://localhost:3000/accounts?platform=instagram)+- [TikTok授权](http://localhost:3000/accounts?platform=tiktok)+- [YouTube授权](http://localhost:3000/accounts?platform=youtube)+- [Twitter授权](http://localhost:3000/accounts?platform=twitter)++### 2. 指定平台类型和空间ID+- [Facebook + 空间ID](http://localhost:3000/accounts?platform=facebook&spaceId=123456)+- [Instagram + 空间ID](http://localhost:3000/accounts?platform=instagram&spaceId=789012)+- [TikTok + 空间ID](http://localhost:3000/accounts?platform=tiktok&spaceId=345678)++### 3. 只指定空间ID+- [指定空间ID](http://localhost:3000/accounts?spaceId=123456)++### 4. 无效参数测试+- [无效平台类型](http://localhost:3000/accounts?platform=invalid_platform)+- [无效平台 + 有效空间ID](http://localhost:3000/accounts?platform=invalid&spaceId=123456)++## 测试步骤++1. **基础功能测试**+ - 点击上述链接+ - 验证弹窗是否自动打开+ - 验证参数是否正确传递++2. **平台授权测试**+ - 使用包含platform参数的链接+ - 验证是否自动触发对应平台授权+ - 验证授权流程是否正常++3. **空间选择测试**+ - 使用包含spaceId参数的链接+ - 验证空间是否正确预选择+ - 验证空间选择器是否按预期显示++4. **参数清理测试**+ - 打开弹窗后关闭+ - 验证URL参数是否被清理+ - 验证页面状态是否重置++5. **错误处理测试**+ - 使用无效参数+ - 验证系统是否正确处理错误+ - 验证其他功能是否正常++## 预期结果++### 成功场景+- ✅ 弹窗自动打开+- ✅ 参数正确传递+- ✅ 平台授权自动触发+- ✅ 空间正确预选择+- ✅ URL参数正确清理++### 错误场景+- ✅ 无效参数被忽略+- ✅ 系统正常运行+- ✅ 错误信息正确显示+- ✅ 用户体验不受影响++## 调试信息++在浏览器控制台中可以看到以下调试信息:+- 参数接收日志+- 平台验证结果+- 弹窗状态变化+- 授权流程日志+- URL清理操作++## 注意事项++1. 确保开发服务器正在运行+2. 确保网络连接正常+3. 某些平台可能需要特定的网络环境+4. 授权流程需要用户手动完成+5. 测试时注意浏览器控制台的错误信息diff --git a/src/api/account.ts b/src/api/account.tsindex 624b4883..8e5d9e2f 100644--- a/src/api/account.ts+++ b/src/api/account.ts@@ -71,7 +71,6 @@ export const deleteAccountGroupApi = (ids: string[]) => {// 获取所有账户组export const getAccountGroupApi = async () => {const res:any = await http.get<AccountGroupItem[]>("accountGroup/getList");- console.log(res.data);// res.data.push({// id: "68a6d3e5861d0b23ca010123",// ip: "188.166.188.86",diff --git a/src/app/[lng]/accounts/accountCore.tsx b/src/app/[lng]/accounts/accountCore.tsxindex 689f61f2..e5fa383f 100644--- a/src/app/[lng]/accounts/accountCore.tsx+++ b/src/app/[lng]/accounts/accountCore.tsx@@ -3,24 +3,76 @@import styles from "./accounts.module.scss";import { useAccountStore } from "@/store/account";import { useShallow } from "zustand/react/shallow";-import { useEffect } from "react";+import { useEffect, useState } from "react";import { NoSSR } from "@kwooshung/react-no-ssr";import AccountSidebar from "@/app/[lng]/accounts/components/AccountSidebar/AccountSidebar";import CalendarTiming from "@/app/[lng]/accounts/components/CalendarTiming";+import AddAccountModal from "@/app/[lng]/accounts/components/AddAccountModal";+import { PlatType } from "@/app/config/platConfig";+import { SocialAccount } from "@/api/types/account.type";-export default function AccountPageCore() {- const { accountInit, accountActive, setAccountActive } = useAccountStore(+interface AccountPageCoreProps {+ searchParams?: {+ platform?: string;+ spaceId?: string;+ };+}++export default function AccountPageCore({ searchParams }: AccountPageCoreProps) {+ const { accountInit, accountActive, setAccountActive, accountGroupList } = useAccountStore(useShallow((state) => ({accountInit: state.accountInit,setAccountActive: state.setAccountActive,accountActive: state.accountActive,+ accountGroupList: state.accountGroupList,})),);+ // 添加账号弹窗状态+ const [addAccountModalOpen, setAddAccountModalOpen] = useState(false);+ const [targetPlatform, setTargetPlatform] = useState<PlatType | undefined>();+ const [targetSpaceId, setTargetSpaceId] = useState<string | undefined>();+useEffect(() => {accountInit();}, []);+ // 处理URL参数+ useEffect(() => {+ if (searchParams?.platform || searchParams?.spaceId) {+ // 验证平台类型是否有效+ const platform = searchParams.platform as PlatType;+ const validPlatforms = Object.values(PlatType);++ if (searchParams.platform && validPlatforms.includes(platform)) {+ setTargetPlatform(platform);+ }++ if (searchParams.spaceId) {+ setTargetSpaceId(searchParams.spaceId);+ }++ // 打开添加账号弹窗+ setAddAccountModalOpen(true);+ }+ }, [searchParams]);++ const handleAddAccountSuccess = (accountInfo: SocialAccount) => {+ setAddAccountModalOpen(false);+ // 可以在这里添加成功提示或其他逻辑+ };++ const handleAddAccountClose = () => {+ setAddAccountModalOpen(false);+ // 清除URL参数(可选)+ if (typeof window !== 'undefined') {+ const url = new URL(window.location.href);+ url.searchParams.delete('platform');+ url.searchParams.delete('spaceId');+ window.history.replaceState({}, '', url.toString());+ }+ };+return (<NoSSR><div className={styles.accounts}>@@ -35,6 +87,16 @@ export default function AccountPageCore() {}}/><CalendarTiming />++ {/* 添加账号弹窗 */}+ <AddAccountModal+ open={addAccountModalOpen}+ onClose={handleAddAccountClose}+ onAddSuccess={handleAddAccountSuccess}+ targetGroupId={targetSpaceId}+ showSpaceSelector={!targetSpaceId}+ autoTriggerPlatform={targetPlatform}+ /></div></NoSSR>);diff --git a/src/app/[lng]/accounts/components/AddAccountModal/index.tsx b/src/app/[lng]/accounts/components/AddAccountModal/index.tsxindex 1938dd49..54977cd5 100644--- a/src/app/[lng]/accounts/components/AddAccountModal/index.tsx+++ b/src/app/[lng]/accounts/components/AddAccountModal/index.tsx@@ -32,12 +32,14 @@ export interface IAddAccountModalProps {targetGroupId?: string;// 是否显示空间选择器(当从AccountSidebar的"添加账号"按钮打开时显示)showSpaceSelector?: boolean;+ // 自动触发平台,用于在打开时直接尝试跳转授权+ autoTriggerPlatform?: PlatType;}const AddAccountModal = memo(forwardRef(- (- { open, onClose, onAddSuccess, targetGroupId, showSpaceSelector = false }: IAddAccountModalProps,+ (+ { open, onClose, onAddSuccess, targetGroupId, showSpaceSelector = false, autoTriggerPlatform }: IAddAccountModalProps,ref: ForwardedRef<IAddAccountModalRef>,) => {const { t } = useTransClient('account');@@ -130,10 +132,25 @@ const AddAccountModal = memo(};}, [open, selectedSpaceId]);+ // 自动触发平台授权+ useEffect(() => {+ if (open && autoTriggerPlatform && selectedSpaceId) {+ // 延迟一下确保弹窗完全打开+ const timer = setTimeout(() => {+ const platformInfo = AccountPlatInfoArr.find(([key]) => key === autoTriggerPlatform);+ if (platformInfo) {+ handlePlatformClick(autoTriggerPlatform, platformInfo[1]);+ }+ }, 500);++ return () => clearTimeout(timer);+ }+ }, [open, autoTriggerPlatform, selectedSpaceId]);+// 判断平台是否在当前属地可用const isPlatformAvailable = (platType: PlatType): boolean => {// TODO: 暂时屏蔽国内平台 @@.@@- // return true;+ return true;if (isCnSpace === null) return true; // 未确定属地时显示所有平台const cnOnlyPlatforms = new Set<PlatType>([@@ -245,13 +262,13 @@ const AddAccountModal = memo(const targetGroup = accountGroupList.find(group => group.id === selectedSpaceId);const isDefaultSpace = targetGroup?.isDefault;- console.log('移动空间调试信息:', {- selectedSpaceId,- targetGroupName: targetGroup?.name,- isDefaultSpace,- showSpaceSelector,- spaceSelectionRequired- });+ // console.log('移动空间调试信息:', {+ // selectedSpaceId,+ // targetGroupName: targetGroup?.name,+ // isDefaultSpace,+ // showSpaceSelector,+ // spaceSelectionRequired+ // });// 只有当选择了非默认空间时才移动账号if (!isDefaultSpace) {diff --git a/src/app/[lng]/accounts/page.tsx b/src/app/[lng]/accounts/page.tsxindex 00716d8a..cbc22f06 100644--- a/src/app/[lng]/accounts/page.tsx+++ b/src/app/[lng]/accounts/page.tsx@@ -15,6 +15,13 @@ export async function generateMetadata({ params }: PageParams) {);}-export default function Page() {- return <AccountPageCore />;+interface AccountsPageProps {+ searchParams: {+ platform?: string;+ spaceId?: string;+ };+}++export default function Page({ searchParams }: AccountsPageProps) {+ return <AccountPageCore searchParams={searchParams} />;}diff --git a/src/app/[lng]/accounts/plat/BilibiliLogin.ts b/src/app/[lng]/accounts/plat/BilibiliLogin.tsindex d1042d05..2e8562e1 100644--- a/src/app/[lng]/accounts/plat/BilibiliLogin.ts+++ b/src/app/[lng]/accounts/plat/BilibiliLogin.ts@@ -28,12 +28,14 @@ export async function bilibiliSkip(platType: PlatType) {export function bilibiliLogin(taskId:any): Promise<any> {return new Promise(async (resolve, reject) => {try {+ let pollCount = 0;+ const maxPollCount = 30; // 最大轮询次数// 开始轮询检查授权状态const checkAuthStatus = async () => {try {+ pollCount++;const authRess:any = await apiCheckBilibiliAuth(taskId);- console.log('authRess', authRess);let authRes = authRess;if (authRes?.code === 0 && authRes?.data.status == 1) {// message.success('授权成功');@@ -43,6 +45,13 @@ export function bilibiliLogin(taskId:any): Promise<any> {resolve(authRes);return true;}++ // 检查是否达到最大轮询次数+ if (pollCount >= maxPollCount) {+ console.log('达到最大轮询次数,停止轮询');+ return true;+ }+// return false;} catch (error) {console.error('检查授权状态失败:', error);@@ -55,6 +64,9 @@ export function bilibiliLogin(taskId:any): Promise<any> {const isSuccess = await checkAuthStatus();if (isSuccess) {clearInterval(interval);+ if (pollCount >= maxPollCount) {+ reject(new Error('授权超时,已达到最大轮询次数'));+ }}}, 2000);diff --git a/src/app/[lng]/accounts/plat/FacebookLogin.ts b/src/app/[lng]/accounts/plat/FacebookLogin.tsindex a8461100..586eeeb1 100644--- a/src/app/[lng]/accounts/plat/FacebookLogin.ts+++ b/src/app/[lng]/accounts/plat/FacebookLogin.ts@@ -30,9 +30,13 @@ export async function facebookSkip(platType: PlatType) {export function facebookLogin(taskId: any): Promise<any> {return new Promise(async (resolve, reject) => {try {+ let pollCount = 0;+ const maxPollCount = 30; // 最大轮询次数+// 开始轮询检查授权状态const checkAuthStatus = async () => {try {+ pollCount++;const authRess: any = await checkMetaAuthApi(taskId);let authRes = authRess;console.log('authRes', authRes)@@ -42,6 +46,13 @@ export function facebookLogin(taskId: any): Promise<any> {resolve(authRes);return true;}++ // 检查是否达到最大轮询次数+ if (pollCount >= maxPollCount) {+ console.log('达到最大轮询次数,停止轮询');+ return true;+ }+// return false;} catch (error) {console.error('检查授权状态失败:', error);@@ -54,6 +65,9 @@ export function facebookLogin(taskId: any): Promise<any> {const isSuccess = await checkAuthStatus();if (isSuccess) {clearInterval(interval);+ if (pollCount >= maxPollCount) {+ reject(new Error('授权超时,已达到最大轮询次数'));+ }}}, 2000);diff --git a/src/app/[lng]/accounts/plat/InstagramLogin.ts b/src/app/[lng]/accounts/plat/InstagramLogin.tsindex a1eb0fe7..31f3800d 100644--- a/src/app/[lng]/accounts/plat/InstagramLogin.ts+++ b/src/app/[lng]/accounts/plat/InstagramLogin.ts@@ -28,9 +28,13 @@ export async function instagramSkip(platType: PlatType) {export function instagramLogin(taskId:any): Promise<any> {return new Promise(async (resolve, reject) => {try {+ let pollCount = 0;+ const maxPollCount = 30; // 最大轮询次数+// 开始轮询检查授权状态const checkAuthStatus = async () => {try {+ pollCount++;const authRess:any = await checkMetaAuthApi(taskId);let authRes = authRess;console.log('authRes', authRes)@@ -42,6 +46,13 @@ export function instagramLogin(taskId:any): Promise<any> {resolve(authRes);return true;}++ // 检查是否达到最大轮询次数+ if (pollCount >= maxPollCount) {+ console.log('达到最大轮询次数,停止轮询');+ return true;+ }+// return false;} catch (error) {console.error('检查授权状态失败:', error);@@ -54,6 +65,9 @@ export function instagramLogin(taskId:any): Promise<any> {const isSuccess = await checkAuthStatus();if (isSuccess) {clearInterval(interval);+ if (pollCount >= maxPollCount) {+ reject(new Error('授权超时,已达到最大轮询次数'));+ }}}, 2000);diff --git a/src/app/[lng]/accounts/plat/PinterestLogin.ts b/src/app/[lng]/accounts/plat/PinterestLogin.tsindex f5c1d4d0..e1ecfcf1 100644--- a/src/app/[lng]/accounts/plat/PinterestLogin.ts+++ b/src/app/[lng]/accounts/plat/PinterestLogin.ts@@ -28,9 +28,13 @@ export async function pinterestSkip(platType: PlatType) {export function pinterestLogin(taskId:any): Promise<any> {return new Promise(async (resolve, reject) => {try {+ let pollCount = 0;+ const maxPollCount = 30; // 最大轮询次数+// 开始轮询检查授权状态const checkAuthStatus = async () => {try {+ pollCount++;const authRess:any = await checkPinterestAuthApi(taskId);let authRes = authRess;console.log('authRes', authRes)@@ -42,6 +46,13 @@ export function pinterestLogin(taskId:any): Promise<any> {resolve(authRes);return true;}++ // 检查是否达到最大轮询次数+ if (pollCount >= maxPollCount) {+ console.log('达到最大轮询次数,停止轮询');+ return true;+ }+// return false;} catch (error) {console.error('检查授权状态失败:', error);@@ -54,6 +65,9 @@ export function pinterestLogin(taskId:any): Promise<any> {const isSuccess = await checkAuthStatus();if (isSuccess) {clearInterval(interval);+ if (pollCount >= maxPollCount) {+ reject(new Error('授权超时,已达到最大轮询次数'));+ }}}, 2000);diff --git a/src/app/[lng]/accounts/plat/ThreadsLogin.ts b/src/app/[lng]/accounts/plat/ThreadsLogin.tsindex 789fdcfc..80b7d6a9 100644--- a/src/app/[lng]/accounts/plat/ThreadsLogin.ts+++ b/src/app/[lng]/accounts/plat/ThreadsLogin.ts@@ -29,9 +29,13 @@ export async function threadsSkip(platType: PlatType) {export function threadsLogin(taskId:any): Promise<any> {return new Promise(async (resolve, reject) => {try {+ let pollCount = 0;+ const maxPollCount = 30; // 最大轮询次数+// 开始轮询检查授权状态const checkAuthStatus = async () => {try {+ pollCount++;const authRess:any = await checkMetaAuthApi(taskId);let authRes = authRess;console.log('authRes', authRes)@@ -43,6 +47,13 @@ export function threadsLogin(taskId:any): Promise<any> {resolve(authRes);return true;}++ // 检查是否达到最大轮询次数+ if (pollCount >= maxPollCount) {+ console.log('达到最大轮询次数,停止轮询');+ return true;+ }+// return false;} catch (error) {console.error('检查授权状态失败:', error);@@ -55,6 +66,9 @@ export function threadsLogin(taskId:any): Promise<any> {const isSuccess = await checkAuthStatus();if (isSuccess) {clearInterval(interval);+ if (pollCount >= maxPollCount) {+ reject(new Error('授权超时,已达到最大轮询次数'));+ }}}, 2000);diff --git a/src/app/[lng]/accounts/plat/TiktokLogin.ts b/src/app/[lng]/accounts/plat/TiktokLogin.tsindex 8c7ab665..6ec3bb55 100644--- a/src/app/[lng]/accounts/plat/TiktokLogin.ts+++ b/src/app/[lng]/accounts/plat/TiktokLogin.ts@@ -28,9 +28,13 @@ export async function tiktokSkip(platType: PlatType) {export function tiktokLogin(taskId:any): Promise<any> {return new Promise(async (resolve, reject) => {try {+ let pollCount = 0;+ const maxPollCount = 30; // 最大轮询次数+// 开始轮询检查授权状态const checkAuthStatus = async () => {try {+ pollCount++;const authRess:any = await checkTiktokAuthApi(taskId);let authRes = authRess;console.log('authRes', authRes)@@ -42,6 +46,13 @@ export function tiktokLogin(taskId:any): Promise<any> {resolve(authRes);return true;}++ // 检查是否达到最大轮询次数+ if (pollCount >= maxPollCount) {+ console.log('达到最大轮询次数,停止轮询');+ return true;+ }+// return false;} catch (error) {console.error('检查授权状态失败:', error);@@ -54,6 +65,9 @@ export function tiktokLogin(taskId:any): Promise<any> {const isSuccess = await checkAuthStatus();if (isSuccess) {clearInterval(interval);+ if (pollCount >= maxPollCount) {+ reject(new Error('授权超时,已达到最大轮询次数'));+ }}}, 2000);diff --git a/src/app/[lng]/accounts/plat/TwtterLogin.ts b/src/app/[lng]/accounts/plat/TwtterLogin.tsindex a463eb17..e9b27452 100644--- a/src/app/[lng]/accounts/plat/TwtterLogin.ts+++ b/src/app/[lng]/accounts/plat/TwtterLogin.ts@@ -28,9 +28,13 @@ export async function twitterSkip(platType: PlatType) {export function twitterLogin(taskId:any): Promise<any> {return new Promise(async (resolve, reject) => {try {+ let pollCount = 0;+ const maxPollCount = 30; // 最大轮询次数+// 开始轮询检查授权状态const checkAuthStatus = async () => {try {+ pollCount++;const authRess:any = await apiCheckTwitterAuth(taskId);let authRes = authRess;console.log('authRes', authRes)@@ -42,6 +46,13 @@ export function twitterLogin(taskId:any): Promise<any> {resolve(authRes);return true;}++ // 检查是否达到最大轮询次数+ if (pollCount >= maxPollCount) {+ console.log('达到最大轮询次数,停止轮询');+ return true;+ }+// return false;} catch (error) {console.error('检查授权状态失败:', error);@@ -54,6 +65,9 @@ export function twitterLogin(taskId:any): Promise<any> {const isSuccess = await checkAuthStatus();if (isSuccess) {clearInterval(interval);+ if (pollCount >= maxPollCount) {+ reject(new Error('授权超时,已达到最大轮询次数'));+ }}}, 2000);diff --git a/src/app/[lng]/accounts/plat/WxGzh.ts b/src/app/[lng]/accounts/plat/WxGzh.tsindex 6d68f387..8b8554bf 100644--- a/src/app/[lng]/accounts/plat/WxGzh.ts+++ b/src/app/[lng]/accounts/plat/WxGzh.ts@@ -28,9 +28,13 @@ export async function wxGzhSkip(platType: PlatType) {export function wxGzhLogin(taskId:any): Promise<any> {return new Promise(async (resolve, reject) => {try {+ let pollCount = 0;+ const maxPollCount = 30; // 最大轮询次数+// 开始轮询检查授权状态const checkAuthStatus = async () => {try {+ pollCount++;const authRess:any = await checkWxGzAuthApi(taskId);let authRes = authRess;console.log('authRes', authRes)@@ -42,6 +46,13 @@ export function wxGzhLogin(taskId:any): Promise<any> {resolve(authRes);return true;}++ // 检查是否达到最大轮询次数+ if (pollCount >= maxPollCount) {+ console.log('达到最大轮询次数,停止轮询');+ return true;+ }+// return false;} catch (error) {console.error('检查授权状态失败:', error);@@ -54,6 +65,9 @@ export function wxGzhLogin(taskId:any): Promise<any> {const isSuccess = await checkAuthStatus();if (isSuccess) {clearInterval(interval);+ if (pollCount >= maxPollCount) {+ reject(new Error('授权超时,已达到最大轮询次数'));+ }}}, 2000);diff --git a/src/app/[lng]/accounts/plat/YoutubeLogin.ts b/src/app/[lng]/accounts/plat/YoutubeLogin.tsindex 1dc0061b..0fee7a9a 100644--- a/src/app/[lng]/accounts/plat/YoutubeLogin.ts+++ b/src/app/[lng]/accounts/plat/YoutubeLogin.ts@@ -21,16 +21,20 @@ export async function youtubeSkip(platType: PlatType) {const url = res.data.url;window.open(`${url}`);- const bilibiliLoginRes = await bilibiliLogin(res.data.taskId);+ const youtubeLoginRes = await youtubeLogin(res.data.taskId);}-export function bilibiliLogin(taskId:any): Promise<any> {+export function youtubeLogin(taskId:any): Promise<any> {return new Promise(async (resolve, reject) => {try {+ let pollCount = 0;+ const maxPollCount = 30; // 最大轮询次数+// 开始轮询检查授权状态const checkAuthStatus = async () => {try {+ pollCount++;const authRess:any = await apiCheckYoutubeAuth(taskId);let authRes = authRess;console.log('authRes', authRes)@@ -42,6 +46,13 @@ export function bilibiliLogin(taskId:any): Promise<any> {resolve(authRes);return true;}++ // 检查是否达到最大轮询次数+ if (pollCount >= maxPollCount) {+ console.log('达到最大轮询次数,停止轮询');+ return true;+ }+// return false;} catch (error) {console.error('检查授权状态失败:', error);@@ -54,6 +65,9 @@ export function bilibiliLogin(taskId:any): Promise<any> {const isSuccess = await checkAuthStatus();if (isSuccess) {clearInterval(interval);+ if (pollCount >= maxPollCount) {+ reject(new Error('授权超时,已达到最大轮询次数'));+ }}}, 2000);diff --git a/src/app/[lng]/accounts/plat/kwaiLogin.ts b/src/app/[lng]/accounts/plat/kwaiLogin.tsindex c10c37f3..bd6f3b4e 100644--- a/src/app/[lng]/accounts/plat/kwaiLogin.ts+++ b/src/app/[lng]/accounts/plat/kwaiLogin.ts@@ -14,7 +14,9 @@ export async function kwaiSkip(platType: PlatType) {window.open(res?.data.url);let queryCount = 0;- while (queryCount < 120) {+ const maxQueryCount = 30; // 最大轮询次数++ while (queryCount < maxQueryCount) {const autoStatusRes = await getKwaiAuthStatus(res.data.taskId);if (!autoStatusRes?.data) break;@@ -26,4 +28,9 @@ export async function kwaiSkip(platType: PlatType) {queryCount++;await sleep(1000);}++ // 如果达到最大轮询次数仍未成功,记录日志+ if (queryCount >= maxQueryCount) {+ console.log('快手授权达到最大轮询次数,停止轮询');+ }}diff --git a/src/app/i18n/locales/en/publish.json b/src/app/i18n/locales/en/publish.jsonindex ff3638e8..10f702a2 100644--- a/src/app/i18n/locales/en/publish.json+++ b/src/app/i18n/locales/en/publish.json@@ -92,6 +92,7 @@},"actions": {"selectMaterial": "Select Material",- "selectDraft": "Select Draft"+ "selectDraft": "Select Draft",+ "cropCover": "Crop Cover"}}\ No newline at end of filediff --git a/src/app/i18n/locales/zh-CN/publish.json b/src/app/i18n/locales/zh-CN/publish.jsonindex c4db69e7..040ef38b 100644--- a/src/app/i18n/locales/zh-CN/publish.json+++ b/src/app/i18n/locales/zh-CN/publish.json@@ -92,6 +92,7 @@},"actions": {"selectMaterial": "选择素材",- "selectDraft": "选择草稿"+ "selectDraft": "选择草稿",+ "cropCover": "裁剪封面"}}\ No newline at end of filediff --git a/src/components/AvatarPlat/avatarPlat.module.scss b/src/components/AvatarPlat/avatarPlat.module.scssindex 7333c2c8..b0428143 100644--- a/src/components/AvatarPlat/avatarPlat.module.scss+++ b/src/components/AvatarPlat/avatarPlat.module.scss@@ -9,4 +9,14 @@transform: translate(-10%, 20%);border-radius: 50%;}++ &.disabled {+ filter: grayscale(100%);+ opacity: 0.6;++ &:hover {+ filter: grayscale(100%);+ opacity: 0.6;+ }+ }}\ No newline at end of filediff --git a/src/components/AvatarPlat/index.tsx b/src/components/AvatarPlat/index.tsxindex 67b368c0..8e8e1666 100644--- a/src/components/AvatarPlat/index.tsx+++ b/src/components/AvatarPlat/index.tsx@@ -14,6 +14,7 @@ export interface IAvatarPlatProps {className?: string;width?: number;avatarWidth?: number;+ disabled?: boolean;}const getAvatar = (url: string) => {@@ -33,6 +34,7 @@ const AvatarPlat = memo(className,width,avatarWidth,+ disabled,}: IAvatarPlatProps,ref: ForwardedRef<IAvatarPlatRef>,) => {@@ -50,10 +52,11 @@ const AvatarPlat = memo(return (<>- <div className={`${styles.avatarPlat} ${className}`}>+ <div className={`${styles.avatarPlat} ${className} ${disabled ? styles.disabled : ''}`}><Avatarsrc={getAvatar(account.avatar)}size={avatarWidth ? avatarWidth : size}+ style={disabled ? { opacity: 0.5 } : undefined}/><imgsrc={plat.icon}@@ -62,9 +65,11 @@ const AvatarPlat = memo(? {width:size === "large" ? 16 : size === "default" ? 12.5 : 10,+ opacity: disabled ? 0.5 : 1,}: {width,+ opacity: disabled ? 0.5 : 1,}}/>diff --git a/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx b/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsxindex fd65053a..e458609d 100644--- a/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx+++ b/src/components/PublishDialog/compoents/PubParmasTextarea/index.tsx@@ -25,6 +25,7 @@ import VideoCoverSeting from "@/components/PublishDialog/compoents/PubParmasTextimport PubParmasTextareaUpload from "@/components/PublishDialog/compoents/PubParmasTextarea/PubParmasTextareaUpload";import { AccountPlatInfoMap, PlatType } from "@/app/config/platConfig";import { PubType } from "@/app/config/publishConfig";+import { useTransClient } from "@/app/i18n/client";const { TextArea } = Input;const { Dragger } = Upload;@@ -89,6 +90,7 @@ const PubParmasTextarea = memo(effect: true,sort: true,});+ const { t } = useTransClient("publish");useEffect(() => {if (isFirst.current.effect) {@@ -437,7 +439,7 @@ const PubParmasTextarea = memo(style={{ marginTop: "10px" }}onClick={() => setVideoCoverSetingModal(true)}>- 裁剪封面+ {t("actions.cropCover")}</Button>)}</div>diff --git a/src/components/PublishDialog/index.tsx b/src/components/PublishDialog/index.tsxindex 672db229..0a511309 100644--- a/src/components/PublishDialog/index.tsx+++ b/src/components/PublishDialog/index.tsx@@ -548,9 +548,10 @@ const PublishDialog = memo(}}><AvatarPlat- className="publishDialog-con-acconts-item-avatar"+ className={`publishDialog-con-acconts-item-avatar ${!isChoosed ? 'disabled' : ''}`}account={pubItem.account}size="large"+ disabled={!isChoosed}/></div>);diff --git a/src/components/PublishDialog/publishDialog.module.scss b/src/components/PublishDialog/publishDialog.module.scssindex c8b9a617..ac3e3fa8 100644--- a/src/components/PublishDialog/publishDialog.module.scss+++ b/src/components/PublishDialog/publishDialog.module.scss@@ -59,6 +59,18 @@ $assistantWidth: 330px;filter: grayscale(0);}}++ // 未选中状态:保持置灰+ &.disabled {+ & > img {+ filter: grayscale(100%);+ }+ &:hover {+ img {+ filter: grayscale(100%);+ }+ }+ }}}}diff --git a/src/hooks/useNotification.ts b/src/hooks/useNotification.tsindex 354f5286..07f374c6 100644--- a/src/hooks/useNotification.ts+++ b/src/hooks/useNotification.ts@@ -27,19 +27,21 @@ export const useNotification = () => {}}, [token]);- useEffect(() => {- // 初始获取- fetchUnreadCount();-- // 每10秒获取一次未读数量- const interval = setInterval(() => {- fetchUnreadCount();- }, 60000);-- return () => {- clearInterval(interval);- };- }, [fetchUnreadCount]);+ // @@.@@++ // useEffect(() => {+ // // 初始获取+ // fetchUnreadCount();++ // // 每10秒获取一次未读数量+ // const interval = setInterval(() => {+ // fetchUnreadCount();+ // }, 60000);++ // return () => {+ // clearInterval(interval);+ // };+ // }, [fetchUnreadCount]);return {unreadCount,