Merge branch 'kuaiyingyong' of iqiyoo:zhuishuyun_wap into kuaiyingyong

app/Http/Controllers/QuickApp/Oauth/UsersController.php

@@ -58,15 +58,17 @@ class UsersController extends Controller
         $device_info   = $request->input('device_info', '');
         
         $origin_package = $package;
-        //FIXME 海天包传成浩瀚了，特殊处理下，这个名字就给海天用
-        if($package =='com.beidao.kuaiying.haohan'){
-            $package = 'com.beidao.kuaiying.haitian';
-        }
-        
-        //FIXME 浩瀚包传的是haohannew，但是打开要跟官方包名保持一致，所以这样特殊处理
-        if($package =='com.beidao.kuaiying.haohannew'){
-            $package = 'com.beidao.kuaiying.haohan';
-        }
+//        //FIXME 海天包传成浩瀚了，特殊处理下，这个名字就给海天用
+//        if($package =='com.beidao.kuaiying.haohan'){
+//            $package = 'com.beidao.kuaiying.haitian';
+//        }
+//
+//        //FIXME 浩瀚包传的是haohannew，但是打开要跟官方包名保持一致，所以这样特殊处理
+//        if($package =='com.beidao.kuaiying.haohannew'){
+//            $package = 'com.beidao.kuaiying.haohan';
+//        }
+
+        $package = get_real_package($package);
         
         //获取渠道id
         $channel_id = QappPackageService::getChannelId($package);

app/Http/Middleware/CheckSign.php

@@ -36,8 +36,10 @@ class CheckSign
         $backendSign = _sign($params, $key);
         \Log::info('[CheckSign]旧版校验sign:', [
             'front_sign' => $sign,
-            'backent_sign' => $backendSign,
-            'device_no' => $request->input('device_no', '')
+            'backend_sign' => $backendSign,
+            'device_no' => $request->input('device_no', ''),
+            'X-Version' => $request->header('X-Version', ''),
+            'package' => $request->input('package', ''),
         ]);
         if ($timestamp && time() - $timestamp <= (SysConsts::ONE_HOUR_SECONDS * 10) && $sign == $backendSign) {
             \Log::info('[CheckSign]旧版校验通过');
@@ -55,8 +57,10 @@ class CheckSign
         $backendSign = _sign($params, $key);
         \Log::info('[CheckSign]新版校验sign:', [
             'front_sign' => $sign,
-            'backent_sign' => $backendSign,
-            'device_no' => $request->input('device_no', '')
+            'backend_sign' => $backendSign,
+            'device_no' => $request->input('device_no', ''),
+            'X-Version' => $request->header('X-Version', ''),
+            'package' => $request->input('package', ''),
         ]);
         if ($timestamp && time() - $timestamp <= (SysConsts::ONE_HOUR_SECONDS * 10) && $sign == $backendSign) {
             \Log::info('[CheckSign]新版校验通过');

app/Http/Middleware/QuickAppGetPackage.php

@@ -26,11 +26,13 @@ class QuickAppGetPackage extends BaseMiddleware
 //             $package = 'com.beidao.kuaiying.haitian';
 //         }
         
-        //FIXME 浩瀚包传的是haohannew，但是打开要跟官方包名保持一致，所以这样特殊处理
-        if($package =='com.beidao.kuaiying.haohannew'){
-            $package = 'com.beidao.kuaiying.haohan';
-        }
-        
+//        //FIXME 浩瀚包传的是haohannew，但是打开要跟官方包名保持一致，所以这样特殊处理
+//        if($package =='com.beidao.kuaiying.haohannew'){
+//            $package = 'com.beidao.kuaiying.haohan';
+//        }
+
+        $package = get_real_package($package);
+
         $channel_id = QappPackageService::getChannelId($package);
         if($channel_id > 0){
             return $next($request);

app/Http/Middleware/QuickAppGetUserFromToken.php

@@ -36,6 +36,8 @@ class QuickAppGetUserFromToken extends BaseMiddleware
         if (!$token = $this->auth->setRequest($request)->getToken()) {
             return response()->error('QAPP_NOT_LOGIN');
         }
+
+        $package = get_real_package($package);
         try {
             $user = $this->auth->authenticate($token);
             if (empty($user->id)) {
@@ -63,6 +65,7 @@ class QuickAppGetUserFromToken extends BaseMiddleware
             myLog('QuickAppGetUserFromToken')->info($e->getMessage());
             return response()->error('QAPP_NOT_LOGIN');
         }
+
         // 更新用户reg_id
         $uid = $user->id;
         PushService::setUserRegId($uid, $regId, $provider, $package);

app/Libs/Helpers.php

@@ -792,4 +792,26 @@ function sendNotice($message)
 function getHiddenCp()
 {
     return array_filter(explode(',',env('HIDDEN_CP_SOURCE')));
+}
+
+/**
+ * 包名替换
+ * @param $name
+ * @return string
+ */
+function get_real_package($name)
+{
+    switch($name)
+    {
+        case 'com.beidao.kuaiying.haohan':
+            $package = 'com.beidao.kuaiying.haitian';
+            break;
+        case 'com.beidao.kuaiying.haohannew':
+            $package = 'com.beidao.kuaiying.haohan';
+            break;
+        default:
+            $package = $name;
+            break;
+    }
+    return $package;
 }