Merge branch 'iteration-oss-up' into online

package-lock.json

@@ -16,6 +16,7 @@
         "browserslist": "^4.20.2",
         "classnames": "^2.3.1",
         "clean-deep": "^3.4.0",
+        "cos-js-sdk-v5": "^1.4.20",
         "countup.js": "^2.3.2",
         "dayjs": "^1.10.7",
         "echarts": "^5.3.3",
@@ -2716,6 +2717,14 @@
         }
       }
     },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.7.1",
       "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.7.1.tgz",
@@ -3556,6 +3565,14 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/cos-js-sdk-v5": {
+      "version": "1.4.20",
+      "resolved": "https://registry.npmmirror.com/cos-js-sdk-v5/-/cos-js-sdk-v5-1.4.20.tgz",
+      "integrity": "sha512-cGpmVoKN3iYBtWo8Lwp059fOrT4yyb/+I6fVS++Zyop/ZFJswDRkjnrASViwYd8N+hi3qWVAa6ruvvBsLutEwg==",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.8.6"
+      }
+    },
     "node_modules/countup.js": {
       "version": "2.3.2",
       "resolved": "https://registry.npmmirror.com/countup.js/-/countup.js-2.3.2.tgz",
@@ -11833,6 +11850,11 @@
         "vue-demi": "*"
       }
     },
+    "@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="
+    },
     "acorn": {
       "version": "8.7.1",
       "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.7.1.tgz",
@@ -12392,6 +12414,14 @@
         }
       }
     },
+    "cos-js-sdk-v5": {
+      "version": "1.4.20",
+      "resolved": "https://registry.npmmirror.com/cos-js-sdk-v5/-/cos-js-sdk-v5-1.4.20.tgz",
+      "integrity": "sha512-cGpmVoKN3iYBtWo8Lwp059fOrT4yyb/+I6fVS++Zyop/ZFJswDRkjnrASViwYd8N+hi3qWVAa6ruvvBsLutEwg==",
+      "requires": {
+        "@xmldom/xmldom": "^0.8.6"
+      }
+    },
     "countup.js": {
       "version": "2.3.2",
       "resolved": "https://registry.npmmirror.com/countup.js/-/countup.js-2.3.2.tgz",

package.json

@@ -29,6 +29,7 @@
     "browserslist": "^4.20.2",
     "classnames": "^2.3.1",
     "clean-deep": "^3.4.0",
+    "cos-js-sdk-v5": "^1.4.20",
     "countup.js": "^2.3.2",
     "dayjs": "^1.10.7",
     "echarts": "^5.3.3",

src/components/o-upload-all/index.tsx

@@ -8,6 +8,7 @@ import iconUploader from '@common/images/icon-upload.png'
 import iconUploadClose from '@common/images/icon-upload-close.png'
 import request from '@/helpers/request'
 import { getOssUploadUrl, state } from '@/state'
+import { getUploadSign, onOnlyFileUpload } from '@/helpers/oss-file-upload'
 
 export default defineComponent({
   name: 'col-upload',
@@ -135,29 +136,42 @@ export default defineComponent({
       // 上传文件
       try {
         // 获取签名
-        if (state.platformType === 'SCHOOL') {
-          state.platformApi = '/api-school'
-        } else if (state.platformType === 'TEACHER') {
-          state.platformApi = '/api-teacher'
-        } else if (state.platformType === 'STUDENT') {
-          state.platformApi = '/api-student'
-        }
-        const signUrl = state.platformApi + '/open/getUploadSign'
+        // if (state.platformType === 'SCHOOL') {
+        //   state.platformApi = '/api-school'
+        // } else if (state.platformType === 'TEACHER') {
+        //   state.platformApi = '/api-teacher'
+        // } else if (state.platformType === 'STUDENT') {
+        //   state.platformApi = '/api-student'
+        // }
+        // const signUrl = state.platformApi + '/open/getUploadSign'
         const tempName = file.name || ''
-        const fileName = this.path + '/' + (tempName && tempName.replace(/ /gi, '_'))
+        const fileName = this.path
+          ? this.path + '/' + (tempName && tempName.replace(/ /gi, '_'))
+          : tempName && tempName.replace(/ /gi, '_')
+
         const key = new Date().getTime() + fileName
-        console.log(file)
+        // console.log(file)
 
-        const res = await request.post(signUrl, {
-          data: {
-            filename: fileName,
-            bucketName: this.bucket,
-            postData: {
-              filename: fileName,
-              acl: 'public-read',
-              key: key,
-              unknowValueField: []
-            }
+        // const res = await request.post(signUrl, {
+        //   data: {
+        //     filename: fileName,
+        //     bucketName: this.bucket,
+        //     postData: {
+        //       filename: fileName,
+        //       acl: 'public-read',
+        //       key: key,
+        //       unknowValueField: []
+        //     }
+        //   }
+        // })
+        const { data } = await getUploadSign({
+          filename: key,
+          bucketName: this.bucket,
+          postData: {
+            filename: key,
+            acl: 'public-read',
+            key: key,
+            unknowValueField: []
           }
         })
         showLoadingToast({
@@ -167,24 +181,28 @@ export default defineComponent({
           duration: 0
         })
         const obj = {
-          policy: res.data.policy,
-          signature: res.data.signature,
+          policy: data.policy,
+          signature: data.signature,
           key: key,
-          KSSAccessKeyId: res.data.kssAccessKeyId,
+          KSSAccessKeyId: data.kssAccessKeyId,
           acl: 'public-read',
-          name: fileName
-        }
-        const formData = new FormData()
-        for (const key in obj) {
-          formData.append(key, obj[key])
+          name: key,
+          file
         }
-        formData.append('file', file, fileName)
-        await umiRequest(getOssUploadUrl(this.bucket), {
-          method: 'POST',
-          data: formData
-        })
-        console.log(getOssUploadUrl(this.bucket) + key)
-        const uploadUrl = getOssUploadUrl(this.bucket) + key
+        // const formData = new FormData()
+        // for (const key in obj) {
+        //   formData.append(key, obj[key])
+        // }
+        // formData.append('file', file, fileName)
+        // await umiRequest(getOssUploadUrl(this.bucket), {
+        //   method: 'POST',
+        //   data: formData
+        // })
+        // console.log(getOssUploadUrl(this.bucket) + key)
+        // const uploadUrl = getOssUploadUrl(this.bucket) + key
+
+        const uploadUrl = await onOnlyFileUpload(getOssUploadUrl(this.bucket), obj)
+        console.log(uploadUrl, 'uploadUrl')
         closeToast()
         // 判断是否是多选
         if (this.maxCount > 1) {
@@ -196,6 +214,7 @@ export default defineComponent({
         }
       } catch (error) {
         console.log(error, 'uploadFile')
+        closeToast()
       }
     }
   },

src/components/o-upload/index.tsx

@@ -16,6 +16,7 @@ import umiRequest from 'umi-request'
 import iconUploader from '@common/images/icon_uploader.png'
 import request from '@/helpers/request'
 import { getOssUploadUrl, state } from '@/state'
+import { getUploadSign, onOnlyFileUpload } from '@/helpers/oss-file-upload'
 
 export default defineComponent({
   name: 'col-upload',
@@ -129,23 +130,39 @@ export default defineComponent({
         } else if (state.platformType === 'STUDENT') {
           state.platformApi = '/api-student'
         }
-        const signUrl = state.platformApi + '/open/getUploadSign'
+        // const signUrl = state.platformApi + '/open/getUploadSign'
+        // const tempName = file.name || ''
+        // console.log(this.path)
+        // const fileName = this.path + '/' + (tempName && tempName.replace(/ /gi, '_'))
+        // const key = new Date().getTime() + fileName
+        // console.log(file)
         const tempName = file.name || ''
-        console.log(this.path)
-        const fileName = this.path + '/' + (tempName && tempName.replace(/ /gi, '_'))
+        const fileName = this.path
+          ? this.path + '/' + (tempName && tempName.replace(/ /gi, '_'))
+          : tempName && tempName.replace(/ /gi, '_')
+
         const key = new Date().getTime() + fileName
-        console.log(file)
 
-        const res = await request.post(signUrl, {
-          data: {
-            filename: fileName,
-            bucketName: this.bucket,
-            postData: {
-              filename: fileName,
-              acl: 'public-read',
-              key: key,
-              unknowValueField: []
-            }
+        // const res = await request.post(signUrl, {
+        //   data: {
+        //     filename: fileName,
+        //     bucketName: this.bucket,
+        //     postData: {
+        //       filename: fileName,
+        //       acl: 'public-read',
+        //       key: key,
+        //       unknowValueField: []
+        //     }
+        //   }
+        // })
+        const { data } = await getUploadSign({
+          filename: key,
+          bucketName: this.bucket,
+          postData: {
+            filename: key,
+            acl: 'public-read',
+            key: key,
+            unknowValueField: []
           }
         })
         showLoadingToast({
@@ -155,24 +172,15 @@ export default defineComponent({
           duration: 0
         })
         const obj = {
-          policy: res.data.policy,
-          signature: res.data.signature,
+          policy: data.policy,
+          signature: data.signature,
           key: key,
-          KSSAccessKeyId: res.data.kssAccessKeyId,
+          KSSAccessKeyId: data.kssAccessKeyId,
           acl: 'public-read',
-          name: fileName
-        }
-        const formData = new FormData()
-        for (const key in obj) {
-          formData.append(key, obj[key])
+          name: key,
+          file
         }
-        formData.append('file', file, fileName)
-        await umiRequest(getOssUploadUrl(this.bucket), {
-          method: 'POST',
-          data: formData
-        })
-        console.log(getOssUploadUrl(this.bucket) + key)
-        const uploadUrl = getOssUploadUrl(this.bucket) + key
+        const uploadUrl = await onOnlyFileUpload(getOssUploadUrl(this.bucket), obj)
         closeToast()
         this.$emit('update:modelValue', uploadUrl)
         this.onUploadChange(uploadUrl)

src/helpers/oss-file-upload.ts

@@ -0,0 +1,242 @@
+import request from './request'
+// import axios from 'axios'
+import umiRequest from 'umi-request'
+import COS from 'cos-js-sdk-v5'
+import { state } from '@/state'
+export const ossSwitch = 'tencent' as 'ks3' | 'tencent' // 上传文件服务商
+const tencentBucket = 'daya-online-1303457149'
+
+/**
+ * 管乐团 gyt/
+ * 酷乐秀 klx/
+ * 课堂乐器 ktqy/
+ * 管乐迷 gym/
+ */
+
+// 定义一个cos 对象
+/**
+ * 获取上传文件签名
+ * @param params 上传对应参数
+ * { filename: fileName,
+     bucketName: props.bucketName,
+     postData: {
+      filename: fileName,
+      acl: 'public-read',
+      key: fileName,
+      unknowValueField: []
+    }}
+ * @param oss 服务商 ks3 tencent
+ * @returns ”{'signatur'':'',''kssAccessKeyI'':'',''policy': '' }“
+ */
+export const getUploadSign = async (params: any) => {
+  const { bucketName, filename, postData } = params
+  const ossType = ossSwitch
+  let bucket = bucketName
+  let file = filename
+  // const key = postData.key;
+  let tempPostData: any = {}
+  if (ossType === 'tencent') {
+    bucket = tencentBucket
+    file = 'gyt/' + filename
+
+    tempPostData = {
+      key: 'gyt/' + postData.key
+    }
+  } else {
+    tempPostData = postData
+  }
+  return request.post('/api-student/open/getUploadSign', {
+    data: {
+      postData: tempPostData,
+      pluginName: ossType,
+      bucketName: bucket,
+      filename: file
+    },
+    params: { pluginName: ossType }
+  })
+}
+
+/**
+ * 使用组件上传时，调用方法
+ * @param param0
+ */
+export const onFileUpload = ({ file, action, data, onProgress, onFinish, onError }: any) => {
+  if (ossSwitch === 'ks3') {
+    const fileParams = {
+      policy: data.policy,
+      signature: data.signature,
+      key: data.key,
+      acl: 'public-read',
+      KSSAccessKeyId: data.KSSAccessKeyId,
+      name: data.name
+    } as any
+    const formData = new FormData()
+    for (const key in fileParams) {
+      formData.append(key, fileParams[key])
+    }
+    formData.append('file', data.file as File)
+    // axios
+    //   .post(action as string, formData, {
+    //     onUploadProgress: ({ progress }) => {
+    //       console.log(progress)
+    //       onProgress({ percent: Math.ceil((progress || 0) * 100) })
+    //     }
+    //   })
+    //   .then(() => {
+    //     file.url = action + data.key
+    //     onFinish()
+    //   })
+    //   .catch((error) => {
+    //     onError(error)
+    //   })
+    umiRequest(action as string, {
+      method: 'POST',
+      data: formData
+    })
+      .then(() => {
+        file.url = action + data.key
+        onFinish()
+      })
+      .catch((error) => {
+        onError(error)
+      })
+  } else {
+    const cos = new COS({
+      Domain: 'https://oss.dayaedu.com',
+      Protocol: 'https',
+      // getAuthorization 必选参数
+      getAuthorization: async (options, callback: any) => {
+        callback({ Authorization: data.signature })
+      }
+    })
+    cos
+      .uploadFile({
+        Bucket: tencentBucket /* 填写自己的 bucket，必须字段 */,
+        Region: 'ap-nanjing' /* 存储桶所在地域，必须字段 */,
+        Key: `gyt/${data.name}`,
+        /* 存储在桶里的对象键（例如:1.jpg，a/b/test.txt，图片.jpg）支持中文，必须字段 */
+        Body: data.file.file, // 上传文件对象
+        SliceSize:
+          1024 *
+          1024 *
+          500 /* 触发分块上传的阈值，超过5MB使用分块上传，小于5MB使用简单上传。可自行设置，非必须 */,
+        onProgress: function (progressData) {
+          onProgress({ percent: Math.ceil((progressData.percent || 0) * 100) })
+        }
+      })
+      .then((res: any) => {
+        // file.url = 'https://' + res.Location;
+        if (res.Location?.indexOf('http') >= 0) {
+          file.url = res.Location
+        } else {
+          file.url = 'https://' + res.Location
+        }
+        onFinish()
+      })
+      .catch((error) => {
+        console.log(error, 'error')
+        onError()
+      })
+  }
+}
+
+export const onOnlyFileUpload = async (action: string, params: any) => {
+  if (ossSwitch === 'ks3') {
+    const fileParams = {
+      policy: params.policy,
+      signature: params.signature,
+      key: params.key,
+      acl: 'public-read',
+      KSSAccessKeyId: params.KSSAccessKeyId,
+      name: params.name
+    } as any
+    const formData = new FormData()
+    for (const key in fileParams) {
+      formData.append(key, fileParams[key])
+    }
+    formData.append('file', params.file as File)
+    let file = ''
+    let errorObj: any = null
+    // await axios
+    //   .post(action as string, formData, {
+    //     // onUploadProgress: ({ progress }) => {
+    //     //   console.log(progress);
+    //     //   onProgress({ percent: Math.ceil((progress || 0) * 100) });
+    //     // }
+    //   })
+    //   .then(() => {
+    //     file = action + params.key
+    //   })
+    //   .catch((error) => {
+    //     // onError(error);
+    //     errorObj = error
+    //     // throw new Error(error);
+    //   })
+    await umiRequest(action as string, {
+      method: 'POST',
+      data: formData
+    })
+      .then(() => {
+        file = action + params.key
+      })
+      .catch((error) => {
+        errorObj = error
+      })
+    if (file) {
+      return file
+    } else {
+      throw new Error(errorObj)
+    }
+    return file
+  } else {
+    let file = ''
+    let errorObj: any = null
+    console.log(params, 'params')
+    const cos = new COS({
+      Domain: 'https://oss.dayaedu.com',
+      // getAuthorization 必选参数
+      getAuthorization: async (options, callback: any) => {
+        callback({ Authorization: params.signature })
+      }
+    })
+
+    // http://daya-online-1303457149.cos.ap-nanjing.myqcloud.com/gyt
+    // http://daya-online-1303457149.cos.ap-nanjing.myqcloud.com/gyt
+    await cos
+      .uploadFile({
+        Bucket: tencentBucket /* 填写自己的 bucket，必须字段 */,
+        Region: 'ap-nanjing' /* 存储桶所在地域，必须字段 */,
+        Key: `gyt/${params.name}`,
+        /* 存储在桶里的对象键（例如:1.jpg，a/b/test.txt，图片.jpg）支持中文，必须字段 */
+        Body: params.file, // 上传文件对象
+        SliceSize:
+          1024 *
+          1024 *
+          500 /* 触发分块上传的阈值，超过5MB使用分块上传，小于5MB使用简单上传。可自行设置，非必须 */
+        // onProgress: function (progressData) {
+        //   onProgress({ percent: Math.ceil((progressData.percent || 0) * 100) });
+        // }
+      })
+      .then((res: any) => {
+        // file.url = 'https://' + res.Location;
+        // file = 'https://' + res.Location;
+        if (res.Location?.indexOf('http') >= 0) {
+          file = res.Location
+        } else {
+          file = 'https://' + res.Location
+        }
+        // onFinish();
+      })
+      .catch((error) => {
+        // console.log(error, 'error');
+        // onError();
+        // throw new Error(error);
+        errorObj = error
+      })
+    if (file) {
+      return file
+    } else {
+      throw new Error(errorObj)
+    }
+  }
+}

src/school/mass-message/create-message.tsx

@@ -1,7 +1,6 @@
 import OPopup from '@/components/o-popup'
 import { sendType } from '@/constant'
 import request from '@/helpers/request'
-import { getOssUploadUrl, state } from '@/state'
 import dayjs from 'dayjs'
 import {
   ActionSheet,

src/school/orchestra/compontent/photo-create.tsx

@@ -25,6 +25,7 @@ import OHeader from '@/components/o-header'
 import OSticky from '@/components/o-sticky'
 import { getOssUploadUrl } from '@/state'
 import umiRequest from 'umi-request'
+import { getUploadSign, onOnlyFileUpload } from '@/helpers/oss-file-upload'
 
 export default defineComponent({
   name: 'phone',
@@ -219,21 +220,35 @@ export default defineComponent({
         console.log(files, 'files')
         const file = files.file
         // 获取签名
-        const signUrl = '/api-school/open/getUploadSign'
+        // const signUrl = '/api-school/open/getUploadSign'
+        // const tempName = file.name || ''
+        // const fileName = '/orchestra/' + (tempName && tempName.replace(/ /gi, '_'))
+        // const key = new Date().getTime() + fileName
+
+        // const res = await request.post(signUrl, {
+        //   data: {
+        //     filename: fileName,
+        //     bucketName: state.bucket,
+        //     postData: {
+        //       filename: fileName,
+        //       acl: 'public-read',
+        //       key: key,
+        //       unknowValueField: []
+        //     }
+        //   }
+        // })
         const tempName = file.name || ''
         const fileName = '/orchestra/' + (tempName && tempName.replace(/ /gi, '_'))
-        const key = new Date().getTime() + fileName
 
-        const res = await request.post(signUrl, {
-          data: {
-            filename: fileName,
-            bucketName: state.bucket,
-            postData: {
-              filename: fileName,
-              acl: 'public-read',
-              key: key,
-              unknowValueField: []
-            }
+        const key = new Date().getTime() + fileName
+        const { data } = await getUploadSign({
+          filename: key,
+          bucketName: state.bucket,
+          postData: {
+            filename: key,
+            acl: 'public-read',
+            key: key,
+            unknowValueField: []
           }
         })
         showLoadingToast({
@@ -243,24 +258,16 @@ export default defineComponent({
           duration: 0
         })
         const obj = {
-          policy: res.data.policy,
-          signature: res.data.signature,
+          policy: data.policy,
+          signature: data.signature,
           key: key,
-          KSSAccessKeyId: res.data.kssAccessKeyId,
+          KSSAccessKeyId: data.kssAccessKeyId,
           acl: 'public-read',
-          name: fileName
-        }
-        const formData = new FormData()
-        for (const key in obj) {
-          formData.append(key, obj[key])
+          name: key,
+          file
         }
-        formData.append('file', file, fileName)
-        await umiRequest(getOssUploadUrl(state.bucket), {
-          method: 'POST',
-          data: formData
-        })
-        // console.log(getOssUploadUrl(state.bucket) + key)
-        const uploadUrl = getOssUploadUrl(state.bucket) + key
+        const uploadUrl = await onOnlyFileUpload(getOssUploadUrl(state.bucket), obj)
+
         closeToast()
 
         // state.fileList.push({ url: uploadUrl })

src/school/orchestra/compontent/photo-detail.tsx

@@ -31,6 +31,7 @@ import checkboxDefault from '@/common/images/icon-checkbox-default.png'
 import iconDown from '../images/icon-down.png'
 import html2canvas from 'html2canvas'
 import { promisefiyPostMessage } from '@/helpers/native-message'
+import { getUploadSign, onOnlyFileUpload } from '@/helpers/oss-file-upload'
 
 export default defineComponent({
   name: 'photo-detail',
@@ -116,21 +117,18 @@ export default defineComponent({
         console.log(files, 'files')
         const file = files.file
         // 获取签名
-        const signUrl = '/api-school/open/getUploadSign'
         const tempName = file.name || ''
         const fileName = '/orchestra/' + (tempName && tempName.replace(/ /gi, '_'))
-        const key = new Date().getTime() + fileName
 
-        const res = await request.post(signUrl, {
-          data: {
-            filename: fileName,
-            bucketName: state.bucket,
-            postData: {
-              filename: fileName,
-              acl: 'public-read',
-              key: key,
-              unknowValueField: []
-            }
+        const key = new Date().getTime() + fileName
+        const { data } = await getUploadSign({
+          filename: key,
+          bucketName: state.bucket,
+          postData: {
+            filename: key,
+            acl: 'public-read',
+            key: key,
+            unknowValueField: []
           }
         })
         showLoadingToast({
@@ -140,24 +138,16 @@ export default defineComponent({
           duration: 0
         })
         const obj = {
-          policy: res.data.policy,
-          signature: res.data.signature,
+          policy: data.policy,
+          signature: data.signature,
           key: key,
-          KSSAccessKeyId: res.data.kssAccessKeyId,
+          KSSAccessKeyId: data.kssAccessKeyId,
           acl: 'public-read',
-          name: fileName
+          name: key,
+          file
         }
-        const formData = new FormData()
-        for (const key in obj) {
-          formData.append(key, obj[key])
-        }
-        formData.append('file', file, fileName)
-        await umiRequest(getOssUploadUrl(state.bucket), {
-          method: 'POST',
-          data: formData
-        })
-        // console.log(getOssUploadUrl(state.bucket) + key)
-        const uploadUrl = getOssUploadUrl(state.bucket) + key
+        const uploadUrl = await onOnlyFileUpload(getOssUploadUrl(state.bucket), obj)
+
         closeToast()
 
         // state.fileList.push({ url: uploadUrl })