更新swoole和头像

.gitignore

@@ -25,3 +25,4 @@ yarn-error.log
 composer.lock
 /resources/js/api/configurl.js
 devicelistdata.text
+cert/test

app/Console/Commands/alarm.php

@@ -64,9 +64,10 @@ class alarm extends Command
             'backlog' => 128,   //Listen队列长度
             'max_request' => 10,//最大连接
             'daemonize'=>0,//守护进程
-            'ssl_cert_file' => base_path() . '/cert/apache/iot.zhkjgf.com_public.crt',
-            'ssl_key_file'  => base_path() . '/cert/apache/iot.zhkjgf.com.key',
+            'ssl_cert_file' => base_path() . config('app.ssl_cert_file'),
+            'ssl_key_file'  => base_path() . config('app.ssl_key_file'),
         ));
+
         $this->ws->on('open', function ($ws, $request) {
 //            //链接成功
 //            $userdata =  new SwooleCommandController();

app/Console/Commands/chemicalswb.php

@@ -64,8 +64,8 @@ class chemicalswb extends Command
             'backlog' => 128,   //Listen队列长度
             'max_request' => 10,//最大连接
             'daemonize'=>0,//守护进程
-            'ssl_cert_file' => base_path() . '/cert/apache/iot.zhkjgf.com_public.crt',
-            'ssl_key_file'          => base_path() . '/cert/apache/iot.zhkjgf.com.key',
+            'ssl_cert_file' => base_path() . config('app.ssl_cert_file'),
+            'ssl_key_file'  => base_path() . config('app.ssl_key_file'),
         ));
         $this->ws->on('open', function ($ws, $request) {
 //            //链接成功

app/Console/Commands/firewb.php

@@ -64,8 +64,8 @@ class firewb extends Command
             'backlog' => 128,   //Listen队列长度
             'max_request' => 10,//最大连接
             'daemonize'=>0,//守护进程
-            'ssl_cert_file' => base_path() . '/cert/apache/iot.zhkjgf.com_public.crt',
-            'ssl_key_file'          => base_path() . '/cert/apache/iot.zhkjgf.com.key',
+            'ssl_cert_file' => base_path() . config('app.ssl_cert_file'),
+            'ssl_key_file'  => base_path() . config('app.ssl_key_file'),
         ));
         $this->ws->on('open', function ($ws, $request) {
 //            //链接成功

app/Console/Commands/swoole.php

@@ -64,8 +64,8 @@ class swoole extends Command
             'backlog' => 128,   //Listen队列长度
             'max_request' => 10,//最大连接
             'daemonize'=>0,//守护进程
-            'ssl_cert_file' => base_path() . '/cert/apache/iot.zhkjgf.com_public.crt',
-            'ssl_key_file'          => base_path() . '/cert/apache/iot.zhkjgf.com.key',
+            'ssl_cert_file' => base_path() . config('app.ssl_cert_file'),
+            'ssl_key_file'  => base_path() . config('app.ssl_key_file'),
         ));
         $this->ws->on('open', function ($ws, $request) {
 //            //链接成功

app/Console/Commands/swooleMeTcp.php

@@ -67,8 +67,8 @@ class swooleMeTcp extends Command
             'backlog' => 128,
             'heartbeat_check_interval' => 30,
             'heartbeat_idle_time' => 65,
-            'ssl_cert_file' => base_path() . '/cert/apache/iot.zhkjgf.com_public.crt',
-            'ssl_key_file'  => base_path() . '/cert/apache/iot.zhkjgf.com.key',
+            'ssl_cert_file' => base_path() . config('app.ssl_cert_file'),
+            'ssl_key_file'  => base_path() . config('app.ssl_key_file'),
         ]);
 //监听连接进入事件
         $this->tcp->on('Connect', function ($serv, $fd) {

app/Http/Resources/UserResource.php

@@ -30,7 +30,7 @@ class UserResource extends JsonResource
                 },
                 $this->getAllPermissions()->toArray()
             ),
-            'avatar' => 'https://i.pravatar.cc',
+            'avatar' => '/images/timg.jpeg',
         ];
     }
 }

config/app.php

@@ -123,6 +123,12 @@ return [
 
     'cipher' => 'AES-256-CBC',
 
+    /*
+     * SSL 证书路径
+     */
+    'ssl_cert_file' => env('SSL_CERT_FILE','/cert/apache/iot.zhkjgf.com_public.crt'),
+    'ssl_key_file' => env('SSL_KEY_FILE','/cert/apache/iot.zhkjgf.com.key'),
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers

resources/js/layout/components/Navbar.vue

@@ -19,7 +19,7 @@
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar+'/128'" class="user-avatar">
+          <img :src="avatar_url" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -55,6 +55,7 @@ import Screenfull from '@/components/Screenfull';
 import SizeSelect from '@/components/SizeSelect';
 import LangSelect from '@/components/LangSelect';
 import Search from '@/components/HeaderSearch';
+import imgUrl from '@/assets/avatar.png';
 
 export default {
   components: {
@@ -65,6 +66,11 @@ export default {
     LangSelect,
     Search,
   },
+  data() {
+    return {
+      avatar_url: imgUrl,
+    };
+  },
   computed: {
     ...mapGetters([
       'sidebar',