Merge branch 'ip' into gdrtvu

.env

-VITE_LOGIN_URL=https://login.segedu.cn/auth/login/index
-VITE_LAB_URL=https://bi.segedu.cn/bi/?proc=0&action=index
-VITE_SURVEYKING_URL=https://surveyking.segedu.cn
\ No newline at end of file
+VITE_LOGIN_URL=http://172.16.3.201:1004/auth/login/index
+VITE_LAB_URL=http://172.16.3.201:1012/bi/?proc=0&action=index
+VITE_SURVEYKING_URL=http://172.16.3.201:1011
+VITE_STATIC_URL=https://saas-lab-api

.env.dev

-VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index
-# VITE_LAB_URL=https://digitalmarketinglab.ezijing.com
-VITE_LAB_URL=https://bi.ezijing.com/bi/?proc=0&action=index
+VITE_LOGIN_URL=https://login.zijing.chat/auth/login/index
+# VITE_LAB_URL=https://digitalmarketinglab.zijing.chat
+VITE_LAB_URL=https://bi.zijing.chat/bi/?proc=0&action=index

.env.test

-VITE_LOGIN_URL=https://login2.ezijing.com/auth/login/index
-VITE_LAB_URL=https://bi.ezijing.com/bi/
+VITE_LOGIN_URL=https://login2.zijing.chat/auth/login/index
+VITE_LAB_URL=https://bi.zijing.chat/bi/

package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite --mode dev",
-    "build": "vue-tsc --noEmit && vite build --mode prod && npm run deploy",
+    "build": "vue-tsc --noEmit && vite build --mode prod",
     "build:test": "vue-tsc --noEmit && vite build --mode test",
     "build:pre": "vue-tsc --noEmit && vite build --mode pre",
     "preview": "vite preview --port 4173",

src/api/base.ts

@@ -106,6 +106,31 @@ export function getMemberEvents() {
 }
 
 // 用户属性搜索
-export function searchEventAttrs(params?: { search: string; experiment_meta_event_id?: string; experiment_meta_event_attr_id?: string; page?: number; per_page?: number }) {
+export function searchEventAttrs(params?: {
+  search: string
+  experiment_meta_event_id?: string
+  experiment_meta_event_attr_id?: string
+  page?: number
+  per_page?: number
+}) {
   return httpRequest.get('/api/lab/v1/experiment/event/search-attributes', { params })
 }
+
+// 获取分片大小和唯一文件名
+export function getLocalFileChunk(params: { file_size: number; file_name: string }) {
+  return httpRequest.get('/api/lab/v1/common/file/chunk', { params })
+}
+
+// 上传每个分片前请求接口来获取当前文件是否超时,之前的分片是否被清理,如果被请求则拒绝处理。返回客户端错误码，让客户端户端不再续传剩余分片
+// 1文件被清理 0文件未被清理
+export function checkLocalFile(params: { file_name: string }) {
+  return httpRequest.get('/api/lab/v1/common/file/check', { params })
+}
+
+// 上传文件
+export function uploadLocalFile(data: { file: File; file_name: string; is_continuingly?: number; now_package_num: number; total_package_num: number }) {
+  return httpRequest.post('/api/lab/v1/common/file/upload', data, {
+    withCredentials: false,
+    headers: { 'Content-Type': 'multipart/form-data' }
+  })
+}

src/components/base/AppEditor.vue

 <script setup lang="ts">
 import Editor from '@tinymce/tinymce-vue'
-import md5 from 'blueimp-md5'
-import { getSignature, uploadFile } from '@/api/base'
+import { getLocalFileChunk, uploadLocalFile } from '@/api/base'
 
 const props = defineProps({
   height: {
@@ -13,31 +12,24 @@ const props = defineProps({
 const ImageUploadHandler = (blobInfo: any) =>
   new Promise((resolve, reject) => {
     const file = blobInfo.blob()
-    getSignature()
+    getLocalFileChunk({ file_name: file.name, file_size: file.size })
       .then((response: any) => {
-        const prefix = 'upload/admin/'
-        const key = prefix + md5(file.name + new Date().getTime()) + file.name.substr(file.name.lastIndexOf('.'))
-        const { accessid, policy, signature, host } = response
         const params = {
-          key,
-          host,
-          OSSAccessKeyId: accessid,
-          policy,
-          signature,
-          success_action_status: '200',
           file,
-          url: `${host}/${key}`
+          file_name: response.data.detail.file_name,
+          now_package_num: 1,
+          total_package_num: 1
         }
-        uploadFile(params)
+        uploadLocalFile(params)
           .then((res: any) => {
-            resolve(res.url)
+            resolve(res.data.detail.uri)
           })
           .catch(() => {
             reject('上传失败')
           })
       })
       .catch(() => {
-        reject('获取Signature失败')
+        reject('上传失败')
       })
   })
 

src/components/base/AppUpload.vue

@@ -2,8 +2,8 @@
 import type { UploadProps, UploadUserFile } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
-import md5 from 'blueimp-md5'
-import { getSignature } from '@/api/base'
+// import md5 from 'blueimp-md5'
+import { getLocalFileChunk } from '@/api/base'
 
 interface Props {
   modelValue: string | { name: string; url: string }[]
@@ -41,19 +41,12 @@ const handleBeforeUpload = async (file: any) => {
     ElMessage.error(`文件大小不能超过${props.size / 1024 / 1024}M`)
     return false
   }
-  const fileName = file.name
-  const key = props.prefix + md5(fileName + new Date().getTime()) + fileName.substr(fileName.lastIndexOf('.'))
-  const response: Record<string, any> = await getSignature()
+  const response: Record<string, any> = await getLocalFileChunk({ file_name: file.name, file_size: file.size })
   uploadData.value = {
-    key,
-    host: response.host,
-    OSSAccessKeyId: response.accessid,
-    policy: response.policy,
-    signature: response.signature,
-    success_action_status: '200',
-    url: `${response.host}/${key}`
+    file_name: response.data.detail.file_name,
+    now_package_num: 1,
+    total_package_num: 1
   }
-  file.url = `${response.host}/${key}`
   if (props.beforeUpload) {
     return props.beforeUpload(file)
   }
@@ -61,6 +54,7 @@ const handleBeforeUpload = async (file: any) => {
 
 // 上传成功
 const handleSuccess = (response: any, file: any, files: any) => {
+  file.url = response.data.detail.uri
   if (!files.every((item: any) => item.status === 'success')) return
   if (showFileList.value) {
     if (props.limit && props.limit === 1) {
@@ -87,7 +81,7 @@ const handleSuccess = (response: any, file: any, files: any) => {
       )
     }
   } else {
-    emit('update:modelValue', file.raw.url)
+    emit('update:modelValue', response.data.detail.uri)
   }
   emit('success', file, files)
 }
@@ -119,7 +113,7 @@ const handlePreview: UploadProps['onPreview'] = uploadFile => {
 
 <template>
   <el-upload
-    :action="uploadData?.host"
+    action="/api/lab/v1/common/file/upload"
     :data="uploadData"
     :show-file-list="showFileList"
     :before-upload="handleBeforeUpload"

src/utils/axios.ts

@@ -3,7 +3,7 @@ import { ElMessage } from 'element-plus'
 // import router from '@/router'
 
 const httpRequest = axios.create({
-  timeout: 60000,
+  // timeout: 60000,
   withCredentials: true,
   headers: {
     // 'Content-Type': 'application/x-www-form-urlencoded'
@@ -49,6 +49,14 @@ httpRequest.interceptors.response.use(
       ElMessage.error(data.message || data.msg)
       return Promise.reject(data)
     }
+    if (import.meta.env.VITE_STATIC_URL) {
+      try {
+        const regex = /(http|https):\/\/(.*?)saas-lab-api/gi
+        return JSON.parse(JSON.stringify(data).replaceAll(regex, import.meta.env.VITE_STATIC_URL))
+      } catch (error) {
+        console.log(error)
+      }
+    }
     return data
   },
   function (error) {

vite.config.ts

@@ -7,8 +7,8 @@ import vue from '@vitejs/plugin-vue'
 // import checker from 'vite-plugin-checker'
 import AutoImport from 'unplugin-auto-import/vite'
 
-export default defineConfig(({ mode }) => ({
-  base: mode === 'prod' ? 'https://webapp-pub.ezijing.com/website/prod/saas-dml/' : '/',
+export default defineConfig(() => ({
+  // base: mode === 'prod' ? 'https://webapp-pub.ezijing.com/website/prod/saas-dml/' : '/',
   plugins: [
     vue({ script: { defineModel: true }, reactivityTransform: true }),
     AutoImport({