Merge branch 'master' of gitee.com:lisgroup/laravel-vue-admin

Author: lisgroup

admin/src/api/api_param.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-export function getList(params) {
+export function getListParam(params) {
   return request({
     url: '/api/api_param',
     method: 'get',

admin/src/views/api_excel/add.vue

@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import { getList } from '@/api/api_param'
+import { getListParam } from '@/api/api_param'
 import { postAdd } from '@/api/api_excel'
 import { getToken } from '@/utils/auth'
 
@@ -124,7 +124,7 @@ export default {
       this.$emit('getItem', this.form.apiParam)
     },
     init() {
-      getList({ perPage: 20 }).then(response => {
+      getListParam({ perPage: 20 }).then(response => {
         this.apiParam = response.data.data
       })
     },

admin/src/views/api_excel/edit.vue

@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import { getList } from '@/api/api_param'
+import { getListParam } from '@/api/api_param'
 import { postEdit, edit } from '@/api/api_excel'
 import { getToken } from '@/utils/auth'
 
@@ -111,7 +111,7 @@ export default {
       this.$emit('getItem', this.form.apiParam)
     },
     init() {
-      getList({ perPage: 20 }).then(response => {
+      getListParam({ perPage: 20 }).then(response => {
         this.apiParam = response.data.data
       })
     },

admin/src/views/api_excel/index.vue

@@ -1,11 +1,73 @@
 <template>
   <div class="app-container">
     <el-row>
-      <el-button type="primary" size="medium">
+      <!--<el-button type="primary" size="medium">
         <router-link to="/api_excel/add">上传测试</router-link>
-      </el-button>
+      </el-button>-->
+      <el-button type="primary" size="medium" @click="dialogFormVisible = true">上传测试</el-button>
       <el-button :loading="reload" type="primary" class="reload" plain @click="fetchData">{{ reload_name }}</el-button>
     </el-row>
+    <el-dialog :visible.sync="dialogFormVisible" title="上传测试">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="接口" prop="api_param_id">
+          <el-select v-model="item" placeholder="请选择接口" value-key="name">
+            <el-option v-for="(cate, index) in apiParam" :key="index" :label="cate.name" :value="cate.id">
+              <span style="float: left; color: #8492a6; font-size: 13px">{{ cate.name }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="appkey" prop="appkey">
+          <el-col :span="11">
+            <el-input v-model="form.appkey"/>
+          </el-col>
+          <el-col :span="13"/>
+        </el-form-item>
+        <el-form-item label="并发请求" prop="concurrent">
+          <el-col :span="2">
+            <el-input v-model="form.concurrent"/>
+          </el-col>
+          <el-col :span="22">
+            &nbsp;&nbsp; 任务执行时并发请求的数量，字段必须是数字默认： 5
+          </el-col>
+        </el-form-item>
+        <el-form-item label="上传文件" prop="upload_url" accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
+          <input v-model="form.upload_url" type="hidden">
+          <el-upload
+            :action="uploadUrl"
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :on-success="handleSuccess"
+            :before-remove="beforeRemove"
+            :on-exceed="handleExceed"
+            :file-list="fileList"
+            multiple
+            class="upload-demo">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传 xls/xlsx 文件，且不超过 20M</div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="描述内容" prop="description">
+          <el-col :span="11">
+            <el-input v-model="form.description" size="medium" placeholder="请输入内容" />
+          </el-col>
+          <el-col :span="13"/>
+        </el-form-item>
+        <el-form-item label="自动删除时间" prop="auto_delete">
+          <el-col :span="2">
+            <el-input v-model="form.auto_delete"/>
+          </el-col>
+          <el-col :span="22">
+            &nbsp;&nbsp; 任务执行完成后自动删除的时间（单位：天），默认： 2 天
+          </el-col>
+          <el-col :span="13"/>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit('form')">提交</el-button>
+          <el-button @click="resetForm('form')">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
     <el-table
       v-loading="listLoading"
       :data="list"
@@ -127,6 +189,8 @@
 </template>
 
 <script>
+import { getListParam } from '@/api/api_param'
+import { postAdd } from '@/api/api_excel'
 import { getToken } from '@/utils/auth'
 import { getList, deleteAct, search, startTask, download_log } from '@/api/api_excel'
 
@@ -143,6 +207,46 @@ export default {
   },
   data() {
     return {
+      // Add -- start
+      dialogFormVisible: false,
+      // 请求需要携带 token
+      uploadUrl: process.env.BASE_API + '/api/upload?token=' + getToken(),
+      fileList: [],
+      item: '',
+      apiParam: [],
+      form: {
+        upload_url: '',
+        api_param_id: '',
+        appkey: '',
+        concurrent: 5,
+        uid: '',
+        description: '',
+        auto_delete: 2,
+        sort: '',
+        loading: false
+      },
+      rules: {
+        api_param_id: [
+          { required: true, message: '请选择接口', trigger: 'blur' }
+        ],
+        upload_url: [
+          { required: true, message: '请上传文件', trigger: 'blur' }
+        ],
+        appkey: [
+          { required: true, message: '请输入 appkey', trigger: 'blur' }
+        ],
+        concurrent: [
+          { required: true, message: '请输入并发请求数', trigger: 'blur' }
+        ],
+        description: [
+          { required: true, message: '请输入描述', trigger: 'blur' }
+        ],
+        auto_delete: [
+          { required: true, message: '请输入天数', trigger: 'blur' }
+        ]
+      },
+      redirect: '/api_excel/index',
+      // Add -- end
       reload: false,
       reload_name: '点击刷新',
       list: null,
@@ -155,6 +259,13 @@ export default {
       websock: null
     }
   },
+  watch: {
+    item(value) {
+      this.form.api_param_id = value
+      // console.log(this.form.api_param_id)
+      this.getItem()
+    }
+  },
   created() {
     this.listQuery = this.$route.query
     const page = parseInt(this.listQuery.page)
@@ -163,6 +274,7 @@ export default {
     this.perpage = isNaN(perPage) ? this.perpage : perPage
     // this.fetchData()
     this.initWebSocket()
+    this.init()
   },
   destroyed() {
     this.websock.close() // 离开路由之后断开 websocket 连接
@@ -366,7 +478,75 @@ export default {
           return false
         }
       })
+    },
+    // Add -- start
+    getItem() {
+      this.$emit('getItem', this.form.apiParam)
+    },
+    init() {
+      getListParam({ perPage: 20 }).then(response => {
+        this.apiParam = response.data.data
+      })
+    },
+    handleRemove(file, fileList) {
+      // console.log(file, fileList)
+    },
+    handlePreview(file) {
+      // console.log(file)
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
+    },
+    handleSuccess(response, file, fileList) {
+      // console.log(response)
+      if (response.code !== 200) {
+        this.$message({
+          message: response.reason,
+          type: 'error'
+        })
+      } else {
+        this.form.upload_url = response.data.url
+      }
+    },
+    onSubmit(form) {
+      // console.log(this.form)
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          postAdd(this.form).then(response => {
+            this.loading = false
+            if (response.code === 200) {
+              this.$message({
+                message: '操作成功',
+                type: 'success'
+              })
+              this.dialogFormVisible = false
+              this.fetchData()
+              // this.$router.push({ path: this.redirect || '/' })
+            } else {
+              this.$message.error(response.reason)
+            }
+          })
+        } else {
+          // this.$message('error submit!')
+          // console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    onCancel() {
+      this.$message({
+        message: 'cancel!',
+        type: 'warning'
+      })
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
     }
+    // Add -- end
   }
 }
 </script>

admin/src/views/api_param/index.vue

@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import { getList, deleteAct, search } from '@/api/api_param'
+import { getListParam, deleteAct, search } from '@/api/api_param'
 
 export default {
   filters: {
@@ -116,7 +116,7 @@ export default {
     fetchData() {
       this.listLoading = true
       const params = Object.assign({ 'page': this.listQuery.page }, { 'perPage': this.perpage })
-      getList(params).then(response => {
+      getListParam(params).then(response => {
         this.list = response.data.data
         this.listLoading = false
         this.total = response.data.total

laravel/.env.example

@@ -59,7 +59,7 @@ GEE_PRIVATE_KEY=4f1c085290bec5afdc54df73535fc361
 QINIU_BUCKET=mingtop
 QINIU_ACCESSKEY=vK5eP-ddvU5fq8GgwJefmiRfEy6fn0SWW0WcU9ba
 QINIU_SECRETKEY=UcoR0xkT7brUk6piY4wPDQWso3PWplmFUgcGh6t5
-QINIU_URL=http://img.guke1.com.qiniudns.com/
+QINIU_URL=http://img.guke1.com/
 # 七牛云存储配置项 end
 
 # 百度 OCR

laravel/app/Http/Controllers/Bus/AutoController.php

@@ -116,7 +116,7 @@ public function baiduOCR($img, $imgUrl)
         $result = json_decode($res['content'], true);
 
         $words = '';
-        if ($result) {
+        if ($result && isset($result['words_result'])) {
             foreach ($result['words_result'] as $value) {
                 $words .= $value['words'].PHP_EOL;
             }

laravel/app/Http/Controllers/Bus/NewApiController.php

@@ -11,10 +11,12 @@
 
 use App\Events\TestEvent;
 use App\Http\Repository\NewBusRepository;
+use App\Rules\Uppercase;
 use App\Tasks\TestTask;
 use Hhxsv5\LaravelS\Swoole\Task\Event;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 use Jxlwqq\ChineseTypesetting\ChineseTypesetting;
 
 class NewApiController extends CommonController
@@ -115,4 +117,41 @@ public function Task()
         var_dump($ret);//判断是否投递成功
     }
 
+    /**
+     * 验证器示例
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function jwt(Request $request)
+    {
+        $input = $request->all();
+        $rules = [
+            'id' => 'required|numeric',
+            'name' => 'required',
+            'title' => [
+                'required',
+                'max:255',
+                function($attribute, $value, $fail) {
+                    if ($value === 'foo') {
+                        $fail($attribute.' is invalid.');
+                    }
+                },
+            ],
+            'upper' => ['required', 'string', new Uppercase()]
+        ];
+
+        $messages = [
+            'required' => ':attribute 不能为空',
+            'numeric' => ':attribute 必须是数字',
+        ];
+
+        $validator = Validator::make($input, $rules, $messages);
+
+        if ($validator->fails()) {
+            return $this->out(4000, [], $validator->errors()->first());
+        }
+        return $this->out(200);
+    }
+
 }

laravel/app/Rules/Uppercase.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Rules;
+
+use Illuminate\Contracts\Validation\Rule;
+
+class Uppercase implements Rule
+{
+    /**
+     * 判断验证规则是否通过。
+     *
+     * @param string $attribute
+     * @param mixed $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return strtoupper($value) === $value;
+    }
+
+    /**
+     * 获取验证错误消息。
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return ':attribute 必须是大写字母';
+    }
+}