From 8a48b2cf0227ca89c1f7add2c25c260ebcae871b Mon Sep 17 00:00:00 2001
From: zlwu <704541015@qq.com>
Date: Sat, 24 Oct 2026 12:23:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=20classMsg=20API=20?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=A4=A7=E5=B0=8F=E5=86=99=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20Linux=20CI=20=E6=9E=84=E5=BB=BA=E6=89=BE=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .drone.yml                                          | 5 ++---
 web/src/views/xg/xsjcxx/classmsg/classMsg/index.vue | 6 +++---
 web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c29d6b14..6158a964 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -36,8 +36,8 @@ steps:
       - ls -lh "/hzdyjs-releases/${DRONE_TAG}/backend-${DRONE_TAG}.jar"
 
   - name: package-web
-    # Node 20 + 无 lock 时 npm 易触发 edgesOut 空指针；18 + legacy-peer-deps 更稳
-    image: node:18-bookworm
+    # 无 package-lock（被 gitignore）；Node20 需 --legacy-peer-deps 规避 npm edgesOut
+    image: node:20-bookworm
     environment:
       NPM_CONFIG_REGISTRY: https://registry.npmmirror.com
     commands:
@@ -45,7 +45,6 @@ steps:
       - echo "==> web tag=${DRONE_TAG} npm=$(npm -v) node=$(node -v)"
       - mkdir -p "/hzdyjs-releases/${DRONE_TAG}"
       - cd web
-      # package-lock.json 被 gitignore，仓库内无 lock
       - npm install --legacy-peer-deps --no-audit --no-fund
       - npm run build:prod
       - test -f dist/index.html
diff --git a/web/src/views/xg/xsjcxx/classmsg/classMsg/index.vue b/web/src/views/xg/xsjcxx/classmsg/classMsg/index.vue
index 41c16b36..98288720 100644
--- a/web/src/views/xg/xsjcxx/classmsg/classMsg/index.vue
+++ b/web/src/views/xg/xsjcxx/classmsg/classMsg/index.vue
@@ -535,9 +535,9 @@ import {
   updateClassStatus,
   updateClassStatusBatch,
   updateClassCampusBatch
-} from '@/api/xg/xsjcxx/classmsg/classMsg';
-import { listColleges, collegeTree, listMajorsByCollegeId } from '@/api/xg/xsjcxx/classmsg/college';
-import { ClassMsgVO, ClassMsgQuery, ClassMsgForm, SysDeptVo } from '@/api/xg/xsjcxx/classmsg/types';
+} from '@/api/xg/xsjcxx/classMsg/classMsg';
+import { listColleges, collegeTree, listMajorsByCollegeId } from '@/api/xg/xsjcxx/classMsg/college';
+import { ClassMsgVO, ClassMsgQuery, ClassMsgForm, SysDeptVo } from '@/api/xg/xsjcxx/classMsg/types';
 import { listDormCampus } from '@/api/xg/xgss/xqxx/dormCampus';
 import type { DormCampusVO } from '@/api/xg/xgss/xqxx/dormCampus/types';
 import { ComponentInternalInstance, ref, reactive, toRefs, onMounted, getCurrentInstance, watch } from 'vue';
diff --git a/web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue b/web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue
index f76d3178..ff4e42c4 100644
--- a/web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue
+++ b/web/src/views/xg/xsjcxx/classmsg/majormsg/index.vue
@@ -239,8 +239,8 @@
 </template>
 
 <script setup name="MajorMsg" lang="ts">
-import { listMajor, getMajor, delMajor, addMajor, updateMajor, getCollegeTree, previewMajorMerge, mergeMajors } from '@/api/xg/xsjcxx/classmsg/majormsg';
-import { MajorVO, MajorQuery, MajorForm, CollegeTreeNode, MajorMergePreviewVO } from '@/api/xg/xsjcxx/classmsg/majormsg/types';
+import { listMajor, getMajor, delMajor, addMajor, updateMajor, getCollegeTree, previewMajorMerge, mergeMajors } from '@/api/xg/xsjcxx/classMsg/majormsg';
+import { MajorVO, MajorQuery, MajorForm, CollegeTreeNode, MajorMergePreviewVO } from '@/api/xg/xsjcxx/classMsg/majormsg/types';
 import { ComponentInternalInstance, ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue';
 import type { FormInstance as ElFormInstance } from 'element-plus';
 import type { ElTree } from 'element-plus';