From d86b301628366cf818795ea93a7645c910303759 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Thu, 3 Aug 2023 14:21:27 +0800
Subject: [PATCH] review code.

---
 docker/.gitkeep                               |  0
 .../ops/framework/common/constant/Const.java  |  2 +-
 orion-ops-ui/config/plugin/arcoResolver.ts    | 14 ++++++-------
 orion-ops-ui/config/plugin/arcoStyleImport.ts |  8 +++----
 orion-ops-ui/config/plugin/compress.ts        |  9 ++++----
 orion-ops-ui/config/plugin/imagemin.ts        |  5 ++---
 orion-ops-ui/config/plugin/visualizer.ts      |  7 +++----
 orion-ops-ui/config/utils/index.ts            |  1 -
 orion-ops-ui/src/api/{ => message}/message.ts |  0
 orion-ops-ui/src/assets/style/layout.less     |  5 +++++
 orion-ops-ui/src/components/footer/index.vue  | 21 ++++++++++++++++++-
 orion-ops-ui/src/components/menu/index.vue    |  4 ++++
 .../src/components/menu/use-menu-tree.ts      |  1 -
 .../src/components/message-box/index.vue      | 11 ++++++++--
 .../src/components/message-box/list.vue       | 17 +++++++++++++--
 orion-ops-ui/src/components/tab-bar/index.vue |  4 ++++
 orion-ops-ui/src/main.ts                      |  5 ++---
 orion-ops-ui/src/{ => types}/axios.d.ts       |  0
 orion-ops-ui/src/utils/file.ts                |  2 +-
 .../src/views/dashboard/workplace/index.vue   | 10 ++-------
 .../src/views/login/components/login-form.vue |  4 ++--
 sql/常用sql.txt                               |  0
 22 files changed, 83 insertions(+), 47 deletions(-)
 create mode 100644 docker/.gitkeep
 rename orion-ops-ui/src/api/{ => message}/message.ts (100%)
 create mode 100644 orion-ops-ui/src/assets/style/layout.less
 rename orion-ops-ui/src/{ => types}/axios.d.ts (100%)
 create mode 100644 sql/常用sql.txt

diff --git a/docker/.gitkeep b/docker/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/constant/Const.java b/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/constant/Const.java
index 82addb93..b69784a5 100644
--- a/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/constant/Const.java
+++ b/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/constant/Const.java
@@ -26,6 +26,6 @@ public class Const implements com.orion.lang.constant.Const {
 
     public static final Long ROOT_MENU_ID = 0L;
 
-    public static final Integer DEFAULT_SORT = 0;
+    public static final Integer DEFAULT_SORT = 10;
 
 }
diff --git a/orion-ops-ui/config/plugin/arcoResolver.ts b/orion-ops-ui/config/plugin/arcoResolver.ts
index 93de66a8..e15cb69c 100644
--- a/orion-ops-ui/config/plugin/arcoResolver.ts
+++ b/orion-ops-ui/config/plugin/arcoResolver.ts
@@ -1,14 +1,12 @@
-/**
- * If you use the template method for development, you can use the unplugin-vue-components plugin to enable on-demand loading support.
- * 按需引入
- * https://github.com/antfu/unplugin-vue-components
- * https://arco.design/vue/docs/start
- * Although the Pro project is full of imported components, this plugin will be used by default.
- * 虽然Pro项目中是全量引入组件，但此插件会默认使用。
- */
 import Components from 'unplugin-vue-components/vite';
 import { ArcoResolver } from 'unplugin-vue-components/resolvers';
 
+/**
+ * 按需引入
+ * https://github.com/antfu/unplugin-vue-components
+ * https://arco.design/vue/docs/start
+ * 虽然Pro项目中是全量引入组件，但此插件会默认使用。
+ */
 export default function configArcoResolverPlugin() {
   const arcoResolverPlugin = Components({
     dirs: [], // Avoid parsing src/components.  避免解析到src/components
diff --git a/orion-ops-ui/config/plugin/arcoStyleImport.ts b/orion-ops-ui/config/plugin/arcoStyleImport.ts
index 7ece00e3..2feb5e06 100644
--- a/orion-ops-ui/config/plugin/arcoStyleImport.ts
+++ b/orion-ops-ui/config/plugin/arcoStyleImport.ts
@@ -1,12 +1,10 @@
+import { vitePluginForArco } from '@arco-plugins/vite-vue';
+
 /**
- * Theme import
  * 样式按需引入
  * https://github.com/arco-design/arco-plugins/blob/main/packages/plugin-vite-vue/README.md
  * https://arco.design/vue/docs/start
  */
-import { vitePluginForArco } from '@arco-plugins/vite-vue';
-
 export default function configArcoStyleImportPlugin() {
-  const arcoResolverPlugin = vitePluginForArco({});
-  return arcoResolverPlugin;
+  return vitePluginForArco({});
 }
diff --git a/orion-ops-ui/config/plugin/compress.ts b/orion-ops-ui/config/plugin/compress.ts
index 1d678d83..ccc33340 100644
--- a/orion-ops-ui/config/plugin/compress.ts
+++ b/orion-ops-ui/config/plugin/compress.ts
@@ -1,11 +1,10 @@
-/**
- * Used to package and output gzip. Note that this does not work properly in Vite, the specific reason is still being investigated
- * gzip压缩
- * https://github.com/anncwb/vite-plugin-compression
- */
 import type { Plugin } from 'vite';
 import compressPlugin from 'vite-plugin-compression';
 
+/**
+ * gzip压缩
+ * https://github.com/anncwb/vite-plugin-compression
+ */
 export default function configCompressPlugin(
   compress: 'gzip' | 'brotli',
   deleteOriginFile = false
diff --git a/orion-ops-ui/config/plugin/imagemin.ts b/orion-ops-ui/config/plugin/imagemin.ts
index 6a457899..cd52fecf 100644
--- a/orion-ops-ui/config/plugin/imagemin.ts
+++ b/orion-ops-ui/config/plugin/imagemin.ts
@@ -1,10 +1,9 @@
+import viteImagemin from 'vite-plugin-imagemin';
+
 /**
- * Image resource files used to compress the output of the production environment
  * 图片压缩
  * https://github.com/anncwb/vite-plugin-imagemin
  */
-import viteImagemin from 'vite-plugin-imagemin';
-
 export default function configImageminPlugin() {
   const imageminPlugin = viteImagemin({
     gifsicle: {
diff --git a/orion-ops-ui/config/plugin/visualizer.ts b/orion-ops-ui/config/plugin/visualizer.ts
index 017c81f9..cfb9fc7d 100644
--- a/orion-ops-ui/config/plugin/visualizer.ts
+++ b/orion-ops-ui/config/plugin/visualizer.ts
@@ -1,10 +1,9 @@
-/**
- * Generation packaging analysis
- * 生成打包分析
- */
 import visualizer from 'rollup-plugin-visualizer';
 import { isReportMode } from '../utils';
 
+/**
+ * 生成打包分析
+ */
 export default function configVisualizerPlugin() {
   if (isReportMode()) {
     return visualizer({
diff --git a/orion-ops-ui/config/utils/index.ts b/orion-ops-ui/config/utils/index.ts
index a1e5d121..1e1eaa13 100644
--- a/orion-ops-ui/config/utils/index.ts
+++ b/orion-ops-ui/config/utils/index.ts
@@ -1,5 +1,4 @@
 /**
- * Whether to generate package preview
  * 是否生成打包报告
  */
 export default {};
diff --git a/orion-ops-ui/src/api/message.ts b/orion-ops-ui/src/api/message/message.ts
similarity index 100%
rename from orion-ops-ui/src/api/message.ts
rename to orion-ops-ui/src/api/message/message.ts
diff --git a/orion-ops-ui/src/assets/style/layout.less b/orion-ops-ui/src/assets/style/layout.less
new file mode 100644
index 00000000..7cd3312f
--- /dev/null
+++ b/orion-ops-ui/src/assets/style/layout.less
@@ -0,0 +1,5 @@
+.layout-container {
+  background-color: var(--color-fill-2);
+  padding: 16px 16px 0 16px;
+  display: flex;
+}
diff --git a/orion-ops-ui/src/components/footer/index.vue b/orion-ops-ui/src/components/footer/index.vue
index e19fb322..34bff3ab 100644
--- a/orion-ops-ui/src/components/footer/index.vue
+++ b/orion-ops-ui/src/components/footer/index.vue
@@ -1,5 +1,11 @@
 <template>
-  <a-layout-footer class="footer">Orion Ops Pro</a-layout-footer>
+  <a-layout-footer class="footer">
+    <div class="footer-text">
+      项目地址 <a target="_blank" href="https://github.com/lijiahangmax/orion-ops-pro">github</a> - <a
+      target="_blank" href="https://gitee.com/lijiahangmax/orion-ops-pro">gitee</a>
+      <a class="license" target="_blank" href="https://github.com/lijiahangmax/orion-ops-pro/blob/main/LICENSE">License - Apache 2.0</a>
+    </div>
+  </a-layout-footer>
 </template>
 
 <script lang="ts" setup>
@@ -13,5 +19,18 @@
     height: 40px;
     color: var(--color-text-2);
     text-align: center;
+
+    &-text {
+      text-wrap: none;
+
+      a {
+        text-decoration: none;
+      }
+
+      .license {
+        display: inline-block;
+        margin-left: 16px;
+      }
+    }
   }
 </style>
diff --git a/orion-ops-ui/src/components/menu/index.vue b/orion-ops-ui/src/components/menu/index.vue
index a2d61d31..c57aff1b 100644
--- a/orion-ops-ui/src/components/menu/index.vue
+++ b/orion-ops-ui/src/components/menu/index.vue
@@ -179,5 +179,9 @@
       width: 28px;
       display: inline-block;
     }
+
+    .arco-menu-title {
+      user-select: none;
+    }
   }
 </style>
diff --git a/orion-ops-ui/src/components/menu/use-menu-tree.ts b/orion-ops-ui/src/components/menu/use-menu-tree.ts
index becb3bc0..0c560719 100644
--- a/orion-ops-ui/src/components/menu/use-menu-tree.ts
+++ b/orion-ops-ui/src/components/menu/use-menu-tree.ts
@@ -1,6 +1,5 @@
 import { computed } from 'vue';
 import { RouteRecordRaw, RouteRecordNormalized } from 'vue-router';
-import usePermission from '@/hooks/permission';
 import { useAppStore } from '@/store';
 import { cloneDeep } from 'lodash';
 
diff --git a/orion-ops-ui/src/components/message-box/index.vue b/orion-ops-ui/src/components/message-box/index.vue
index c0a24f73..7c80f930 100644
--- a/orion-ops-ui/src/components/message-box/index.vue
+++ b/orion-ops-ui/src/components/message-box/index.vue
@@ -6,7 +6,7 @@
           <span> {{ item.title }}{{ formatUnreadLength(item.key) }} </span>
         </template>
         <a-result v-if="!renderList.length" status="404">
-          <template #subtitle> {{ $t('messageBox.noContent') }} </template>
+          <template #subtitle> {{ $t('messageBox.noContent') }}</template>
         </a-result>
         <List
           :render-list="renderList"
@@ -31,7 +31,7 @@
     setMessageStatus,
     MessageRecord,
     MessageListType,
-  } from '@/api/message';
+  } from '@/api/message/message';
   import useLoading from '@/hooks/loading';
   import List from './list.vue';
 
@@ -40,6 +40,7 @@
     title: string;
     avatar?: string;
   }
+
   const { loading, setLoading } = useLoading(true);
   const messageType = ref('message');
   const { t } = useI18n();
@@ -65,6 +66,7 @@
       title: t('messageBox.tab.title.todo'),
     },
   ];
+
   async function fetchSourceData() {
     setLoading(true);
     try {
@@ -76,11 +78,13 @@
       setLoading(false);
     }
   }
+
   async function readMessage(data: MessageListType) {
     const ids = data.map((item) => item.id);
     await setMessageStatus({ ids });
     fetchSourceData();
   }
+
   const renderList = computed(() => {
     return messageData.messageList.filter(
       (item) => messageType.value === item.type
@@ -116,12 +120,15 @@
   :deep(.arco-list-item-meta) {
     align-items: flex-start;
   }
+
   :deep(.arco-tabs-nav) {
     padding: 14px 0 12px 16px;
     border-bottom: 1px solid var(--color-neutral-3);
   }
+
   :deep(.arco-tabs-content) {
     padding-top: 0;
+
     .arco-result-subtitle {
       color: rgb(var(--gray-6));
     }
diff --git a/orion-ops-ui/src/components/message-box/list.vue b/orion-ops-ui/src/components/message-box/list.vue
index b0c64885..7c695f5d 100644
--- a/orion-ops-ui/src/components/message-box/list.vue
+++ b/orion-ops-ui/src/components/message-box/list.vue
@@ -36,7 +36,8 @@
                 :ellipsis="{
                   rows: 1,
                 }"
-                >{{ item.content }}</a-typography-paragraph
+              >{{ item.content }}
+              </a-typography-paragraph
               >
               <a-typography-text
                 v-if="item.type === 'message'"
@@ -72,7 +73,7 @@
 
 <script lang="ts" setup>
   import { PropType } from 'vue';
-  import { MessageRecord, MessageListType } from '@/api/message';
+  import { MessageRecord, MessageListType } from '@/api/message/message';
 
   const props = defineProps({
     renderList: {
@@ -103,45 +104,57 @@
       min-height: 86px;
       border-bottom: 1px solid rgb(var(--gray-3));
     }
+
     .arco-list-item-extra {
       position: absolute;
       right: 20px;
     }
+
     .arco-list-item-meta-content {
       flex: 1;
     }
+
     .item-wrap {
       cursor: pointer;
     }
+
     .time-text {
       font-size: 12px;
       color: rgb(var(--gray-6));
     }
+
     .arco-empty {
       display: none;
     }
+
     .arco-list-footer {
       padding: 0;
       height: 50px;
       line-height: 50px;
       border-top: none;
+
       .arco-space-item {
         width: 100%;
         border-right: 1px solid rgb(var(--gray-3));
+
         &:last-child {
           border-right: none;
         }
       }
+
       .add-border-top {
         border-top: 1px solid rgb(var(--gray-3));
       }
     }
+
     .footer-wrap {
       text-align: center;
     }
+
     .arco-typography {
       margin-bottom: 0;
     }
+
     .add-border {
       border-top: 1px solid rgb(var(--gray-3));
     }
diff --git a/orion-ops-ui/src/components/tab-bar/index.vue b/orion-ops-ui/src/components/tab-bar/index.vue
index f7786a64..844e8235 100644
--- a/orion-ops-ui/src/components/tab-bar/index.vue
+++ b/orion-ops-ui/src/components/tab-bar/index.vue
@@ -95,6 +95,10 @@
                 display: none;
               }
             }
+
+            .tag-link {
+              user-select: none;
+            }
           }
         }
       }
diff --git a/orion-ops-ui/src/main.ts b/orion-ops-ui/src/main.ts
index 9b34d2e1..eceac854 100644
--- a/orion-ops-ui/src/main.ts
+++ b/orion-ops-ui/src/main.ts
@@ -8,10 +8,9 @@ import i18n from './locale';
 import directive from './directive';
 import './mock';
 import App from './App.vue';
-// Styles are imported via arco-plugin. See config/plugin/arcoStyleImport.ts in the directory for details
-// 样式通过 arco-plugin 插件导入。详见目录文件 config/plugin/arcoStyleImport.ts
-// https://arco.design/docs/designlab/use-theme-package
+// 样式通过 arco-plugin 插件导入 详见目录文件 config/plugin/arcoStyleImport.ts
 import '@/assets/style/global.less';
+import '@/assets/style/layout.less';
 import '@/api/interceptor';
 
 const app = createApp(App);
diff --git a/orion-ops-ui/src/axios.d.ts b/orion-ops-ui/src/types/axios.d.ts
similarity index 100%
rename from orion-ops-ui/src/axios.d.ts
rename to orion-ops-ui/src/types/axios.d.ts
diff --git a/orion-ops-ui/src/utils/file.ts b/orion-ops-ui/src/utils/file.ts
index 7b28fbe9..c4350049 100644
--- a/orion-ops-ui/src/utils/file.ts
+++ b/orion-ops-ui/src/utils/file.ts
@@ -1,4 +1,4 @@
-import { isEmptyStr } from '@/utils/index';
+import { isEmptyStr } from './index';
 
 /**
  * 获取 base64 实际数据
diff --git a/orion-ops-ui/src/views/dashboard/workplace/index.vue b/orion-ops-ui/src/views/dashboard/workplace/index.vue
index 9764e6ba..0de0c949 100644
--- a/orion-ops-ui/src/views/dashboard/workplace/index.vue
+++ b/orion-ops-ui/src/views/dashboard/workplace/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="layout-container">
     <div class="left-side">
       <div class="panel">
         <Banner />
@@ -61,12 +61,6 @@
 </script>
 
 <style lang="less" scoped>
-  .container {
-    background-color: var(--color-fill-2);
-    padding: 16px 20px;
-    padding-bottom: 0;
-    display: flex;
-  }
 
   .left-side {
     flex: 1;
@@ -140,7 +134,7 @@
 <style lang="less" scoped>
   // responsive
   .mobile {
-    .container {
+    .layout-container {
       display: block;
     }
 
diff --git a/orion-ops-ui/src/views/login/components/login-form.vue b/orion-ops-ui/src/views/login/components/login-form.vue
index 4e207a45..110818d2 100644
--- a/orion-ops-ui/src/views/login/components/login-form.vue
+++ b/orion-ops-ui/src/views/login/components/login-form.vue
@@ -57,7 +57,7 @@
   import { useI18n } from 'vue-i18n';
   import { useUserStore } from '@/store';
   import useLoading from '@/hooks/loading';
-  import type { LoginData } from '@/api/user';
+  import type { LoginRequest } from '@/api/user/auth';
 
   const router = useRouter();
   const { t } = useI18n();
@@ -82,7 +82,7 @@
       setLoading(true);
       try {
         // 执行登陆
-        await userStore.login(values as LoginData);
+        await userStore.login(values as LoginRequest);
         // 跳转路由
         const { redirect, ...othersQuery } = router.currentRoute.value.query;
         router.push({
diff --git a/sql/常用sql.txt b/sql/常用sql.txt
new file mode 100644
index 00000000..e69de29b