diff --git a/apps/frontend/src/assets/icons/close.svg b/apps/frontend/src/assets/icons/close.svg
deleted file mode 100644
index 5b5057f..0000000
--- a/apps/frontend/src/assets/icons/close.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/frontend/src/assets/icons/close_all.svg b/apps/frontend/src/assets/icons/close_all.svg
deleted file mode 100644
index aa13cd7..0000000
--- a/apps/frontend/src/assets/icons/close_all.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/frontend/src/assets/icons/close_left.svg b/apps/frontend/src/assets/icons/close_left.svg
deleted file mode 100644
index e5708ea..0000000
--- a/apps/frontend/src/assets/icons/close_left.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/frontend/src/assets/icons/close_other.svg b/apps/frontend/src/assets/icons/close_other.svg
deleted file mode 100644
index 212e6c2..0000000
--- a/apps/frontend/src/assets/icons/close_other.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/apps/frontend/src/assets/icons/close_right.svg b/apps/frontend/src/assets/icons/close_right.svg
deleted file mode 100644
index 14d3cf3..0000000
--- a/apps/frontend/src/assets/icons/close_right.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/frontend/src/assets/icons/expire-time.svg b/apps/frontend/src/assets/icons/expire-time.svg
deleted file mode 100644
index c47ac4f..0000000
--- a/apps/frontend/src/assets/icons/expire-time.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/frontend/src/assets/icons/homepage.svg b/apps/frontend/src/assets/icons/homepage.svg
deleted file mode 100644
index 48f4e24..0000000
--- a/apps/frontend/src/assets/icons/homepage.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/frontend/src/assets/icons/info-account.svg b/apps/frontend/src/assets/icons/info-account.svg
deleted file mode 100644
index 62c8dec..0000000
--- a/apps/frontend/src/assets/icons/info-account.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/frontend/src/assets/icons/quota.svg b/apps/frontend/src/assets/icons/quota.svg
deleted file mode 100644
index f897b12..0000000
--- a/apps/frontend/src/assets/icons/quota.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/frontend/src/assets/icons/share.svg b/apps/frontend/src/assets/icons/share.svg
deleted file mode 100644
index 31e5b5a..0000000
--- a/apps/frontend/src/assets/icons/share.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/frontend/src/components/Hamburger/index.vue b/apps/frontend/src/components/Hamburger/index.vue
index bbd3acf..802c6dc 100644
--- a/apps/frontend/src/components/Hamburger/index.vue
+++ b/apps/frontend/src/components/Hamburger/index.vue
@@ -1,20 +1,16 @@
-
+
diff --git a/apps/frontend/src/layout/components/Sidebar/Logo.vue b/apps/frontend/src/layout/components/Sidebar/Logo.vue
index 9d4ee18..a27f0c4 100644
--- a/apps/frontend/src/layout/components/Sidebar/Logo.vue
+++ b/apps/frontend/src/layout/components/Sidebar/Logo.vue
@@ -58,9 +58,9 @@ const logo = ref(new URL(`../../../assets/logo.png`, import.meta.url).href);
.sidebar-logo-title {
margin-left: 12px;
- color: #fff;
font-size: 14px;
font-weight: 700;
+ color: #fff;
}
.sidebarLogoFade-enter-active {
diff --git a/apps/frontend/src/layout/components/Sidebar/index.vue b/apps/frontend/src/layout/components/Sidebar/index.vue
index 7c2cd72..f97755a 100644
--- a/apps/frontend/src/layout/components/Sidebar/index.vue
+++ b/apps/frontend/src/layout/components/Sidebar/index.vue
@@ -33,11 +33,9 @@ const route = useRoute();
:item="route"
:key="route.path"
:base-path="route.path"
- :is-collapse="!appStore.sidebar.opened"
/>
-
diff --git a/apps/frontend/src/styles/index.scss b/apps/frontend/src/styles/index.scss
index 3b10a86..d751628 100644
--- a/apps/frontend/src/styles/index.scss
+++ b/apps/frontend/src/styles/index.scss
@@ -5,7 +5,6 @@
.app-container {
margin: 20px;
- .search,
.page-toolbar {
padding: 16px 20px;
margin-bottom: 12px;
@@ -13,9 +12,7 @@
border: 1px solid var(--el-border-color-light);
border-radius: 4px;
box-shadow: var(--el-box-shadow-light);
- }
- .page-toolbar {
.el-form {
display: flex;
flex-wrap: wrap;
@@ -28,11 +25,4 @@
margin-bottom: 0;
}
}
-
- .search {
- padding: 18px 0 0 10px;
- margin-bottom: 10px;
- }
}
-
-
diff --git a/apps/frontend/src/styles/reset.scss b/apps/frontend/src/styles/reset.scss
index 40f2fed..8f74395 100644
--- a/apps/frontend/src/styles/reset.scss
+++ b/apps/frontend/src/styles/reset.scss
@@ -26,7 +26,7 @@ body {
height: 100%;
margin: 0;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
- "Microsoft YaHei", "Arial", Arial, sans-serif;
+ "Microsoft YaHei", Arial, Arial, sans-serif;
line-height: inherit;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
diff --git a/apps/frontend/src/styles/sidebar.scss b/apps/frontend/src/styles/sidebar.scss
index 1de353e..84f365e 100644
--- a/apps/frontend/src/styles/sidebar.scss
+++ b/apps/frontend/src/styles/sidebar.scss
@@ -49,11 +49,11 @@
.el-menu-item,
.el-sub-menu__title {
display: flex;
- align-items: center;
gap: 12px;
+ align-items: center;
height: 48px;
- line-height: normal;
padding: 0 16px !important;
+ line-height: normal;
color: $menuText !important;
}
@@ -83,8 +83,8 @@
width: 18px;
height: 18px;
margin-right: 0;
- color: currentColor;
- fill: currentColor;
+ color: currentcolor;
+ fill: currentcolor;
}
.menu-title {
@@ -150,8 +150,8 @@
.sidebar-container .el-menu--collapse > .el-menu-item,
.sidebar-container .el-menu--collapse > .el-sub-menu > .el-sub-menu__title {
- justify-content: center;
gap: 0;
+ justify-content: center;
padding: 0 !important;
}
diff --git a/apps/frontend/src/styles/variables.scss b/apps/frontend/src/styles/variables.scss
index 218a7b8..41d5b89 100644
--- a/apps/frontend/src/styles/variables.scss
+++ b/apps/frontend/src/styles/variables.scss
@@ -8,7 +8,6 @@
--el-color-primary-light-7: #ffc8bd;
--el-color-primary-light-8: #ffdcd6;
--el-color-primary-light-9: #ffedea;
-
--menuBg: #181818;
--menuText: #fff;
--menuActiveText: #fff;
diff --git a/apps/frontend/src/views/peer/list/index.vue b/apps/frontend/src/views/peer/list/index.vue
index b941664..8fd909a 100644
--- a/apps/frontend/src/views/peer/list/index.vue
+++ b/apps/frontend/src/views/peer/list/index.vue
@@ -352,9 +352,9 @@ onMounted(handleQuery);
diff --git a/apps/service/journal.go b/apps/service/journal.go
index 32ddbfa..d61b0cc 100644
--- a/apps/service/journal.go
+++ b/apps/service/journal.go
@@ -12,16 +12,23 @@ import (
)
type journalctlLogLine struct {
- Message string `json:"MESSAGE"`
- Priority string `json:"PRIORITY"`
- RealtimeTimestamp string `json:"__REALTIME_TIMESTAMP"`
+ Message string `json:"MESSAGE"`
+ Priority string `json:"PRIORITY"`
+ RealtimeTimestamp string `json:"__REALTIME_TIMESTAMP"`
+}
+
+func normalizeJournalLineLimit(value int, fallback int, max int) int {
+ if value <= 0 {
+ return fallback
+ }
+ if value > max {
+ return max
+ }
+ return value
}
func ReadHysteriaJournalLogs(numLine int) ([]vo.LogHysteria2Vo, int, error) {
- lines := 100
- if numLine > 0 {
- lines = numLine
- }
+ lines := normalizeJournalLineLimit(numLine, 100, 300)
output, err := util.Exec(fmt.Sprintf("journalctl --no-pager -u hysteria-server.service -n %d -o json", lines))
if err != nil {
@@ -52,10 +59,7 @@ func ReadHysteriaJournalLogs(numLine int) ([]vo.LogHysteria2Vo, int, error) {
}
func ExportHysteriaJournalLogs(numLine int) (string, error) {
- lines := 5000
- if numLine > 0 {
- lines = numLine
- }
+ lines := normalizeJournalLineLimit(numLine, 5000, 10000)
return util.Exec(fmt.Sprintf("journalctl --no-pager -u hysteria-server.service -n %d -o short-iso", lines))
}
@@ -117,4 +121,3 @@ func mapJournalPriorityToLevel(priority string) string {
return "info"
}
}
-
diff --git a/docs/12-operations-and-troubleshooting.md b/docs/12-operations-and-troubleshooting.md
index 60440c3..bdb9f15 100644
--- a/docs/12-operations-and-troubleshooting.md
+++ b/docs/12-operations-and-troubleshooting.md
@@ -69,8 +69,8 @@ cat /etc/hysteria/post-install.env
Проверка логов через journald:
```bash
-journalctl -u hysteria-server -n 100 --no-pager
-journalctl -u hy2xs-admin -n 100 --no-pager
+journalctl -u hysteria-server.service -n 100 --no-pager
+journalctl -u hy2xs-admin.service -n 100 --no-pager
```
Источник логов в UI: