From 92071f41f7ed2ae3f457175994531e7875706f45 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Sun, 26 Sep 2021 17:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/UploadController.cs           |  8 ++++--
 ZR.Vue/src/components/ThemePicker/index.vue   | 28 +++++++++----------
 ZR.Vue/src/views/login.vue                    |  8 +++---
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/UploadController.cs b/ZR.Admin.WebApi/Controllers/UploadController.cs
index aa14a79..c05fca5 100644
--- a/ZR.Admin.WebApi/Controllers/UploadController.cs
+++ b/ZR.Admin.WebApi/Controllers/UploadController.cs
@@ -1,4 +1,5 @@
 using Infrastructure;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -13,10 +14,11 @@ namespace ZR.Admin.WebApi.Controllers
     {
         private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
         private OptionsSetting OptionsSetting;
-
-        public UploadController(IOptions<OptionsSetting> optionsSetting)
+        private IWebHostEnvironment WebHostEnvironment;
+        public UploadController(IOptions<OptionsSetting> optionsSetting, IWebHostEnvironment webHostEnvironment)
         {
             OptionsSetting = optionsSetting.Value;
+            WebHostEnvironment = webHostEnvironment;
         }
         /// <summary>
         /// 存储文件
@@ -28,7 +30,7 @@ namespace ZR.Admin.WebApi.Controllers
         {
             if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传图片不能为空");
             string fileExt = Path.GetExtension(formFile.FileName);
-            string savePath = Path.Combine("wwwroot", FileUtil.GetdirPath("uploads"));
+            string savePath = Path.Combine(WebHostEnvironment.WebRootPath, FileUtil.GetdirPath("uploads"));
 
             if (!Directory.Exists(savePath)) { Directory.CreateDirectory(savePath); }
 
diff --git a/ZR.Vue/src/components/ThemePicker/index.vue b/ZR.Vue/src/components/ThemePicker/index.vue
index 0f6627c..bf13c28 100644
--- a/ZR.Vue/src/components/ThemePicker/index.vue
+++ b/ZR.Vue/src/components/ThemePicker/index.vue
@@ -9,7 +9,7 @@
 
 <script>
 const version = require('element-ui/package.json').version // element-ui version from node_modules
-const ORIGINAL_THEME = '#13C2C2' // default color
+const ORIGINAL_THEME =  '#409EFF' // default color
 
 export default {
   data() {
@@ -31,19 +31,21 @@ export default {
       immediate: true
     },
     async theme(val) {
+      await this.setTheme(val)
+    }
+  },
+  created() {
+    if(this.defaultTheme !== ORIGINAL_THEME) {
+      this.setTheme(this.defaultTheme)
+    }
+  },
+
+  methods: {
+    async setTheme(val) {
       const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
       if (typeof val !== 'string') return
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
       const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      console.log(themeCluster, originalCluster)
-
-      const $message = this.$message({
-        message: '  Compiling the theme',
-        customClass: 'theme-message',
-        type: 'success',
-        duration: 0,
-        iconClass: 'el-icon-loading'
-      })
 
       const getHandler = (variable, id) => {
         return () => {
@@ -81,12 +83,8 @@ export default {
       })
 
       this.$emit('change', val)
+    },
 
-      $message.close()
-    }
-  },
-
-  methods: {
     updateStyle(style, oldCluster, newCluster) {
       let newStyle = style
       oldCluster.forEach((color, index) => {
diff --git a/ZR.Vue/src/views/login.vue b/ZR.Vue/src/views/login.vue
index 9bfb2ec..38c059e 100644
--- a/ZR.Vue/src/views/login.vue
+++ b/ZR.Vue/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">ZrAdmin.NET</h3>
+      <h3 class="title">ZrAdmin.NET管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -29,9 +29,9 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <!-- <div class="el-login-footer">
-      <span>Copyright © 2018-2020 ruoyi.vip All Rights Reserved.</span>
-    </div> -->
+    <div class="el-login-footer">
+      <span>Copyright ©2021 <a href="https://gitee.com/izory/ZrAdminNetCore" target="_black">ZrAdmin.NET</a> All Rights Reserved.</span>
+    </div>
   </div>
 </template>