Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

crmeb/config/workerman.php

@@ -15,7 +15,7 @@ return [
         //监听地址
         'ip' => '0.0.0.0',
         //监听端口
-        'port' => 20002,
+        'port' => 40001,
         //设置当前Worker实例启动多少个进程
         'serverCount' => 1,
     ],
@@ -26,14 +26,14 @@ return [
         //监听地址
         'ip' => '0.0.0.0',
         //监听端口
-        'port' => 20003,
+        'port' => 40002,
         //设置当前Worker实例启动多少个进程
         'serverCount' => 1,
     ],
 
     'channel' => [
         //内部通讯监听端口
-        'port' => 20012,
+        'port' => 40003,
         //内部通讯地址
         'ip' => '127.0.0.1',
     ],

crmeb/public/install/crmeb.sql

@@ -33903,7 +33903,7 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont
 (147, 32, '', '添加拼团', 'admin', 'marketing.store_combination', 'create', '', '', '[]', 0, 1, 1, 1, '/marketing/store_combination/create', '', 1, '', 0, 'marketing-store_combination-create', 0),
 (148, 33, '', '添加秒杀', 'admin', 'marketing.store_seckill', 'create', '', '', '[]', 0, 1, 1, 1, '/marketing/store_seckill/create', '', 1, '', 0, 'marketing-store_seckill-create', 0),
 (154, 34, '', '签到配置', 'admin', 'setting.system_group_data', 'index', '', '', '[]', 0, 1, 0, 1, '/marketing/sign', '', 1, '', 0, 'marketing-sign-index', 0),
-(165, 0, 'md-chatboxes', '客服', 'admin', 'setting.storeService', 'index', '', '', '[]', 104, 1, 0, 1, '/kefu', '', 1, '', 0, 'setting-store-service', 0),
+(165, 0, 'md-chatboxes', '客服', 'admin', 'setting.storeService', 'index', '', '', '[]', 104, 1, 0, 1, '/kefu', '', 1, '', 1, 'setting-store-service', 0),
 (166, 65, '', '日志', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/system/log', '25/65', 1, '', 0, 'system-log', 0),
 (169, 577, '', '商品删除', 'admin', 'product', '商品删除', 'product/product/<id>', 'DELETE', '[]', 0, 0, 0, 1, '', '', 2, '0', 1, '', 0),
 (170, 3, '', '分类列表', 'admin', '', '', 'product/category', 'GET', '[]', 0, 0, 0, 1, 'product/category', '', 2, '', 0, '', 0),

crmeb/route/route.php

@@ -21,7 +21,7 @@ Route::miss(function () {
                 return view(app()->getRootPath() . 'public' . DS . 'home' . DS . 'index.html');
             }
         case 'kefu':
-            return view(app()->getRootPath() . 'public' . DS . 'admin' . DS . 'index.html');
+            return view(app()->getRootPath() . 'public'  . DS . 'system.html');
         case 'pages':
             return view(app()->getRootPath() . 'public' .DS . 'index.html');
         default: