-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/pages/login/Login.vue b/app/src/pages/login/Login.vue
index ac16ae6..10169f1 100644
--- a/app/src/pages/login/Login.vue
+++ b/app/src/pages/login/Login.vue
@@ -3,54 +3,78 @@
-
-
-
-
- (null);
+
+// 核心：处理日志时间戳，移除 .xxx +08:00 部分
+const formatLogTime = (logContent: string) => {
+ // 正则匹配：2025-12-11 18:41:39.624 +08:00 格式，捕获前面的日期时间部分
+ // 正则解释：
+ // (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}) 捕获 年-月-日 时:分:秒
+ // \.\d+ \+08:00 匹配 .毫秒 +时区 部分
+ const timeRegex = /(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\.\d+ \+08:00/g;
+
+ // 替换匹配到的内容，只保留捕获的日期时间部分
+ return logContent.replace(timeRegex, '$1');
+};
onMounted(() => {
// console.log(mIfrm.value);
loadLogs();
@@ -54,6 +66,7 @@ const loadLogs = () => {
.apiGetLogs(iframeUrl.value)
.then((log) => {
// console.log(log);
+ log = formatLogTime(log);
const lines = log.split('\n'); // 将文本按换行符分割为行数组
const reversedLines = lines.reverse(); // 对行数组进行倒序操作
const reversedText = reversedLines.join('\n'); // 将行数组重新连接为一个字符串
diff --git a/app/src/router/guards.ts b/app/src/router/guards.ts
index b565436..fc063af 100644
--- a/app/src/router/guards.ts
+++ b/app/src/router/guards.ts
@@ -16,7 +16,7 @@ interface NaviGuard {
const loginGuard: NavigationGuard = function (to, from) {
// console.log('Authorization', http.checkAuthorization())
const account = useAccountStore();
- if (!http.checkAuthorization() && !/^\/(login|home|init)?$/.test(to.fullPath)) {
+ if (!http.checkAuthorization() && !/^\/(login|home|init|mobile)?$/.test(to.fullPath)) {
account.setLogged(false)
return '/login';
} else {
diff --git a/app/src/router/routes.ts b/app/src/router/routes.ts
index 9e7cb80..fd7f541 100644
--- a/app/src/router/routes.ts
+++ b/app/src/router/routes.ts
@@ -14,6 +14,18 @@ const routes: RouteRecordRaw[] = [
children: null,
component: () => import('@/pages/login'),
},
+ {
+ path: '/',
+ name: 'mobile',
+ redirect: '/mobile',
+ meta: {
+ title: '登录',
+ renderMenu: false,
+ icon: 'CreditCardOutlined',
+ },
+ children: null,
+ component: () => import('@/pages/mobile/MobileDashboard.vue'),
+ },
// {
// path: '/',
// name: 'init',
@@ -26,6 +38,7 @@ const routes: RouteRecordRaw[] = [
// children: null,
// component: () => import('@/pages/init'),
// },
+
{
path: '/front',
name: '前端',
@@ -45,7 +58,18 @@ const routes: RouteRecordRaw[] = [
},
component: () => import('@/pages/login'),
},
-
+ {
+ path: '/mobile',
+ name: 'mobile',
+ meta: {
+ icon: 'LoginOutlined',
+ view: 'blank',
+ target: '_blank',
+ cacheable: false,
+ },
+ children: null,
+ component: () => import('@/pages/mobile/MobileDashboard.vue'),
+ },
// {
// path: '/init',
// name: '初始化',
diff --git a/app/src/store/coreapi.ts b/app/src/store/coreapi.ts
index 52b247a..7efc158 100644
--- a/app/src/store/coreapi.ts
+++ b/app/src/store/coreapi.ts
@@ -236,7 +236,27 @@ export const useApiStore = defineStore('coreapi', () => {
});
}
+
+ //移动端获取日志列表
+ async function MobileLogs() {
+ return http.request>('/api/logs/list', 'get').then(r => {
+ return r.data;
+ }).finally(() => {
+
+ });
+ }
+
+ //移动端获取日志详情
+ async function LogDetail(type: string, date: string) {
+ return http.request>('/api/logs/content?type=' + type + "&Date=" + date, 'get').then(r => {
+ return r.data;
+ }).finally(() => {
+
+ });
+ }
return {
+ LogDetail,
+ MobileLogs,
ExportConf,
ImportConf,
GetDeleteViedos,
diff --git a/appsettings.json b/appsettings.json
index 97796ea..dae4dc3 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -1,7 +1,7 @@
{
"dbconn": "",
- //"tagName": "arm_1.8.5",
- //"tagName": "dev_1.8.5",
- "tagName": "beta_1.8.5",
+ //"tagName": "arm_1.8.6",
+ //"tagName": "dev_1.8.6",
+ "tagName": "beta_1.8.6",
"dbtype": "Sqlite"
}
\ No newline at end of file
diff --git a/dto/LogFileInfoDto.cs b/dto/LogFileInfoDto.cs
new file mode 100644
index 0000000..c738a3b
--- /dev/null
+++ b/dto/LogFileInfoDto.cs
@@ -0,0 +1,40 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace dy.net.dto
+{
+ public class LogFileInfoDto
+ {
+
+
+ ///
+ /// 日志类型（debug/error）
+ ///
+ public string Type { get; set; }
+
+ ///
+ /// 日志日期（格式：20251203）
+ ///
+ public string Date { get; set; }
+
+ ///
+ /// 完整文件名
+ ///
+ public string FileName { get; set; }
+ }
+
+
+ public class LogContentRequest
+ {
+ ///
+ /// 日志类型
+ ///
+ [Required]
+ public string Type { get; set; }
+
+ ///
+ /// 日志日期
+ ///
+ [Required]
+ public string Date { get; set; }
+ }
+}
diff --git a/service/LogInfoService.cs b/service/LogInfoService.cs
new file mode 100644
index 0000000..b44ce93
--- /dev/null
+++ b/service/LogInfoService.cs
@@ -0,0 +1,83 @@
+using dy.net.dto;
+using System.Globalization;
+
+namespace dy.net.service
+{
+ public class LogInfoService
+ {
+
+ public List GetLogFiles(string logDirectory)
+ {
+ var logFiles = new List();
+
+ // 验证目录是否存在
+ if (!Directory.Exists(logDirectory))
+ {
+ Serilog.Log.Error("日志目录不存在：{Directory}", logDirectory);
+ return logFiles;
+ }
+
+ // 获取最近10天的日期范围
+ var endDate = DateTime.Today;
+ var startDate = endDate.AddDays(-9);
+
+ // 遍历日期范围，查找对应日志文件
+ for (var date = startDate; date <= endDate; date = date.AddDays(1))
+ {
+ var dateStr = date.ToString("yyyyMMdd");
+
+ // 查找debug日志
+ var debugFile = Path.Combine(logDirectory, $"log-debug-{dateStr}.txt");
+ if (File.Exists(debugFile))
+ {
+ logFiles.Add(new LogFileInfoDto
+ {
+ Type = "debug",
+ Date = dateStr,
+ FileName = Path.GetFileName(debugFile)
+ });
+ }
+
+ // 查找error日志
+ var errorFile = Path.Combine(logDirectory, $"log-error-{dateStr}.txt");
+ if (File.Exists(errorFile))
+ {
+ logFiles.Add(new LogFileInfoDto
+ {
+ Type = "error",
+ Date = dateStr,
+ FileName = Path.GetFileName(errorFile)
+ });
+ }
+ }
+
+ return logFiles.OrderByDescending(x => x.Date).ToList();
+ }
+
+
+ public Stream GetLogFileStream(string logDirectory, string type, string date)
+ {
+ // 验证日期格式
+ if (!DateTime.TryParseExact(date, "yyyyMMdd", CultureInfo.InvariantCulture,
+ DateTimeStyles.None, out _))
+ {
+ throw new ArgumentException("日期格式错误，应为yyyyMMdd");
+ }
+
+ // 验证类型
+ if (type != "debug" && type != "error")
+ {
+ throw new ArgumentException("日志类型只能是debug或error");
+ }
+
+ var filePath = Path.Combine(logDirectory, $"log-{type}-{date}.txt");
+ if (!File.Exists(filePath))
+ {
+ throw new FileNotFoundException("日志文件不存在", filePath);
+ }
+
+ // 返回文件流（使用FileStream确保流可被前端读取）
+ return new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+ }
+ }
+}
-
+ 登录
+ 登录中...
+
+
+
+
\ No newline at end of file
diff --git a/app/src/pages/mobile/MobileDashboard.vue b/app/src/pages/mobile/MobileDashboard.vue
new file mode 100644
index 0000000..2fbdba5
--- /dev/null
+++ b/app/src/pages/mobile/MobileDashboard.vue
@@ -0,0 +1,999 @@
+
+
- 
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 登录
- 登录中...
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 
-
抖小云
+抖小云
+
+
+
+
+
+
+ 记住密码
+
+
-
-
-
- 记住密码
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/pages/mylogs/MyLogs.vue b/app/src/pages/mylogs/MyLogs.vue
index 052014c..8ef7b53 100644
--- a/app/src/pages/mylogs/MyLogs.vue
+++ b/app/src/pages/mylogs/MyLogs.vue
@@ -45,6 +45,18 @@ const typeChange = (e) => {
loadLogs();
};
const mIfrm = ref
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ totalVideos }}
+
+
+
+
+
+ {{ favoriteCount }}
+
+
+
+
+ {{ collectCount }}
+
+
+
+
+ {{ followCount }}
+
+
+
+
+ {{ graphicVideoCount }}
+
+
+
+
+
+
+
+
+
+ {{ fileSizeTotal }} G
+
+
+
+
+
+ {{ favoriteSize }} G
+
+
+
+
+ {{ collectSize }} G
+
+
+
+
+ {{ followSize }} G
+
+
+
+
+ {{ graphicVideoSize }} G
+
+
+
+
+
+
+ 系统日志
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ log.type }}
+
+ {{formatShowDate(log?.date) }}
+
+
+ {{ log.fileName }}
+
+ 暂无{{ logFilter === 'all' ? '' : logFilter.toUpperCase() }}类型日志
+
+
+
+
+
+
+
+
+
+
+