From 77cc0736c5567d6578c49094988ccde4327b62ba Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Wed, 1 Jun 2022 13:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/vue/src/api/sys/model/themeModel.ts      |  8 ++++
 apps/vue/src/api/sys/theme.ts                 | 15 +++++++
 apps/vue/src/hooks/web/useSignalR.ts          |  5 ++-
 .../setting/components/SettingFooter.vue      | 39 ++++++++++++++++---
 apps/vue/src/locales/lang/en/layout.ts        |  1 +
 apps/vue/src/locales/lang/zh-CN/layout.ts     |  1 +
 apps/vue/src/store/modules/app.ts             |  8 ++++
 apps/vue/src/store/modules/user.ts            |  9 +++++
 .../VueVbenAdmin/ThemeSettingController.cs    |  1 +
 .../Theme/VueVbenAdmin/ThemeSettingDto.cs     |  1 -
 10 files changed, 80 insertions(+), 8 deletions(-)
 create mode 100644 apps/vue/src/api/sys/model/themeModel.ts
 create mode 100644 apps/vue/src/api/sys/theme.ts

diff --git a/apps/vue/src/api/sys/model/themeModel.ts b/apps/vue/src/api/sys/model/themeModel.ts
new file mode 100644
index 000000000..2f53c432e
--- /dev/null
+++ b/apps/vue/src/api/sys/model/themeModel.ts
@@ -0,0 +1,8 @@
+import type { BeforeMiniState } from '/#/store';
+import type { ProjectConfig } from '/#/config';
+
+export interface ThemeSetting {
+  darkMode?: string;
+  projectConfig: ProjectConfig;
+  beforeMiniInfo: BeforeMiniState;
+}
diff --git a/apps/vue/src/api/sys/theme.ts b/apps/vue/src/api/sys/theme.ts
new file mode 100644
index 000000000..151b84cc8
--- /dev/null
+++ b/apps/vue/src/api/sys/theme.ts
@@ -0,0 +1,15 @@
+import { defAbpHttp } from '/@/utils/http/abp';
+import { ThemeSetting } from './model/themeModel';
+
+export const getTheme = () => {
+  return defAbpHttp.get<ThemeSetting>({
+    url: '/api/theme/vue-vben-admin',
+  });
+};
+
+export const changeTheme = (themeSetting: ThemeSetting) => {
+  return defAbpHttp.put<void>({
+    url: '/api/theme/vue-vben-admin/change',
+    data: themeSetting,
+  });
+};
diff --git a/apps/vue/src/hooks/web/useSignalR.ts b/apps/vue/src/hooks/web/useSignalR.ts
index c550613ee..58a649cd9 100644
--- a/apps/vue/src/hooks/web/useSignalR.ts
+++ b/apps/vue/src/hooks/web/useSignalR.ts
@@ -4,6 +4,7 @@ import {
   HubConnectionBuilder,
   HubConnectionState,
   IHttpConnectionOptions,
+  LogLevel,
 } from '@microsoft/signalr';
 import { useUserStoreWithOut } from '/@/store/modules/user';
 
@@ -45,7 +46,9 @@ export function useSignalR({
       httpOptions.accessTokenFactory = () =>
         token.startsWith('Bearer ') ? token.substring(7) : token;
     }
-    var connectionBuilder = new HubConnectionBuilder().withUrl(serverUrl, httpOptions);
+    var connectionBuilder = new HubConnectionBuilder()
+      .withUrl(serverUrl, httpOptions)
+      .configureLogging(LogLevel.Warning);
     if (automaticReconnect) {
       connectionBuilder.withAutomaticReconnect({
         nextRetryDelayInMilliseconds: () => nextRetryDelayInMilliseconds,
diff --git a/apps/vue/src/layouts/default/setting/components/SettingFooter.vue b/apps/vue/src/layouts/default/setting/components/SettingFooter.vue
index 237566401..985fc04e4 100644
--- a/apps/vue/src/layouts/default/setting/components/SettingFooter.vue
+++ b/apps/vue/src/layouts/default/setting/components/SettingFooter.vue
@@ -1,25 +1,30 @@
 <template>
   <div :class="prefixCls">
-    <a-button type="primary" block @click="handleCopy">
+    <a-button type="primary" block @click="handleCopy" class="my-1">
       <CopyOutlined class="mr-2" />
       {{ t('layout.setting.copyBtn') }}
     </a-button>
 
-    <a-button color="warning" block @click="handleResetSetting" class="my-3">
+    <a-button color="primary" block @click="handleSyncSetting" :loading="syncLoading"  class="my-1">
+      <CloudSyncOutlined class="mr-2" />
+      {{ t('layout.setting.syncBtn') }}
+    </a-button>
+
+    <a-button color="warning" block @click="handleResetSetting" class="my-1">
       <RedoOutlined class="mr-2" />
       {{ t('common.resetText') }}
     </a-button>
 
-    <a-button color="error" block @click="handleClearAndRedo">
+    <a-button color="error" block @click="handleClearAndRedo" class="my-1">
       <RedoOutlined class="mr-2" />
       {{ t('layout.setting.clearBtn') }}
     </a-button>
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, unref } from 'vue';
+  import { defineComponent, ref, unref } from 'vue';
 
-  import { CopyOutlined, RedoOutlined } from '@ant-design/icons-vue';
+  import { CopyOutlined, RedoOutlined, CloudSyncOutlined } from '@ant-design/icons-vue';
 
   import { useAppStore } from '/@/store/modules/app';
   import { usePermissionStore } from '/@/store/modules/permission';
@@ -35,10 +40,14 @@
   import { updateGrayMode } from '/@/logics/theme/updateGrayMode';
   import defaultSetting from '/@/settings/projectSetting';
 
+  import { changeTheme } from '/@/api/sys/theme';
+  import { ThemeSetting } from '/@/api/sys/model/themeModel';
+
   export default defineComponent({
     name: 'SettingFooter',
-    components: { CopyOutlined, RedoOutlined },
+    components: { CopyOutlined, RedoOutlined, CloudSyncOutlined },
     setup() {
+      const syncLoading = ref(false);
       const permissionStore = usePermissionStore();
       const { prefixCls } = useDesign('setting-footer');
       const { t } = useI18n();
@@ -78,11 +87,29 @@
         userStore.resetState();
         location.reload();
       }
+
+      function handleSyncSetting() {
+        const themeSetting: ThemeSetting = {
+          darkMode: appStore.getDarkMode,
+          projectConfig: appStore.getProjectConfig,
+          beforeMiniInfo: appStore.getBeforeMiniInfo,
+        };
+
+        syncLoading.value = true;
+        changeTheme(themeSetting).then(() => {
+          createMessage.success(t('layout.setting.operatingTitle'));
+        }).finally(() => {
+          syncLoading.value = false;
+        });
+      }
+
       return {
         prefixCls,
         t,
+        syncLoading,
         handleCopy,
         handleResetSetting,
+        handleSyncSetting,
         handleClearAndRedo,
       };
     },
diff --git a/apps/vue/src/locales/lang/en/layout.ts b/apps/vue/src/locales/lang/en/layout.ts
index 5a9408a08..cf13f7f5d 100644
--- a/apps/vue/src/locales/lang/en/layout.ts
+++ b/apps/vue/src/locales/lang/en/layout.ts
@@ -56,6 +56,7 @@ export default {
 
     copyBtn: 'Copy',
     clearBtn: 'Clear cache and to the login page',
+    syncBtn: 'Synchronize to my configuration',
 
     drawerTitle: 'Configuration',
 
diff --git a/apps/vue/src/locales/lang/zh-CN/layout.ts b/apps/vue/src/locales/lang/zh-CN/layout.ts
index ed1f85372..ede52973b 100644
--- a/apps/vue/src/locales/lang/zh-CN/layout.ts
+++ b/apps/vue/src/locales/lang/zh-CN/layout.ts
@@ -56,6 +56,7 @@ export default {
 
     copyBtn: '拷贝',
     clearBtn: '清空缓存并返回登录页',
+    syncBtn: '同步到个人配置',
 
     drawerTitle: '项目配置',
 
diff --git a/apps/vue/src/store/modules/app.ts b/apps/vue/src/store/modules/app.ts
index 72f9bf6c3..3419cc381 100644
--- a/apps/vue/src/store/modules/app.ts
+++ b/apps/vue/src/store/modules/app.ts
@@ -17,6 +17,8 @@ import { darkMode } from '/@/settings/designSetting';
 import { resetRouter } from '/@/router';
 import { deepMerge } from '/@/utils';
 
+import { getTheme } from '/@/api/sys/theme';
+
 interface AppState {
   darkMode?: ThemeEnum;
   // Page loading status
@@ -99,6 +101,12 @@ export const useAppStore = defineStore({
         clearTimeout(timeId);
       }
     },
+    async initlizeTheme() {
+      const theme = await getTheme();
+      this.setDarkMode(theme.darkMode === ThemeEnum.DARK ? ThemeEnum.DARK : ThemeEnum.LIGHT);
+      this.setProjectConfig(theme.projectConfig);
+      this.setBeforeMiniInfo(theme.beforeMiniInfo);
+    },
   },
 });
 
diff --git a/apps/vue/src/store/modules/user.ts b/apps/vue/src/store/modules/user.ts
index 47515223a..db9b305db 100644
--- a/apps/vue/src/store/modules/user.ts
+++ b/apps/vue/src/store/modules/user.ts
@@ -7,6 +7,7 @@ import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import { GetUserInfoModel, LoginParams, LoginByPhoneParams } from '/@/api/sys/model/userModel';
 import { useAbpStoreWithOut } from './abp';
+import { useAppStoreWithOut } from './app';
 
 import { loginApi, loginPhoneApi, getUserInfo } from '/@/api/sys/user';
 import { useI18n } from '/@/hooks/web/useI18n';
@@ -142,6 +143,13 @@ export const useUserStore = defineStore({
       // get user info
       await this.getUserInfoAction();
 
+      try {
+        const appStore = useAppStoreWithOut();
+        await appStore.initlizeTheme();
+      } catch(error) {
+        console.warn('Failed to synchronize the user theme.');
+      }
+
       const sessionTimeout = this.sessionTimeout;
       if (sessionTimeout) {
         this.setSessionTimeout(false);
@@ -162,6 +170,7 @@ export const useUserStore = defineStore({
     async getUserInfoAction(): Promise<GetUserInfoModel> {
       const abpStore = useAbpStoreWithOut();
       await abpStore.initlizeAbpApplication();
+      
       const userInfo = await getUserInfo();
       const currentUser = abpStore.getApplication.currentUser;
 
diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN/Platform/Theme/VueVbenAdmin/ThemeSettingController.cs b/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN/Platform/Theme/VueVbenAdmin/ThemeSettingController.cs
index a559a33de..bd0c7a59e 100644
--- a/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN/Platform/Theme/VueVbenAdmin/ThemeSettingController.cs
+++ b/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN/Platform/Theme/VueVbenAdmin/ThemeSettingController.cs
@@ -27,6 +27,7 @@ public class ThemeSettingController : AbpControllerBase, IThemeSettingAppService
 
     [HttpPut]
     [Authorize]
+    [Route("change")]
     public Task ChangeAsync(ThemeSettingDto input)
     {
         return ThemeSettingAppService.ChangeAsync(input);
diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN/Platform/Theme/VueVbenAdmin/ThemeSettingDto.cs b/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN/Platform/Theme/VueVbenAdmin/ThemeSettingDto.cs
index 722c274ed..f079f2166 100644
--- a/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN/Platform/Theme/VueVbenAdmin/ThemeSettingDto.cs
+++ b/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN/Platform/Theme/VueVbenAdmin/ThemeSettingDto.cs
@@ -3,7 +3,6 @@
 public class ThemeSettingDto
 {
     public string DarkMode { get; set; } = "light";
-    public bool PageLoading { get; set; }
     public ProjectConfigDto ProjectConfig { get; set; } = new ProjectConfigDto();
     public BeforeMiniStateDto BeforeMiniInfo { get; set; } = new BeforeMiniStateDto();
 }