Merge remote-tracking branch 'upsteam/main' into fork

client/migrations/migrations_app.tsx

@@ -100,9 +100,9 @@ const MigrationsApp: React.FC = () => {
     },
     {
       title: '时间',
-      dataIndex: 'timestamp',
-      key: 'timestamp',
-      render: (timestamp: string) => dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')
+      dataIndex: 'migration_time',
+      key: 'migration_time',
+      render: (migration_time: string) => dayjs(migration_time).format('YYYY-MM-DD HH:mm:ss')
     },
   ];
 

client/mobile/api/index.ts

@@ -5,6 +5,15 @@ const API_BASE_URL = '/api';
 // 全局axios配置
 axios.defaults.baseURL = API_BASE_URL;
 
+// 获取OSS完整URL
+export const getOssUrl = (path: string): string => {
+  // 获取全局配置中的OSS_HOST，如果不存在使用默认值
+  const ossHost = (window.CONFIG?.OSS_BASE_URL) || '';
+  // 确保path不以/开头
+  const ossPath = path.startsWith('/') ? path.substring(1) : path;
+  return `${ossHost}/${ossPath}`;
+};
+
 export * from './auth.ts';
 export * from './user.ts';
 export * from './file.ts';
@@ -14,12 +23,3 @@ export * from './home.ts';
 export * from './map.ts';
 export * from './system.ts';
 export * from './message.ts';
-
-// 获取OSS完整URL
-export const getOssUrl = (path: string): string => {
-  // 获取全局配置中的OSS_HOST，如果不存在使用默认值
-  const ossHost = (window.CONFIG?.OSS_BASE_URL) || '';
-  // 确保path不以/开头
-  const ossPath = path.startsWith('/') ? path.substring(1) : path;
-  return `${ossHost}/${ossPath}`;
-};