bug fix

src/components/FileUpload/index.vue

@@ -1,29 +1,29 @@
 <template>
   <div class="upload-file">
     <el-upload
-      multiple
+      ref="fileUpload"
       :action="uploadFileUrl"
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
+      :headers="headers"
       :limit="limit"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       :on-success="handleUploadSuccess"
       :show-file-list="false"
-      :headers="headers"
       class="upload-file-uploader"
-      ref="fileUpload"
+      multiple
     >
       <!-- 上传按钮 -->
       <el-button type="primary">选取文件</el-button>
     </el-upload>
     <!-- 上传提示 -->
-    <div class="el-upload__tip" v-if="showTip">
+    <div v-if="showTip" class="el-upload__tip">
       请上传
       <template v-if="fileSize">
         大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
       </template>
-      <template v-if="fileType">
+      <template v-if="fileType && fileType.length">
         格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
       </template>
       的文件
@@ -35,9 +35,9 @@
       tag="ul"
     >
       <li
+        v-for="(file, index) in fileList"
         :key="file.uid"
         class="el-upload-list__item ele-upload-list__item-content"
-        v-for="(file, index) in fileList"
       >
         <el-link
           :href="`${baseUrl}${file.url}`"
@@ -47,9 +47,9 @@
           <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
         </el-link>
         <div class="ele-upload-list__item-content-action">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger"
-            >删除</el-link
-          >
+          <el-link :underline="false" type="danger" @click="handleDelete(index)"
+            >删除
+          </el-link>
         </div>
       </li>
     </transition-group>
@@ -158,7 +158,7 @@ function handleUploadError(err) {
 // 上传成功回调
 function handleUploadSuccess(res, file) {
   if (res.code === 200) {
-    uploadList.value.push({ name: res.fileName, url: res.fileName });
+    uploadList.value.push({ name: res.fileName, url: res.url });
     uploadedSuccessfully();
   } else {
     number.value--;
@@ -210,22 +210,25 @@ function listToString(list, separator) {
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .upload-file-uploader {
   margin-bottom: 5px;
 }
+
 .upload-file-list .el-upload-list__item {
   border: 1px solid #e4e7ed;
   line-height: 2;
   margin-bottom: 10px;
   position: relative;
 }
+
 .upload-file-list .ele-upload-list__item-content {
   display: flex;
   justify-content: space-between;
   align-items: center;
   color: inherit;
 }
+
 .ele-upload-list__item-content-action .el-link {
   margin-right: 10px;
 }

src/components/NotificationCenter/index.vue

@@ -277,6 +277,8 @@ onMounted(() => {
     let wsUrl;
     if (import.meta.env.VITE_APP_ENV === "development") {
       wsUrl = `ws://192.168.1.201:1616/ws-msg/${userStore.uniqueId}/${userStore.userId}`;
+    } else if (import.meta.env.VITE_APP_ENV === "caddy") {
+      wsUrl = `ws://192.168.1.201:1616/ws-msg/${userStore.uniqueId}/${userStore.userId}`;
     } else {
       let protocol;
       if (window.location.protocol === "https:") {
@@ -284,9 +286,7 @@ onMounted(() => {
       } else {
         protocol = "ws:";
       }
-      // TODO:
-      // wsUrl = `${protocol}//${window.location.host}/ws-msg/${userStore.userId}`;
-      wsUrl = `ws://192.168.1.201:1616/ws-msg/${userStore.uniqueId}/${userStore.userId}`;
+      wsUrl = `${protocol}//${window.location.host}/ws-msg/${userStore.uniqueId}/${userStore.userId}`;
     }
     const rws = new ReconnectingWebSocket(wsUrl);
     rws.addEventListener("open", () => {
@@ -300,7 +300,6 @@ onMounted(() => {
       console.log("websocket error");
     });
     rws.addEventListener("message", (event) => {
-      console.log(event.data);
       const wsData = JSON.parse(event.data);
       if (wsData.type === "msg") {
         if (visible.value && queryParams.value.status === 1) {