diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj index 6138b0be..db486934 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj @@ -1,5 +1,8 @@ + + + diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs index dbb3963a..97bcda0a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs @@ -7,8 +7,8 @@ namespace NetAdmin.SysComponent.Application.Services.Sys; /// public sealed class CaptchaService : ServiceBase, ICaptchaService { - private static readonly Assembly _entryAsm = Assembly.GetEntryAssembly(); - private static readonly string _entryAsmName = _entryAsm.FullName![.._entryAsm.FullName.IndexOf(',')]; + private static readonly Assembly _currAsm = Assembly.GetAssembly(typeof(CaptchaService)); + private static readonly string _currAsmName = _currAsm.FullName![.._currAsm.FullName.IndexOf(',')]; /// /// Initializes a new instance of the class. @@ -19,8 +19,8 @@ public sealed class CaptchaService : ServiceBase, ICaptchaServi public async Task GetCaptchaImageAsync() { var (backgroundImage, sliderImage, offsetSaw) = await CaptchaImageHelper.CreateSawSliderImageAsync( - _entryAsm, $"{_entryAsmName}.Assets.Captcha.background" - , $"{_entryAsmName}.Assets.Captcha.template", (1, 101), (1, 7) + _currAsm, $"{_currAsmName}.Assets.Captcha.background" + , $"{_currAsmName}.Assets.Captcha.template", (1, 101), (1, 7) , new Size(50, 50)) .ConfigureAwait(false); diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj index 500bc68a..ec0aa07b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj @@ -1,8 +1,5 @@ - - - diff --git a/src/frontend/admin/.prettierrc b/src/frontend/admin/.prettierrc index a896e4e0..5f298a31 100644 --- a/src/frontend/admin/.prettierrc +++ b/src/frontend/admin/.prettierrc @@ -2,7 +2,7 @@ "attributeGroups": ["^v-", "$DEFAULT"], "attributeSort": "ASC", "bracketSameLine": true, - "endOfLine": "auto", + "endOfLine": "lf", "plugins": ["prettier-plugin-organize-attributes"], "printWidth": 150, "semi": false, diff --git a/src/frontend/admin/index.html b/src/frontend/admin/index.html index 6396e5a3..6ff3fbc9 100644 --- a/src/frontend/admin/index.html +++ b/src/frontend/admin/index.html @@ -30,7 +30,7 @@ justify-content: center; align-items: center; flex-direction: column; - background: #fff; + background: white; } .app-loading__logo { @@ -47,7 +47,7 @@ width: 35px; height: 35px; border: 5px solid transparent; - border-top-color: #000; + border-top-color: black; border-radius: 50%; animation: 0.5s loader linear infinite; position: relative; @@ -79,7 +79,7 @@ } .dark .app-loading__loader { - border-top-color: #fff; + border-top-color: white; } .dark .app-loading__title { @@ -103,7 +103,7 @@
NetAdmin
diff --git a/src/frontend/admin/public/favicon.ico b/src/frontend/admin/public/favicon.ico index bbc5cb6c..899060fa 100644 Binary files a/src/frontend/admin/public/favicon.ico and b/src/frontend/admin/public/favicon.ico differ diff --git a/src/frontend/admin/src/assets/img/404.png b/src/frontend/admin/src/assets/img/404.png deleted file mode 100644 index 38358d25..00000000 Binary files a/src/frontend/admin/src/assets/img/404.png and /dev/null differ diff --git a/src/frontend/admin/src/assets/img/404.svg b/src/frontend/admin/src/assets/img/404.svg new file mode 100644 index 00000000..fbac1873 --- /dev/null +++ b/src/frontend/admin/src/assets/img/404.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/frontend/admin/src/assets/img/logo-r.png b/src/frontend/admin/src/assets/img/logo-r.png deleted file mode 100644 index dfcfb70c..00000000 Binary files a/src/frontend/admin/src/assets/img/logo-r.png and /dev/null differ diff --git a/src/frontend/admin/src/assets/img/logo.png b/src/frontend/admin/src/assets/img/logo.png deleted file mode 100644 index dfcfb70c..00000000 Binary files a/src/frontend/admin/src/assets/img/logo.png and /dev/null differ diff --git a/src/frontend/admin/src/assets/img/logo.svg b/src/frontend/admin/src/assets/img/logo.svg index 67773370..1bc7c5e4 100644 --- a/src/frontend/admin/src/assets/img/logo.svg +++ b/src/frontend/admin/src/assets/img/logo.svg @@ -1,50 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/src/frontend/admin/src/assets/img/no-widgets.svg b/src/frontend/admin/src/assets/img/no-widgets.svg index bd6c6a57..0f95e1ae 100644 --- a/src/frontend/admin/src/assets/img/no-widgets.svg +++ b/src/frontend/admin/src/assets/img/no-widgets.svg @@ -3,11 +3,11 @@ -
-
+
+
+
{{ $t('请完成安全验证') }} - + + +
-
+
\ No newline at end of file diff --git a/src/frontend/admin/src/components/naVerifition/slide.vue b/src/frontend/admin/src/components/naVerifition/slide.vue index d2827ef5..e5e35b8a 100644 --- a/src/frontend/admin/src/components/naVerifition/slide.vue +++ b/src/frontend/admin/src/components/naVerifition/slide.vue @@ -4,7 +4,9 @@
- + + +
{{ tipWords }} @@ -40,7 +42,9 @@ @mousedown="start" @touchstart="start" class="verify-move-block"> - + + +
- +

{{ item[fileProps.fileName] }}

@@ -371,7 +371,7 @@ export default { right: 7px; z-index: 2; background: rgba(0, 0, 0, 0.2); - border: 1px solid #fff; + border: 1px solid var(--el-color-white); display: flex; flex-direction: column; align-items: center; @@ -380,7 +380,7 @@ export default { .sc-file-select__item__checkbox i { font-size: 1.1rem; - color: #fff; + color: var(--el-color-white); font-weight: bold; display: none; } @@ -401,7 +401,7 @@ export default { .sc-file-select__item__select i { font-size: 1.1rem; - color: #fff; + color: var(--el-color-white); font-weight: bold; } @@ -431,7 +431,7 @@ export default { } .sc-file-select__item__file .item-file.item-file-doc { - color: var(--na-color-primary); + color: var(--el-color-primary); } .sc-file-select__item__upload { @@ -478,7 +478,7 @@ export default { .sc-file-select__top .tips { font-size: 0.9rem; margin-left: 10px; - color: #999; + color: var(--el-color-info); } .sc-file-select__top .tips i { diff --git a/src/frontend/admin/src/components/scIconSelect/index.vue b/src/frontend/admin/src/components/scIconSelect/index.vue index 6b6c49d2..29b0f67e 100644 --- a/src/frontend/admin/src/components/scIconSelect/index.vue +++ b/src/frontend/admin/src/components/scIconSelect/index.vue @@ -168,7 +168,7 @@ export default { width: 100%; height: 100%; font-size: 2rem; - color: #6d7882; + color: var(--el-text-color-regular); display: flex; justify-content: center; align-items: center; @@ -176,11 +176,11 @@ export default { } .sc-icon-select__list li:hover { - box-shadow: 0 0 1px 0.3rem var(--na-color-primary); + box-shadow: 0 0 1px 0.3rem var(--el-color-primary); background: var(--el-color-primary-light-9); } .sc-icon-select__list li:hover i { - color: var(--na-color-primary); + color: var(--el-color-primary); } \ No newline at end of file diff --git a/src/frontend/admin/src/components/scMini/scStatusIndicator.vue b/src/frontend/admin/src/components/scMini/scStatusIndicator.vue index a1edebad..07044987 100644 --- a/src/frontend/admin/src/components/scMini/scStatusIndicator.vue +++ b/src/frontend/admin/src/components/scMini/scStatusIndicator.vue @@ -14,7 +14,7 @@ export default { \ No newline at end of file diff --git a/src/frontend/admin/src/components/scPageHeader/index.vue b/src/frontend/admin/src/components/scPageHeader/index.vue index 7f827c39..c184fec2 100644 --- a/src/frontend/admin/src/components/scPageHeader/index.vue +++ b/src/frontend/admin/src/components/scPageHeader/index.vue @@ -31,8 +31,8 @@ export default { \ No newline at end of file diff --git a/src/frontend/admin/src/components/scSelect/index.vue b/src/frontend/admin/src/components/scSelect/index.vue index d7636c04..728b523e 100644 --- a/src/frontend/admin/src/components/scSelect/index.vue +++ b/src/frontend/admin/src/components/scSelect/index.vue @@ -87,10 +87,10 @@ export default { left: 0; right: 0; bottom: 0; - background: #fff; + background: var(--el-color-white); z-index: 100; border-radius: 0.4rem; - border: 1px solid #ebeef5; + border: 1px solid var(--el-border-color-lighter); display: flex; align-items: center; padding-left: 1rem; diff --git a/src/frontend/admin/src/components/scSelectFilter/index.vue b/src/frontend/admin/src/components/scSelectFilter/index.vue index 498fb2b5..b3570a7b 100644 --- a/src/frontend/admin/src/components/scSelectFilter/index.vue +++ b/src/frontend/admin/src/components/scSelectFilter/index.vue @@ -183,7 +183,7 @@ export default { align-items: center; justify-content: space-between; padding-right: 1rem; - color: #999; + color: var(--el-color-info); } .sc-select-filter__item-options { @@ -217,12 +217,12 @@ export default { } .sc-select-filter__item-options li:hover { - color: var(--na-color-primary); + color: var(--el-color-primary); } .sc-select-filter__item-options li.active { - background: var(--na-color-primary); - color: #fff; + background: var(--el-color-primary); + color: var(--el-color-white); font-weight: bold; } @@ -231,7 +231,7 @@ export default { } .sc-select-filter__no-data { - color: #999; + color: var(--el-color-info); } .sc-select-filter__item-w100p { diff --git a/src/frontend/admin/src/components/scStatistic/index.vue b/src/frontend/admin/src/components/scStatistic/index.vue index e9897921..73106c3b 100644 --- a/src/frontend/admin/src/components/scStatistic/index.vue +++ b/src/frontend/admin/src/components/scStatistic/index.vue @@ -59,7 +59,7 @@ export default { \ No newline at end of file diff --git a/src/frontend/admin/src/layout/components/sideM.vue b/src/frontend/admin/src/layout/components/sideM.vue index 8fd1472f..9f78e5b5 100644 --- a/src/frontend/admin/src/layout/components/sideM.vue +++ b/src/frontend/admin/src/layout/components/sideM.vue @@ -9,7 +9,7 @@
- {{ $CONFIG.APP_NAME }} + {{ $CONFIG.APP_NAME }}
@@ -18,9 +18,7 @@ :active-text-color="DEFAULT_CONFIG.APP_SET_COLOR" :default-active="$route.meta.active || $route.fullPath" @select="select" - background-color="#424c50" - router - text-color="#fff"> + router> @@ -142,20 +140,19 @@ export default { z-index: 10; width: 4rem; height: 4rem; - background: var(--na-color-primary); - box-shadow: 0 0.2rem 1rem 0 var(--na-color-primary); + background: var(--el-color-primary); + box-shadow: 0 0.2rem 1rem 0 var(--el-color-primary); display: flex; align-items: center; justify-content: center; } .mobile-nav-button i { - color: #fff; + color: var(--el-color-white); font-size: 1.5rem; } .mobile-nav { - background: #424c50; } .mobile-nav .el-header { @@ -172,7 +169,7 @@ export default { align-items: center; font-weight: bold; font-size: 1.5rem; - color: #fff; + color: var(--el-text-color-primary); } .mobile-nav .logo-bar img { diff --git a/src/frontend/admin/src/layout/components/tags.vue b/src/frontend/admin/src/layout/components/tags.vue index 44d94dad..442cd178 100644 --- a/src/frontend/admin/src/layout/components/tags.vue +++ b/src/frontend/admin/src/layout/components/tags.vue @@ -58,10 +58,6 @@ - - - {{ $t('按下 ALT+Q 可快速关闭当前标签页') }} -