#: Modify Authorization.tsx

zdu-strong · Jan 18, 2025 · 725d9bd · 725d9bd
1 parent 55b461e
commit 725d9bd
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 23 deletions.
diff --git a/capacitor/src/api/index.tsx b/capacitor/src/api/index.tsx
@@ -1,12 +1,9 @@
 import * as Git from '@/api/Git'
 import * as Resource from '@/api/Resource'
+import * as LongTermTask from '@/api/LongTermTask'
 
 export default {
   Git,
   Resource,
+  LongTermTask,
 }
-
-
-
-
-
diff --git a/capacitor/src/common/WebWorker/UploadResource/UploadResource.worker.tsx b/capacitor/src/common/WebWorker/UploadResource/UploadResource.worker.tsx
@@ -3,7 +3,7 @@ import registerWebworker from 'webworker-promise/lib/register'
 import axios from "axios";
 import { concatMap, from, lastValueFrom, map, range, timer, toArray } from "rxjs";
 import * as mathjs from 'mathjs'
-import { getLongTermTask } from '@/api/LongTermTask';
+import api from '@/api';
 import { addMilliseconds } from 'date-fns'
 import linq from 'linq'
 
@@ -78,7 +78,7 @@ registerWebworker(async ({
     }),
     map((response) => response.data),
     toArray(),
-    concatMap((urlList) => from(getLongTermTask(async () => axios.post<string>(`/upload/merge`, urlList)))),
+    concatMap((urlList) => from(api.LongTermTask.getLongTermTask(async () => axios.post<string>(`/upload/merge`, urlList)))),
     map((result) => result as string)
   ));
   return url;

diff --git a/electron/src/api/index.tsx b/electron/src/api/index.tsx
@@ -1,12 +1,9 @@
 import * as Git from '@/api/Git'
 import * as Resource from '@/api/Resource'
+import * as LongTermTask from '@/api/LongTermTask'
 
 export default {
   Git,
   Resource,
+  LongTermTask,
 }
-
-
-
-
-
diff --git a/electron/src/common/WebWorker/UploadResource/UploadResource.worker.tsx b/electron/src/common/WebWorker/UploadResource/UploadResource.worker.tsx
@@ -3,7 +3,7 @@ import registerWebworker from 'webworker-promise/lib/register'
 import axios from "axios";
 import { concatMap, from, lastValueFrom, map, range, timer, toArray } from "rxjs";
 import * as mathjs from 'mathjs'
-import { getLongTermTask } from '@/api/LongTermTask';
+import api from '@/api';
 import { addMilliseconds } from 'date-fns'
 import linq from 'linq'
 
@@ -78,7 +78,7 @@ registerWebworker(async ({
     }),
     map((response) => response.data),
     toArray(),
-    concatMap((urlList) => from(getLongTermTask(async () => axios.post<string>(`/upload/merge`, urlList)))),
+    concatMap((urlList) => from(api.LongTermTask.getLongTermTask(async () => axios.post<string>(`/upload/merge`, urlList)))),
     map((result) => result as string)
   ));
   return url;

diff --git a/react/src/api/Authorization.tsx b/react/src/api/Authorization.tsx
@@ -1,4 +1,4 @@
-import { getKeyOfRSAPublicKey } from '@/api/EncryptDecrypt';
+import api from '@/api';
 import { encryptByPublicKeyOfRSA } from "@/common/RSAUtils";
 import { GlobalUserInfo, removeGlobalUserInfo, setGlobalUserInfo } from "@/common/Server";
 import { UserEmailModel } from "@/model/UserEmailModel";
@@ -29,7 +29,7 @@ export async function signIn(username: string, password: string): Promise<void>
   const { data } = await axios.post(`/sign_in/one_time_password`, null, {
     params: {
       username: username,
-      password: await encryptByPublicKeyOfRSA(password, await getKeyOfRSAPublicKey()),
+      password: await encryptByPublicKeyOfRSA(password, await api.EncryptDecrypt.getKeyOfRSAPublicKey()),
     }
   });
   const user = new TypedJSON(UserModel).parse(data)!;

diff --git a/react/src/api/index.tsx b/react/src/api/index.tsx
@@ -5,6 +5,9 @@ import * as Resource from '@/api/Resource'
 import * as Friendship from '@/api/Friendship'
 import * as SuperAdminSystemRoleQuery from '@/api/SuperAdminUserRoleQuery'
 import * as SuperAdminUserQuery from '@/api/SuperAdminUserQuery'
+import * as EncryptDecrypt from '@/api/EncryptDecrypt'
+import * as LongTermTask from '@/api/LongTermTask'
+import * as User from '@/api/User'
 
 export default {
   Authorization,
@@ -14,9 +17,7 @@ export default {
   Resource,
   SuperAdminSystemRoleQuery,
   SuperAdminUserQuery,
+  EncryptDecrypt,
+  LongTermTask,
+  User,
 }
-
-
-
-
-
diff --git a/react/src/common/WebWorker/UploadResource/UploadResource.worker.tsx b/react/src/common/WebWorker/UploadResource/UploadResource.worker.tsx
@@ -3,7 +3,7 @@ import registerWebworker from 'webworker-promise/lib/register'
 import axios from "axios";
 import { concatMap, from, lastValueFrom, map, range, timer, toArray } from "rxjs";
 import * as mathjs from 'mathjs'
-import { getLongTermTask } from '@/api/LongTermTask';
+import api from '@/api';
 import { addMilliseconds } from 'date-fns'
 import linq from 'linq'
 
@@ -78,7 +78,7 @@ registerWebworker(async ({
     }),
     map((response) => response.data),
     toArray(),
-    concatMap((urlList) => from(getLongTermTask(async () => axios.post<string>(`/upload/merge`, urlList)))),
+    concatMap((urlList) => from(api.LongTermTask.getLongTermTask(async () => axios.post<string>(`/upload/merge`, urlList)))),
     map((result) => result as string)
   ));
   return url;