wupengfei 2 年之前
父節點
當前提交
e6b25fb514
共有 3 個文件被更改,包括 15 次插入14 次删除
  1. 4 3
      .idea/workspace.xml
  2. 2 2
      application/api/controller/Base.php
  3. 9 9
      application/api/controller/CloudWallet.php

+ 4 - 3
.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="39916099-6c76-4a34-b5a2-40f5b4c0c928" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Base.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Base.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/CloudWallet.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/CloudWallet.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -217,7 +218,7 @@
       <workItem from="1665535774839" duration="2954000" />
       <workItem from="1665543792569" duration="7208000" />
       <workItem from="1665621143495" duration="2513000" />
-      <workItem from="1665708328289" duration="1715000" />
+      <workItem from="1665708328289" duration="1984000" />
     </task>
     <task id="LOCAL-00001" summary=".">
       <created>1663731279977</created>
@@ -257,10 +258,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1242" y="398" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1663731298581" />
-    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog" timestamp="1665710365564">
+    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog" timestamp="1665710696137">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1665710365564" />
+    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1665710696137" />
     <state x="1125" y="483" key="FileChooserDialogImpl" timestamp="1665476140468">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 2 - 2
application/api/controller/Base.php

@@ -58,8 +58,8 @@ class Base extends Controller
         $authorization = app()->request->header('Authorization');
         if(empty($authorization) || $authorization == null){
             if($this->is_test == 1) {
-                 $this->uid = input('user_id') ?  input('user_id') : 965;
-                 return true;
+               //  $this->uid = input('user_id') ?  input('user_id') : 965;
+                 //return true;
             }
             $this->error('Token不存在,拒绝访问',null,-1);
         }

+ 9 - 9
application/api/controller/CloudWallet.php

@@ -86,7 +86,7 @@ class CloudWallet extends Base
      */
     public function openAcctApply()
     {
-        $user_id = input('post.user_id');
+        $user_id = $this->uid;
         $user_info  = Db::name('store_member')->find($user_id);
         //if(empty($user_info)) $user_info  = Db::name('store_member')->find(6);
         if(empty($user_info)) $this->error('用户信息有误');
@@ -110,7 +110,7 @@ class CloudWallet extends Base
                 'occupation' =>18,
             ],
             'accountInfo' => [
-                //'account_type' => 'PERSONAL_PAYMENT_ACCOUNT'
+               //'account_type' => 'PERSONAL_PAYMENT_ACCOUNT'
             ],
             'linkedAcctInfo'=>[
                 //'linked_accttype'=> 'LEGALREPT_BANK_CARD',
@@ -144,7 +144,7 @@ class CloudWallet extends Base
      */
     public function activateApply()
     {
-        $user_id = input('post.user_id');
+        $user_id = $this->uid;
         $password = input('post.password');
         $flag_chnl = input('get.flag_chnl','H5');
         $pkg_name = input('get.pkg_name');
@@ -190,7 +190,7 @@ class CloudWallet extends Base
      */
     public function getRandomKeys()
     {
-        $user_id = input('get.user_id');
+        $user_id = $this->uid;
         $flag_chnl = input('get.flag_chnl','H5');
         $pkg_name = input('get.pkg_name');
         $app_name = input('get.app_name');
@@ -232,7 +232,7 @@ class CloudWallet extends Base
      */
     public function getUserInfo()
     {
-        $user_id = input('get.user_id');
+        $user_id = $this->uid;
         $current = date("YmdHis");
         $params = [
             'timestamp' => $current,
@@ -269,7 +269,7 @@ class CloudWallet extends Base
      */
     public function getAcctInfo()
     {
-        $user_id = input('get.user_id');
+        $user_id = $this->uid;
         $current = date("YmdHis");
         $params = [
             'timestamp' => $current,
@@ -300,7 +300,7 @@ class CloudWallet extends Base
      */
     public function validationSms()
     {
-        $user_id = input('get.user_id');
+        $user_id = $this->uid;
         $token = input('get.token');
         $txn_seqno = input('get.txn_seqno');
         $total_amount = input('get.total_amount');
@@ -368,7 +368,7 @@ class CloudWallet extends Base
      */
     public function withdrawal()
     {
-        $user_id = input('post.user_id');
+        $user_id = $this->uid;
         $money = input('post.money');
         $password = input('post.password');
         $flag_chnl = input('get.flag_chnl','H5');
@@ -413,7 +413,7 @@ class CloudWallet extends Base
         $header = '{"accept-encoding":"gzip,deflate","host":"xianglian-api.hdlkeji.com","content-length":"458","signature-type":"RSA","signature-data":"a5BMrkODcWl6FJ2vOEMG\/dnDbHfsBp34yY9ls9KmaWv5zYYO2EoK+DwL9PAFWTFzb0sKKYaOgrO8mFjl4CclTEd5UWvDFTAhv+EijImHTm4rGwbv1k2fpiw5MCSci1JTAE3ROsocgDWbLSsuFbTQ\/d97oR9KJbrjIInlVPEjO04=","correlationid":"2b9369df-ca95-49df-8f25-10fca9854c02","user-agent":"httpcomponents","connection":"Close","content-type":"text\/json;charset=UTF-8"}';
         $result = json_decode($result,true);
         $header = json_decode($header,true);
-        // var_dump($result,$header);
+       // var_dump($result,$header);
         $check_sign = LLianPayAccpSignature::checkSign(json_encode($result,JSON_UNESCAPED_UNICODE),$header['signature-data']);
         var_dump($check_sign);
         $orderNo = $result['orderInfo']['txn_seqno'];