Merge Develop

.travis.yml

@@ -0,0 +1,13 @@
+language: php
+
+php:
+  - 7.0.27
+  - 7.1.13
+  - 7.2.1
+  - 7.3.1
+
+before_script:
+  - cd laravel
+  - composer install
+
+script: composer info

README.md

@@ -138,8 +138,8 @@ npm run dev
 
 # 打包(可选)
 npm run build
-# 将 dist 目录下的文件 copy 到 php/public 目录。
 ```
+~~npm run build 命令会自动将 dist 目录下的文件 copy 到 laravel/public 目录下。~~
 
 ## 域名绑定
 域名需要绑定到根目录，即项目的 laravel/public 目录下。
@@ -149,7 +149,7 @@ npm run build
 ```shell
 server {
     listen 443 ssl;
-    root /www/vueBus/laravel/public;
+    root /www/laravel-vue-admin/laravel/public;
     server_name www.guke1.com; # 改为绑定证书的域名
 
     # ssl 配置
@@ -217,8 +217,8 @@ upstream laravels {
 server {
     listen 80;
     # 别忘了绑Host哟
-    server_name www.bus.com;
-    root /home/www/vueBus/laravel/public;
+    server_name www.guke1.com;
+    root /home/www/laravel-vue-admin/laravel/public;
     access_log /home/wwwlogs/nginx/$server_name.access.log;
     autoindex off;
     index index.html index.htm;

admin/config/dev.env.js

@@ -5,4 +5,5 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   BASE_API: '"http://localhost:8000"',
+  WEBSOCKET: '"ws://127.0.0.1:5200"',
 })

admin/config/prod.env.js

@@ -2,4 +2,5 @@
 module.exports = {
   NODE_ENV: '"production"',
   BASE_API: '"https://www.guke1.com"',
+  WEBSOCKET: '"wss://www.guke1.com/ws"',
 }

admin/src/api/config.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+export function getList(params) {
+  return request({
+    url: '/api/config',
+    method: 'get',
+    params
+  })
+}
+
+export function postAdd(params) {
+  return request.post('/api/config', params)
+}
+
+export function edit(id) {
+  return request.get('/api/config/' + id)
+}
+
+export function postEdit(id, params) {
+  return request.patch('/api/config/' + id, params)
+}
+
+export function deleteAct(id) {
+  return request.delete('/api/config/' + id)
+}
+
+/**
+ * 搜索 config
+ * @param params
+ */
+export function search(params) {
+  return request({
+    url: '/api/config_search',
+    method: 'get',
+    params
+  })
+}

admin/src/router/index.js

@@ -126,7 +126,7 @@ const routeTest = [
 export const constantRouterMap = [...routeBase, ...routeTest]
 
 export default new Router({
-  // mode: 'history', //后端支持可开
+  // mode: 'history', // 后端支持可开
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap
 })

admin/src/router/router.js

@@ -137,7 +137,7 @@ export const routeSuper = [
       {
         path: 'config',
         name: '配置管理',
-        component: () => import('@/views/lines/index'),
+        component: () => import('@/views/config/index'),
         meta: { title: '配置列表', icon: 'table', roles: [Super] }
       },
       {

admin/src/utils/request.js

@@ -6,7 +6,9 @@ import { getToken } from '@/utils/auth'
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 5000 // 请求超时时间
+  timeout: 5000, // 请求超时时间
+  retry: 3, // 全局的请求次数，请求的间隙
+  retryDelay: 300
 })
 
 // request拦截器
@@ -62,12 +64,39 @@ service.interceptors.response.use(
   },
   error => {
     console.log('err' + error) // for debug
-    Message({
-      message: error.message,
-      type: 'error',
-      duration: 5 * 1000
+    const config = error.config
+    console.log(config)
+    // If config does not exist or the retry option is not set, reject
+    if (!config || !config.retry) return Promise.reject(error)
+
+    // Set the variable for keeping track of the retry count
+    config.__retryCount = config.__retryCount || 0
+
+    // Check if we've maxed out the total number of retries
+    if (config.__retryCount >= config.retry) {
+      // Reject with the error
+      Message({
+        message: error.message,
+        type: 'error',
+        duration: 5 * 1000
+      })
+      return Promise.reject(error)
+    }
+
+    // Increase the retry count
+    config.__retryCount += 1
+
+    // Create new promise to handle exponential backoff
+    const backoff = new Promise(function(resolve) {
+      setTimeout(function() {
+        resolve()
+      }, config.retryDelay || 1)
+    })
+
+    // Return the promise in which recalls axios to retry the request
+    return backoff.then(function() {
+      return axios(config)
     })
-    return Promise.reject(error)
   }
 )
 

admin/src/views/api_excel/index.vue

@@ -4,6 +4,7 @@
       <el-button type="primary" size="medium">
         <router-link to="/api_excel/add">上传测试</router-link>
       </el-button>
+      <el-button :loading="reload" type="primary" class="reload" plain @click="fetchData">{{ reload_name }}</el-button>
     </el-row>
     <el-table
       v-loading="listLoading"
@@ -55,7 +56,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="进度条" width="1" align="center" display="none">
+      <el-table-column label="进度条" width="100" align="center" display="none">
         <template slot-scope="scope">
           <div v-if="scope.row.state === 0">
             <el-progress :text-inside="true" :stroke-width="18" :percentage="0"/>
@@ -67,7 +68,7 @@
             <el-progress :text-inside="true" :stroke-width="18" :percentage="100" status="success"/>
           </div>
           <div v-else>
-            <el-progress :text-inside="true" :stroke-width="18" :percentage="50" status="exception"/>
+            <el-progress :text-inside="true" :stroke-width="18" :percentage="scope.row.rate" status="exception"/>
           </div>
         </template>
       </el-table-column>
@@ -126,6 +127,7 @@
 </template>
 
 <script>
+import { getToken } from '@/utils/auth'
 import { getList, deleteAct, search, startTask, download_log } from '@/api/api_excel'
 
 export default {
@@ -141,6 +143,8 @@ export default {
   },
   data() {
     return {
+      reload: false,
+      reload_name: '点击刷新',
       list: null,
       listLoading: true,
       perpage: 10,
@@ -153,10 +157,12 @@ export default {
   },
   created() {
     this.listQuery = this.$route.query
-    this.currentpage = parseInt(this.listQuery.page)
+    const page = parseInt(this.listQuery.page)
+    this.currentpage = isNaN(page) ? 1 : page
     const perPage = parseInt(this.$route.query.perPage)
     this.perpage = isNaN(perPage) ? this.perpage : perPage
-    this.fetchData()
+    // this.fetchData()
+    this.initWebSocket()
   },
   destroyed() {
     this.websock.close() // 离开路由之后断开 websocket 连接
@@ -209,20 +215,22 @@ export default {
                 type: msg,
                 message: res.reason
               })
+              this.initWebSocket()
             })
           }
         }
       })
     },
-    initWebSocket(id) { // 初始化 weosocket
+    initWebSocket() { // 初始化 weosocket
       if ('WebSocket' in window) {
-        const url = 'wss://www.guke1.com/ws?id=' + id
+        const url = process.env.WEBSOCKET + '?action=api_excel&token=' + getToken() + '&page=' + this.currentpage + '&perPage=' + this.perpage
         this.websock = new WebSocket(url)
         this.websock.onmessage = this.onmessage
         this.websock.onopen = this.onopen
         this.websock.onerror = this.onerror
         this.websock.onclose = this.close
       } else {
+        this.fetchData()
         // 浏览器不支持 WebSocket，使用 ajax 轮询
         console.log('Your browser does not support WebSocket!')
       }
@@ -232,44 +240,60 @@ export default {
       // const rs = this.send(JSON.stringify(actions))
       // console.log(rs)
     },
-    onerror() { // 连接建立失败重连
+    onerror() {
+      // 连接建立失败, 发送 http 请求获取数据
       // this.initWebSocket()
+      this.fetchData()
     },
     onmessage(e) { // 数据接收
-      console.log(e.data)
+      // console.log(e.data)
       const data = JSON.parse(e.data)
       // this.list[2].rate = parseInt(data.data.rate)
       // console.log(this.list[2].rate)
-      console.log(data)
+      // console.log(data)
+      // websocket 返回的数据
+      this.list = data.data.data
+      this.listLoading = false
+      this.total = data.data.total
+      this.url = data.data.appUrl
+      // console.log('type', Object.prototype.toString.call(this.list))
+      setTimeout(() => {
+        this.reload = false
+        this.reload_name = '刷新'
+      }, 800)
     },
     send(Data) {
       this.websock.send(Data)
     },
     close() { // 关闭
-      console.log('断开连接')
+      // console.log('断开连接')
     },
     download(index, row) {
       window.location.href = this.url + row.finish_url
     },
     download_log(index, row) {
       download_log({ id: row.id }).then(res => {
-        console.log(res)
+        // console.log(res)
         if (res.code === 200) {
           window.location.href = this.url + res.data.failed_done_file
         }
       })
     },
     fetchData() {
-      this.listLoading = true
+      this.listLoading = this.reload = true
+      this.reload_name = '加载中'
       const params = Object.assign({ 'page': this.listQuery.page }, { 'perPage': this.perpage })
       getList(params).then(response => {
         this.list = response.data.data
         this.listLoading = false
         this.total = response.data.total
         this.url = response.data.appUrl
-        console.log('type', Object.prototype.toString.call(this.list))
-
-        this.initWebSocket(8)
+        // console.log('type', Object.prototype.toString.call(this.list))
+        setTimeout(() => {
+          this.reload = false
+          this.reload_name = '刷新'
+        }, 800)
+        // this.initWebSocket()
       })
     },
     handleEdit(index, row) {
@@ -354,4 +378,8 @@ export default {
   .pagination {
       margin: 20px auto;
   }
+  .reload {
+    margin-right: 300px;
+    float: right;
+  }
 </style>