Merge remote-tracking branch 'origin/main' into bin

App.vue

@@ -9,8 +9,7 @@ import config from '@/config.js';
 onLaunch((options) => {
     useUserStore().initSeesionId(); //更新
     useDictStore().getDictData();
-    // uni.hideTabBar();
+    uni.hideTabBar();
-
     // 登录
     let token = uni.getStorageSync('token') || ''; // 同步获取 缓存信息
     if (token) {
@@ -26,14 +25,7 @@ onLaunch((options) => {
     }
 });
 
-onMounted(() => {
+onMounted(() => {});
-    // #ifndef MP-WEIXIN
-    appendScriptTagElement('https://qd.zhaopinzao8dian.com/file/csn/jweixin-1.4.0.js').then(() => {
-        console.log('✅ 微信 JSSDK 加载完成');
-        // signatureFn();
-    });
-    // #endif
-});
 
 onShow(() => {
     console.log('App Show');

common/globalFunction.js

@@ -1,6 +1,5 @@
 import useUserStore from "../stores/useUserStore";
 import {
-    request,
     createRequest,
     uploadFile
 } from "../utils/request";
@@ -8,6 +7,9 @@ import streamRequest, {
     chatRequest
 } from "../utils/streamRequest.js";
 
+const sm4 = typeof window.sm4 !== 'undefined' ? window.sm4 :
+    (typeof window.smCrypto !== 'undefined' ? window.smCrypto.sm4 : null);
+
 export const CloneDeep = (props) => {
     if (typeof props !== 'object' || props === null) {
         return props
@@ -553,11 +555,51 @@ function isEmptyObject(obj) {
 }
 
 
+export function sm4Decrypt(key, value, mode = "hex") {
+    try {
+        if (key.length !== 32) {
+            alert('密钥必须是32位16进制字符串（128位）');
+            return;
+        }
+        const decrypted = sm4.decrypt(value, key, {
+            mode: 'ecb',
+            cipherType: mode === 'hex' ? 'hex' : 'base64',
+            padding: 'pkcs#5'
+        });
+
+        return decrypted
+
+    } catch (e) {
+        console.log('解密失败')
+    }
+}
+
+export function sm4Encrypt(key, value, mode = "hex") {
+    try {
+
+        if (key.length !== 32) {
+            alert('密钥必须是32位16进制字符串（128位）');
+            return;
+        }
+
+        const encrypted = sm4.encrypt(value, key, {
+            mode: 'ecb',
+            cipherType: mode === 'hex' ? 'hex' : 'base64',
+            padding: 'pkcs#5'
+        });
+
+        return encrypted
+
+    } catch (e) {
+        console.log('加密失败')
+    }
+}
+
+
 export const $api = {
     msg,
     prePage,
     sleep,
-    request,
     createRequest,
     streamRequest,
     chatRequest,
@@ -595,4 +637,5 @@ export default {
     insertSortData,
     isInWechatMiniProgramWebview,
     isEmptyObject,
+    sm4Decrypt,
 }

components/Salary-Expectation/Salary-Expectation.vue

@@ -1,17 +1,37 @@
 <template>
-    <view>{{ salaryText }}</view>
+  <view>
+    <view v-if="!minSalary || !maxSalary">面议</view>
+    <view v-else class="texts">
+      <text class="num">{{ minSalary / 1000 }}</text>
+      <text class="unit">k</text>
+      <text class="gap">~</text>
+      <text class="num">{{ maxSalary / 1000 }}</text>
+      <text class="unit">k</text>
+    </view>
+  </view>
 </template>
 
 <script setup>
-import { inject, computed } from 'vue';
+import { inject, computed } from "vue";
-import useDictStore from '../../stores/useDictStore';
+import useDictStore from "../../stores/useDictStore";
-const { minSalary, maxSalary, isMonth } = defineProps(['minSalary', 'maxSalary', 'isMonth']);
+const { minSalary, maxSalary } = defineProps(["minSalary", "maxSalary"]);
-
-const salaryText = computed(() => {
-    if (!minSalary || !maxSalary) return '面议';
-    if (isMonth) {
-        return `${minSalary}-${maxSalary}/月`;
-    }
-    return `${minSalary / 1000}k-${maxSalary / 1000}k`;
-});
 </script>
+
+<style lang="scss" scoped>
+.texts{
+    letter-spacing: 1rpx;
+}
+.num{
+    font-size: 32rpx;
+    font-weight: 500;
+}
+.unit{
+    font-size: 24rpx;
+    font-weight: 500;
+}
+.gap{
+    font-size: 32rpx;
+    font-weight: 500;
+    margin-left: 5rpx;
+}
+</style>

components/selectJobs/selectJobs.vue

@@ -32,7 +32,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, computed, inject, nextTick, defineExpose, onMounted } from 'vue';
+import { ref, reactive, computed, inject, nextTick, onMounted } from 'vue';
 const { $api, navTo, setCheckedNodes, cloneDeep } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
 import { storeToRefs } from 'pinia';

components/tabbar/midell-box.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script setup>
-import { ref, defineProps, onMounted, computed } from 'vue';
+import { ref, onMounted, computed } from 'vue';
 import { useReadMsg } from '@/stores/useReadMsg';
 const props = defineProps({
     currentpage: {

config.js

@@ -1,6 +1,9 @@
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
     baseUrl: 'https://qd.zhaopinzao8dian.com/api', // 测试
+    // baseUrl: 'http://10.133.17.161:8080/api', // 测试
+    // baseUrl: 'http://192.168.3.19:8080', // 测试
+    // baseUrl: 'http://39.98.44.136:6009', // 测试
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
     StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
@@ -13,7 +16,7 @@ export default {
     // indexedDB
     DBversion: 2,
     // 只使用本地缓寸的数据
-    OnlyUseCachedDB: true,
+    OnlyUseCachedDB: false,
     // 使用模拟定位
     UsingSimulatedPositioning: true,
     // 应用信息
@@ -69,5 +72,11 @@ export default {
         title: '找工作，用 AI 更高效｜青岛市智能求职平台',
         desc: '融合海量岗位、智能简历匹配、竞争力分析，助你精准锁定理想职位！',
         imgUrl: 'https://qd.zhaopinzao8dian.com/file/csn/qd_shareLogo.jpg',
+    },
+    sm4Config: {
+        key: '86C63180C1306ABC4D8F989E0A0BC9F3',
+        mode: 'ECB', // default
+        iv: 'UISwD9fW6cFh9SNS', // default is null
+        cipherType: 'base64' // default is base64
     }
 }

index.html

@@ -24,7 +24,9 @@
             vConsole.destroy();
         </script> -->
         <!-- 爱山东jssdk -->
-        <script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script>
+        <!-- <script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script> -->
+
+        <script type="module" src="./static/js/sm4.min.js"></script>
     </head>
     <!-- <body> -->
     <div id="app"><!--app-html--></div>

package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "pixi.js": "^7.4.3"
+  }
+}

packageA/pages/vCard/vCard.vue

@@ -37,8 +37,8 @@
         </view>
         <view class="des-card" style="margin-top: 24rpx">
           <view class="fl_box fl_justbet">
-            <view>求职意向岗位</view>
+            <view style="white-space:nowrap">求职意向岗位</view>
-            <view>{{ userInfo.jobIntention || "-" }}</view>
+            <view class="line_1" style="padding-left:40rpx" >{{ userInfo.jobIntention || userInfo.jobTitle?.join(',') || '-' }}</view>
           </view>
           <view class="fl_box fl_justbet">
             <view>毕业学校</view>

pages.json

@@ -68,11 +68,9 @@
             }
         }
     ],
-  "subpackages": [
+    "subpackages": [{
-    {
         "root": "packageA",
-      "pages": [
+        "pages": [{
-        {
                 "path": "pages/choiceness/choiceness",
                 "style": {
                     "navigationBarTitleText": "精选",
@@ -227,8 +225,7 @@
                 }
             }
         ]
-    }
+    }],
-  ],
     "tabBar": {
         "custom": true,
         "display": "none",
@@ -241,8 +238,7 @@
             "height": "50px",
             "backgroundImage": "static/tabbar/logo2copy.png"
         },
-    "list": [
+        "list": [{
-      {
                 "pagePath": "pages/index/index",
                 "iconPath": "static/tabbar/calendar.png",
                 "selectedIconPath": "static/tabbar/calendared.png",

pages/chat/components/ai-paging.vue

@@ -250,8 +250,6 @@ import {
     ref,
     inject,
     nextTick,
-    defineProps,
-    defineEmits,
     onMounted,
     onUnmounted,
     toRaw,
@@ -448,7 +446,7 @@ const scrollToBottom = throttle(function () {
 }, 500);
 
 function getGuess() {
-    $api.chatRequest('/guest', { sessionId: chatSessionID.value }, 'POST').then((res) => {
+    $api.chatRequest('/app/chat/guest', { sessionId: chatSessionID.value }, 'POST').then((res) => {
         guessList.value = res.data;
         showGuess.value = true;
         nextTick(() => {

pages/chat/components/popupbadFeeback.vue

@@ -37,7 +37,7 @@
 </template>
 
 <script setup>
-import { ref, inject, defineEmits } from 'vue';
+import { ref, inject } from 'vue';
 const emit = defineEmits(['onSend']);
 const { $api } = inject('globalFunction');
 const popup = ref(null);

pages/index/components/AIMatch.vue

@@ -0,0 +1,345 @@
+<template>
+  <view class="container">
+    <!-- 用于承载 PIXI 的 Canvas -->
+    <!-- #ifdef H5 -->
+    <view id="matchCanvas" class="match-canvas"></view>
+    <!-- #endif -->
+    <!-- #ifndef H5 -->
+    <canvas type="webgl" id="matchCanvas" canvas-id="matchCanvas" class="match-canvas" />
+    <!-- #endif -->
+  </view>
+</template>
+
+<script setup>
+import { onMounted, onUnmounted, ref } from "vue";
+import * as PIXI from "pixi.js";
+
+const appRef = ref(null); // 存储 PIXI 应用实例
+
+// 标签数据：包含名称、颜色、大小、位置（角度、半径）
+const mockTags = [
+  {
+    name: "医生",
+    bgColor: 0x0069fe,
+    fontColor: 0xffffff,
+    size: 17,
+    opacity: 1.0,
+    angle: 0,
+    radius: 0,
+  },
+  {
+    name: "工程师",
+    bgColor: 0x87e2ec,
+    fontColor: 0xffffff,
+    size: 14,
+    opacity: 1,
+    angle: -Math.PI / 2, // 12点方向
+    radius: 60,
+    tailRotation: Math.PI / 2, // 拖尾向下
+  },
+  {
+    name: "建筑师",
+    bgColor: 0xffebeb,
+    fontColor: 0xf86e6e,
+    size: 11.5,
+    opacity: 1,
+    angle: -Math.PI / 4, // 1点方向
+    radius: 115,
+    tailRotation: (3 * Math.PI) / 4, // 拖尾向左下
+  },
+  {
+    name: "律师",
+    bgColor: 0x21ea85,
+    fontColor: 0xffffff,
+    size: 15,
+    opacity: 1,
+    angle: -Math.PI / 10, // 2点方向
+    radius: 130,
+    tailRotation: (3 * Math.PI) / 4, // 拖尾向左下
+  },
+  {
+    name: "记者",
+    bgColor: 0xebf3ff,
+    fontColor: 0x1d71ef,
+    size: 12,
+    opacity: 1,
+    angle: Math.PI / 120, // 3点方向
+    radius: 130,
+    tailRotation: Math.PI, // 拖尾向左
+  },
+  {
+    name: "程序员",
+    bgColor: 0xff9d57,
+    fontColor: 0xffffff,
+    size: 14.5,
+    opacity: 0.6,
+    angle: Math.PI / 9, // 4点方向
+    radius: 120,
+    tailRotation: (5 * Math.PI) / 4, // 拖尾向左上
+  },
+  {
+    name: "摄影师",
+    bgColor: 0xd8e5fe,
+    fontColor: 0x1d71ef,
+    size: 11,
+    opacity: 1,
+    angle: Math.PI / 3.2, // 5点方向
+    radius: 75,
+    tailRotation: (3 * Math.PI) / 2, // 拖尾向上
+  },
+  {
+    name: "设计师",
+    bgColor: 0xff9400,
+    fontColor: 0xffffff,
+    size: 14,
+    opacity: 1,
+    angle: (2 * Math.PI) / 3, // 7点方向
+    radius: 92,
+    tailRotation: (7 * Math.PI) / 4, // 拖尾向右上
+  },
+  {
+    name: "心理咨询师",
+    bgColor: 0xebf3ff,
+    fontColor: 0x1d71ef,
+    size: 10.5,
+    opacity: 1,
+    angle: (5.4 * Math.PI) / 6, // 8点方向
+    radius: 110,
+    tailRotation: 0, // 拖尾向右
+  },
+  {
+    name: "护士",
+    bgColor: 0xff6969,
+    fontColor: 0xffffff,
+    size: 15,
+    opacity: 1,
+    angle: (6.3 * Math.PI) / 6, // 10点方向
+    radius: 110,
+    tailRotation: Math.PI / 4, // 拖尾向右下
+  },
+  {
+    name: "会计",
+    bgColor: 0xfce9c9,
+    fontColor: 0xfbc55f,
+    size: 13,
+    opacity: 1,
+    angle: (7.2 * Math.PI) / 6, // 11点方向
+    radius: 115,
+    tailRotation: Math.PI / 4, // 拖尾向右下
+  },
+];
+
+onMounted(async () => {
+  if (appRef.value) return;
+  // 初始化 PIXI 应用
+  const canvas = document.getElementById("matchCanvas");
+  const sw = canvas.clientWidth;
+  const sh = canvas.clientHeight;
+
+  const app = new PIXI.Application({
+    backgroundAlpha: 0,
+    antialias: true,
+    autoDensity: true,
+    width: sw,
+    height: sh,
+    backgroundColor: 0xf5f7fa,
+  });
+  appRef.value = app;
+
+  canvas.appendChild(app.view);
+
+  // 标签容器（管理所有标签）
+  const tagsContainer = new PIXI.Container();
+  app.stage.addChild(tagsContainer);
+
+  // 存储已放置标签的信息（位置、尺寸、浮动动画参数）
+  const placedTags = [];
+
+  for (let i = 0; i < mockTags.length; i++) {
+    const { angle, radius, tailRotation, ...tagData } = mockTags[i];
+    const x = sw / 2 + radius * Math.cos(angle);
+    const y = sh / 2 + radius * Math.sin(angle);
+    const tag = createTag(tagData, x, y, placedTags, app, i);
+
+    // 上下浮动动画
+    const originalY = tag.y;
+    let floatOffset = Math.random() * Math.PI * 2;
+    let floatSpeed = 0.01 + Math.random() * 0.02;
+    let floatRange = 2 + Math.random() * 2;
+
+    // 为标签添加彗星拖尾效果
+    if (radius > 0) {
+      // 中心标签不需要拖尾
+      const tail = createCometTail(tagData.bgColor, tailRotation, tag);
+
+      // 修正：使用 addChildAt 将拖尾添加到最底层
+      tag.addChildAt(tail, 0);
+
+      // 为拖尾添加单独的动画
+      app.ticker.add(() => {
+        if (tail.updateTail) {
+          tail.updateTail();
+        }
+      });
+    }
+
+    // 使用PIXI ticker进行动画
+    app.ticker.add(() => {
+      floatOffset += floatSpeed;
+      tag.y = originalY + Math.sin(floatOffset) * floatRange;
+    });
+
+    tagsContainer.addChild(tag);
+    placedTags.push({ ...tagData, bounds: tag.getBounds() });
+  }
+});
+
+// 销毁时清理资源
+onUnmounted(() => {
+  if (appRef.value) {
+    appRef.value.destroy(true, true);
+    appRef.value = null;
+  }
+});
+
+// 创建彗星拖尾效果
+function createCometTail(bgColor, tailRotation, tag) {
+  const tailGroup = new PIXI.Container();
+
+  // 拖尾直接放在标签中心位置
+  tailGroup.x = 0;
+  tailGroup.y = 0;
+
+  const tail = new PIXI.Graphics();
+  tailGroup.addChild(tail);
+
+  // 拖尾参数
+  const baseLength = 45; // 基础长度
+  const startWidth = tag.width * 0.9; // 起始宽度（长边）
+  const endWidth = 35; // 末端宽度（短边）
+
+  // 拖尾动画参数
+  let breathPhase = Math.random() * Math.PI * 2;
+  const breathSpeed = 0.04;
+
+  // 更新拖尾的呼吸动画
+  tailGroup.updateTail = () => {
+    breathPhase += breathSpeed;
+    const breathScale = 0.85 + 0.15 * Math.sin(breathPhase);
+    tail.clear();
+
+    // 绘制梯形拖尾
+    const currentLength = baseLength * breathScale;
+
+    // 计算拖尾的四个顶点
+    // 长边在标签中心，水平方向（与标签长边平行）
+    const startLeft = { x: -startWidth / 2, y: 0 };
+    const startRight = { x: startWidth / 2, y: 0 };
+
+    // 短边在拖尾方向，保持水平
+    const endCenter = {
+      x: Math.cos(tailRotation) * currentLength,
+      y: Math.sin(tailRotation) * currentLength,
+    };
+
+    const endLeft = {
+      x: endCenter.x - endWidth / 2,
+      y: endCenter.y,
+    };
+
+    const endRight = {
+      x: endCenter.x + endWidth / 2,
+      y: endCenter.y,
+    };
+
+    // 使用分段绘制实现渐变
+    const segments = 6;
+    for (let i = 0; i < segments; i++) {
+      const progress = i / segments;
+      const nextProgress = (i + 1) / segments;
+
+      // 计算分段的位置 - 保持长边水平
+      const segmentStartLeft = {
+        x: startLeft.x * (1 - progress) + endLeft.x * progress,
+        y: startLeft.y * (1 - progress) + endLeft.y * progress,
+      };
+      const segmentStartRight = {
+        x: startRight.x * (1 - progress) + endRight.x * progress,
+        y: startRight.y * (1 - progress) + endRight.y * progress,
+      };
+      const segmentEndLeft = {
+        x: startLeft.x * (1 - nextProgress) + endLeft.x * nextProgress,
+        y: startLeft.y * (1 - nextProgress) + endLeft.y * nextProgress,
+      };
+      const segmentEndRight = {
+        x: startRight.x * (1 - nextProgress) + endRight.x * nextProgress,
+        y: startRight.y * (1 - nextProgress) + endRight.y * nextProgress,
+      };
+
+      // 透明度从0.4渐变到0
+      const segmentAlpha = 0.4 * (1 - progress);
+
+      tail.beginFill(bgColor, segmentAlpha);
+      tail.moveTo(segmentStartLeft.x, segmentStartLeft.y);
+      tail.lineTo(segmentEndLeft.x, segmentEndLeft.y);
+      tail.lineTo(segmentEndRight.x, segmentEndRight.y);
+      tail.lineTo(segmentStartRight.x, segmentStartRight.y);
+      tail.lineTo(segmentStartLeft.x, segmentStartLeft.y);
+      tail.endFill();
+    }
+  };
+
+  // 初始绘制
+  tailGroup.updateTail();
+
+  return tailGroup;
+}
+
+// 创建单个标签（背景+文本）
+function createTag(tagData, x, y, placedTags, app, index) {
+  const tagGroup = new PIXI.Container();
+  tagGroup.x = x;
+  tagGroup.y = y;
+
+  // 先创建文本以测量宽度
+  const text = new PIXI.Text(tagData.name, {
+    fontFamily: "Arial",
+    fontSize: tagData.size,
+    fill: tagData.fontColor,
+  });
+  text.anchor.set(0.5);
+
+  // 根据文字个数动态计算宽度
+  const padding = 10;
+  const charWidth = tagData.size * 1.5;
+  const charHeight = tagData.size * 1.3;
+  const textWidth = tagData.name.length * charWidth;
+
+  let width = textWidth + padding * 2;
+  if (index == 0) width = tagData.size * 4.5 + 10;
+
+  const height = charHeight + padding;
+
+  // 背景（圆角矩形）
+  const bg = new PIXI.Graphics();
+  bg.beginFill(tagData.bgColor, tagData.opacity ?? 1);
+  bg.drawRoundedRect(-width / 2, -height / 2, width, height, 20);
+  bg.endFill();
+  tagGroup.addChild(bg);
+
+  // 添加文本
+  tagGroup.addChild(text);
+
+  return tagGroup;
+}
+</script>
+
+<style scoped>
+.container {
+  width: 100%;
+}
+.match-canvas {
+  width: 100%;
+  height: 350rpx; /* 可根据需求调整高度 */
+}
+</style>

pages/index/components/index-one.vue

@@ -148,14 +148,14 @@
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
 
-        <!--        <view class="maskFristEntry" v-if="maskFristEntry">
+               <view class="maskFristEntry" v-if="maskFristEntry">
             <view class="entry-content">
                 <text class="text1">左滑查看视频</text>
                 <text class="text2">左滑查看视频</text>
                 <view class="goExperience">去体验</view>
                 <view class="maskFristEntry-Close" @click="closeFristEntry">1</view>
             </view>
-        </view> -->
+        </view>
     </view>
 </template>
 
@@ -183,7 +183,7 @@ const waterfallsFlowRef = ref(null);
 const loadmoreRef = ref(null);
 const conditionSearch = ref({});
 const waterfallcolumn = ref(2);
-const maskFristEntry = ref(false);
+const maskFristEntry = ref(true);
 const state = reactive({
     tabIndex: 'all',
 });

pages/index/index.vue

@@ -47,11 +47,13 @@
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import Tabbar from '@/components/tabbar/midell-box.vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
+import IndexRefactor from './components/index-refactor.vue';
 import IndexOne from './components/index-one.vue';
 import IndexTwo from './components/index-two.vue';
 const loadedMap = reactive([false, false]);
 const swiperRefs = [ref(null), ref(null)];
-const components = [IndexOne, IndexTwo];
+// const components = [IndexOne, IndexTwo];
+const components = [IndexRefactor, IndexTwo];
 import { storeToRefs } from 'pinia';
 import { useReadMsg } from '@/stores/useReadMsg';
 const { unreadCount } = storeToRefs(useReadMsg());

pages/login/login.vue

@@ -109,6 +109,7 @@
             </template>
         </tabcontrolVue>
         <SelectJobs ref="selectJobsModel"></SelectJobs>
+        <view class="backdoor" @click="loginbackdoor">后门</view>
     </AppLayout>
 </template>
 
@@ -149,7 +150,7 @@ const fromValue = reactive({
 });
 
 onLoad((parmas) => {
-    getTreeselect();
+    // getTreeselect();
 });
 
 onMounted(() => {});
@@ -243,6 +244,23 @@ function getTreeselect() {
     });
 }
 
+function loginbackdoor() {
+    $api.createRequest('/app/mock/login', {}, 'post').then((resData) => {
+        $api.msg('模拟帐号密码测试登录成功');
+        loginSetToken(resData.token).then((resume) => {
+            if (resume.data.jobTitleId) {
+                // 设置推荐列表，每次退出登录都需要更新
+                useUserStore().initSeesionId();
+                uni.reLaunch({
+                    url: '/pages/index/index',
+                });
+            } else {
+                nextStep();
+            }
+        });
+    });
+}
+
 // 登录
 function loginTest() {
     // uni.share({
@@ -289,6 +307,12 @@ function complete() {
 </script>
 
 <style lang="stylus" scoped>
+.backdoor{
+    position: fixed;
+    left: 0;
+    top: 500rpx;
+    background: red
+}
 .input-nx
     position: relative
     border-bottom: 2rpx solid #EBEBEB

pages/mine/mine.vue

@@ -45,9 +45,7 @@
                         <text v-if="userInfo.jobTitle.length - 1 !== index">|</text>
                     </text>
                 </view>
-                <view class="top-btn button-click" >
+                <view class="top-btn button-click">电子名片</view>
-                    电子名片
-                </view>
             </view>
             <view class="card-main">
                 <view class="main-title">服务专区</view>
@@ -132,7 +130,6 @@ const isAbove90 = (percent) => parseFloat(percent) < 90;
 
 function getUserstatistics() {
     $api.createRequest('/app/user/statistics').then((resData) => {
-        console.log(resData);
         counts.value = resData.data;
     });
 }

stores/userChatGroupStore.js

@@ -180,7 +180,7 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
                     resolve();
                 }
 
-                $api.streamRequest('/chat', params, onDataReceived, onError, onComplete);
+                $api.streamRequest('/app/chat/chat', params, onDataReceived, onError, onComplete);
             } catch (err) {
                 console.log(err);
                 reject(err);
@@ -230,7 +230,7 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
 
     // 云端数据
     function getHistory() {
-        $api.chatRequest('/getHistory').then((res) => {
+        $api.chatRequest('/app/chat/getHistory').then((res) => {
             if (!res.data.list.length) return
             let tabel = parseHistory(res.data.list)
             if (tabel && tabel.length) {
@@ -250,7 +250,7 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
         const params = {
             sessionId: chatSessionID.value
         }
-        $api.chatRequest('/detail', params, 'GET', loading).then((res) => {
+        $api.chatRequest('/app/chat/detail', params, 'GET', loading).then((res) => {
             let list = parseHistoryDetail(res.data.list, chatSessionID.value)
             if (list.length) {
                 baseDB.db.add(massageName.value, list).then((ids) => {

utils/request.js

@@ -1,69 +1,20 @@
 import config from "@/config.js"
 import useUserStore from '@/stores/useUserStore';
-export function request({
+import {
-    url,
+    sm4Decrypt,
-    method = 'GET',
+    sm4Encrypt
-    data = {},
+} from '../common/globalFunction';
-    load = false,
-    header = {}
-} = {}) {
 
-    return new Promise((resolve, reject) => {
-        if (load) {
-            uni.showLoading({
-                title: '请稍候',
-                mask: true
-            });
-        }
-        let Authorization = ''
-        if (useUserStore().token) {
-            Authorization = `${useUserStore().userInfo.token}${useUserStore().token}`
-        }
-        uni.request({
-            url: config.baseUrl + url,
-            method,
-            data: data,
-            header: {
-                'Authorization': Authorization || '',
-            },
-            success: resData => {
-                // 响应拦截
-                if (resData.statusCode === 200) {
-                    const {
-                        code,
-                        msg
-                    } = resData.data
-                    if (code === 200) {
-                        resolve(resData.data)
-                        return
-                    }
-                    uni.showToast({
-                        title: msg,
-                        icon: 'none'
-                    })
-                }
-                if (resData.data?.code === 401 || resData.data?.code === 402) {
-                    useUserStore().logOut()
-                    uni.showToast({
-                        title: '登录过期，请重新登录',
-                        icon: 'none'
-                    })
-                    return
-                }
-                const err = new Error('请求出现异常，请联系工作人员')
-                err.error = resData
-                reject(err)
-            },
-            fail: err => reject(err),
-            complete() {
-                if (load) {
-                    uni.hideLoading();
-                }
-            }
-        })
-    })
-}
 
+const needToEncrypt = [
+    ["post", "/app/login"],
+    ["get", "/app/user/resume"],
+    ["post", "/app/user/resume"],
+    ["post", "/app/user/experience/edit"],
+    ["post", "/app/user/experience/delete"],
+    ["get", "/app/user/experience/getSingle/{value}"],
+    ["get", "/app/user/experience/list"]
+]
 
 /**
  * @param url  String，请求的地址，默认：none
@@ -87,15 +38,44 @@ export function createRequest(url, data = {}, method = 'GET', loading = false, h
 
     const header = headers || {};
     header["Authorization"] = encodeURIComponent(Authorization);
+
+    // ------------------------------------------------------------------
+    // 检查当前请求是否需要加密
+    const isEncrypt = needToEncrypt.some(item => {
+        const matchMethod = item[0].toLowerCase() === method.toLowerCase();
+        const matchUrl = item[1].includes('{') ?
+            url.startsWith(item[1].split('/{')[0]) // 检查动态路径的前缀
+            :
+            item[1] === url; // 检查静态路径
+        return matchMethod && matchUrl;
+    });
+
+    let requestData = data;
+
+    if (isEncrypt) {
+        const jsonData = JSON.stringify(data);
+        const encryptedBody = sm4Encrypt(config.sm4Config.key, jsonData);
+        requestData = {
+            encrypted: true,
+            encryptedData: encryptedBody,
+            timestamp: Date.now()
+        };
+    }
+    // ------------------------------------------------------------------
     return new Promise((resolve, reject) => {
         uni.request({
             url: config.baseUrl + url,
             method: method,
-            data: data,
+            data: requestData,
             header,
             success: resData => {
                 // 响应拦截
                 if (resData.statusCode === 200) {
+                    if (resData.data.encrypted) {
+                        const decryptedData = sm4Decrypt(config
+                            .sm4Config.key, resData.data.encryptedData)
+                        resData.data = JSON.parse(decryptedData)
+                    }
                     const {
                         code,
                         msg

utils/streamRequest.js

@@ -17,7 +17,7 @@ export default function StreamRequest(url, data = {}, onDataReceived, onError, o
     };
     return new Promise(async (resolve, reject) => {
         try {
-            const response = await fetch(config.StreamBaseURl + url, {
+            const response = await fetch(config.baseUrl + url, {
                 method: "POST",
                 headers,
                 body: JSON.stringify(data)
@@ -46,6 +46,7 @@ export default function StreamRequest(url, data = {}, onDataReceived, onError, o
                 let lines = buffer.split("\n");
                 buffer = lines.pop(); // 可能是不完整的 JSON 片段，留待下次解析
                 for (let line of lines) {
+                    line = line.slice(5).trim()
                     if (line.startsWith("data: ")) {
                         const jsonData = line.slice(6).trim();
                         if (jsonData === "[DONE]") {
@@ -104,7 +105,7 @@ export function chatRequest(url, data = {}, method = 'GET', loading = false, hea
     header["Authorization"] = encodeURIComponent(Authorization);
     return new Promise((resolve, reject) => {
         uni.request({
-            url: config.StreamBaseURl + url,
+            url: config.baseUrl + url,
             method: method,
             data: data,
             header,