!3 Websocket 应用

Merge pull request !3 from lisgroup/develop

Author: lisgroup

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/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/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/views/api_excel/index.vue

@@ -157,7 +157,8 @@ 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()
@@ -222,7 +223,7 @@ export default {
     },
     initWebSocket() { // 初始化 weosocket
       if ('WebSocket' in window) {
-        const url = process.env.WEBSOCKET + '?action=api_excel&token=' + getToken()
+        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

admin/src/views/config/index.vue

@@ -0,0 +1,102 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="form.name"/>
+      </el-form-item>
+      <el-form-item label="开启新老接口" prop="default_open">
+        <el-col :span="4">
+          <el-input v-model="form.default_open"/>
+        </el-col>
+        <el-col :span="20">&nbsp;开启公交配置情况--【1: 老接口，2: 新接口，3: 先老接口再新接口，4: 先新接口后老接口】</el-col>
+      </el-form-item>
+      <el-form-item label="是否启用">
+        <el-switch v-model="form.state"/>
+      </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>
+  </div>
+</template>
+
+<script>
+import { postAdd, getList } from '@/api/config'
+
+export default {
+  data() {
+    return {
+      form: {
+        name: '',
+        default_open: 1,
+        state: true,
+        loading: false
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        default_open: [
+          { required: true, message: '请输入开启公交配置情况', trigger: 'blur' }
+        ]
+      },
+      redirect: '/config/index'
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      const that = this
+      getList({ perPage: 20 }).then(response => {
+        const data = response.data
+        that.form.name = data.name
+        that.form.default_open = data.default_open
+      })
+    },
+    onSubmit(form) {
+      // console.log(this.form)
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          postAdd(this.form).then(response => {
+            // console.log(response)
+            this.loading = false
+            if (response.code === 200) {
+              this.$message({
+                message: '操作成功',
+                type: 'success'
+              })
+              // 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()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .line {
+    text-align: center;
+  }
+</style>
+

laravel/app/Http/Controllers/Api/ArticleController.php

@@ -42,7 +42,7 @@ public function __construct(Request $request)
      */
     public function index()
     {
-        $list = Article::orderBy('id', 'DESC')->paginate($this->perPage);
+        $list = Article::orderBy('id', 'DESC')->select('id', 'title', 'author', 'keywords', 'created_at')->paginate($this->perPage);
         return $this->out(200, $list);
     }
 

laravel/app/Http/Controllers/Api/ConfigController.php

@@ -0,0 +1,148 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Models\Config;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+
+class ConfigController extends Controller
+{
+    /**
+     * @var int 默认分页条数
+     */
+    public $perPage = 10;
+
+    private $allow = ['name', 'title', 'default_open', 'state'];
+
+    /**
+     * Create a new AuthController instance.
+     * 要求附带email和password（数据来源users表）
+     *
+     * @return void
+     */
+    public function __construct(Request $request)
+    {
+        // 这里额外注意了：官方文档样例中只除外了『login』
+        // 这样的结果是，token 只能在有效期以内进行刷新，过期无法刷新
+        // 如果把 refresh 也放进去，token 即使过期但仍在刷新期以内也可刷新
+        // 不过刷新一次作废
+        $this->middleware(['auth:api', 'role']);
+        // 另外关于上面的中间件，官方文档写的是『auth:api』
+        // 但是我推荐用 『jwt.auth』，效果是一样的，但是有更加丰富的报错信息返回
+
+        $perPage = intval($request->input('perPage'));
+        $this->perPage = $perPage ?? 11;
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $list = [];
+        foreach ($this->allow as $item) {
+            $list[$item] = Cache::get($item) ?? '';
+        }
+        return $this->out(200, $list);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        return $this->out(200, ['method' => 'create']);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     * 新增入库操作
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        // 全部数据
+        $input = $request->all();
+        // 存入缓存数据
+        foreach ($input as $key => $item) {
+            if (in_array($key, $this->allow)) {
+                Cache::forever($key, $item);
+            }
+        }
+        return $this->out(200);
+    }
+
+    /**
+     * Display the specified resource.
+     * 展示某个详情数据
+     *
+     * @param Config $Config
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Config $Config)
+    {
+        return $this->out(200, $Config);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     * 编辑展示数据
+     *
+     * @param  int $id
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        $data = Config::findOrFail($id);
+        return $this->out(200, $data);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     * 更新数据
+     *
+     * @param  Request $request
+     * @param  int $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $input = $request->all();
+        // $model = new Config();$model->save($input, ['id' => $id]);
+        // 老版本更新操作如下，新版本先查询再更新
+        // Config::where('id', $id)->update($input)
+        $Config = Config::findOrFail($id);
+        if ($Config->update($input)) {
+            return $this->out(200, ['data' => ['id' => $id]]);
+        } else {
+            return $this->out(4000);
+        }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int $id
+     * @return \Illuminate\Http\Response
+     * @throws \Exception
+     */
+    public function destroy($id)
+    {
+        if (Config::findOrFail($id)->delete()) {
+            $data = ['msg' => '删除成功', 'errno' => 0];
+        } else {
+            $data = ['msg' => '删除失败', 'errno' => 2];
+        }
+        return $this->out(200, $data);
+    }
+}

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

@@ -18,7 +18,7 @@ class AutoController extends Controller
 
     public function __construct()
     {
-        $this->http = Http::getInstent();
+        $this->http || $this->http = Http::getInstent();
     }
     /**
      * 获取七牛 Token 的方法