From 2550a1fde84c1062b54a695036610786291dc047 Mon Sep 17 00:00:00 2001 From: jianzhichu Date: Mon, 8 Dec 2025 12:45:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=20=E4=BB=A5=E5=8F=8Aapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/AuthController.cs | 2 +- .../PublishProfiles/FolderProfile.pubxml.user | 2 +- app/src/App.vue | 13 +- app/src/pages/init/Init.vue | 129 ------------------ app/src/pages/init/index.ts | 3 - app/src/pages/login/LoginBox.vue | 1 + app/src/pages/set/AppSet.vue | 4 - app/src/router/guards.ts | 17 +-- app/src/store/coreapi.ts | 36 ----- appsettings.json | 6 +- 10 files changed, 12 insertions(+), 201 deletions(-) delete mode 100644 app/src/pages/init/Init.vue delete mode 100644 app/src/pages/init/index.ts diff --git a/Controllers/AuthController.cs b/Controllers/AuthController.cs index 5097ce5..dac4acf 100644 --- a/Controllers/AuthController.cs +++ b/Controllers/AuthController.cs @@ -127,7 +127,7 @@ namespace dy.net.Controllers var tokenString = GenerateJwtToken(user.UserName); - return Ok(new { code = 0, erro = "", token = tokenString, expires = 24 * 60 * 60 * 1000 }); + return Ok(new { code = 0, erro = "", token = tokenString, expires = 24 * 60 * 60 * 1000,data=user.UserName }); } else { diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user index 3180e12..5dd7b1e 100644 --- a/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\code\dysync\bin\Release\net6.0\publish\ - True|2025-12-08T03:34:29.6673185Z||;False|2025-12-08T11:30:56.2857042+08:00||;True|2025-12-08T10:52:43.7427594+08:00||;True|2025-12-08T07:05:03.2845531+08:00||;True|2025-12-07T23:02:10.0037815+08:00||;True|2025-12-07T22:48:25.7859648+08:00||;True|2025-12-07T20:49:13.6683281+08:00||;True|2025-12-07T08:47:30.1236366+08:00||;True|2025-12-06T13:14:32.4410202+08:00||;True|2025-12-06T13:07:29.7182102+08:00||;True|2025-12-06T13:05:46.2855366+08:00||;False|2025-12-06T13:05:40.3550904+08:00||;True|2025-12-06T13:03:47.8773880+08:00||;True|2025-12-06T13:03:28.9521030+08:00||;True|2025-12-05T23:11:51.5026151+08:00||;True|2025-12-05T12:46:26.1415079+08:00||;False|2025-12-05T12:46:19.1274332+08:00||;True|2025-12-05T09:04:36.7111717+08:00||;True|2025-12-05T08:22:51.7343317+08:00||;True|2025-12-05T08:20:32.0383739+08:00||;True|2025-12-04T21:58:29.4112766+08:00||;True|2025-12-04T21:58:10.0382218+08:00||;True|2025-12-04T21:57:55.3894059+08:00||;True|2025-12-04T21:10:38.8943797+08:00||;True|2025-12-04T21:09:31.5024569+08:00||;True|2025-12-04T08:22:47.9617427+08:00||;False|2025-12-04T08:22:41.3759733+08:00||;True|2025-12-04T08:14:02.2478893+08:00||;True|2025-12-04T07:57:00.2208139+08:00||;True|2025-12-03T23:58:13.3693303+08:00||;True|2025-12-03T23:57:40.4257893+08:00||;True|2025-12-03T23:56:38.8717769+08:00||;True|2025-12-03T23:56:24.0663568+08:00||;False|2025-12-03T23:55:36.1902974+08:00||;True|2025-12-03T23:51:30.6688504+08:00||;True|2025-12-03T23:34:17.1648971+08:00||;False|2025-12-03T23:34:07.7649161+08:00||;True|2025-12-03T22:32:56.2435003+08:00||;True|2025-12-03T22:27:45.6059666+08:00||;True|2025-12-03T15:55:28.0186597+08:00||;False|2025-12-03T15:54:17.5032724+08:00||;True|2025-12-03T15:53:10.2273509+08:00||;True|2025-12-02T22:11:37.4645042+08:00||;False|2025-12-02T22:10:47.1320259+08:00||;True|2025-12-02T14:39:58.8932130+08:00||;True|2025-12-02T14:36:37.1529072+08:00||;True|2025-12-02T12:58:22.0951548+08:00||;True|2025-12-02T09:30:33.7066474+08:00||;True|2025-12-02T09:30:14.5481844+08:00||;True|2025-12-02T09:30:00.3123364+08:00||;False|2025-12-02T09:29:54.4615520+08:00||;True|2025-12-02T09:13:01.7995414+08:00||;False|2025-12-02T09:12:55.8360281+08:00||;True|2025-12-02T09:12:31.0156791+08:00||;True|2025-12-02T08:55:11.3773395+08:00||;True|2025-12-02T08:53:21.3927713+08:00||;False|2025-12-02T08:48:55.8638037+08:00||;True|2025-12-02T07:29:25.2192447+08:00||;False|2025-12-02T07:29:10.2504665+08:00||;True|2025-12-02T07:28:29.0769286+08:00||;True|2025-12-01T21:53:07.6474834+08:00||;True|2025-12-01T21:44:28.1674315+08:00||;True|2025-12-01T21:18:47.2119609+08:00||;True|2025-12-01T20:51:19.9948301+08:00||;True|2025-12-01T20:50:36.9904697+08:00||;True|2025-12-01T20:44:10.1695142+08:00||;True|2025-12-01T19:27:58.0479456+08:00||;True|2025-12-01T19:16:02.2288214+08:00||;False|2025-12-01T19:15:56.0372115+08:00||;True|2025-12-01T19:15:16.4854821+08:00||;False|2025-12-01T19:15:06.7001019+08:00||;True|2025-12-01T17:10:38.9739466+08:00||;False|2025-12-01T17:10:18.8928139+08:00||;True|2025-12-01T17:03:59.3171589+08:00||;True|2025-12-01T17:03:12.5681656+08:00||;True|2025-12-01T16:42:51.4415025+08:00||;True|2025-12-01T01:29:59.6975567+08:00||;True|2025-12-01T01:29:45.1898652+08:00||;False|2025-12-01T01:29:33.1787721+08:00||;True|2025-12-01T01:27:33.1297605+08:00||;True|2025-12-01T01:27:27.3976862+08:00||;False|2025-12-01T01:27:20.5193052+08:00||;True|2025-12-01T01:11:11.0210582+08:00||;True|2025-12-01T01:04:04.3307782+08:00||;True|2025-12-01T00:55:49.8018864+08:00||;True|2025-12-01T00:27:25.1323561+08:00||;True|2025-11-30T23:58:20.7284116+08:00||;True|2025-11-30T23:57:58.3027622+08:00||;True|2025-11-30T23:57:43.0829614+08:00||;False|2025-11-30T23:57:33.5606716+08:00||;True|2025-11-30T23:54:29.6203368+08:00||;True|2025-11-30T23:54:27.5383120+08:00||;False|2025-11-30T23:54:17.0823982+08:00||;True|2025-11-30T22:41:11.4538820+08:00||;True|2025-11-30T22:38:19.7064566+08:00||;True|2025-11-30T22:37:35.2889186+08:00||;True|2025-11-30T21:42:31.1408314+08:00||;True|2025-11-30T21:42:19.5385333+08:00||;False|2025-11-30T21:42:13.3290237+08:00||;True|2025-11-30T21:33:28.0806806+08:00||; + True|2025-12-08T04:40:19.2430740Z||;True|2025-12-08T12:02:30.6005542+08:00||;True|2025-12-08T11:34:29.6673185+08:00||;False|2025-12-08T11:30:56.2857042+08:00||;True|2025-12-08T10:52:43.7427594+08:00||;True|2025-12-08T07:05:03.2845531+08:00||;True|2025-12-07T23:02:10.0037815+08:00||;True|2025-12-07T22:48:25.7859648+08:00||;True|2025-12-07T20:49:13.6683281+08:00||;True|2025-12-07T08:47:30.1236366+08:00||;True|2025-12-06T13:14:32.4410202+08:00||;True|2025-12-06T13:07:29.7182102+08:00||;True|2025-12-06T13:05:46.2855366+08:00||;False|2025-12-06T13:05:40.3550904+08:00||;True|2025-12-06T13:03:47.8773880+08:00||;True|2025-12-06T13:03:28.9521030+08:00||;True|2025-12-05T23:11:51.5026151+08:00||;True|2025-12-05T12:46:26.1415079+08:00||;False|2025-12-05T12:46:19.1274332+08:00||;True|2025-12-05T09:04:36.7111717+08:00||;True|2025-12-05T08:22:51.7343317+08:00||;True|2025-12-05T08:20:32.0383739+08:00||;True|2025-12-04T21:58:29.4112766+08:00||;True|2025-12-04T21:58:10.0382218+08:00||;True|2025-12-04T21:57:55.3894059+08:00||;True|2025-12-04T21:10:38.8943797+08:00||;True|2025-12-04T21:09:31.5024569+08:00||;True|2025-12-04T08:22:47.9617427+08:00||;False|2025-12-04T08:22:41.3759733+08:00||;True|2025-12-04T08:14:02.2478893+08:00||;True|2025-12-04T07:57:00.2208139+08:00||;True|2025-12-03T23:58:13.3693303+08:00||;True|2025-12-03T23:57:40.4257893+08:00||;True|2025-12-03T23:56:38.8717769+08:00||;True|2025-12-03T23:56:24.0663568+08:00||;False|2025-12-03T23:55:36.1902974+08:00||;True|2025-12-03T23:51:30.6688504+08:00||;True|2025-12-03T23:34:17.1648971+08:00||;False|2025-12-03T23:34:07.7649161+08:00||;True|2025-12-03T22:32:56.2435003+08:00||;True|2025-12-03T22:27:45.6059666+08:00||;True|2025-12-03T15:55:28.0186597+08:00||;False|2025-12-03T15:54:17.5032724+08:00||;True|2025-12-03T15:53:10.2273509+08:00||;True|2025-12-02T22:11:37.4645042+08:00||;False|2025-12-02T22:10:47.1320259+08:00||;True|2025-12-02T14:39:58.8932130+08:00||;True|2025-12-02T14:36:37.1529072+08:00||;True|2025-12-02T12:58:22.0951548+08:00||;True|2025-12-02T09:30:33.7066474+08:00||;True|2025-12-02T09:30:14.5481844+08:00||;True|2025-12-02T09:30:00.3123364+08:00||;False|2025-12-02T09:29:54.4615520+08:00||;True|2025-12-02T09:13:01.7995414+08:00||;False|2025-12-02T09:12:55.8360281+08:00||;True|2025-12-02T09:12:31.0156791+08:00||;True|2025-12-02T08:55:11.3773395+08:00||;True|2025-12-02T08:53:21.3927713+08:00||;False|2025-12-02T08:48:55.8638037+08:00||;True|2025-12-02T07:29:25.2192447+08:00||;False|2025-12-02T07:29:10.2504665+08:00||;True|2025-12-02T07:28:29.0769286+08:00||;True|2025-12-01T21:53:07.6474834+08:00||;True|2025-12-01T21:44:28.1674315+08:00||;True|2025-12-01T21:18:47.2119609+08:00||;True|2025-12-01T20:51:19.9948301+08:00||;True|2025-12-01T20:50:36.9904697+08:00||;True|2025-12-01T20:44:10.1695142+08:00||;True|2025-12-01T19:27:58.0479456+08:00||;True|2025-12-01T19:16:02.2288214+08:00||;False|2025-12-01T19:15:56.0372115+08:00||;True|2025-12-01T19:15:16.4854821+08:00||;False|2025-12-01T19:15:06.7001019+08:00||;True|2025-12-01T17:10:38.9739466+08:00||;False|2025-12-01T17:10:18.8928139+08:00||;True|2025-12-01T17:03:59.3171589+08:00||;True|2025-12-01T17:03:12.5681656+08:00||;True|2025-12-01T16:42:51.4415025+08:00||;True|2025-12-01T01:29:59.6975567+08:00||;True|2025-12-01T01:29:45.1898652+08:00||;False|2025-12-01T01:29:33.1787721+08:00||;True|2025-12-01T01:27:33.1297605+08:00||;True|2025-12-01T01:27:27.3976862+08:00||;False|2025-12-01T01:27:20.5193052+08:00||;True|2025-12-01T01:11:11.0210582+08:00||;True|2025-12-01T01:04:04.3307782+08:00||;True|2025-12-01T00:55:49.8018864+08:00||;True|2025-12-01T00:27:25.1323561+08:00||;True|2025-11-30T23:58:20.7284116+08:00||;True|2025-11-30T23:57:58.3027622+08:00||;True|2025-11-30T23:57:43.0829614+08:00||;False|2025-11-30T23:57:33.5606716+08:00||;True|2025-11-30T23:54:29.6203368+08:00||;True|2025-11-30T23:54:27.5383120+08:00||;False|2025-11-30T23:54:17.0823982+08:00||;True|2025-11-30T22:41:11.4538820+08:00||;True|2025-11-30T22:38:19.7064566+08:00||;True|2025-11-30T22:37:35.2889186+08:00||;True|2025-11-30T21:42:31.1408314+08:00||;True|2025-11-30T21:42:19.5385333+08:00||; diff --git a/app/src/App.vue b/app/src/App.vue index 61e4341..b233f23 100644 --- a/app/src/App.vue +++ b/app/src/App.vue @@ -81,19 +81,10 @@ const user = reactive({ onMounted(() => { useApiStore() - .apiCheckInitStatus() + .apiUserInfo() .then((res) => { if (res.code === 0) { - // useApiStore() - // .apiUserInfo() - // .then((res) => { - // if (res.code === 0 && res.code !== '') { - // if (res.data.avatar && res.data.avatar != null) { - // user.avatar = `/upload/${res.data.avatar}`; - // } - // user.name = res.data.userName; - // } - // }); + user.name = res.data?.userName; } }); }); diff --git a/app/src/pages/init/Init.vue b/app/src/pages/init/Init.vue deleted file mode 100644 index 6713178..0000000 --- a/app/src/pages/init/Init.vue +++ /dev/null @@ -1,129 +0,0 @@ - - - - diff --git a/app/src/pages/init/index.ts b/app/src/pages/init/index.ts deleted file mode 100644 index 7d52dc7..0000000 --- a/app/src/pages/init/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import Init from './Init.vue'; - -export default Init; diff --git a/app/src/pages/login/LoginBox.vue b/app/src/pages/login/LoginBox.vue index a81b921..041901c 100644 --- a/app/src/pages/login/LoginBox.vue +++ b/app/src/pages/login/LoginBox.vue @@ -158,6 +158,7 @@ async function login(params: LoginFormProps) { try { const res = await accountStore.login(params.username, params.password); emit('success', params); + console.log(res); message.success('登录成功！'); } catch (e: any) { // emit('failure', e.message, e.data); diff --git a/app/src/pages/set/AppSet.vue b/app/src/pages/set/AppSet.vue index 1c3e720..a70ef5b 100644 --- a/app/src/pages/set/AppSet.vue +++ b/app/src/pages/set/AppSet.vue @@ -215,7 +215,6 @@ interface FormState { Cron: number; Id: string; BatchCount: number; - DownImageVideoFromEnv: boolean; DownImageVideo: boolean; UperSaveTogether: boolean; UperUseViedoTitle: boolean; @@ -240,7 +239,6 @@ const formState: UnwrapRef = reactive({ UperUseViedoTitle: false, UperSaveTogether: false, DownImageVideo: false, - DownImageVideoFromEnv: false, DownMp3: false, DownImage: false, ImageViedoSaveAlone: true, @@ -313,7 +311,6 @@ const getConfig = () => { Cron: res.data.cron, Id: res.data.id, BatchCount: res.data.batchCount, - DownImageVideoFromEnv: res.data.downImageVideoFromEnv, DownImageVideo: res.data.downImageVideo, UperUseViedoTitle: res.data.uperUseViedoTitle, UperSaveTogether: res.data.uperSaveTogether, @@ -329,7 +326,6 @@ const getConfig = () => { DownDynamicVideo: res.data.downDynamicVideo, }); - // downImgVideo.value = res.data.downImageVideoFromEnv; tagData.value = JSON.parse(res.data.priorityLevel); } else { message.error(res.erro || '获取配置失败', 8); diff --git a/app/src/router/guards.ts b/app/src/router/guards.ts index 2b25a71..b565436 100644 --- a/app/src/router/guards.ts +++ b/app/src/router/guards.ts @@ -42,19 +42,10 @@ const dynamicinitRoute = const InitGuard: NavigationGuard = function (to, from) { if (to.fullPath != '/login') { - useApiStore() - .apiCheckInitStatus() - .then((res) => { - // console.log(to.fullPath) - if (res.code === 0) { - } else { - if (!router.hasRoute('login')) { - router.addRoute(dynamicinitRoute) - } - router.push('/login') - // return '/init' - } - }); + if (!router.hasRoute('login')) { + router.addRoute(dynamicinitRoute) + } + router.push('/login') } }; diff --git a/app/src/store/coreapi.ts b/app/src/store/coreapi.ts index 7bc179d..ed71a8c 100644 --- a/app/src/store/coreapi.ts +++ b/app/src/store/coreapi.ts @@ -28,43 +28,9 @@ import { Response } from '@/types'; // } export const useApiStore = defineStore('coreapi', () => { - //检查是否已经初始化过了 - async function apiCheckInitStatus() { - return { code: 0 } - // const initStatus = localStorage.getItem('ddns-init'); - // if (initStatus && initStatus === '1') { - // return { code: 0 } - // } else { - // return http - // .request>('/api/init/Check', 'GET') - // .then((res) => { - // // console.log(res) - // if (res.data.code === 0) { - // // localStorage.setItem('ddns-init', '1') - // } - // return res.data; - // }) - // .finally(() => { - // }); - // } - } - //初始化系统配置 - async function apiInit(request: object) { - console.log(request) - return http - .request>('/api/init/Init', 'post_json', request) - .then((res) => { - // console.log(res) - - return res.data; - }) - .finally(() => { - - }); - } //获取配置 async function apiGetConfig() { return http @@ -261,8 +227,6 @@ export const useApiStore = defineStore('coreapi', () => { CheckTag, deleteCookie, UpdateConfig, - apiCheckInitStatus, - apiInit, apiGetConfig, apiUpdateConfig, apiGetLogs, diff --git a/appsettings.json b/appsettings.json index 3d1f560..adcf3b9 100644 --- a/appsettings.json +++ b/appsettings.json @@ -1,7 +1,7 @@ { "dbconn": "", - //"tagName": "arm_1.8.3", - //"tagName": "dev_1.2.3", - "tagName": "beta_1.8.3", + //"tagName": "arm_1.8.4", + //"tagName": "dev_1.2.4", + "tagName": "beta_1.8.4", "dbtype": "Sqlite" } \ No newline at end of file