From 29b07ebf29ee02b34ee0c35d59c78bb1ea17b411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B8=AD=E8=84=96yaboo?= <863176846@qq.com>
Date: Sat, 13 Aug 2022 23:51:15 +0800
Subject: [PATCH 1/3] fix

---
 .github/workflows/server.prod.yml             |   2 +-
 UNO-client/src/plugins/dialog/Dialog.ts       |  28 ++--
 UNO-client/src/plugins/dialog/Dialog.vue      |  11 +-
 UNO-client/src/plugins/dialog/index.ts        |   2 +-
 .../src/plugins/notification/Notification.vue |  26 ++--
 UNO-client/src/plugins/notification/index.ts  |   2 +-
 UNO-client/src/plugins/notification/notify.ts | 145 +++++++++---------
 7 files changed, 107 insertions(+), 109 deletions(-)

diff --git a/.github/workflows/server.prod.yml b/.github/workflows/server.prod.yml
index cea3e8d..2bf1125 100644
--- a/.github/workflows/server.prod.yml
+++ b/.github/workflows/server.prod.yml
@@ -12,4 +12,4 @@ jobs:
     steps:
     # 切出代码，使用该 Action 将可以拉取最新代码
       - uses: actions/checkout@v2
-      - run: docker-compose up -f docker-compose.prod.yaml --build -d
+      - run: docker-compose -f docker-compose.prod.yaml up --build -d
diff --git a/UNO-client/src/plugins/dialog/Dialog.ts b/UNO-client/src/plugins/dialog/Dialog.ts
index 3b59e63..61bccf5 100644
--- a/UNO-client/src/plugins/dialog/Dialog.ts
+++ b/UNO-client/src/plugins/dialog/Dialog.ts
@@ -1,18 +1,18 @@
 /**
  * 创建弹窗插件的调用方法
  */
-import { createApp,App } from 'vue';
+import { createApp, App } from 'vue';
 import DialogVue from './Dialog.vue';
 
 export type OptionsType = {
   title: string,
-  content:string,
-  comfirm?:(close:Function)=>void
-  cancel?:(close:Function)=>void
-  showCancel?:boolean
+  content: string,
+  comfirm?: (close: Function) => void
+  cancel?: (close: Function) => void
+  showCancel?: boolean
 };
 
-const removeInstance = (app:App<Element>,container:Element)=>{
+const removeInstance = (app: App<Element>, container: Element) => {
   app.unmount()
   document.body.removeChild(container)
 }
@@ -26,24 +26,24 @@ const Dialog = (options: OptionsType): void => {
   container.style.top = '0';
 
   const app = createApp({
-    methods:{
-      closeDialog(){
-        removeInstance(app,container)
+    methods: {
+      closeDialog() {
+        removeInstance(app, container)
       },
-      handleConfirm(){
+      handleConfirm() {
         options.comfirm && options.comfirm(this.closeDialog)
       },
-      handleCancel(){
+      handleCancel() {
         options.cancel && options.cancel(this.closeDialog)
       }
     },
     render() {
       return h(DialogVue, {
         ...options,
-        visible:true,
+        visible: true,
         onClose: this.closeDialog,
-        onConfirm:this.handleConfirm,
-        onCancel:this.handleCancel
+        onConfirm: this.handleConfirm,
+        onCancel: this.handleCancel
       })
     }
   })
diff --git a/UNO-client/src/plugins/dialog/Dialog.vue b/UNO-client/src/plugins/dialog/Dialog.vue
index 1ce2095..163a02d 100644
--- a/UNO-client/src/plugins/dialog/Dialog.vue
+++ b/UNO-client/src/plugins/dialog/Dialog.vue
@@ -1,6 +1,7 @@
 <template>
   <div v-if="visible" z-99 flex flex-col items-center justify="center" w="100%" h="100%" bg="#00000033">
-    <div flex flex-col justify="between" relative w="60 sm:80" :bg="isDark ? 'black' : 'white'" b="rounded-4 gray-300 4 dashed">
+    <div flex flex-col justify="between" relative w="60 sm:80" :bg="isDark ? 'black' : 'white'"
+      b="rounded-4 gray-300 4 dashed">
       <button absolute top="1" right="2" @click="handleClose">X</button>
       <div b="b-4 gray-300 dashed" min-h="10" p="2" c="gray-700 dark:gray-200">
         <slot name="title">
@@ -17,8 +18,8 @@
           hover="bg-gray-400 text-white" px-3 py-1 @click="handleConfirm">
           确认
         </button>
-        <button v-if="showCancel" text="3.5" c-red b="red rounded-10 3 dashed hover:transparent" transition="duration-400"
-          hover="bg-red-400 text-white" px-3 py-1 @click="handleCancel">
+        <button v-if="showCancel" text="3.5" c-red b="red rounded-10 3 dashed hover:transparent"
+          transition="duration-400" hover="bg-red-400 text-white" px-3 py-1 @click="handleCancel">
           取消
         </button>
       </div>
@@ -33,7 +34,7 @@ interface DialogProps {
   title?: string;
   visible?: boolean;
   content?: string;
-  showCancel?:boolean
+  showCancel?: boolean
 }
 
 const emit = defineEmits(['close', 'open', 'confirm', 'cancel'])
@@ -41,7 +42,7 @@ const emit = defineEmits(['close', 'open', 'confirm', 'cancel'])
 withDefaults(defineProps<DialogProps>(), {
   title: '',
   content: '',
-  visible:true,
+  visible: true,
   showCancel: true
 })
 
diff --git a/UNO-client/src/plugins/dialog/index.ts b/UNO-client/src/plugins/dialog/index.ts
index fa3c7c5..49b6cf3 100644
--- a/UNO-client/src/plugins/dialog/index.ts
+++ b/UNO-client/src/plugins/dialog/index.ts
@@ -1,7 +1,7 @@
 import { Plugin, App } from 'vue';
 import Dialog from './Dialog.vue';
 
-const install = (app: App)=>{
+const install = (app: App) => {
   app.component('Dialog', Dialog);
   return app;
 }
diff --git a/UNO-client/src/plugins/notification/Notification.vue b/UNO-client/src/plugins/notification/Notification.vue
index 39b2c7a..ed96ccf 100644
--- a/UNO-client/src/plugins/notification/Notification.vue
+++ b/UNO-client/src/plugins/notification/Notification.vue
@@ -1,13 +1,7 @@
 <template>
   <transition name="fade" @after-leave="afterLeave" @after-enter="afterEnter">
-    <div
-      v-show="visible"
-      ref="root"
-      class="notification"
-      :style="styleObj"
-      @mouseenter="clearTimer"
-      @mouseleave="createTimer"
-    >
+    <div v-show="visible" ref="root" class="notification" :style="styleObj" @mouseenter="clearTimer"
+      @mouseleave="createTimer">
       <span class="content">{{ content }}</span>
       <a class="btn" @click="handleClose">{{ btn }}</a>
     </div>
@@ -22,7 +16,7 @@ import {
   toRefs,
   computed,
   onMounted,
-  onBeforeUnmount,StyleValue
+  onBeforeUnmount, StyleValue
 } from 'vue';
 
 export default defineComponent({
@@ -133,24 +127,28 @@ export default defineComponent({
   position: relative;
   font-size: 16px;
 }
+
 .content {
   padding: 0;
 }
+
 .btn {
-  padding:0;
+  padding: 0;
   cursor: pointer;
   border-radius: 20px;
-  position:absolute;
-  right:16px;
-  top:8px;
+  position: absolute;
+  right: 16px;
+  top: 8px;
   font-size: 10px;
   background-color: transparent;
-  color:gray
+  color: gray
 }
+
 .fade-enter-active,
 .fade-leave-active {
   transition: opacity 0.5s;
 }
+
 .fade-enter,
 .fade-leave-to {
   opacity: 0;
diff --git a/UNO-client/src/plugins/notification/index.ts b/UNO-client/src/plugins/notification/index.ts
index bcc0724..6ae380f 100644
--- a/UNO-client/src/plugins/notification/index.ts
+++ b/UNO-client/src/plugins/notification/index.ts
@@ -2,7 +2,7 @@ import { Plugin, App } from 'vue';
 import Notification from './Notification.vue'
 import notify from './notify';
 
-const install = (app: App)=>{
+const install = (app: App) => {
   app.config.globalProperties.$notify = notify;
   app.component(Notification.name, Notification);
   return app;
diff --git a/UNO-client/src/plugins/notification/notify.ts b/UNO-client/src/plugins/notification/notify.ts
index 96f6e82..e5addb8 100644
--- a/UNO-client/src/plugins/notification/notify.ts
+++ b/UNO-client/src/plugins/notification/notify.ts
@@ -1,76 +1,75 @@
 /**
  * 创建通知插件的调用方法
  */
- import { createApp, ComponentPublicInstance } from 'vue';
- import Notification from './Notification.vue';
- 
- export type OptionsType = {
-   content: string;
-   duration?: number;
-   btn?: string;
- };
- 
- type InstanceType = {
-   id: string;
-   vm: ComponentPublicInstance<any>;
- }
- 
- const instances: InstanceType[] = [];
- let seed = 1;
- 
- const removeInstance = (id: string, removeHeight: number): void => {
-   const index = instances.findIndex(item => item.id === id);
-   const len = instances.length;
-   
-   // 删除 instance
-   instances.splice(index, 1);
-   
-   if (len < 1) return;
-   
-   for (let i = index; i < len - 1; i++) {
-     const inst = instances[i].vm;
-     inst.topOffset = inst.topOffset - removeHeight - 16;
-   }
- };
- 
- const notify = (options: OptionsType): void => {
-   const id = `notification_${seed++}`;
-   const container = document.createElement('div');
-   document.body.appendChild(container);
- 
-   let verticalOffset = 16;
-   instances.forEach(item => {
-     verticalOffset += item.vm.$el.offsetHeight + 16;
-   });
- 
-   const instance = createApp({
-     data() {
-       return {
-         topOffset: verticalOffset
-       }
-     },
-     methods: {
-       closedFunc(height: number):void {
-         removeInstance(id, height);
-         document.body.removeChild(container)
-         instance.unmount();
-       }
-     },
-     render() {
-       return h(Notification,{
-         ...options,
-         verticalOffset:this.topOffset,
-         onClosed:this.closedFunc
-       })
-     }
-   });
- 
-   instances.push({
-     id,
-     vm: instance.mount(container)
-   });
- };
- 
- export default notify;
- 
- 
\ No newline at end of file
+import { createApp, ComponentPublicInstance } from 'vue';
+import Notification from './Notification.vue';
+
+export type OptionsType = {
+  content: string;
+  duration?: number;
+  btn?: string;
+};
+
+type InstanceType = {
+  id: string;
+  vm: ComponentPublicInstance<any>;
+}
+
+const instances: InstanceType[] = [];
+let seed = 1;
+
+const removeInstance = (id: string, removeHeight: number): void => {
+  const index = instances.findIndex(item => item.id === id);
+  const len = instances.length;
+
+  // 删除 instance
+  instances.splice(index, 1);
+
+  if (len < 1) return;
+
+  for (let i = index; i < len - 1; i++) {
+    const inst = instances[i].vm;
+    inst.topOffset = inst.topOffset - removeHeight - 16;
+  }
+};
+
+const notify = (options: OptionsType): void => {
+  const id = `notification_${seed++}`;
+  const container = document.createElement('div');
+  document.body.appendChild(container);
+
+  let verticalOffset = 16;
+  instances.forEach(item => {
+    verticalOffset += item.vm.$el.offsetHeight + 16;
+  });
+
+  const instance = createApp({
+    data() {
+      return {
+        topOffset: verticalOffset
+      }
+    },
+    methods: {
+      closedFunc(height: number): void {
+        removeInstance(id, height);
+        document.body.removeChild(container)
+        instance.unmount();
+      }
+    },
+    render() {
+      return h(Notification, {
+        ...options,
+        verticalOffset: this.topOffset,
+        onClosed: this.closedFunc
+      })
+    }
+  });
+
+  instances.push({
+    id,
+    vm: instance.mount(container)
+  });
+};
+
+export default notify;
+

From d0e0d580b5bbf8c47793f362e1280ec5732c7823 Mon Sep 17 00:00:00 2001
From: Merlin218 <61051874+Merlin218@users.noreply.github.com>
Date: Thu, 22 Sep 2022 16:25:46 +0800
Subject: [PATCH 2/3] Update server.dev.yml

---
 .github/workflows/server.dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/server.dev.yml b/.github/workflows/server.dev.yml
index e307fb9..47b255d 100644
--- a/.github/workflows/server.dev.yml
+++ b/.github/workflows/server.dev.yml
@@ -12,4 +12,4 @@ jobs:
     steps:
     # 切出代码，使用该 Action 将可以拉取最新代码
       - uses: actions/checkout@v2
-      - run: docker-compose -f docker-compose.dev.yaml up --build -d
+      - run: sudo docker-compose -f docker-compose.dev.yaml up --build -d

From 13df2c2b2266e39f77bc66e9f10b4881edcf31fe Mon Sep 17 00:00:00 2001
From: Merlin218 <61051874+Merlin218@users.noreply.github.com>
Date: Thu, 22 Sep 2022 16:44:45 +0800
Subject: [PATCH 3/3] Update server.prod.yml

---
 .github/workflows/server.prod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/server.prod.yml b/.github/workflows/server.prod.yml
index 2bf1125..4572fae 100644
--- a/.github/workflows/server.prod.yml
+++ b/.github/workflows/server.prod.yml
@@ -12,4 +12,4 @@ jobs:
     steps:
     # 切出代码，使用该 Action 将可以拉取最新代码
       - uses: actions/checkout@v2
-      - run: docker-compose -f docker-compose.prod.yaml up --build -d
+      - run: sudo docker-compose -f docker-compose.prod.yaml up --build -d