diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json
index 9a109a90..a835acdf 100644
--- a/mayfly_go_web/package.json
+++ b/mayfly_go_web/package.json
@@ -15,7 +15,7 @@
     "countup.js": "^2.7.0",
     "cropperjs": "^1.5.11",
     "echarts": "^5.4.0",
-    "element-plus": "^2.3.14",
+    "element-plus": "^2.4.0",
     "jsencrypt": "^3.3.1",
     "lodash": "^4.17.21",
     "mitt": "^3.0.1",
@@ -23,14 +23,14 @@
     "monaco-sql-languages": "^0.11.0",
     "monaco-themes": "^0.4.4",
     "nprogress": "^0.2.0",
-    "pinia": "^2.1.6",
+    "pinia": "^2.1.7",
     "qrcode.vue": "^3.4.0",
     "screenfull": "^6.0.2",
     "sortablejs": "^1.15.0",
     "sql-formatter": "^12.1.2",
     "vue": "^3.3.4",
     "vue-clipboard3": "^1.0.1",
-    "vue-router": "^4.2.4",
+    "vue-router": "^4.2.5",
     "xterm": "^5.3.0",
     "xterm-addon-fit": "^0.8.0",
     "xterm-addon-search": "^0.13.0",
diff --git a/mayfly_go_web/src/App.vue b/mayfly_go_web/src/App.vue
index c726f189..2d52f7d4 100644
--- a/mayfly_go_web/src/App.vue
+++ b/mayfly_go_web/src/App.vue
@@ -1,21 +1,32 @@
 <template>
-    <router-view v-show="themeConfig.lockScreenTime !== 0" />
+    <el-watermark
+        :zIndex="10000000"
+        :width="200"
+        v-if="themeConfig.isWartermark"
+        :font="{ color: 'rgba(180, 180, 180, 0.5)' }"
+        :content="state.watermarkContent"
+    >
+        <router-view v-show="themeConfig.lockScreenTime !== 0" />
+    </el-watermark>
+    <router-view v-if="!themeConfig.isWartermark" v-show="themeConfig.lockScreenTime !== 0" />
+
     <LockScreen v-if="themeConfig.isLockScreen" />
     <Setings ref="setingsRef" v-show="themeConfig.lockScreenTime !== 0" />
 </template>
 
 <script setup lang="ts" name="app">
-import { ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
+import { ref, reactive, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
 import { useRoute } from 'vue-router';
-// import { useTagsViewRoutes } from '@/store/tagsViewRoutes';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '@/store/themeConfig';
 import { getLocal } from '@/common/utils/storage';
 import LockScreen from '@/layout/lockScreen/index.vue';
 import Setings from '@/layout/navBars/breadcrumb/setings.vue';
-import Watermark from '@/common/utils/wartermark';
 import mittBus from '@/common/utils/mitt';
 import { getThemeConfig } from './common/utils/storage';
+import { dateFormat2 } from '@/common/utils/date';
+import { useWartermark } from '@/common/sysconfig';
+import { useUserInfo } from '@/store/userInfo';
 
 const setingsRef = ref();
 const route = useRoute();
@@ -23,6 +34,11 @@ const route = useRoute();
 const themeConfigStores = useThemeConfig();
 const { themeConfig } = storeToRefs(themeConfigStores);
 
+const state = reactive({
+    useWatermark: false,
+    watermarkContent: [] as any,
+});
+
 // 布局配置弹窗打开
 const openSetingsDrawer = () => {
     setingsRef.value.openDrawer();
@@ -39,6 +55,11 @@ onBeforeMount(() => {
 // 页面加载时
 onMounted(() => {
     nextTick(() => {
+        // 是否开启水印
+        useWartermark().then((res) => {
+            themeConfigStores.setWatermarkConfig(res);
+        });
+
         // 监听布局配置弹窗点击打开
         mittBus.on('openSetingsDrawer', () => {
             openSetingsDrawer();
@@ -55,8 +76,52 @@ onMounted(() => {
     });
 });
 
+// 监听 themeConfig isWartermark配置文件的变化
+watch(
+    () => themeConfig.value.isWartermark,
+    (val) => {
+        if (val) {
+            setTimeout(() => {
+                setWatermarkContent();
+                refreshWatermarkTime();
+            }, 1500);
+        }
+    }
+);
+
+const setWatermarkContent = () => {
+    const userinfo = useUserInfo().userInfo;
+    if (!userinfo) {
+        themeConfig.value.isWartermark = false;
+        return;
+    }
+    state.watermarkContent = [`${userinfo.username}(${userinfo.name})`, dateFormat2('yyyy-MM-dd HH:mm:ss', new Date())];
+    // 存在额外水印信息，则追加水印信息
+    if (themeConfig.value.wartermarkText?.trim()) {
+        state.watermarkContent.push(themeConfig.value.wartermarkText);
+    }
+};
+
+let refreshWatermarkTimeInterval: any = null;
+/**
+ * 刷新水印时间
+ */
+const refreshWatermarkTime = () => {
+    if (refreshWatermarkTimeInterval) {
+        clearInterval(refreshWatermarkTimeInterval);
+    }
+    refreshWatermarkTimeInterval = setInterval(() => {
+        if (themeConfig.value.isWartermark) {
+            state.watermarkContent[1] = dateFormat2('yyyy-MM-dd HH:mm:ss', new Date());
+        } else {
+            clearInterval(refreshWatermarkTimeInterval);
+        }
+    }, 10000);
+};
+
 // 页面销毁时，关闭监听布局配置
 onUnmounted(() => {
+    clearInterval(refreshWatermarkTimeInterval);
     mittBus.off('openSetingsDrawer', () => {});
 });
 
@@ -65,8 +130,6 @@ watch(
     () => route.path,
     () => {
         nextTick(() => {
-            // 路由变化更新水印
-            Watermark.use();
             document.title = `${route.meta.title} - ${themeConfig.value.globalTitle}` || themeConfig.value.globalTitle;
         });
     }
diff --git a/mayfly_go_web/src/assets/image/401.png b/mayfly_go_web/src/assets/image/401.png
deleted file mode 100644
index ce306dab..00000000
Binary files a/mayfly_go_web/src/assets/image/401.png and /dev/null differ
diff --git a/mayfly_go_web/src/assets/image/401.svg b/mayfly_go_web/src/assets/image/401.svg
new file mode 100644
index 00000000..c81d3d41
--- /dev/null
+++ b/mayfly_go_web/src/assets/image/401.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg height="1024" node-id="1" sillyvg="true" template-height="1024" template-width="1024" version="1.1" viewBox="0 0 1024 1024" width="1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs node-id="30"></defs><g node-id="77"><g node-id="78"><path d="M 0.00 0.00 L 1024.00 0.00 L 1024.00 1024.00 L 0.00 1024.00 Z" fill="none" group-id="1,2" node-id="35" stroke="none" target-height="1024" target-width="1024" target-x="0" target-y="0"></path><path d="M 161.31 691.68 L 167.66 717.42 C 168.37 720.31 170.62 722.56 173.51 723.27 L 199.25 729.61 C 200.15 729.83 200.78 730.63 200.78 731.55 C 200.78 732.48 200.15 733.28 199.25 733.50 L 173.51 739.84 C 170.62 740.55 168.37 742.80 167.66 745.69 L 161.31 771.44 C 161.09 772.33 160.29 772.95 159.37 772.95 C 158.45 772.95 157.65 772.33 157.43 771.44 L 151.08 745.69 C 150.37 742.80 148.12 740.55 145.23 739.84 L 119.49 733.50 C 118.59 733.28 117.96 732.48 117.96 731.55 C 117.96 730.63 118.59 729.83 119.49 729.61 L 145.23 723.27 C 148.12 722.56 150.37 720.31 151.08 717.42 L 157.43 691.68 C 157.65 690.79 158.45 690.17 159.37 690.17 C 160.29 690.17 161.09 690.79 161.31 691.68 Z" fill="#ccdeff" fill-rule="nonzero" group-id="1,2" node-id="37" stroke="none" target-height="82.7876" target-width="82.82839" target-x="117.9558" target-y="690.1662"></path><path d="M 763.62 113.94 L 761.62 135.22 C 761.41 137.61 762.53 139.92 764.54 141.22 L 782.47 152.84 C 783.08 153.24 783.34 154.01 783.11 154.70 C 782.87 155.39 782.20 155.84 781.47 155.79 L 760.19 153.85 C 757.81 153.63 755.50 154.75 754.19 156.76 L 742.58 174.69 C 742.20 175.36 741.40 175.67 740.67 175.43 C 739.93 175.19 739.48 174.46 739.58 173.69 L 741.58 152.41 C 741.80 150.02 740.68 147.71 738.67 146.41 L 720.74 134.79 C 720.07 134.41 719.76 133.61 720.00 132.88 C 720.24 132.14 720.97 131.69 721.74 131.79 L 743.01 133.79 C 745.40 134.00 747.70 132.88 749.01 130.87 L 760.63 112.94 C 761.01 112.28 761.81 111.98 762.53 112.22 C 763.26 112.47 763.71 113.18 763.62 113.94 Z" fill="#ccdeff" fill-rule="nonzero" group-id="1,2" node-id="39" stroke="none" target-height="63.692215" target-width="63.587036" target-x="719.75635" target-y="111.98143"></path><path d="M 239.36 831.69 L 255.49 850.15 C 257.30 852.22 260.11 853.11 262.78 852.47 L 286.62 846.77 C 287.45 846.58 288.29 846.97 288.68 847.73 C 289.07 848.48 288.90 849.40 288.26 849.96 L 269.81 866.09 C 267.74 867.90 266.84 870.71 267.48 873.38 L 273.19 897.21 C 273.39 898.04 273.00 898.89 272.24 899.28 C 271.49 899.67 270.56 899.50 270.00 898.86 L 253.87 880.41 C 252.06 878.34 249.25 877.44 246.58 878.08 L 222.74 883.78 C 221.91 883.98 221.06 883.59 220.67 882.83 C 220.28 882.08 220.45 881.15 221.09 880.59 L 239.55 864.46 C 241.62 862.65 242.52 859.84 241.88 857.17 L 236.17 833.34 C 235.97 832.51 236.36 831.66 237.12 831.27 C 237.87 830.88 238.80 831.05 239.36 831.69 Z" fill="#ccdeff" fill-rule="nonzero" group-id="1,2" node-id="41" stroke="none" target-height="68.79767" target-width="68.7926" target-x="220.27618" target-y="830.87616"></path><path d="M 896.00 360.00 C 896.00 373.25 885.25 384.00 872.00 384.00 C 858.75 384.00 848.00 373.25 848.00 360.00 C 848.00 346.75 858.75 336.00 872.00 336.00 C 885.25 336.00 896.00 346.75 896.00 360.00 Z" fill="#ccdeff" fill-rule="nonzero" group-id="1,2" node-id="43" stroke="none" target-height="48" target-width="48" target-x="848" target-y="336"></path><path d="M 246.23 203.62 C 267.01 203.62 283.91 186.41 283.91 165.26 C 283.92 157.66 281.69 150.23 277.50 143.89 C 271.32 139.64 264.00 137.37 256.50 137.37 C 255.65 137.37 254.75 137.37 253.68 137.49 C 252.25 137.59 250.91 136.79 250.32 135.49 C 248.88 132.39 247.01 129.51 244.75 126.95 L 243.40 127.03 C 241.97 127.14 240.63 126.34 240.04 125.03 C 239.28 123.37 238.38 121.78 237.36 120.26 C 227.99 113.50 215.31 109.48 201.69 109.48 C 173.36 109.48 150.31 126.69 150.31 147.84 C 150.32 148.76 149.96 149.64 149.32 150.29 C 148.68 150.94 147.81 151.31 146.89 151.32 C 126.11 151.32 109.21 165.40 109.21 182.71 C 109.23 187.71 110.64 192.61 113.27 196.86 C 120.23 201.34 128.34 203.69 136.61 203.63 Z" fill="#80adff" fill-rule="nonzero" group-id="1,2" node-id="45" stroke="none" target-height="94.2132" target-width="174.71463" target-x="109.21" target-y="109.48"></path><path d="M 246.23 211.11 L 232.53 211.11 C 230.32 211.11 228.53 209.32 228.53 207.11 C 228.53 204.90 230.32 203.11 232.53 203.11 L 246.23 203.11 C 266.69 203.11 283.33 186.11 283.33 165.26 C 283.33 144.41 266.69 127.42 246.23 127.42 C 245.40 127.42 244.52 127.42 243.46 127.53 C 241.79 127.66 240.22 126.73 239.52 125.21 C 232.52 109.84 213.15 99.52 191.43 99.52 C 163.43 99.52 140.62 116.52 140.62 137.37 C 140.62 139.58 138.83 141.37 136.62 141.37 C 116.16 141.37 99.52 155.21 99.52 172.24 C 99.52 189.27 116.16 203.11 136.62 203.11 L 205.13 203.11 C 207.34 203.11 209.13 204.90 209.13 207.11 C 209.13 209.32 207.34 211.11 205.13 211.11 L 136.62 211.11 C 111.75 211.11 91.52 193.67 91.52 172.24 C 91.52 151.90 109.73 135.17 132.83 133.50 C 135.35 110.02 160.67 91.50 191.43 91.50 C 215.09 91.50 236.43 102.61 245.56 119.40 L 246.23 119.40 C 271.10 119.40 291.33 139.96 291.33 165.24 C 291.33 190.52 271.10 211.11 246.23 211.11 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="47" stroke="none" target-height="119.61" target-width="199.81" target-x="91.52" target-y="91.5"></path><path d="M 918.73 892.13 C 939.52 892.13 956.44 872.39 956.44 848.13 C 956.48 839.53 954.25 831.08 950.00 823.61 C 944.04 818.82 936.64 816.18 929.00 816.13 C 928.15 816.13 927.26 816.13 926.18 816.27 C 924.67 816.34 923.30 815.40 922.82 813.97 C 921.41 810.47 919.53 807.17 917.24 804.17 L 915.89 804.27 C 914.38 804.34 913.01 803.40 912.53 801.97 C 911.77 800.08 910.87 798.26 909.85 796.50 C 899.73 788.38 887.11 784.01 874.14 784.13 C 845.79 784.13 822.72 803.87 822.72 828.13 C 822.86 830.18 821.34 831.96 819.29 832.13 C 798.49 832.13 781.57 848.28 781.57 868.13 C 781.57 873.79 782.97 879.37 785.64 884.36 C 792.37 889.43 800.57 892.16 809.00 892.13 Z" fill="#80adff" fill-rule="nonzero" group-id="1,2" node-id="49" stroke="none" target-height="108.15027" target-width="174.9054" target-x="781.57" target-y="784.00586"></path><path d="M 918.73 900.13 L 905.00 900.13 C 902.79 900.13 901.00 898.34 901.00 896.13 C 901.00 893.92 902.79 892.13 905.00 892.13 L 918.72 892.13 C 939.20 892.13 955.86 872.39 955.86 848.13 C 955.86 823.87 939.20 804.13 918.72 804.13 C 917.91 804.13 917.04 804.13 915.98 804.26 C 914.24 804.39 912.63 803.37 911.98 801.76 C 904.89 784.04 885.57 772.13 863.91 772.13 C 835.91 772.13 813.05 791.87 813.05 816.13 C 813.05 818.34 811.26 820.13 809.05 820.13 C 788.57 820.13 771.91 836.28 771.91 856.13 C 771.91 875.98 788.57 892.13 809.05 892.13 L 877.62 892.13 C 879.83 892.13 881.62 893.92 881.62 896.13 C 881.62 898.34 879.83 900.13 877.62 900.13 L 809.00 900.13 C 784.11 900.13 763.86 880.39 763.86 856.13 C 763.86 833.13 782.06 814.19 805.16 812.29 C 807.39 785.40 832.87 764.13 863.86 764.13 C 887.68 764.13 909.12 776.88 918.20 796.13 L 918.72 796.13 C 943.61 796.13 963.86 819.46 963.86 848.13 C 963.86 876.80 943.62 900.13 918.73 900.13 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="51" stroke="none" target-height="136" target-width="200" target-x="763.86" target-y="764.13"></path><path d="M 512.00 192.00 C 392.44 220.52 313.17 254.22 250.76 299.20 C 233.99 311.24 224.03 330.61 224.00 351.26 L 224.00 640.00 C 224.00 640.00 272.00 816.00 512.00 896.00 C 752.00 816.00 800.00 640.00 800.00 640.00 L 800.00 351.26 C 799.97 330.61 790.01 311.24 773.24 299.20 C 710.83 254.22 631.56 220.52 512.00 192.00 Z" fill="#ffffff" fill-rule="nonzero" group-id="1,2" node-id="53" stroke="none" target-height="704" target-width="576" target-x="224" target-y="192"></path><path d="M 512.00 900.00 C 511.57 900.00 511.14 899.93 510.73 899.79 C 455.60 881.42 406.00 856.42 363.40 825.49 C 330.03 801.47 300.21 772.85 274.84 740.49 C 232.84 686.49 220.64 642.91 220.14 641.08 C 220.05 640.75 220.01 640.42 220.00 640.08 L 220.00 351.26 C 220.07 329.35 230.64 308.80 248.42 296.00 C 313.26 249.27 394.26 216.00 511.07 188.15 C 511.68 188.00 512.32 188.00 512.93 188.15 C 629.74 216.00 710.74 249.23 775.58 296.00 C 793.36 308.80 803.93 329.35 804.00 351.26 L 804.00 640.00 C 803.99 640.34 803.95 640.67 803.86 641.00 C 803.36 642.83 791.17 686.40 749.16 740.41 C 723.79 772.77 693.97 801.39 660.60 825.41 C 617.97 856.34 568.40 881.34 513.26 899.71 C 512.86 899.88 512.43 899.97 512.00 900.00 Z M 228.00 639.43 C 229.47 644.37 242.60 686.08 281.42 735.88 C 319.27 784.43 390.00 850.81 512.00 891.78 C 634.25 850.78 705.00 784.21 742.84 735.54 C 781.54 685.80 794.54 644.36 796.00 639.44 L 796.00 351.26 C 795.94 331.91 786.61 313.75 770.90 302.45 C 707.12 256.45 627.25 223.67 512.00 196.11 C 396.75 223.67 316.88 256.49 253.10 302.45 C 237.39 313.75 228.06 331.91 228.00 351.26 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="55" stroke="none" target-height="712" target-width="584" target-x="220" target-y="187.99998"></path><path d="M 735.66 676.00 C 734.92 676.00 734.19 675.79 733.56 675.40 C 731.68 674.24 731.10 671.78 732.26 669.90 C 738.49 659.84 744.20 649.47 749.35 638.82 C 749.93 637.47 751.21 636.55 752.67 636.42 C 754.13 636.28 755.55 636.97 756.36 638.20 C 757.17 639.42 757.24 640.99 756.55 642.29 C 751.28 653.19 745.44 663.81 739.07 674.10 C 738.34 675.28 737.05 676.00 735.66 676.00 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="57" stroke="none" target-height="39.717102" target-width="26.142456" target-x="731.1024" target-y="636.28485"></path><path d="M 638.00 783.88 C 636.29 783.88 634.77 782.80 634.21 781.19 C 633.66 779.57 634.19 777.78 635.53 776.73 C 652.43 763.51 668.33 749.06 683.10 733.50 C 692.73 723.33 701.84 712.67 710.37 701.56 C 711.72 699.81 714.23 699.48 715.98 700.83 C 717.74 702.17 718.07 704.69 716.72 706.44 C 708.01 717.77 698.73 728.63 688.90 739.00 C 673.86 754.84 657.67 769.54 640.47 783.00 C 639.77 783.56 638.90 783.87 638.00 783.88 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="59" stroke="none" target-height="84.4046" target-width="84.41058" target-x="633.657" target-y="699.4774"></path><path d="M 704.00 480.00 L 512.00 480.00 L 512.00 288.00 C 618.67 298.67 682.67 330.67 704.00 384.00 Z" fill="#80adff" fill-rule="nonzero" group-id="1,2" node-id="61" stroke="none" target-height="192" target-width="192" target-x="512" target-y="288"></path><path d="M 704.00 484.00 L 512.00 484.00 C 509.79 484.00 508.00 482.21 508.00 480.00 L 508.00 288.00 C 507.99 286.87 508.47 285.78 509.31 285.02 C 510.15 284.26 511.27 283.89 512.40 284.00 C 565.97 289.36 609.50 300.26 641.79 316.40 C 674.54 332.78 696.72 355.02 707.71 382.49 C 707.90 382.97 708.00 383.48 708.00 384.00 L 708.00 480.00 C 708.00 482.21 706.21 484.00 704.00 484.00 Z M 516.00 476.00 L 700.00 476.00 L 700.00 384.78 C 689.66 359.50 668.87 338.91 638.21 323.58 C 607.55 308.25 566.58 297.84 516.00 292.44 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="63" stroke="none" target-height="200.1134" target-width="200.00757" target-x="507.99432" target-y="283.8866"></path><path d="M 320.00 480.00 L 512.00 480.00 L 512.00 672.00 C 405.33 661.33 341.33 629.33 320.00 576.00 Z" fill="#81e6c1" fill-rule="nonzero" group-id="1,2" node-id="65" stroke="none" target-height="192" target-width="192" target-x="320" target-y="480"></path><path d="M 512.00 676.00 L 511.60 676.00 C 458.03 670.64 414.50 659.74 382.21 643.60 C 349.46 627.22 327.28 604.98 316.29 577.51 C 316.10 577.03 316.00 576.52 316.00 576.00 L 316.00 480.00 C 316.00 477.79 317.79 476.00 320.00 476.00 L 512.00 476.00 C 514.21 476.00 516.00 477.79 516.00 480.00 L 516.00 672.00 C 516.00 674.21 514.21 676.00 512.00 676.00 Z M 324.00 575.22 C 334.34 600.50 355.13 621.09 385.79 636.42 C 416.45 651.75 457.42 662.16 508.00 667.57 L 508.00 484.00 L 324.00 484.00 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="67" stroke="none" target-height="200" target-width="200.00189" target-x="315.9981" target-y="476"></path><path d="M 408.00 304.00 L 408.00 304.00 C 447.76 304.00 480.00 336.24 480.00 376.00 L 480.00 376.00 C 480.00 415.76 447.76 448.00 408.00 448.00 L 408.00 448.00 C 368.24 448.00 336.00 415.76 336.00 376.00 L 336.00 376.00 C 336.00 336.24 368.24 304.00 408.00 304.00 Z" fill="#81e6c1" fill-rule="nonzero" group-id="1,2" node-id="69" stroke="none" target-height="144" target-width="144" target-x="336" target-y="304"></path><path d="M 408.00 452.00 C 366.03 452.00 332.00 417.97 332.00 376.00 C 332.00 334.03 366.03 300.00 408.00 300.00 C 449.97 300.00 484.00 334.03 484.00 376.00 C 483.96 417.96 449.96 451.96 408.00 452.00 Z M 408.00 308.00 C 370.44 308.00 340.00 338.44 340.00 376.00 C 340.00 413.56 370.44 444.00 408.00 444.00 C 445.56 444.00 476.00 413.56 476.00 376.00 C 475.96 338.46 445.54 308.04 408.00 308.00 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="71" stroke="none" target-height="152" target-width="152" target-x="332" target-y="300"></path><path d="M 544.89 672.40 L 703.89 511.40 L 543.89 511.40 L 544.89 672.40 Z" fill="#ffdc8a" fill-rule="nonzero" group-id="1,2" node-id="73" stroke="none" target-height="161.00003" target-width="160" target-x="543.89" target-y="511.4"></path><path d="M 544.89 676.40 C 544.38 676.40 543.87 676.30 543.39 676.11 C 541.89 675.50 540.90 674.05 540.89 672.43 L 539.89 511.43 C 539.89 509.22 541.68 507.43 543.89 507.43 L 703.89 507.43 C 705.50 507.43 706.96 508.40 707.58 509.89 C 708.21 511.37 707.87 513.09 706.74 514.24 L 547.74 675.24 C 546.98 675.99 545.96 676.41 544.89 676.40 Z M 547.89 515.40 L 548.80 662.72 L 694.32 515.40 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="75" stroke="none" target-height="168.98013" target-width="168.31616" target-x="539.89" target-y="507.42868"></path></g></g></svg>
\ No newline at end of file
diff --git a/mayfly_go_web/src/assets/image/404.png b/mayfly_go_web/src/assets/image/404.png
deleted file mode 100644
index 903c8e07..00000000
Binary files a/mayfly_go_web/src/assets/image/404.png and /dev/null differ
diff --git a/mayfly_go_web/src/assets/image/404.svg b/mayfly_go_web/src/assets/image/404.svg
new file mode 100644
index 00000000..242352d5
--- /dev/null
+++ b/mayfly_go_web/src/assets/image/404.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg height="1024" node-id="1" sillyvg="true" template-height="1024" template-width="1024" version="1.1" viewBox="0 0 1024 1024" width="1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs node-id="27"></defs><g node-id="68"><g node-id="69"><path d="M 0.00 0.00 L 1024.00 0.00 L 1024.00 1024.00 L 0.00 1024.00 Z" fill="none" group-id="1,2" node-id="32" stroke="none" target-height="1024" target-width="1024" target-x="0" target-y="0"></path><path d="M 932.00 896.10 C 941.24 899.47 951.60 896.95 958.27 889.72 C 964.93 882.48 966.60 871.95 962.48 863.02 C 958.37 854.08 949.29 848.49 939.46 848.85 C 938.84 848.85 938.19 848.85 937.46 848.93 C 936.43 849.01 935.45 848.44 935.02 847.50 C 933.99 845.29 932.64 843.23 931.02 841.41 L 930.02 841.47 C 928.99 841.55 928.02 840.98 927.58 840.04 C 927.01 838.85 926.34 837.72 925.58 836.64 C 918.78 831.82 909.58 828.95 899.69 828.95 C 879.12 828.95 862.38 841.22 862.38 856.31 C 862.38 856.97 862.12 857.60 861.65 858.07 C 861.18 858.53 860.55 858.79 859.89 858.79 C 844.81 858.79 832.53 868.84 832.53 881.18 C 832.54 884.75 833.57 888.25 835.48 891.27 C 840.56 894.48 846.47 896.16 852.48 896.10 Z" fill="#80adff" fill-rule="nonzero" group-id="1,2" node-id="34" stroke="none" target-height="70.51898" target-width="134.06702" target-x="832.53" target-y="828.95"></path><path d="M 922.00 898.59 L 932.00 898.59 C 948.27 898.29 961.30 885.02 961.30 868.75 C 961.30 852.47 948.27 839.20 932.00 838.90 C 931.25 838.90 930.50 838.90 929.77 838.99 C 924.34 827.35 909.58 818.99 892.20 818.99 C 870.20 818.99 852.41 832.35 852.41 848.84 C 835.93 848.84 822.57 859.97 822.57 873.71 C 822.57 887.45 835.93 898.58 852.41 898.58 L 902.15 898.58" fill="none" group-id="1,2" node-id="36" stroke="#101129" stroke-linecap="round" stroke-width="8" target-height="79.60004" target-width="138.73364" target-x="822.57" target-y="818.99"></path><path d="M 278.86 220.57 C 292.79 220.57 305.59 212.90 312.14 200.60 C 318.69 188.31 317.93 173.40 310.16 161.84 C 303.96 157.65 296.64 155.42 289.16 155.43 C 288.31 155.43 287.42 155.43 286.34 155.55 C 284.91 155.65 283.57 154.85 282.98 153.55 C 281.54 150.49 279.66 147.66 277.40 145.15 C 276.98 145.15 276.54 145.15 276.05 145.23 C 274.62 145.33 273.28 144.53 272.69 143.23 C 271.92 141.62 271.02 140.07 270.00 138.60 C 260.60 132.00 247.91 128.00 234.29 128.00 C 205.93 128.00 182.86 144.92 182.86 165.71 C 182.86 167.60 181.32 169.14 179.43 169.14 C 158.63 169.14 141.71 182.99 141.71 200.00 C 141.74 204.93 143.15 209.75 145.78 213.91 C 152.76 218.33 160.88 220.64 169.14 220.57 Z" fill="#80adff" fill-rule="nonzero" group-id="1,2" node-id="38" stroke="none" target-height="92.641205" target-width="176.98262" target-x="141.71" target-y="128"></path><path d="M 265.14 224.00 L 278.86 224.00 C 301.33 223.65 319.37 205.33 319.37 182.85 C 319.37 160.38 301.33 142.06 278.86 141.71 C 277.86 141.71 276.80 141.77 275.78 141.84 C 268.30 125.84 247.95 114.29 224.00 114.29 C 193.70 114.29 169.14 132.71 169.14 155.43 C 146.42 155.43 128.00 170.78 128.00 189.71 C 128.00 208.64 146.42 224.00 169.14 224.00 L 237.71 224.00" fill="none" group-id="1,2" node-id="40" stroke="#101129" stroke-linecap="round" stroke-width="8" target-height="109.71" target-width="191.36853" target-x="128" target-y="114.29"></path><path d="M 402.85 817.00 L 408.00 837.76 C 408.57 840.08 410.39 841.90 412.71 842.47 L 433.46 847.58 C 434.18 847.75 434.69 848.40 434.69 849.14 C 434.69 849.89 434.18 850.54 433.46 850.71 L 412.71 855.83 C 410.39 856.40 408.57 858.22 408.00 860.54 L 402.88 881.28 C 402.71 882.01 402.07 882.52 401.32 882.52 C 400.57 882.52 399.93 882.01 399.76 881.28 L 394.64 860.54 C 394.07 858.22 392.25 856.40 389.93 855.83 L 369.18 850.71 C 368.46 850.54 367.95 849.89 367.95 849.14 C 367.95 848.40 368.46 847.75 369.18 847.58 L 389.93 842.47 C 392.25 841.90 394.07 840.08 394.64 837.76 L 399.73 817.00 C 399.91 816.29 400.55 815.79 401.29 815.79 C 402.03 815.79 402.67 816.29 402.85 817.00 Z" fill="#ccdeff" fill-rule="nonzero" group-id="1,2" node-id="42" stroke="none" target-height="66.73633" target-width="66.74402" target-x="367.948" target-y="815.78815"></path><path d="M 867.20 190.66 L 872.32 211.41 C 872.89 213.73 874.71 215.55 877.03 216.12 L 897.77 221.24 C 898.49 221.41 899.00 222.06 899.00 222.81 C 899.00 223.55 898.49 224.20 897.77 224.37 L 877.00 229.48 C 874.68 230.05 872.86 231.87 872.29 234.19 L 867.17 254.94 C 867.00 255.66 866.35 256.17 865.61 256.17 C 864.86 256.17 864.21 255.66 864.04 254.94 L 859.00 234.19 C 858.43 231.87 856.61 230.05 854.29 229.48 L 833.54 224.37 C 832.82 224.20 832.31 223.55 832.31 222.81 C 832.31 222.06 832.82 221.41 833.54 221.24 L 854.29 216.12 C 856.61 215.55 858.43 213.73 859.00 211.41 L 864.11 190.66 C 864.31 189.97 864.94 189.50 865.65 189.50 C 866.37 189.50 867.00 189.97 867.20 190.66 Z" fill="#ccdeff" fill-rule="nonzero" group-id="1,2" node-id="44" stroke="none" target-height="66.66914" target-width="66.69403" target-x="832.308" target-y="189.50285"></path><path d="M 619.47 129.41 L 625.34 153.20 C 625.99 155.87 628.08 157.96 630.75 158.61 L 654.55 164.48 C 655.37 164.69 655.95 165.43 655.95 166.28 C 655.95 167.12 655.37 167.86 654.55 168.07 L 630.75 173.94 C 628.08 174.59 625.99 176.68 625.34 179.35 L 619.47 203.14 C 619.26 203.96 618.52 204.54 617.67 204.54 C 616.83 204.54 616.09 203.96 615.88 203.14 L 610.00 179.35 C 609.35 176.68 607.26 174.59 604.59 173.94 L 580.79 168.07 C 579.97 167.86 579.39 167.12 579.39 166.28 C 579.39 165.43 579.97 164.69 580.79 164.48 L 604.59 158.61 C 607.26 157.96 609.35 155.87 610.00 153.20 L 615.86 129.41 C 616.05 128.57 616.80 127.97 617.66 127.97 C 618.53 127.97 619.28 128.57 619.47 129.41 Z" fill="#ccdeff" fill-rule="nonzero" group-id="1,2" node-id="46" stroke="none" target-height="76.5767" target-width="76.564514" target-x="579.38776" target-y="127.96555"></path><path d="M 215.00 700.44 C 212.79 700.44 211.00 698.65 211.00 696.44 L 211.00 655.88 C 211.00 653.67 209.21 651.88 207.00 651.88 L 71.82 651.88 C 69.61 651.88 67.82 650.09 67.82 647.88 L 67.82 604.60 L 172.00 358.88 C 172.63 357.40 174.07 356.44 175.68 356.44 L 212.00 356.44 C 213.34 356.44 214.59 357.11 215.33 358.22 C 216.07 359.34 216.20 360.75 215.69 361.98 L 116.25 599.32 C 115.74 600.55 115.87 601.96 116.61 603.08 C 117.35 604.19 118.60 604.86 119.94 604.86 L 207.00 604.86 C 209.21 604.86 211.00 603.07 211.00 600.86 L 211.00 504.00 C 211.00 501.79 212.79 500.00 215.00 500.00 L 247.69 500.00 C 249.90 500.00 251.69 501.79 251.69 504.00 L 251.69 600.83 C 251.69 603.04 253.48 604.83 255.69 604.83 L 263.81 604.83 C 266.02 604.83 267.81 606.62 267.81 608.83 L 267.81 647.83 C 267.81 650.04 266.02 651.83 263.81 651.83 L 255.69 651.83 C 253.48 651.83 251.69 653.62 251.69 655.83 L 251.69 696.39 C 251.69 698.60 249.90 700.39 247.69 700.39 Z" fill="#ffffff" fill-rule="nonzero" group-id="1,2" node-id="48" stroke="none" target-height="344" target-width="199.98999" target-x="67.82" target-y="356.44"></path><path d="M 212.00 360.44 L 212.00 360.44 M 212.00 360.44 L 112.56 597.77 C 111.53 600.24 111.80 603.06 113.28 605.29 C 114.76 607.52 117.26 608.86 119.94 608.86 L 207.00 608.86 C 211.42 608.86 215.00 605.28 215.00 600.86 L 215.00 504.00 L 247.69 504.00 L 247.69 600.83 C 247.69 605.25 251.27 608.83 255.69 608.83 L 263.81 608.83 L 263.81 647.83 L 255.69 647.83 C 251.27 647.83 247.69 651.41 247.69 655.83 L 247.69 696.38 L 215.00 696.38 L 215.00 655.89 C 215.00 651.47 211.42 647.89 207.00 647.89 L 71.82 647.89 L 71.82 605.41 L 175.64 360.41 L 212.00 360.41 M 212.00 352.41 L 175.64 352.41 C 172.43 352.41 169.52 354.33 168.27 357.29 L 63.82 603.78 L 63.82 647.89 C 63.82 652.31 67.40 655.89 71.82 655.89 L 207.00 655.89 L 207.00 696.44 C 207.00 700.86 210.58 704.44 215.00 704.44 L 247.69 704.44 C 252.11 704.44 255.69 700.86 255.69 696.44 L 255.69 655.89 L 263.81 655.89 C 268.23 655.89 271.81 652.31 271.81 647.89 L 271.81 608.89 C 271.81 604.47 268.23 600.89 263.81 600.89 L 255.69 600.89 L 255.69 504.00 C 255.69 499.58 252.11 496.00 247.69 496.00 L 215.00 496.00 C 210.58 496.00 207.00 499.58 207.00 504.00 L 207.00 600.83 L 119.94 600.83 L 219.33 363.50 C 220.35 361.04 220.08 358.24 218.61 356.02 C 217.14 353.80 214.66 352.46 212.00 352.44 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="50" stroke="none" target-height="352.0314" target-width="207.98999" target-x="63.82" target-y="352.4086"></path><path d="M 903.00 700.44 C 900.79 700.44 899.00 698.65 899.00 696.44 L 899.00 655.88 C 899.00 653.67 897.21 651.88 895.00 651.88 L 759.82 651.88 C 757.61 651.88 755.82 650.09 755.82 647.88 L 755.82 604.60 L 860.00 358.88 C 860.63 357.40 862.07 356.44 863.68 356.44 L 900.00 356.44 C 901.34 356.44 902.59 357.11 903.33 358.22 C 904.07 359.34 904.20 360.75 903.69 361.98 L 804.25 599.32 C 803.74 600.55 803.87 601.96 804.61 603.08 C 805.35 604.19 806.60 604.86 807.94 604.86 L 894.94 604.86 C 897.15 604.86 898.94 603.07 898.94 600.86 L 898.94 504.00 C 898.94 501.79 900.73 500.00 902.94 500.00 L 935.63 500.00 C 937.84 500.00 939.63 501.79 939.63 504.00 L 939.63 600.83 C 939.63 603.04 941.42 604.83 943.63 604.83 L 951.75 604.83 C 953.96 604.83 955.75 606.62 955.75 608.83 L 955.75 647.83 C 955.75 650.04 953.96 651.83 951.75 651.83 L 943.63 651.83 C 941.42 651.83 939.63 653.62 939.63 655.83 L 939.63 696.39 C 939.63 698.60 937.84 700.39 935.63 700.39 Z" fill="#ffffff" fill-rule="nonzero" group-id="1,2" node-id="52" stroke="none" target-height="344" target-width="199.93" target-x="755.82" target-y="356.44"></path><path d="M 900.00 360.44 L 900.00 360.44 M 900.00 360.44 L 800.56 597.77 C 799.53 600.24 799.80 603.06 801.28 605.29 C 802.76 607.52 805.26 608.86 807.94 608.86 L 894.94 608.86 C 899.36 608.86 902.94 605.28 902.94 600.86 L 902.94 504.00 L 935.63 504.00 L 935.63 600.83 C 935.63 605.25 939.21 608.83 943.63 608.83 L 951.75 608.83 L 951.75 647.83 L 943.63 647.83 C 939.21 647.83 935.63 651.41 935.63 655.83 L 935.63 696.38 L 903.00 696.38 L 903.00 655.89 C 903.00 651.47 899.42 647.89 895.00 647.89 L 759.82 647.89 L 759.82 605.41 L 863.64 360.41 L 900.00 360.41 M 900.00 352.41 L 863.64 352.41 C 860.43 352.41 857.52 354.33 856.27 357.29 L 751.82 603.78 L 751.82 647.89 C 751.82 652.31 755.40 655.89 759.82 655.89 L 895.00 655.89 L 895.00 696.44 C 895.00 700.86 898.58 704.44 903.00 704.44 L 935.69 704.44 C 940.11 704.44 943.69 700.86 943.69 696.44 L 943.69 655.89 L 951.81 655.89 C 956.23 655.89 959.81 652.31 959.81 647.89 L 959.81 608.89 C 959.81 604.47 956.23 600.89 951.81 600.89 L 943.69 600.89 L 943.69 504.00 C 943.69 499.58 940.11 496.00 935.69 496.00 L 903.00 496.00 C 898.58 496.00 895.00 499.58 895.00 504.00 L 895.00 600.83 L 808.00 600.83 L 907.39 363.50 C 908.41 361.03 908.13 358.22 906.65 356.00 C 905.17 353.77 902.67 352.44 900.00 352.44 Z" fill="#101129" fill-rule="nonzero" group-id="1,2" node-id="54" stroke="none" target-height="352.0314" target-width="207.98999" target-x="751.82" target-y="352.4086"></path><path d="M 583.13 316.54 L 598.00 375.00 L 512.00 429.00 L 554.00 484.00 L 496.00 529.00 L 517.61 587.08 C 517.78 587.54 517.60 588.05 517.18 588.30 C 516.76 588.55 516.22 588.45 515.91 588.08 L 466.00 529.00 L 501.00 481.00 L 437.00 428.00 L 495.00 378.00 L 432.00 319.74 C 348.00 351.90 288.24 433.17 288.00 528.42 C 287.69 652.05 388.37 753.00 512.00 753.00 C 635.63 753.00 736.00 652.71 736.00 529.00 C 736.00 430.15 672.00 346.27 583.13 316.54 Z" fill="#ffffff" fill-rule="nonzero" group-id="1,2" node-id="56" stroke="#101129" stroke-linecap="round" stroke-width="8" target-height="436.46" target-width="448.31" target-x="287.69" target-y="316.54"></path><path d="M 583.13 316.54 L 598.00 375.00 L 512.00 429.00 L 554.00 484.00 L 496.00 529.00 L 516.10 588.71 L 610.10 730.41 C 687.14 692.88 736.01 614.69 736.00 529.00 C 736.00 430.15 672.00 346.27 583.13 316.54 Z" fill="#80adff" fill-rule="nonzero" group-id="1,2" node-id="58" stroke="#101129" stroke-linecap="round" stroke-width="8" target-height="413.86996" target-width="240.01294" target-x="496" target-y="316.54"></path><path d="M 656.00 491.00 C 656.00 508.67 641.67 523.00 624.00 523.00 C 606.33 523.00 592.00 508.67 592.00 491.00 C 592.00 473.33 606.33 459.00 624.00 459.00 C 641.67 459.00 656.00 473.33 656.00 491.00 Z" fill="#ffdc8a" fill-rule="nonzero" group-id="1,2" node-id="60" stroke="#101129" stroke-linecap="round" stroke-width="8" target-height="64" target-width="64" target-x="592" target-y="459"></path><path d="M 432.00 491.00 C 432.00 508.67 417.67 523.00 400.00 523.00 C 382.33 523.00 368.00 508.67 368.00 491.00 C 368.00 473.33 382.33 459.00 400.00 459.00 C 417.67 459.00 432.00 473.33 432.00 491.00 Z" fill="#81e6c1" fill-rule="nonzero" group-id="1,2" node-id="62" stroke="#101129" stroke-linecap="round" stroke-width="8" target-height="64" target-width="64" target-x="368" target-y="459"></path><path d="M 624.00 297.74 C 635.10 303.15 645.80 309.36 656.00 316.31" fill="none" group-id="1,2" node-id="64" stroke="#101129" stroke-linecap="round" stroke-width="8" target-height="18.570007" target-width="32" target-x="624" target-y="297.74"></path><path d="M 681.33 336.00 C 712.98 363.90 737.26 399.19 752.00 438.72" fill="none" group-id="1,2" node-id="66" stroke="#101129" stroke-linecap="round" stroke-width="8" target-height="102.72" target-width="70.66998" target-x="681.33" target-y="336"></path></g></g></svg>
\ No newline at end of file
diff --git a/mayfly_go_web/src/common/config.ts b/mayfly_go_web/src/common/config.ts
index 77af0a8c..8e13d364 100644
--- a/mayfly_go_web/src/common/config.ts
+++ b/mayfly_go_web/src/common/config.ts
@@ -11,7 +11,7 @@ const config = {
     baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${getBaseApiUrl()}`}/api`,
 
     // 系统版本
-    version: 'v1.5.2',
+    version: 'v1.5.3',
 };
 
 export default config;
diff --git a/mayfly_go_web/src/common/sysconfig.ts b/mayfly_go_web/src/common/sysconfig.ts
index 10eaf570..d5038052 100644
--- a/mayfly_go_web/src/common/sysconfig.ts
+++ b/mayfly_go_web/src/common/sysconfig.ts
@@ -53,12 +53,21 @@ export async function useLoginCaptcha(): Promise<boolean> {
 }
 
 /**
- * 是否启用水印
+ * 是否启用水印信息配置
  *
  * @returns
  */
-export async function useWartermark(): Promise<boolean> {
-    return await getBoolConfigValue(UseWartermarkConfigKey, true);
+export async function useWartermark(): Promise<any> {
+    const value = await getConfigValue(UseWartermarkConfigKey);
+    if (!value) {
+        return {
+            isUse: true,
+        };
+    }
+    const jsonValue = JSON.parse(value);
+    // 将字符串转为bool
+    jsonValue.isUse = convertBool(jsonValue.isUse, true);
+    return jsonValue;
 }
 
 function convertBool(value: string, defaultValue: boolean) {
@@ -77,4 +86,3 @@ export async function getLdapEnabled(): Promise<any> {
     const value = await openApi.getLdapEnabled();
     return convertBool(value, false);
 }
-
diff --git a/mayfly_go_web/src/common/utils/storage.ts b/mayfly_go_web/src/common/utils/storage.ts
index fea0a4e4..08c5646f 100644
--- a/mayfly_go_web/src/common/utils/storage.ts
+++ b/mayfly_go_web/src/common/utils/storage.ts
@@ -30,15 +30,6 @@ export function getThemeConfig() {
     return getLocal('themeConfig');
 }
 
-// 获取是否开启水印
-export function getUseWatermark() {
-    return getLocal('useWatermark');
-}
-
-export function saveUseWatermark(useWatermark: boolean) {
-    setLocal('useWatermark', useWatermark);
-}
-
 // 清除用户相关的用户信息
 export function clearUser() {
     removeLocal(TokenKey);
diff --git a/mayfly_go_web/src/common/utils/wartermark.ts b/mayfly_go_web/src/common/utils/wartermark.ts
deleted file mode 100644
index c5ef43fb..00000000
--- a/mayfly_go_web/src/common/utils/wartermark.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { getUseWatermark, getUser } from '@/common/utils/storage';
-import { dateFormat2 } from '@/common/utils/date';
-
-// 页面添加水印效果
-const setWatermark = (str: any) => {
-    const id = '1.23452384164.123412416';
-    if (document.getElementById(id) !== null) document.body.removeChild(document.getElementById(id) as any);
-    const can = document.createElement('canvas');
-    can.width = 400;
-    can.height = 250;
-    const cans: any = can.getContext('2d');
-    cans.rotate((-20 * Math.PI) / 180);
-    cans.font = '14px Vedana';
-    cans.fillStyle = 'rgba(200, 200, 200, 0.35)';
-    cans.textAlign = 'left';
-    cans.textBaseline = 'Middle';
-    // cans.fillText('mayfly go', can.width / 4, can.height )
-    cans.fillText(str, can.width / 8, can.height / 2);
-
-    const div = document.createElement('div');
-    div.id = id;
-    div.style.pointerEvents = 'none';
-    div.style.top = '30px';
-    div.style.left = '0px';
-    div.style.position = 'fixed';
-    div.style.zIndex = '10000000';
-    div.style.width = document.documentElement.clientWidth + 'px';
-    div.style.height = document.documentElement.clientHeight + 'px';
-    div.style.background = `url(${can.toDataURL('image/png')}) left top repeat`;
-    document.body.appendChild(div);
-    return id;
-};
-
-function set(str: any) {
-    let id = setWatermark(str);
-    if (document.getElementById(id) === null) id = setWatermark(str);
-}
-
-function del() {
-    let id = '1.23452384164.123412416';
-    if (document.getElementById(id) !== null) document.body.removeChild(document.getElementById(id) as any);
-}
-
-const watermark = {
-    use: () => {
-        const userinfo = getUser();
-        if (!userinfo) {
-            del();
-        }
-        setTimeout(() => {
-            if (getUseWatermark()) {
-                set(`${userinfo.username} ${dateFormat2('yyyy-MM-dd HH:mm:ss', new Date())}`);
-            } else {
-                del();
-            }
-        }, 1500);
-    },
-    // 设置水印
-    set: (str: any) => {
-        set(str);
-    },
-    // 删除水印
-    del: () => {
-        del();
-    },
-};
-
-export default watermark;
diff --git a/mayfly_go_web/src/store/themeConfig.ts b/mayfly_go_web/src/store/themeConfig.ts
index 85825635..a361fbbd 100644
--- a/mayfly_go_web/src/store/themeConfig.ts
+++ b/mayfly_go_web/src/store/themeConfig.ts
@@ -89,8 +89,8 @@ export const useThemeConfig = defineStore('themeConfig', {
             isInvert: false,
             // 是否开启水印
             isWartermark: false,
-            // 水印文案
-            wartermarkText: 'mayfly',
+            // 额外水印文案
+            wartermarkText: '',
 
             /* 其它设置
             ------------------------------- */
@@ -152,5 +152,10 @@ export const useThemeConfig = defineStore('themeConfig', {
                 this.themeConfig.editorTheme = 'SolarizedLight';
             }
         },
+        // 设置水印配置信息
+        setWatermarkConfig(useWatermarkConfig: any) {
+            this.themeConfig.isWartermark = useWatermarkConfig.isUse;
+            this.themeConfig.wartermarkText = useWatermarkConfig.content;
+        },
     },
 });
diff --git a/mayfly_go_web/src/views/error/401.vue b/mayfly_go_web/src/views/error/401.vue
index 05ec891d..8623714a 100644
--- a/mayfly_go_web/src/views/error/401.vue
+++ b/mayfly_go_web/src/views/error/401.vue
@@ -12,7 +12,7 @@
                 </div>
             </div>
             <div class="right">
-                <img src="@/assets/image/401.png" />
+                <img src="@/assets/image/401.svg" />
             </div>
         </div>
     </div>
@@ -20,7 +20,7 @@
 
 <script lang="ts">
 import { useRouter } from 'vue-router';
-import { clearSession } from '@/common/utils/storage.ts';
+import { clearSession } from '@/common/utils/storage';
 export default {
     name: '401',
     setup() {
@@ -39,7 +39,7 @@ export default {
 <style scoped lang="scss">
 .error {
     height: 100%;
-    background-color: white;
+    background-color: var(--bg-main-color);
     display: flex;
     .error-flex {
         margin: auto;
diff --git a/mayfly_go_web/src/views/error/404.vue b/mayfly_go_web/src/views/error/404.vue
index 226cd914..d07248ca 100644
--- a/mayfly_go_web/src/views/error/404.vue
+++ b/mayfly_go_web/src/views/error/404.vue
@@ -12,7 +12,7 @@
                 </div>
             </div>
             <div class="right">
-                <img src="@/assets/image/404.png" />
+                <img src="@/assets/image/404.svg" />
             </div>
         </div>
     </div>
@@ -37,7 +37,7 @@ export default {
 <style scoped lang="scss">
 .error {
     height: 100%;
-    background-color: white;
+    background-color: var(--bg-main-color);
     display: flex;
     .error-flex {
         margin: auto;
diff --git a/mayfly_go_web/src/views/login/component/AccountLogin.vue b/mayfly_go_web/src/views/login/component/AccountLogin.vue
index f0a36f38..815aed91 100644
--- a/mayfly_go_web/src/views/login/component/AccountLogin.vue
+++ b/mayfly_go_web/src/views/login/component/AccountLogin.vue
@@ -132,7 +132,7 @@ import { nextTick, onMounted, ref, toRefs, reactive, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus';
 import { initRouter } from '@/router/index';
-import { saveToken, saveUser, saveUseWatermark } from '@/common/utils/storage';
+import { saveToken, saveUser } from '@/common/utils/storage';
 import { formatAxis } from '@/common/utils/format';
 import openApi from '@/common/openApi';
 import { RsaEncrypt } from '@/common/rsa';
@@ -142,7 +142,8 @@ import { useUserInfo } from '@/store/userInfo';
 import QrcodeVue from 'qrcode.vue';
 import { personApi } from '@/views/personal/api';
 import { AccountUsernamePattern } from '@/common/pattern';
-import { getToken } from '../../../common/utils/storage';
+import { getToken } from '@/common/utils/storage';
+import { useThemeConfig } from '@/store/themeConfig';
 
 const rules = {
     username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
@@ -150,6 +151,9 @@ const rules = {
     captcha: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
 };
 
+// 定义变量内容
+const storesThemeConfig = useThemeConfig();
+
 const route = useRoute();
 const router = useRouter();
 const loginFormRef: any = ref(null);
@@ -405,7 +409,8 @@ const toIndex = async () => {
         // 关闭 loading
         state.loading.signIn = true;
         ElMessage.success(`${currentTimeInfo}，欢迎回来！`);
-        saveUseWatermark(await useWartermark());
+        // 水印信息配置
+        storesThemeConfig.setWatermarkConfig(await useWartermark());
     }, 300);
 };
 
diff --git a/mayfly_go_web/src/views/login/index.vue b/mayfly_go_web/src/views/login/index.vue
index 38a6c67f..aaaae402 100644
--- a/mayfly_go_web/src/views/login/index.vue
+++ b/mayfly_go_web/src/views/login/index.vue
@@ -78,6 +78,7 @@ const getThemeConfig = computed(() => {
 });
 
 onMounted(async () => {
+    getThemeConfig.value.isWartermark = false;
     state.oauth2LoginConfig = await openApi.oauth2LoginConfig();
 });
 
diff --git a/mayfly_go_web/src/views/ops/machine/file/MachineFile.vue b/mayfly_go_web/src/views/ops/machine/file/MachineFile.vue
index b04ced73..d731c230 100755
--- a/mayfly_go_web/src/views/ops/machine/file/MachineFile.vue
+++ b/mayfly_go_web/src/views/ops/machine/file/MachineFile.vue
@@ -195,15 +195,6 @@
                         操作
                     </template>
                     <template #default="scope">
-                        <el-link
-                            @click="downloadFile(scope.row)"
-                            v-if="scope.row.type == '-'"
-                            v-auth="'machine:file:write'"
-                            type="primary"
-                            icon="download"
-                            :underline="false"
-                        ></el-link>
-
                         <el-link
                             @click="deleteFile([scope.row])"
                             v-if="!dontOperate(scope.row)"
@@ -211,7 +202,18 @@
                             type="danger"
                             icon="delete"
                             :underline="false"
+                            title="删除"
+                        ></el-link>
+
+                        <el-link
+                            @click="downloadFile(scope.row)"
+                            v-if="scope.row.type == '-'"
+                            v-auth="'machine:file:write'"
+                            type="primary"
+                            icon="download"
+                            :underline="false"
                             class="ml10"
+                            title="下载"
                         ></el-link>
 
                         <el-popover placement="top-start" :title="`${scope.row.path}-文件详情`" :width="520" trigger="click" @show="showFileStat(scope.row)">
diff --git a/mayfly_go_web/yarn.lock b/mayfly_go_web/yarn.lock
index e07af923..060840c4 100644
--- a/mayfly_go_web/yarn.lock
+++ b/mayfly_go_web/yarn.lock
@@ -773,10 +773,10 @@ echarts@^5.4.0:
     tslib "2.3.0"
     zrender "5.4.0"
 
-element-plus@^2.3.14:
-  version "2.3.14"
-  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.3.14.tgz#302a23916b0c3375fcf4b927d7b94483dac13e1b"
-  integrity sha512-9yvxUaU4jXf2ZNPdmIxoj/f8BG8CDcGM6oHa9JIqxLjQlfY4bpzR1E5CjNimnOX3rxO93w1TQ0jTVt0RSxh9kA==
+element-plus@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.4.0.tgz#e79249ac4c0a606d377c2f31ad553aa992286fe3"
+  integrity sha512-yJEa8LXkGOOgkfkeqMMEdeX/Dc8EH9qPcRuX91dlhSXxgCKKbp9tH3QFTOG99ibZsrN/Em62nh7ddvbc7I1frw==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.0.6"
@@ -1502,10 +1502,10 @@ picomatch@^2.2.3:
   resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz?cache=0&sync_timestamp=1621648246651&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpicomatch%2Fdownload%2Fpicomatch-2.3.0.tgz"
   integrity sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI=
 
-pinia@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.npmmirror.com/pinia/-/pinia-2.1.6.tgz#e88959f14b61c4debd9c42d0c9944e2875cbe0fa"
-  integrity sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==
+pinia@^2.1.7:
+  version "2.1.7"
+  resolved "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz#4cf5420d9324ca00b7b4984d3fbf693222115bbc"
+  integrity sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==
   dependencies:
     "@vue/devtools-api" "^6.5.0"
     vue-demi ">=0.14.5"
@@ -1835,10 +1835,10 @@ vue-eslint-parser@^9.3.1:
     lodash "^4.17.21"
     semver "^7.3.6"
 
-vue-router@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.npmmirror.com/vue-router/-/vue-router-4.2.4.tgz#382467a7e2923e6a85f015d081e1508052c191b9"
-  integrity sha512-9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ==
+vue-router@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.npmmirror.com/vue-router/-/vue-router-4.2.5.tgz#b9e3e08f1bd9ea363fdd173032620bc50cf0e98a"
+  integrity sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==
   dependencies:
     "@vue/devtools-api" "^6.5.0"
 
diff --git a/server/pkg/config/app.go b/server/pkg/config/app.go
index 9c582d13..5e79847a 100644
--- a/server/pkg/config/app.go
+++ b/server/pkg/config/app.go
@@ -4,7 +4,7 @@ import "fmt"
 
 const (
 	AppName = "mayfly-go"
-	Version = "v1.5.2"
+	Version = "v1.5.3"
 )
 
 func GetAppInfo() string {
diff --git a/server/resources/data/mayfly-go.sqlite b/server/resources/data/mayfly-go.sqlite
index bd55c734..0541049c 100644
Binary files a/server/resources/data/mayfly-go.sqlite and b/server/resources/data/mayfly-go.sqlite differ
diff --git a/server/resources/script/sql/v1.5.3.sql b/server/resources/script/sql/v1.5.3.sql
new file mode 100644
index 00000000..c42b01e4
--- /dev/null
+++ b/server/resources/script/sql/v1.5.3.sql
@@ -0,0 +1,7 @@
+UPDATE `t_sys_config`
+SET
+  `params` = '[{"name":"是否启用","model":"isUse","placeholder":"是否启用水印","options":"true,false"},{"name":"自定义信息","model":"content","placeholder":"额外添加的水印内容，可添加公司名称等"}]',
+  `value` = '',
+  `remark` = '水印信息配置'
+WHERE
+  `key` = 'UseWartermark';
\ No newline at end of file