Jelajahi Sumber

fix人脸抓拍上传

Michael Wang 6 tahun lalu
induk
melakukan
b95fa3f1ef

+ 0 - 3
.env.development

@@ -1,7 +1,4 @@
 VUE_APP_TK_SERVER_URL=http://192.168.10.39:8868
-VUE_APP_UPYUN_URL=https://ecs-test-static.qmth.com.cn
-VUE_APP_UPYUN_UPLOAD_URL=https://v0.api.upyun.com/exam-cloud-test
-VUE_APP_UPYUN_HEADER_AUTH=Basic ZXhhbWNsb3VkOmV4YW1jbG91ZDEyMzQ1Ng==
 VUE_APP_FACEPP_KEY=kEz_MSSjkNuHL3fHhCvv62fXkAo-vobE
 VUE_APP_FACEPP_SECRET=aQMioMGUDShMnQmfM1_H_kPTP2pJva6J
 VUE_APP_WK_SERVER_SOCKET=ws://192.168.10.39:8878/oewebsocket/

+ 0 - 3
.env.production

@@ -1,7 +1,4 @@
 VUE_APP_TK_SERVER_URL=http://ecs.qmth.com.cn:8868
-VUE_APP_UPYUN_URL=https://ecs-static.qmth.com.cn
-VUE_APP_UPYUN_UPLOAD_URL=https://v0.api.upyun.com/exam-cloud
-VUE_APP_UPYUN_HEADER_AUTH=Basic ZXhhbWNsb3VkOmV4YW1jbG91ZDEyMzQ1Ng==
 VUE_APP_FACEPP_KEY=VOlRKNlCSAYIOcSLDKOaZukkqpmi-Pwo
 VUE_APP_FACEPP_SECRET=bzMjy-JfwtVUxVDMzagFh7ggbQBC71f1
 VUE_APP_WK_SERVER_SOCKET=wss://ecs.qmth.com.cn:8878/oewebsocket/

+ 0 - 2
.env.staging

@@ -1,5 +1,3 @@
 VUE_APP_TK_SERVER_URL=http://192.168.10.39:8868
-VUE_APP_UPYUN_UPLOAD_URL=https://v0.api.upyun.com/exam-cloud-test
-VUE_APP_UPYUN_HEADER_AUTH=Basic ZXhhbWNsb3VkOmV4YW1jbG91ZDEyMzQ1Ng==
 VUE_APP_FACEPP_KEY=kEz_MSSjkNuHL3fHhCvv62fXkAo-vobE
 VUE_APP_FACEPP_SECRET=aQMioMGUDShMnQmfM1_H_kPTP2pJva6J

+ 2 - 2
src/components/FaceRecognition/FaceRecognition.vue

@@ -12,7 +12,6 @@
 import { mapState as globalMapState } from "vuex";
 import { createNamespacedHelpers } from "vuex";
 const { mapState, mapMutations } = createNamespacedHelpers("examingHomeModule");
-import { UPYUN_URL } from "../../constants/constants.js";
 
 export default {
   name: "FaceRecognition",
@@ -55,7 +54,6 @@ export default {
     ...mapMutations(["toggleSnapNow"]),
     async openCamera() {
       const video = this.$refs.video;
-
       if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
         try {
           console.log("启动摄像头");
@@ -88,6 +86,8 @@ export default {
       this.msg = "上传照片中...";
       const [, captureFilePath] = await this.uploadToServer(captureBlob);
       this.msg = "人脸比对中...";
+      const UPYUN_URL = (await this.$http.get("/api/ecs_oe_student_face/upyun"))
+        .data.downloadPrefix;
       await this.faceCompareSync(UPYUN_URL + captureFilePath);
       const video = this.$refs.video;
       video && video.play();

+ 0 - 3
src/constants/constants.js

@@ -2,9 +2,6 @@ export const FACEPP_API = "facepp_api";
 export const FACEID_LINENESS_URL =
   "https://api.megvii.com/faceid/liveness/v2/do?token=";
 export const TK_SERVER_URL = process.env.VUE_APP_TK_SERVER_URL;
-export const UPYUN_URL = process.env.VUE_APP_UPYUN_URL;
-export const UPYUN_UPLOAD_URL = process.env.VUE_APP_UPYUN_UPLOAD_URL;
-export const UPYUN_HEADER_AUTH = process.env.VUE_APP_UPYUN_HEADER_AUTH;
 export const FACEPP_KEY = process.env.VUE_APP_FACEPP_KEY;
 export const FACEPP_SECRET = process.env.VUE_APP_FACEPP_SECRET;
 export const VUE_APP_WK_SERVER_SOCKET = process.env.VUE_APP_WK_SERVER_SOCKET;

+ 1 - 4
src/utils/axios.js

@@ -4,7 +4,6 @@ import { loadProgressBar } from "./axiosProgress";
 import cachingGet from "./axiosCache";
 import { Message } from "iview";
 import router from "../router";
-// import { UPYUN_UPLOAD_URL, UPYUN_HEADER_AUTH } from "@/constants/constants.js";
 //axios配置 start
 
 const qmInstance = axios.create({});
@@ -94,9 +93,7 @@ qmInstance.get = cachingGet(qmInstance.get, [
 ]);
 loadProgressBar(qmInstance);
 
-const upyunInstance = axios.create({
-  // baseURL: UPYUN_UPLOAD_URL
-});
+const upyunInstance = axios.create({});
 // FIXME: axios bug. wait 0.19 release. https://github.com/axios/axios/issues/385
 upyunInstance.defaults.headers.common = {};
 // upyunInstance.defaults.headers.common["Authorization"] = UPYUN_HEADER_AUTH;