From a8b982f32c6ba0b8b86c703a6371130b0b48c473 Mon Sep 17 00:00:00 2001
From: timerzz <zhhgzhhgzhhg@163.com>
Date: Tue, 21 May 2024 22:09:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=AF=E6=8C=81pusher=E5=88=86?=
 =?UTF-8?q?=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nginx.conf                  |  2 +-
 src/views/Pusher/index.vue  |  1 +
 src/views/Watcher/index.vue | 30 ++++++++++++++++++------------
 vite.config.js              | 14 ++++++++++++++
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/nginx.conf b/nginx.conf
index 5677ee9..1489e13 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -16,7 +16,7 @@ server {
 
     location /api/v1/pushers {
        resolver   10.43.0.10  valid=10s;   # 6.6.6.6 为自建DNS
-       proxy_pass http://ht-watcher:8080;
+       proxy_pass http://pushers:8080;
     }
 
     location /api/v1/watchers {
diff --git a/src/views/Pusher/index.vue b/src/views/Pusher/index.vue
index d84b9dd..8503b38 100644
--- a/src/views/Pusher/index.vue
+++ b/src/views/Pusher/index.vue
@@ -118,6 +118,7 @@ const cleanAddModal=()=>{
     remark:'',
     option: {}
   }
+  addModal.visible = false
   addModal.formItems = []
   formRef.value.clearValidate()
 }
diff --git a/src/views/Watcher/index.vue b/src/views/Watcher/index.vue
index 4e4aec1..a248ec9 100644
--- a/src/views/Watcher/index.vue
+++ b/src/views/Watcher/index.vue
@@ -24,9 +24,9 @@
           <template v-else-if="column.key === 'updatedAt'">
             <span>{{moment(record.updatedAt).format('YYYY-MM-DD HH:mm:ss')}}</span>
           </template>
-          <template v-else-if="column.key === 'pusherIds'">
-            <template v-if="record.pusherIds" v-for="id in record.pusherIds">
-              <a-tag :bordered="false" color="processing">{{pusher.list.find(p =>p.id === id)?.name}}</a-tag>
+          <template v-else-if="column.key === 'pushers'">
+            <template v-if="record.pushers.length>0" v-for="id in record.pushers">
+              <a-tag :bordered="false" color="processing" v-for="pusher in record.pushers">{{pusher.name}}</a-tag>
             </template>
             <span v-else>-</span>
           </template>
@@ -52,14 +52,15 @@
     <a-form-item label="ID" name="pid" :rules="[{ required: true, message: '请填写商品id' }]">
       <a-input v-model:value="addModal.data.pid" />
     </a-form-item>
-    <a-form-item label="推送" name="pusherIds" :rules="[{ required: true, message: '请选择通知推送' }]">
+    <a-form-item label="推送" name="pushers" :rules="[{ required: true, message: '请选择通知推送' }]">
       <a-select
-          v-model:value="addModal.data.pusherIds"
+          v-model:value="pushersComputed"
           mode="multiple"
           @dropdown-visible-change="getPushers"
-          placeholder="请选择通知推送" :fieldNames="{label:'name',value:'id'}"
-          :options="pusher.list"
-      ></a-select>
+          placeholder="请选择通知推送"
+      >
+        <a-select-option v-for="p in pusher.list" :value="p.id">{{p.name}}</a-select-option>
+      </a-select>
     </a-form-item>
     <a-form-item label="备注" name="remark">
       <a-textarea  v-model:value="addModal.data.remark" />
@@ -70,7 +71,7 @@
 </template>
 <script setup>
 import moment from "moment";
-import {h, onMounted, reactive, ref} from "vue";
+import {computed, h, onMounted, reactive, ref} from "vue";
 import {ListWatchers, CreateWatcher, DeleteWatcher, StartWatcher, StopWatcher} from "@/api/watcher.js";
 import { LoadingOutlined } from '@ant-design/icons-vue';
 import {message, Modal} from 'ant-design-vue';
@@ -127,17 +128,22 @@ const addModal = reactive({
   data: {
     pid:'',
     remark:'',
-    pusherIds:[]
+    pushers:[]
   },
   loading: false
 })
-
+const pushersComputed = computed({
+  get:()=>addModal.data.pushers.map(p => p.id),
+  set:(val)=>{
+    addModal.data.pushers = val.map(id=>pusher.list.find(p=> p.id===id))
+  }
+})
 const closeAddModal = ()=>{
   addModal.visible = false
   addModal.data = {
     pid:'',
     remark:'',
-    pusherIds: []
+    pushers: []
   }
 }
 
diff --git a/vite.config.js b/vite.config.js
index ede14bd..d89415f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -43,6 +43,20 @@ export default defineConfig({
         secure: false,
         ws: true,
       },
+      '/api/v1/watchers': {
+        target: 'https://ht-dev.timerzz.com:20443/',
+        // target: 'http://192.168.31.55:2280/',
+        changeOrigin: true,
+        secure: false,
+        ws: true,
+      },
+      '/api/v1/proxies': {
+        target: 'https://ht-dev.timerzz.com:20443/',
+        // target: 'http://192.168.31.55:2280/',
+        changeOrigin: true,
+        secure: false,
+        ws: true,
+      },
       '/api/v1': {
         target: 'https://ht.timerzz.com:20443/',
         // target: 'http://192.168.31.55:2280/',