vue-alive-check 1.0.6 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-alive-check",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "private": false,
   "description": "活体检测 + 人脸登陆，人脸注册，扫码登陆",
   "main": "dist/vue-alive-check.common.js",
@@ -19,23 +19,24 @@
   },
   "dependencies": {
     "axios": "^0.27.2",
-    "core-js": "^3.8.3",
     "element-ui": "^2.15.14",
     "vue": "^2.6.14",
     "vue-qr": "^4.0.9",
     "vue-router": "^3.4.9"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.16",
-    "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "~5.0.0",
-    "@vue/cli-plugin-eslint": "~5.0.0",
-    "@vue/cli-service": "~5.0.0",
-    "eslint": "^7.32.0",
-    "eslint-plugin-vue": "^8.0.3",
-    "sass": "1.32.13",
+    "@babel/parser": "7.18.4",
+    "@vue/cli-plugin-babel": "4.5.18",
+    "@vue/cli-plugin-eslint": "4.5.18",
+    "@vue/cli-service": "4.5.18",
+    "babel-eslint": "10.1.0",
+    "compression-webpack-plugin": "5.0.2",
+    "core-js": "^3.26.0",
+    "eslint": "^6.2.0",
+    "eslint-plugin-vue": "9.0.0",
+    "sass": "^1.32.13",
     "sass-loader": "10.2.0",
-    "vue-template-compiler": "^2.6.14"
+    "url-loader": "^4.1.1"
   },
   "engines": {
     "node": ">= 10.13.0",

package/src/api/alive.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 export function uploadShard(data) {
   return request({
     baseURL: '/face-api/',
-    url: '/uploadShard',
+    url: '/upload-shard',
     method: 'post',
     data: data
   })
@@ -13,7 +13,7 @@ export function uploadShard(data) {
 export function aliveDetect(data) {
   return request({
     baseURL: '/face-api/',
-    url: '/aliveDetect',
+    url: '/alive-detect',
     method: 'post',
     data: data
   })

package/src/index.vue

@@ -11,6 +11,9 @@
         <el-link type="primary" :underline="false" href="./register">注册人脸</el-link>
       </div>
     </div>
+    <div>
+
+    </div>
   </div>
 </template>
 

package/src/utils/request.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
-import {Message, MessageBox, Notification, Loading} from 'element-ui'
+import { getTenantId } from '@/utils/auth'
+import {Message } from 'element-ui'
 
 // 需要忽略的提示。忽略后，自动 Promise.reject('error')
 const ignoreMsgs = [
@@ -19,7 +20,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API + '/admin-api/', // 此处的 /admin-api/ 地址，原因是后端的基础路径为 /admin-api/
+  baseURL: '/admin-api/', // 此处的 /admin-api/ 地址，原因是后端的基础路径为 /admin-api/
   // 超时
   timeout: 300000,
   // 禁用 Cookie 等信息
@@ -27,6 +28,10 @@ const service = axios.create({
 })
 // request拦截器
 service.interceptors.request.use(config => {
+  const tenantId = getTenantId();
+  if (tenantId) {
+    config.headers['tenant-id'] = tenantId;
+  }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?';

package/src/views/login.vue

@@ -1,21 +1,27 @@
 <template>
   <div style="border:0px solid #DDD; border-radius:5px;">
+    
+    <div class="title padding-20" style="text-align:center; display: none;">
+      正在进行人脸验证
+    </div>
+     
     <!-- 人脸登陆 -->
-    <!-- <FaceLogin :tenantId="tenantId" :requestId="requestId" @success="handleSuccess" @error="handleFail" /> -->
+    <!-- <FaceLogin :tenantId="tenantId" :requestId="requestId" @success="handleSuccess" @error="handleFail" @pageChanged="handlePage" /> -->
     <!-- 活体 + 人脸 登陆 -->
-    <AliveCheckLogin :tenantId="tenantId" :requestId="requestId" @success="handleSuccess" @error="handleFail" />
+    <AliveCheckLogin :tenantId="tenantId" :requestId="requestId" @success="handleSuccess" @error="handleFail" @pageChanged="handlePage" />
   </div>
 </template>
 
 <script>
 import { Message } from 'element-ui'
 // import FaceLogin from '/packages/VueFaceLogin/FaceLogin'
-// import AliveCheckLogin from '/packages/VueFaceLogin/AliveCheckLogin'
+// import AliveCheckLogin from '/packages/AliveCheckLogin/AliveCheckLogin'
 import * as auth from '@/utils/auth'
 
 export default {
   name: 'Login',
   components: {
+    // FaceLogin,
     // AliveCheckLogin
   },
   data() {
@@ -43,6 +49,11 @@ export default {
     handleFail(err){
       console.log("error", err)
       Message.error("登陆失败")
+    },
+    handlePage(page){
+      this.$router.push({
+        path: "/"+page
+      })
     }
   }
   

package/src/views/register.vue

@@ -1,16 +1,21 @@
 <template>
   <div style="border:0px solid #DDD; border-radius:5px;">
+    
+    <div class="title padding-20" style="text-align:center;">
+      正在进行人脸验证注册
+    </div>
+
     <el-link v-if="0" :underline="false" href="/" class="face-login-back"><i class="el-icon-arrow-left" /> 返回</el-link>
-    <FaceRegister :userId="115" :tenantId="1" @success="handleSuccess" @error="handleFail" />
+    <FaceRegister :userId="115" :tenantId="1" @success="handleSuccess" @error="handleFail" @pageChanged="handlePage" />
   </div>
 </template>
 
 <script>
-// import FaceRegister from '/packages/VueFaceLogin/FaceRegister'
+import FaceRegister from '/packages/VueFaceLogin/FaceRegister'
 export default {
   name: 'Register',
   components: {
-    // FaceRegister
+    FaceRegister
   },
   methods:{
     
@@ -23,6 +28,11 @@ export default {
     handleFail(err){
       console.log("error", err)
     },
+    handlePage(page){
+      this.$router.push({
+        path: "/"+page
+    })
+  }
   }
   
 }

package/vue.config.js

@@ -17,11 +17,13 @@ module.exports = {
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）, 相对于 outputDir
+  
   assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
   lintOnSave: process.env.NODE_ENV === 'development',
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
+  parallel:false,
   // webpack-dev-server 相关配置
   devServer: {
     host: '0.0.0.0',
@@ -37,6 +39,14 @@ module.exports = {
           '^/face-api/': '/uhr/face-api/' 
         }               
       },
+      '/admin-api/': { 
+        target: "https://124.71.63.200",
+        changeOrigin: true,                
+        secure:false,                     
+        pathRewrite: {
+          '^/admin-api/': '/admin-api/' 
+        }               
+      },
     },
   },
 
@@ -63,6 +73,20 @@ module.exports = {
         '@': resolve('src')
       }
     },
+    module: {
+      rules: [
+        {
+          test: /\.(png|jpg|gif)$/,
+          loader: 'url-loader',
+          options: {
+            name: '[name].[ext]?[hash]',
+            limit: 99999,
+            outputPath: 'images/', // 输出目录
+            publicPath: 'images/', // 公共路径
+          }
+        },
+      ],
+    }
   },
 
 }

package/.env.dev

@@ -1,25 +0,0 @@
-# 开发环境配置
-ENV = 'development'
-
-# 页面标题
-VUE_APP_TITLE = 冰火融创
-
-# 冰火融创企业管理系统/开发环境
-VUE_APP_BASE_API = ''
-#VUE_APP_BASE_API = 'http://192.168.1.222:48080'
-#VUE_APP_BASE_API = 'http://124.71.63.200:48080'
-
-# 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
-
-# 多租户的开关
-VUE_APP_TENANT_ENABLE = true
-
-# 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
-
-# 文档的开关
-VUE_APP_DOC_ENABLE = false
-
-# 百度统计
-#VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab