Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Admin/Conf/config.php

@@ -17,6 +17,9 @@ return array(
     'DATA_CACHE_TYPE'      => 'File', // 数据缓存类型
     'URL_MODEL'            => 3, //URL模式
 
+    /*获取信息加密KEY*/
+    'GET_INFO_KEY'         => 'wmkjtx_kj213',
+
     /* 文件上传相关配置 */
     'DOWNLOAD_UPLOAD' => array(
         'mimes'    => '', //允许上传的文件MiMe类型

Application/Admin/Controller/FengHuoApiController.class.php

@@ -5,11 +5,11 @@
  * Date: 2019/8/5
  * Time: 16:04
  */
-namespace SDK\Controller;
+namespace Admin\Controller;
 use Think\Controller;
 use Think\Log;
 
-class FengHuoApiController extends Controller{
+class FengHuoApiController extends GetInfoBaseController{
 //    protected function _initialize(){
 //        // 制定允许其他域名访问
 //        header("Access-Control-Allow-Origin:*");
@@ -57,7 +57,6 @@ class FengHuoApiController extends Controller{
      * @param
      */
     public function registerDetail(){
-
         $time = $_REQUEST['time'];
         $page = $_REQUEST['page'];
         $pageSize = $_REQUEST['page_size'];

Application/Admin/Controller/GetInfoBaseController.class.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Admin\Controller;
+
+use Think\Controller;
+
+class GetInfoBaseController extends Controller
+{
+    public function _initialize()
+    {
+        $data = I('param.');
+        if (empty($data['time_stamp']) || time() - 60 * 10 > $data['time_stamp']) {
+            $result = [
+                'ResultCode'    => 2001,
+                'ResultMessage' => "链接已过期",
+                'Data'          => 'null',
+            ];
+            return $this->ajaxReturn($result);
+        } else {
+            $sign = $data['sign'];
+            unset($data['sign']);
+            ksort($data);
+            reset($data);
+            $str = "";
+            foreach ($data as $k => $v) {
+                $str = $str . $k . "=" . $v;
+            }
+            $str = $str . 'key=' . C('GET_INFO_KEY');
+            if (md5($str) != $sign) {
+                $result = [
+                    'ResultCode'    => 2001,
+                    'ResultMessage' => "参数错误",
+                    'Data'          => 'null',
+                ];
+                return $this->ajaxReturn($result);
+            }
+        }
+    }
+}

Application/Admin/Controller/OAController.class.php

@@ -5,10 +5,10 @@
  * Date: 2016/11/4
  * Time: 16:04
  */
-namespace SDK\Controller;
+namespace Admin\Controller;
 use Think\Controller;
 
-class OAController extends Controller{
+class OAController extends GetInfoBaseController{
 
     /**
      * 游戏列表接口

Application/Sdk/View/default/UserH/platform_pay_show.html

@@ -40,7 +40,7 @@
                 <div class="weui-cell formitem">
                         <div class="weui-cell__hd"><label class="weui-label">充值金额</label></div>
                         <div class="weui-cell__bd">
-                            <input id="money" class="weui-input paymoneyinput" type="number" value="" name="money" placeholder="充值金额需要正整数" oninput="this.value=this.value.replace(/[^0-9.]+/,'');">
+                            <input id="money" class="weui-input paymoneyinput" type="number" value="" name="money" placeholder="充值金额需要正整数" oninput="this.value=this.value.replace(/[^0-9]+|^0/,'');">
                         </div>
                     </div>
                 <p class="paymoneyinfo">
@@ -66,7 +66,7 @@
     			showerror("金额不能为空");
     			return ;
     		}
-    		if (!$("#money").val() < 0) {
+    		if (!$("#money").val() <= 0) {
     			showerror("金额有误");
     			return ;
     		}