diff --git a/agent/app/service/dashboard.go b/agent/app/service/dashboard.go
index 7a6c9c4ef..4a8efc361 100644
--- a/agent/app/service/dashboard.go
+++ b/agent/app/service/dashboard.go
@@ -81,7 +81,7 @@ func (u *DashboardService) Restart(operation string) error {
if operation != "1panel" && operation != "system" {
return fmt.Errorf("handle restart operation %s failed, err: nonsupport such operation", operation)
}
- itemCmd := fmt.Sprintf("%s systemctl restart 1panel.service", cmd.SudoHandleCmd())
+ itemCmd := fmt.Sprintf("%s systemctl restart 1panel-agent.service", cmd.SudoHandleCmd())
if operation == "system" {
itemCmd = fmt.Sprintf("%s reboot", cmd.SudoHandleCmd())
}
diff --git a/agent/utils/encrypt/encrypt.go b/agent/utils/encrypt/encrypt.go
index 6062c1f63..519f45375 100644
--- a/agent/utils/encrypt/encrypt.go
+++ b/agent/utils/encrypt/encrypt.go
@@ -25,6 +25,19 @@ func StringEncryptWithBase64(text string) (string, error) {
return encryptKeyItem, nil
}
+func StringEncryptWithKey(text, key string) (string, error) {
+ if len(text) == 0 {
+ return "", nil
+ }
+ pass := []byte(text)
+ xpass, err := aesEncryptWithSalt([]byte(key), pass)
+ if err == nil {
+ pass64 := base64.StdEncoding.EncodeToString(xpass)
+ return pass64, err
+ }
+ return "", err
+}
+
func StringEncrypt(text string) (string, error) {
if len(text) == 0 {
return "", nil
@@ -37,13 +50,7 @@ func StringEncrypt(text string) (string, error) {
global.CONF.Base.EncryptKey = encryptSetting.Value
}
key := global.CONF.Base.EncryptKey
- pass := []byte(text)
- xpass, err := aesEncryptWithSalt([]byte(key), pass)
- if err == nil {
- pass64 := base64.StdEncoding.EncodeToString(xpass)
- return pass64, err
- }
- return "", err
+ return StringEncryptWithKey(text, key)
}
func StringDecryptWithBase64(text string) (string, error) {
diff --git a/agent/utils/files/file_op.go b/agent/utils/files/file_op.go
index 53dc3f0e6..9456e6f3a 100644
--- a/agent/utils/files/file_op.go
+++ b/agent/utils/files/file_op.go
@@ -69,7 +69,7 @@ func (f FileOp) CreateDirWithPath(isDir bool, pathItem string) (string, error) {
if !isDir {
checkPath = path.Dir(pathItem)
}
- if f.Stat(checkPath) {
+ if !f.Stat(checkPath) {
if err := f.CreateDir(checkPath, os.ModePerm); err != nil {
global.LOG.Errorf("mkdir %s failed, err: %v", checkPath, err)
return pathItem, err
diff --git a/frontend/src/assets/iconfont/iconfont.css b/frontend/src/assets/iconfont/iconfont.css
index e063172cd..a607f404a 100644
--- a/frontend/src/assets/iconfont/iconfont.css
+++ b/frontend/src/assets/iconfont/iconfont.css
@@ -1,9 +1,9 @@
@font-face {
font-family: "iconfont"; /* Project id 4776196 */
- src: url('iconfont.woff2?t=1738832240410') format('woff2'),
- url('iconfont.woff?t=1738832240410') format('woff'),
- url('iconfont.ttf?t=1738832240410') format('truetype'),
- url('iconfont.svg?t=1738832240410#iconfont') format('svg');
+ src: url('iconfont.woff2?t=1739873339591') format('woff2'),
+ url('iconfont.woff?t=1739873339591') format('woff'),
+ url('iconfont.ttf?t=1739873339591') format('truetype'),
+ url('iconfont.svg?t=1739873339591#iconfont') format('svg');
}
.iconfont {
@@ -14,8 +14,8 @@
-moz-osx-font-smoothing: grayscale;
}
-.p-terminal3:before {
- content: "\eace";
+.p-terminal2:before {
+ content: "\e82f";
}
.p-tuijian:before {
@@ -70,14 +70,6 @@
content: "\e638";
}
-.p-terminal:before {
- content: "\e864";
-}
-
-.p-terminal1:before {
- content: "\e663";
-}
-
.p-arrow-right:before {
content: "\e665";
}
@@ -386,10 +378,6 @@
content: "\e701";
}
-.p-zhongduan:before {
- content: "\e61e";
-}
-
.p-17:before {
content: "\e618";
}
diff --git a/frontend/src/assets/iconfont/iconfont.js b/frontend/src/assets/iconfont/iconfont.js
index c99c52492..92eec1736 100644
--- a/frontend/src/assets/iconfont/iconfont.js
+++ b/frontend/src/assets/iconfont/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4776196='',(h=>{var l=(a=(a=document.getElementsByTagName("script"))[a.length-1]).getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var c,t,p,z,v,i=function(l,a){a.parentNode.insertBefore(l,a)};if(l&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}c=function(){var l,a=document.createElement("div");a.innerHTML=h._iconfont_svg_string_4776196,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(l=document.body).firstChild?i(a,l.firstChild):l.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),c()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(p=c,z=h.document,v=!1,d(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,m())})}function m(){v||(v=!0,p())}function d(){try{z.documentElement.doScroll("left")}catch(l){return void setTimeout(d,50)}m()}})(window);
\ No newline at end of file
+window._iconfont_svg_string_4776196='',(h=>{var l=(a=(a=document.getElementsByTagName("script"))[a.length-1]).getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var c,t,p,z,v,i=function(l,a){a.parentNode.insertBefore(l,a)};if(l&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}c=function(){var l,a=document.createElement("div");a.innerHTML=h._iconfont_svg_string_4776196,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(l=document.body).firstChild?i(a,l.firstChild):l.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),c()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(p=c,z=h.document,v=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,d())})}function d(){v||(v=!0,p())}function m(){try{z.documentElement.doScroll("left")}catch(l){return void setTimeout(m,50)}d()}})(window);
\ No newline at end of file
diff --git a/frontend/src/assets/iconfont/iconfont.json b/frontend/src/assets/iconfont/iconfont.json
index f3f67711e..c9418f627 100644
--- a/frontend/src/assets/iconfont/iconfont.json
+++ b/frontend/src/assets/iconfont/iconfont.json
@@ -6,11 +6,11 @@
"description": "",
"glyphs": [
{
- "icon_id": "40071541",
+ "icon_id": "5127551",
"name": "terminal",
- "font_class": "terminal3",
- "unicode": "eace",
- "unicode_decimal": 60110
+ "font_class": "terminal2",
+ "unicode": "e82f",
+ "unicode_decimal": 59439
},
{
"icon_id": "34213658",
@@ -103,20 +103,6 @@
"unicode": "e638",
"unicode_decimal": 58936
},
- {
- "icon_id": "6172786",
- "name": "terminal",
- "font_class": "terminal",
- "unicode": "e864",
- "unicode_decimal": 59492
- },
- {
- "icon_id": "14772948",
- "name": "terminal",
- "font_class": "terminal1",
- "unicode": "e663",
- "unicode_decimal": 58979
- },
{
"icon_id": "15838431",
"name": "arrow-right",
@@ -656,13 +642,6 @@
"unicode": "e701",
"unicode_decimal": 59137
},
- {
- "icon_id": "11052436",
- "name": "命令行",
- "font_class": "zhongduan",
- "unicode": "e61e",
- "unicode_decimal": 58910
- },
{
"icon_id": "11124973",
"name": "表单",
diff --git a/frontend/src/assets/iconfont/iconfont.svg b/frontend/src/assets/iconfont/iconfont.svg
index fe96ac2b6..57ce7ab90 100644
--- a/frontend/src/assets/iconfont/iconfont.svg
+++ b/frontend/src/assets/iconfont/iconfont.svg
@@ -14,7 +14,7 @@
/>
-
+
@@ -42,10 +42,6 @@
-
-
-
-
@@ -200,8 +196,6 @@
-
-
diff --git a/frontend/src/assets/iconfont/iconfont.ttf b/frontend/src/assets/iconfont/iconfont.ttf
index cc5f794f3..3673abf5d 100644
Binary files a/frontend/src/assets/iconfont/iconfont.ttf and b/frontend/src/assets/iconfont/iconfont.ttf differ
diff --git a/frontend/src/assets/iconfont/iconfont.woff b/frontend/src/assets/iconfont/iconfont.woff
index 7bf03a5a6..210d0dfc4 100644
Binary files a/frontend/src/assets/iconfont/iconfont.woff and b/frontend/src/assets/iconfont/iconfont.woff differ
diff --git a/frontend/src/assets/iconfont/iconfont.woff2 b/frontend/src/assets/iconfont/iconfont.woff2
index 57cd7d6d1..6acb89d57 100644
Binary files a/frontend/src/assets/iconfont/iconfont.woff2 and b/frontend/src/assets/iconfont/iconfont.woff2 differ
diff --git a/frontend/src/components/license-import/index.vue b/frontend/src/components/license-import/index.vue
index a64810c0a..9adc8b361 100644
--- a/frontend/src/components/license-import/index.vue
+++ b/frontend/src/components/license-import/index.vue
@@ -111,12 +111,12 @@ const submit = async () => {
globalStore.themeConfig.themeColor = xpackRes.data.themeColor;
}
loading.value = false;
- switchTheme();
- initFavicon();
uploadRef.value!.clearFiles();
uploaderFiles.value = [];
open.value = false;
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
+ switchTheme();
+ initFavicon();
window.location.reload();
})
.catch(() => {
diff --git a/frontend/src/routers/modules/terminal.ts b/frontend/src/routers/modules/terminal.ts
index 1971597b7..5a8bc1a00 100644
--- a/frontend/src/routers/modules/terminal.ts
+++ b/frontend/src/routers/modules/terminal.ts
@@ -7,7 +7,7 @@ const terminalRouter = {
redirect: '/terminal',
meta: {
title: 'menu.terminal',
- icon: 'p-terminal3',
+ icon: 'p-terminal2',
},
children: [
{
diff --git a/frontend/src/views/setting/license/index.vue b/frontend/src/views/setting/license/index.vue
index 63979f56a..cd90e1d49 100644
--- a/frontend/src/views/setting/license/index.vue
+++ b/frontend/src/views/setting/license/index.vue
@@ -211,7 +211,7 @@ const loadVersion = (row: any) => {
if (row.productPro && row.productPro !== '0') {
return i18n.global.t('license.subscription') + ' [ ' + row.expiresAt + ' ] ';
}
- if (row.versionConstraint !== 'all') {
+ if (row.versionConstraint && row.versionConstraint !== 'all') {
return i18n.global.t('license.versionConstraint', ['v' + row.versionConstraint.replace('.x', '')]);
}
return i18n.global.t('license.perpetual');