修改

.ENV.php

@@ -22,7 +22,11 @@ define('DEFAULT_CLASS_ACTION_NAME', 'index');
  * 域名
  */
 // 根域名
-define('DOMAIN', 'ql.frp.liuniu946.com');
+//define('DOMAIN', 'ql.frp.liuniu946.com');
+define('DOMAIN', 'ql.frp.liuniu.com');
+define('MP_DOMAIN', 'api.liuniukj.com');//小程序接口域名
+
+
 /* 域名后缀 */
 define('DOMAIN_SUFFIX', '.' . DOMAIN);
 // 项目域名
@@ -44,6 +48,8 @@ define('AGREEMENT', 'http://');
 define('AGREEMENTSSL', 'https://');
 // 项目地址
 define('URL_PROJECT', AGREEMENT . DOMAIN_PROJECT);
+//支付回调
+define('PAY_NOTIFY_URL', AGREEMENTSSL . "api.liuniukj.com");
 // 项目资源地址
 define('URL_PROJECT_RES',  AGREEMENT . DOMAIN_PROJECT_IMG . '/');
 // 阿里云请求主域名
@@ -57,7 +63,7 @@ define('URL_ANDROID_DOWNLOAD', 'http://a.app.qq.com/o/simple.jsp?pkgname=com.mao
 // ios 下载地址
 define('URL_IOS_DOWNLOAD', 'http://www.mallguang.com');
 // 队列处理地址
-define('QIANNIAO_QUEUE', 'http://devqueue.qianniao.vip:8080');
+define('QIANNIAO_QUEUE', 'http://queueseablue.liuniukj.com');
 //七牛上传域名
 define('QINIU_UPLOAD', 'https://upload-z0.qiniup.com');
 //七牛图片
@@ -171,7 +177,7 @@ define('SESSION_COOKIE_PATH', '/');
 define('SESSION_COOKIE_LIFETIME', 0);
 
 /** 附加常量 **/
-
+define('SOOOLE_SOURCE', "qianniaoSAAS");//websocket平台标识，和后台前端设置一样的
 /**
  * 时间戳
  */
@@ -185,7 +191,11 @@ define('SITE_SECRET', 'uhW2XlE4OCz5pW6Hf3USOWaeWAVqsjoJ');
 /**
  * Upload File Path
  */
-define('UPLOAD_FILE_PATH', '/apps/devapi.qianniao.vip/Public/upload/');
+//define('UPLOAD_FILE_PATH', '/apps/devapi.qianniao.vip/Public/upload/');
+define('UPLOAD_FILE_PATH', PROJECT_PATH . DS.'Public/www/upload/file/');
+
+//小程序文件链接
+define('MP_FILE_URL', AGREEMENTSSL.MP_DOMAIN.'/upload/file/');
 
 /**
  * default member avatar path

Config/Config.php

@@ -5,19 +5,33 @@ return [
     // redis
     'queue'  => [
         'class'    => 'Jobs\Model\Queue\MRedisTopicQueue',
-        'host'     => '120.0.0.1',
+        'host'     => '127.0.0.1',
         'port'     => '6379',
         'password' => '',
         'database' =>'' ,
         ],
+     'swooleServer'=>[
+        'order'=>[
+            "host"=>"127.0.0.1",
+            "port"=>"9503",
+            "ssl"=>true,
+            //没有访问权限,需要放在这个位置
+             'ssl_cert_file' => '/www/server/panel/vhost/cert/api.liuniukj.com/fullchain.pem',
+             'ssl_key_file' => '/www/server/panel/vhost/cert/api.liuniukj.com/privkey.pem',
+//            'ssl_cert_file' => '/www/wwwroot/api.liuniukj.com/swoole_server/cert/api.liuniukj.com/fullchain.pem',
+//            'ssl_key_file' => '/www/wwwroot/api.liuniukj.com/swoole_server/cert/api.liuniukj.com/privkey.pem',
+            
+            
+        ],
+    ],
     'db' => [
         'default' => [
             'driver' => 'mysql',
             'host' => '127.0.0.1',
             'port' => '3306',
-            'username' => 'qianniao',
-            'password' => 'qianniao',
-            'dbname' => 'dev_b2b_anfei',
+            'username' => 'seablue_devanfei',
+            'password' => 'tkKYEfnKEtChiDp5',
+            'dbname' => 'seablue_devanfei',
             'prefix' => 'qianniao',
             'pconnect' => 0,
             'charset' => 'utf8',
@@ -26,31 +40,31 @@ return [
             'driver' => 'mysql',
             'host' => '127.0.0.1',
             'port' => '3306',
-            'username' => 'qianniao',
-            'password' => 'qianniao',
-            'dbname' => 'devstock_b2b',
+            'username' => 'seablue_devstock',
+            'password' => 'tkKYEfnKEtChiDp5',
+            'dbname' => 'seablue_devstock',
             'prefix' => 'qianniao',
             'pconnect' => 0,
             'charset' => 'utf8',
         ],
         'price'   => [
-            'driver'   => 'mysql',
-            'host'     => '127.0.0.1',
-            'port'     => '3306',
-             'username' => 'qianniao',
-            'password' => 'qianniao',
-            'dbname'   => 'devprice_b2b',
-            'prefix'   => 'qianniao',
+            'driver' => 'mysql',
+            'host' => '127.0.0.1',
+            'port' => '3306',
+            'username' => 'seablue_devprice',
+            'password' => 'tkKYEfnKEtChiDp5',
+            'dbname' => 'seablue_devprice',
+            'prefix' => 'qianniao',
             'pconnect' => 0,
-            'charset'  => 'utf8',
+            'charset' => 'utf8',
         ],
         'log' => [
             'driver' => 'mysql',
             'host' => '127.0.0.1',
             'port' => '3306',
-             'username' => 'qianniao',
-            'password' => 'qianniao',
-            'dbname' => 'devlog_b2b',
+            'username' => 'seablue_devlog',
+            'password' => 'tkKYEfnKEtChiDp5',
+            'dbname' => 'seablue_devlog',
             'prefix' => 'qianniao',
             'pconnect' => 0,
             'charset' => 'utf8',
@@ -59,9 +73,9 @@ return [
             'driver' => 'mysql',
             'host' => '127.0.0.1',
             'port' => '3306',
-            'username' => 'qianniao',
-            'password' => 'qianniao',
-            'dbname' => 'devfinance_b2b',
+            'username' => 'seablue_devfinan',
+            'password' => 'tkKYEfnKEtChiDp5',
+            'dbname' => 'seablue_devfinan',
             'prefix' => 'qianniao',
             'pconnect' => 0,
             'charset' => 'utf8',
@@ -114,7 +128,7 @@ return [
     'dataResources' => [
         'stock' => [
             'host' => '0.0.0.0',
-            'port' => '9501'
+            'port' => '9503'
         ]
     ],
 
@@ -122,7 +136,7 @@ return [
         'goods_search' =>[
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_goods_search',
@@ -131,7 +145,7 @@ return [
         'customer_search' =>[
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_customer_search',
@@ -140,7 +154,7 @@ return [
         'goods_basic_search' =>[
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_goods_basic_search',
@@ -149,7 +163,7 @@ return [
         'order_search' =>[
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_order_search',
@@ -158,7 +172,7 @@ return [
         'shop_search' =>[
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_shop_search',
@@ -167,7 +181,7 @@ return [
         'login_log' =>[
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_login_log',
@@ -176,7 +190,7 @@ return [
         'logs'                                => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_logs',
@@ -185,7 +199,7 @@ return [
         'inventory_in_search' => [
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_inventory_in_search',
@@ -194,7 +208,7 @@ return [
         'priceAdjustmentSheet_search' => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_price_adjustment_sheet_search',
@@ -203,7 +217,7 @@ return [
         'customerPriceAdjustmentSheet_search' => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_customer_price_adjustment_sheet_search',
@@ -212,7 +226,7 @@ return [
         'inventory_out_search' => [
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_inventory_out_search',
@@ -221,7 +235,7 @@ return [
         'allocate_search' => [
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_allocate_search',
@@ -230,7 +244,7 @@ return [
         'stocktaking_search' => [
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_stocktaking_search',
@@ -239,7 +253,7 @@ return [
         'inventory_details_search' => [
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_inventory_details_search',
@@ -248,7 +262,7 @@ return [
         'order_out_search' => [
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_order_out_search',
@@ -257,7 +271,7 @@ return [
         'purchase_details_search' => [
             'protocol' => 'http',
             'servers' => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout' => null,
             'index' => 'dev_purchase_details_search',
@@ -266,7 +280,7 @@ return [
         'coupon_search' => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_coupon_search',
@@ -275,7 +289,7 @@ return [
         'user_coupon_search' => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_user_coupon_search',
@@ -284,7 +298,7 @@ return [
         'activity_search' => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_activity_search',
@@ -293,7 +307,7 @@ return [
         'should_receive_receipt_search'                  => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_should_receive_receipt_search',
@@ -302,7 +316,7 @@ return [
         'should_pay_receipt_search'                  => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_should_pay_receipt_search',
@@ -311,7 +325,7 @@ return [
         'received_receipt_search'                  => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_received_receipt_search',
@@ -320,7 +334,7 @@ return [
         'paid_receipt_search'                  => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_paid_receipt_search',
@@ -329,7 +343,7 @@ return [
         'inventory_batch_search'                  => [
             'protocol' => 'http',
             'servers'  => [
-                '49.233.71.60:9200'
+                '124.71.11.196:80'
             ],
             'timeout'  => null,
             'index'    => 'dev_inventory_batch_search',

Controller/Common/Login.Class.php

@@ -165,7 +165,9 @@ class Login extends BaseController
         $objMiniprogram = new Miniprogram($miniprogramSetting['appid'], $miniprogramSetting['APPscrect']);
         $result = $objMiniprogram->getwxacodeunlimit($access_token, $params);
         if ($result->isSuccess()) {
-            parent::sendOutput($result->getData());
+            
+            $url = MP_FILE_URL.$result->getData();
+            parent::sendOutput($url);
         } else {
             parent::sendOutput($result->getData(), $result->getErrorCode());
         }

swoole_server/Order/Config/Config.php

@@ -11,17 +11,17 @@ return [
         'type' => 'WebsocketServer',
         'module' => 'Order',
         'host' => '0.0.0.0',
-        'port' => 9501,
+        'port' => 9503,
         'ssl'  => true,
     ],
 
     'ssl' => [
-        'ssl_cert_file' => '/www/server/panel/vhost/cert/apiqnys.liuniukj.com/fullchain.pem',
-        'ssl_key_file' => '/www/server/panel/vhost/cert/apiqnys.liuniukj.com/privkey.pem',
+        'ssl_cert_file' => '/www/server/panel/vhost/cert/api.liuniukj.com/fullchain.pem',
+        'ssl_key_file' => '/www/server/panel/vhost/cert/api.liuniukj.com/privkey.pem',
     ],
     'app_name' => 'qianniao_websocket',
-    //'logPath'  => '/www/wwwroot/logs/apiqnys.liuniukj.com/', // 日志目录
-    'logPath'  => '/www/wwwroot/logs/apiqnys.liuniukj.com/websocket/'.date("Ymd"), // 日志目录
+    //'logPath'  => '/www/wwwroot/logs/api.liuniukj.com/', // 日志目录
+    'logPath'  => '/www/wwwroot/logs/api.liuniukj.com/websocket/'.date("Ymd"), // 日志目录
     'logSaveFileApp'    => 'websocketinfo.log', // 默认日志文件名称
 
     'db' => [