Merge branch 'master' of http://git.meme100.com:10180/yigao/qpapi

app/Http/Controllers/Api/AgentController.php

@@ -13,28 +13,47 @@ use \Exception;
 class AgentController extends Controller
 {
 
-
     /**
-     * 代理登陆、注册
+     * 构造函数
      *
      * @access public
      * @param mixed $req 数据传输
      * @return array JsonString
      */
-    public function login(Request $req)
-    {
+    public function __construct(Request $req) {
         $code = -2;
         $msg = '操作失败';
         try {
-            $agentModel = new Models\Agent;
-            $sportsAgentModel = new Models\SportsAgent;
             // 获取Token url及参数.
             $gmenuId = $req->input('id');
+            $sportsAgentModel = new Models\SportsAgent;
             $backData = $sportsAgentModel->getSportsToken($gmenuId);
             if ($backData !== 1) {
                 $msg = '链接失败';
                 return toJson($code, $msg, []);
             }
+        } catch (Exception $e) {
+            return toJson($code, $msg, []);
+        }
+
+    }
+
+
+    /**
+     * 代理登陆、注册
+     *
+     * @access public
+     * @param mixed $req 数据传输
+     * @return array JsonString
+     */
+    public function login(Request $req)
+    {
+        $code = -2;
+        $msg = '操作失败';
+        try {
+            $agentModel = new Models\Agent;
+            $sportsAgentModel = new Models\SportsAgent;
+            $gmenuId = $req->input('id');
 
             // 获取用户信息.
             $getMemberInfo = $agentModel->getMember();
@@ -67,7 +86,47 @@ class AgentController extends Controller
             $msg = '成功';
             $code = 1;
 
-            return toJson($code, $msg, ['apiToken' => $loginBackData['token']]);
+            return toJson($code, $msg, session('sportsToken'));
+        } catch (Exception $e) {
+            return toJson($code, $msg, []);
+        }
+
+    }//end login()
+
+
+    /**
+     * 代理转账
+     *
+     * @access public
+     * @param mixed $req 数据传输
+     * @return array JsonString
+     */
+    public function turnOutMoney(Request $req)
+    {
+        $code = -2;
+        $msg = '操作失败';
+        try {
+            $agentModel = new Models\Agent;
+            $sportsAgentModel = new Models\SportsAgent;
+            $gmenuId = $req->input('id');
+            $money = $req->input('money');
+            // 获取用户信息.
+            $getMemberInfo = $agentModel->getMember();
+            // 獲取余额.
+            $getMembersDetailed = $agentModel->getMembersDetailed();
+            $cash = ($getMembersDetailed->membersDetailed_cash + $money);
+            $backData = $sportsAgentModel->transferSports($gmenuId, $money, $cash, $getMemberInfo, 'IN');
+            if ($backData !== 1) {
+                $msg = '链接失败';
+                return toJson($code, $msg, []);
+            }
+
+
+
+            $msg = '成功';
+            $code = 1;
+
+            return toJson($code, $msg, session('sportsToken'));
         } catch (Exception $e) {
             return toJson($code, $msg, []);
         }

app/Http/Controllers/Sys/UserController.php

@@ -79,7 +79,6 @@ class UserController extends Controller
         if(!$member){
             return toJson(-20002);
         }
-
         if(($member['password'])!=createPasswd(trim($user['password']),$member['uuid'])){
             return toJson(-20003);
         }

app/Http/Models/Agent.php

@@ -12,6 +12,54 @@ class Agent extends Model
 {
 
 
+    /**
+     * 获取游戏token
+     *
+     * @access public
+     * @param mixed $where 查询条件
+     * @return String
+     */
+    public function getAgent($where)
+    {
+        $agentModel = new Models\Agent;
+        $select = [
+            'agent_token',
+            'updated_at',
+        ];
+        $result = $agentModel
+            ->select($select)
+            ->where($where)
+            ->first();
+
+        return $result;
+
+    }//end getAgent()
+
+
+    /**
+     * 修改游戏token
+     *
+     * @access public
+     * @param mixed $where 查询条件
+     * @param mixed $token token
+     * @return String
+     */
+    public function updateAgent($where, $token)
+    {
+        $agentModel = new Models\Agent;
+        $update = [
+            'agent_token' => $token,
+            'updated_at' => date('Y-m-d H:i:s'),
+        ];
+        $result = $agentModel
+            ->where($where)
+            ->update($update);
+
+        return $result;
+
+    }//end updateAgent()
+
+
     /**
      * 获取游戏url及参数
      *

app/Http/Models/Common.php

@@ -86,7 +86,7 @@ class Common extends Model
             $a++;
         }
         $params = base64_encode($paramsSting);
-        $key = md5($params . S('sportsToken'));
+        $key = md5($params . session('sportsToken'));
         $loginUrl = $url . '?params=' . $params . '&Key=' . $key;
 
         return $loginUrl;

app/Http/Models/SportsAgent.php

@@ -5,6 +5,7 @@ namespace App\Http\Models;
 use Illuminate\Database\Eloquent\Model;
 use \App\Http\Models as HttpModel;
 use Illuminate\Support\Facades\DB;
+use \App\Models;
 
 /**
  * 赛事代理管理模型类
@@ -23,10 +24,22 @@ class SportsAgent extends Model
     public function getSportsToken($gmenuId)
     {
         $agentModel = new HttpModel\Agent;
+        // 获取数据库token.
+        $getAgentWhere = [
+            'agent_name' => 'sports',
+        ];
+        $getAgent = $agentModel->getAgent($getAgentWhere);
+        $agent_token = $getAgent && $getAgent->agent_token ? $getAgent->agent_token : '';
+        $updated_at = $getAgent && $getAgent->updated_at ? $getAgent->updated_at : '';
+        $newDate = date('Y-m-d H:i:s',strtotime('-20 hour'));
+        if ($agent_token && $updated_at > $newDate) {
+            session()->put('sportsToken', $agent_token);
+            return 1;
+        }
         // 获取url及参数.
         $getGameUrlWhere = [
             'gmenu_id' => $gmenuId,
-            'gameUrl_type' => 'getToken',
+            'gameUrl_type' => 'getSportsToken',
         ];
         $getGameUrl = $agentModel->getGameUrl($getGameUrlWhere);
 
@@ -43,7 +56,11 @@ class SportsAgent extends Model
         $getToken = $commonModel->make_request($url, $dataString);
         if ($getToken && json_decode($getToken)->status === 1) {
             // 存儲token
-            S('sportsToken', json_decode($getToken)->data->token);
+            $updateAgentWhere = [
+                'agent_name' => 'sports',
+            ];
+            $agentModel->updateAgent($updateAgentWhere, json_decode($getToken)->data->token);
+            session()->put('sportsToken', json_decode($getToken)->data->token);
             return 1;
         } else {
             return 2;
@@ -66,7 +83,7 @@ class SportsAgent extends Model
         // 获取验证用户 url及参数.
         $getGameUrlWhere = [
             'gmenu_id' => $gmenuId,
-            'gameUrl_type' => 'checkAccount',
+            'gameUrl_type' => 'sportsCheckAccount',
         ];
         $getGameUrl = $agentModel->getGameUrl($getGameUrlWhere);
         // 获取验证用户传参.
@@ -106,7 +123,7 @@ class SportsAgent extends Model
         // 获取登陆 url及参数.
         $getGameUrlWhere = [
             'gmenu_id' => $gmenuId,
-            'gameUrl_type' => 'login',
+            'gameUrl_type' => 'sportsLogin',
         ];
         $getGameUrl = $agentModel->getGameUrl($getGameUrlWhere);
         // 获取登陆传参.
@@ -159,7 +176,7 @@ class SportsAgent extends Model
         // 获取转账 url及参数.
         $getGameUrlWhere = [
             'gmenu_id' => $gmenuId,
-            'gameUrl_type' => 'transfer',
+            'gameUrl_type' => 'sportsTransfer',
         ];
         $getGameUrl = $agentModel->getGameUrl($getGameUrlWhere);
         // 获取转账传参.
@@ -205,7 +222,7 @@ class SportsAgent extends Model
         // 获取余额 url及参数.
         $getGameUrlWhere = [
             'gmenu_id' => $gmenuId,
-            'gameUrl_type' => 'seeCash',
+            'gameUrl_type' => 'sportsSeeCash',
         ];
         $getGameUrl = $agentModel->getGameUrl($getGameUrlWhere);
         // 获取余额传参.

app/Models/Agent.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * 数据库gameUrl模型类
+ */
+class Agent extends Model
+{
+
+    protected $table = 'agent';
+
+
+}