From 6c1f9b4a733fea327e9100683621fa20059b5571 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 27 Nov 2019 17:56:07 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=8E=A9=E5=AE=B6=E5=85=85=E5=80=BC=E8=84=9A?= =?UTF-8?q?=E6=9C=AC--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/AutoController.class.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php index 21da2b965..a3a75f42a 100644 --- a/Application/Admin/Controller/AutoController.class.php +++ b/Application/Admin/Controller/AutoController.class.php @@ -891,9 +891,13 @@ public function auto_rrdae(){ } //根据时间统计玩家充值 - public function userPlayDataCount() + public function userPlayDataCount($time = '') { - $time = strtotime(date('Y-m-d 00:00:00', time() - (3600 * 24))); + if ($time == '') { + $time = strtotime(date('Y-m-d 00:00:00', time() - (3600 * 24))); + } else { + $time = strtotime(date('Y-m-d 00:00:00', strtotime($time))); + } $res = M('user_play_data_count', 'tab_')->where(array('create_time' => $time))->find(); if (empty($res)) { $map['pay_time'] = ['between', [$time, strtotime(date('Y-m-d 23:59:59', $time))]]; From 9df85a49d48f0f92afcf67c33132832496358e4e Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Wed, 27 Nov 2019 18:12:25 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 68 ++++++------------- 1 file changed, 19 insertions(+), 49 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 66598be29..1c3407f51 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -481,17 +481,7 @@ class DownloadController extends BaseController { $map1['chain'] = ['like','%'.'/'.PID.'/'.'%']; $rs = M('promote','tab_')->where($map1)->field('id,account,nickname')->select(); $childPromoteIds = ''; - if(empty($rs)) { - $map['tab_test_resource.promote_id'] = PID; - }else { - foreach ($rs as $rsKey => $rsValue) { - $id = $rsValue['id']; - $childPromoteIds .= $id.','; - } - $childPromoteIds = rtrim($childPromoteIds, ','); - $childPromoteIds .= ',' . PID; - $map['tab_test_resource.promote_id'] = ['in', $childPromoteIds]; - } + $map['tab_test_resource.promote_id'] = PID; if(!empty(I('role_name'))){ $map['role_name']=['like','%'.I('role_name').'%']; @@ -547,17 +537,7 @@ class DownloadController extends BaseController { $map1['chain'] = ['like','%'.'/'.PID.'/'.'%']; $rs = M('promote','tab_')->where($map1)->field('id,account,nickname')->select(); $childPromoteIds = ''; - if(empty($rs)) { - $map['tab_test_resource.promote_id'] = PID; - }else { - foreach ($rs as $rsKey => $rsValue) { - $id = $rsValue['id']; - $childPromoteIds .= $id.','; - } - $childPromoteIds = rtrim($childPromoteIds, ','); - $childPromoteIds .= ',' . PID; - $map['tab_test_resource.promote_id'] = ['in', $childPromoteIds]; - } + $map['tab_test_resource.promote_id'] = PID; if(!empty(I('type'))||I('type')==='0'){ $map['apply_status']=I('type'); @@ -617,33 +597,23 @@ class DownloadController extends BaseController { $map1['chain'] = ['like','%'.'/'.PID.'/'.'%']; $rs = M('promote','tab_')->where($map1)->field('id,account,nickname')->select(); $childPromoteIds = ''; - if(empty($rs)) { - $map['tab_test_resource.promote_id'] = PID; - }else { - foreach ($rs as $rsKey => $rsValue) { - $id = $rsValue['id']; - $childPromoteIds .= $id.','; - } - $childPromoteIds = rtrim($childPromoteIds, ','); - $childPromoteIds .= ',' . PID; - $map['tab_test_resource.promote_id'] = ['in', $childPromoteIds]; - } + $map['tab_test_resource.promote_id'] = PID; - if(!empty(I('server_name'))){ - $map['tab_test_resource.server_name']=I('server_name'); - } - if(!empty(I('game_name'))){ - $map['tab_test_resource.game_name']=I('game_name'); - } - if(!empty(I('role_name'))){ - $map['tab_test_resource.role_name']=['like','%'.I('role_name').'%']; - } - if(!empty(I('user_account'))){ - $map['tab_test_resource.user_account']=['like','%'.I('user_account').'%']; - } - if(!empty(I('promote_id'))){ - $map['tab_test_resource.promote_id']=I('promote_id'); - } + if(!empty(I('server_name'))){ + $map['tab_test_resource.server_name']=I('server_name'); + } + if(!empty(I('game_name'))){ + $map['tab_test_resource.game_name']=I('game_name'); + } + if(!empty(I('role_name'))){ + $map['tab_test_resource.role_name']=['like','%'.I('role_name').'%']; + } + if(!empty(I('user_account'))){ + $map['tab_test_resource.user_account']=['like','%'.I('user_account').'%']; + } + if(!empty(I('promote_id'))){ + $map['tab_test_resource.promote_id']=I('promote_id'); + } $conditions = json_encode($map,TRUE); $addtime = time(); @@ -852,7 +822,7 @@ class DownloadController extends BaseController { } $levelPromote = $this->getLevelPromote(); $queryPromote = $this->getQueryPromote($levelPromote); - + $map2[] = [ '_logic' => 'or', 'id' => $queryPromote['id'], From 8f36f7204ffcee86acd49beb690fd43741ad3d0f Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Wed, 27 Nov 2019 18:21:04 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/IndexController.class.php | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Controller/IndexController.class.php b/Application/Admin/Controller/IndexController.class.php index f779e3c5f..8a47b995f 100644 --- a/Application/Admin/Controller/IndexController.class.php +++ b/Application/Admin/Controller/IndexController.class.php @@ -260,14 +260,24 @@ class IndexController extends AdminController { $count1 = array(); $active_user_list = []; $pay_user_list = []; - $dbdata = M("IndexChart","tab_")->field("new_user_count,active_user_count,active_user_list,pay_user_count,pay_user_list,pay_money_count,promote_new_count") - ->where($map)->select(); + $dbdata = M("IndexChart","tab_")->field("FROM_UNIXTIME(`date`, '%Y-%m-%d') as time,new_user_count,active_user_count,active_user_list,pay_user_count,pay_user_list,pay_money_count,promote_new_count") + ->where($map) + ->group("time") + ->select(); + //替换数据 + $temparr = array(); + for ($i=0; $i < count($datelist); $i++) { + $temparr[$datelist[$i]]['news'] = 0; + $temparr[$datelist[$i]]['active'] = 0; + $temparr[$datelist[$i]]['player'] = 0; + $temparr[$datelist[$i]]['money'] = 0; + } foreach($dbdata as $k => $v) { - $data['news'][$k] = $v['new_user_count']; - $data['active'][$k] = $v['active_user_count']; - $data['player'][$k] = $v['pay_user_count']; - $data['money'][$k] = $v['pay_money_count']; + $temparr[$v['time']]['news'] =$v['new_user_count']; + $temparr[$v['time']]['active'] =$v['active_user_count']; + $temparr[$v['time']]['player'] =$v['pay_user_count']; + $temparr[$v['time']]['money'] =$v['pay_money_count']; $active_user_list += json_decode($v['active_user_list'],true); unset($v['active_user_list']); unset($dbdata[$k]['active_user_list']); @@ -278,6 +288,14 @@ class IndexController extends AdminController { $count1['pay_money_count'] += $v['pay_money_count']; $count1['promote_new_count'] += $v['promote_new_count']; } + foreach ($temparr as $key => $value) { + # code... + $data['news'][] = $value['news']; + $data['active'][] = $value['active']; + $data['player'][] = $value['player']; + $data['money'][] = $value['money']; + } + unset($dbdata); $count1['active_user_count'] = count(array_flip(array_flip($active_user_list))); unset($active_user_list); From 06ad29c55260214dffb4c7beb5553ab4ac1677a7 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 27 Nov 2019 18:30:08 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=AE=A1=E7=90=86->=E4=B8=93=E6=9C=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86|=E6=B7=B7=E6=9C=8D=E7=AE=A1=E7=90=86->?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B8=B8=E6=88=8F--=E5=90=8D=E8=AF=8D?= =?UTF-8?q?=E8=A7=A3=E9=87=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/my_game.html | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 0f3e90578..33dff8572 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -663,7 +663,7 @@ $('.add-game').on('click', function () { var thisElement = $(this); var gameId = thisElement.attr('game-id'); - var promoteType = thisElement.attr('promote-type'); + var promoteType = parseInt(thisElement.attr('promote-type')); $.ajax({ type: "post", @@ -690,8 +690,16 @@ }); } - if (promoteType == 3) { - $('#add_promote_title').text('添加推广员:'); + switch (promoteType) { + case 2: + $('#add_promote_title').text('添加部长:'); + break; + case 3: + $('#add_promote_title').text('添加组长:'); + break; + case 4: + $('#add_promote_title').text('添加推广员:'); + break; } $.myMethod("#add_promote_data",tagData,"add_promote_ids"); From 99db894808934625e7e779710198751fbd2c9c0a Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Thu, 28 Nov 2019 06:10:15 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 1c3407f51..12e57fead 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -801,6 +801,9 @@ class DownloadController extends BaseController { * @author sunke */ public function regist_data_export() { + if (empty(I('begtime')) || empty(I('endtime'))) { + $this->error('请选择起止时间'); + } $beginTime = strtotime(I('begtime') . ' 00:00:00'); $endtime = strtotime(I('endtime') . ' 23:59:59'); if (($endtime - $beginTime) > 31 * 24 * 3600) { From 793c1501ba8f2c9b40fd5438bdba3c5c3180ab67 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 28 Nov 2019 06:11:33 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ConsoleController.class.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index 71ff3486e..6c4ac9fff 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -244,4 +244,22 @@ class ConsoleController extends Think { } } } + + public function resetIndexChart() + { + for ($i=1; $i<100; $i++) { + $item = M('index_chart', 'tab_')->where(['id' => $i])->find(); + if ($item) { + $item['new_user_hours'] = json_encode(unserialize($item['new_user_hours'])); + $item['active_user_hours'] = json_encode(unserialize($item['active_user_hours'])); + $item['active_user_list'] = json_encode(unserialize($item['active_user_list'])); + $item['pay_user_hours'] = json_encode(unserialize($item['pay_user_hours'])); + $item['pay_user_list'] = json_encode(unserialize($item['pay_user_list'])); + $item['pay_money_hours'] = json_encode(unserialize($item['pay_money_hours'])); + $item['promote_new_hours'] = json_encode(unserialize($item['promote_new_hours'])); + $item['all_count'] = json_encode(unserialize($item['all_count'])); + M("index_chart_1", "tab_")->add($item); + } + } + } } From 87ee527a0162bf5fea9e40a1d12cd0303e0cf491 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Thu, 28 Nov 2019 06:44:41 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=85=85?= =?UTF-8?q?=E5=80=BC=E8=B4=B9=E7=8E=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/Controller/SsgController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index 83074ed64..bd1a466c1 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -19,7 +19,7 @@ class SsgController extends BaseController { const CODE_ERROR = -97; //验证码错误 const RETURN_SUCCESS = 1; const RETURN_FALSE = 2; - const signprice = 0.1; //充值金额 + const signprice = 10; //充值金额 public function login() From a0a86fe8af2af9cdf1615d4273e09ebcfa770b3e Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 28 Nov 2019 07:32:39 +0800 Subject: [PATCH 08/25] =?UTF-8?q?OA=E5=85=B3=E8=81=94=E5=88=87=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index c77b8df1f..d7cefa6f1 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -112,7 +112,7 @@ class PromoteController extends ThinkController reset($arr); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $arr['sign'] = $sign; - $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/platformAccount', $arr); + $re_data = curl_post('http://oa.76ba.com/api/wanmeng/platformAccount', $arr); $re_data = json_decode($re_data, true); if ($re_data['code'] == 1) { $oa = $re_data['data']; @@ -151,7 +151,7 @@ class PromoteController extends ThinkController reset($arr); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $arr['sign'] = $sign; - $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/verifyBind', $arr); + $re_data = curl_post('http://oa.76ba.com/api/wanmeng/verifyBind', $arr); $re_data = json_decode($re_data, true)['data']; foreach ($list_data as $k => $v) { $oa_val = $re_data[trim($v['account'])]; From 728f78db093a2b0c752662065c2f0a6cca2389f3 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 28 Nov 2019 08:01:49 +0800 Subject: [PATCH 09/25] =?UTF-8?q?OA=E5=85=B3=E8=81=94=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Conf/config.php | 5 +++++ Application/Admin/Controller/PromoteController.class.php | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index 62f5a797c..18e03bdb6 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -19,6 +19,11 @@ return array( 'GET_INFO_KEY' => 'wmkjtx_kj213', + 'OA' => array( + 'testUrl' => 'http://test.oa.76ba.com', + 'formalUrl' => 'http://test.oa.76ba.com', + ), + /* 文件上传相关配置 */ 'DOWNLOAD_UPLOAD' => array( 'mimes' => '', //允许上传的文件MiMe类型 diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index c77b8df1f..27234fe1a 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -110,9 +110,9 @@ class PromoteController extends ThinkController $arr['pageSize'] = 1000; ksort($arr); reset($arr); - $sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); + $sign = md5(http_build_query($arr) . C('GET_INFO_KEY')); $arr['sign'] = $sign; - $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/platformAccount', $arr); + $re_data = curl_post(C('OA.formalUrl') . '/api/wanmeng/platformAccount', $arr); $re_data = json_decode($re_data, true); if ($re_data['code'] == 1) { $oa = $re_data['data']; @@ -151,7 +151,7 @@ class PromoteController extends ThinkController reset($arr); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $arr['sign'] = $sign; - $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/verifyBind', $arr); + $re_data = curl_post(C('OA.formalUrl') . '/api/wanmeng/verifyBind', $arr); $re_data = json_decode($re_data, true)['data']; foreach ($list_data as $k => $v) { $oa_val = $re_data[trim($v['account'])]; From db6558bc764d4c6508297eefd5bd480a38b3a448 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 28 Nov 2019 08:20:18 +0800 Subject: [PATCH 10/25] =?UTF-8?q?ssg=E6=89=93=E5=8D=B0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/Controller/SsgController.class.php | 3 ++- ThinkPHP/Library/Think/Pay.class.php | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index bd1a466c1..8684daf05 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -3,6 +3,7 @@ namespace Mobile\Controller; use Org\Ipa365SDK\Ipa365; use Org\WeixinSDK\Weixin; use User\Api\MemberApi; +use Think\Log; class SsgController extends BaseController { const USER_NOT_ILLEGAL = -1; //用户名不合法 @@ -591,7 +592,7 @@ class SsgController extends BaseController { $param['callback'] = "https://".$_SERVER['HTTP_HOST']."/mobile.php/Ssg/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; //$param['notifyurl'] = "https://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay"; } - + Log::write(serialize($param), Log::DEBUG); $ali_pay = $this->alipay($param); redirect($ali_pay['url']); }else{ diff --git a/ThinkPHP/Library/Think/Pay.class.php b/ThinkPHP/Library/Think/Pay.class.php index af718417e..5583aecf0 100644 --- a/ThinkPHP/Library/Think/Pay.class.php +++ b/ThinkPHP/Library/Think/Pay.class.php @@ -8,6 +8,7 @@ namespace Think; use Org\UcenterSDK\Ucservice; +use Think\Log; class Pay { @@ -167,8 +168,10 @@ class Pay break; } $notifyurl = $vo->getNotifyUrl(); - if (!$notifyurl) - $notifyurl = 'http://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; + if (!$notifyurl){ + $notifyurl = 'http://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; + } + Log::write($notifyurl, Log::DEBUG); $request->setNotifyUrl($notifyurl); switch ($type) { From 3d3062dd8c675226cc201a317e662fab8fb028c0 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 28 Nov 2019 08:24:43 +0800 Subject: [PATCH 11/25] OA --- Application/Admin/Conf/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index 18e03bdb6..6c0807fa0 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -20,8 +20,8 @@ return array( 'GET_INFO_KEY' => 'wmkjtx_kj213', 'OA' => array( - 'testUrl' => 'http://test.oa.76ba.com', - 'formalUrl' => 'http://test.oa.76ba.com', + 'testUrl' => 'http://oa.76ba.com', + 'formalUrl' => 'http://oa.76ba.com', ), /* 文件上传相关配置 */ From f4cd306f949c3ea727fad01194e09cde4fc8baac Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 28 Nov 2019 08:38:37 +0800 Subject: [PATCH 12/25] =?UTF-8?q?ssg=E6=89=93=E5=8D=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Callback/Controller/Notify2Controller.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Application/Callback/Controller/Notify2Controller.class.php b/Application/Callback/Controller/Notify2Controller.class.php index 67e764913..ed0d45291 100644 --- a/Application/Callback/Controller/Notify2Controller.class.php +++ b/Application/Callback/Controller/Notify2Controller.class.php @@ -16,6 +16,8 @@ class Notify2Controller extends BaseController */ public function notify() { + Log::write("回来了", Log::DEBUG); + C(api('Config/lists')); $apitype = I('get.apitype');#获取支付api类型 if (IS_POST && !empty($_POST)) { @@ -31,6 +33,7 @@ class Notify2Controller extends BaseController exit('Access Denied'); } } + Log::write(serialize($notify), Log::DEBUG); $pay_way = $apitype; if ($apitype == "swiftpass") { $apitype = "weixin"; From 5737c714b132cb1128c2ba0596cf6032d216e0b0 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 28 Nov 2019 08:39:13 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ConsoleController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index 7f23aa733..602063e05 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -140,7 +140,7 @@ class ConsoleController extends Think { public function deleteRepeatUserPlayInfo() { - $gameIds = [157, 155, 153, 150, 151, 148, 175, 142, 143, 172, 173, 155, 154]; + $gameIds = [157, 155, 153, 150, 151, 148, 175, 142, 143, 172, 173, 155, 154, 180]; foreach($gameIds as $gameId) { $this->doDeleteRepeatUserPlayInfo($gameId); } @@ -194,7 +194,7 @@ class ConsoleController extends Think { public function deleteRepeatUserPlayInfo2() { - $gameIds = [157, 148, 150, 151, 158, 175, 142, 143, 172, 173, 154, 155, 176, 165, 164, 179, 156, 153]; + $gameIds = [157, 148, 150, 151, 158, 175, 142, 143, 172, 173, 154, 155, 176, 165, 164, 179, 156, 153, 180]; foreach ($gameIds as $gameId) { $this->doDeleteRepeatUserPlayInfo2($gameId); } From 4851ffe4e38112a529c0cd3c9cf4493f926c377e Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 28 Nov 2019 08:49:01 +0800 Subject: [PATCH 14/25] =?UTF-8?q?ssg=E6=B5=8B=E8=AF=95=E5=9B=9E=E6=8E=893?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ThinkPHP/Library/Think/Pay.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ThinkPHP/Library/Think/Pay.class.php b/ThinkPHP/Library/Think/Pay.class.php index 5583aecf0..25987dbfa 100644 --- a/ThinkPHP/Library/Think/Pay.class.php +++ b/ThinkPHP/Library/Think/Pay.class.php @@ -169,7 +169,8 @@ class Pay } $notifyurl = $vo->getNotifyUrl(); if (!$notifyurl){ - $notifyurl = 'http://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; + // $notifyurl = 'http://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; + $notifyurl = 'http://m.wmtxkj.cn/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; } Log::write($notifyurl, Log::DEBUG); $request->setNotifyUrl($notifyurl); From 56db28bd425552651a0bd6b60e0c6a44dcc12650 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 28 Nov 2019 08:52:06 +0800 Subject: [PATCH 15/25] =?UTF-8?q?ssg=E5=9B=9E=E8=B0=834?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ThinkPHP/Library/Think/Pay.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ThinkPHP/Library/Think/Pay.class.php b/ThinkPHP/Library/Think/Pay.class.php index 25987dbfa..3d4b06543 100644 --- a/ThinkPHP/Library/Think/Pay.class.php +++ b/ThinkPHP/Library/Think/Pay.class.php @@ -170,7 +170,7 @@ class Pay $notifyurl = $vo->getNotifyUrl(); if (!$notifyurl){ // $notifyurl = 'http://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; - $notifyurl = 'http://m.wmtxkj.cn/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; + $notifyurl = 'http://m.wmtxkj.com/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; } Log::write($notifyurl, Log::DEBUG); $request->setNotifyUrl($notifyurl); From 02e5dcdd2155aafd234420c04b5c87e4a9b2e591 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 28 Nov 2019 08:55:18 +0800 Subject: [PATCH 16/25] =?UTF-8?q?ssg=E5=9B=9E=E8=B0=835?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ThinkPHP/Library/Think/Pay.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ThinkPHP/Library/Think/Pay.class.php b/ThinkPHP/Library/Think/Pay.class.php index 3d4b06543..02340de61 100644 --- a/ThinkPHP/Library/Think/Pay.class.php +++ b/ThinkPHP/Library/Think/Pay.class.php @@ -170,7 +170,7 @@ class Pay $notifyurl = $vo->getNotifyUrl(); if (!$notifyurl){ // $notifyurl = 'http://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; - $notifyurl = 'http://m.wmtxkj.com/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; + $notifyurl = 'https://m.wmtxkj.com/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; } Log::write($notifyurl, Log::DEBUG); $request->setNotifyUrl($notifyurl); From fb0170048f1857d5abeade500dc7407db2c93551 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 28 Nov 2019 09:00:39 +0800 Subject: [PATCH 17/25] =?UTF-8?q?ssg=E5=9B=9E=E8=B0=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Callback/Controller/Notify2Controller.class.php | 2 -- Application/Mobile/Controller/SsgController.class.php | 1 - ThinkPHP/Library/Think/Pay.class.php | 4 +--- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Application/Callback/Controller/Notify2Controller.class.php b/Application/Callback/Controller/Notify2Controller.class.php index ed0d45291..4e196c26c 100644 --- a/Application/Callback/Controller/Notify2Controller.class.php +++ b/Application/Callback/Controller/Notify2Controller.class.php @@ -16,7 +16,6 @@ class Notify2Controller extends BaseController */ public function notify() { - Log::write("回来了", Log::DEBUG); C(api('Config/lists')); $apitype = I('get.apitype');#获取支付api类型 @@ -33,7 +32,6 @@ class Notify2Controller extends BaseController exit('Access Denied'); } } - Log::write(serialize($notify), Log::DEBUG); $pay_way = $apitype; if ($apitype == "swiftpass") { $apitype = "weixin"; diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index 8684daf05..86cec8911 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -592,7 +592,6 @@ class SsgController extends BaseController { $param['callback'] = "https://".$_SERVER['HTTP_HOST']."/mobile.php/Ssg/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; //$param['notifyurl'] = "https://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay"; } - Log::write(serialize($param), Log::DEBUG); $ali_pay = $this->alipay($param); redirect($ali_pay['url']); }else{ diff --git a/ThinkPHP/Library/Think/Pay.class.php b/ThinkPHP/Library/Think/Pay.class.php index 02340de61..972efffd6 100644 --- a/ThinkPHP/Library/Think/Pay.class.php +++ b/ThinkPHP/Library/Think/Pay.class.php @@ -169,10 +169,8 @@ class Pay } $notifyurl = $vo->getNotifyUrl(); if (!$notifyurl){ - // $notifyurl = 'http://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; - $notifyurl = 'https://m.wmtxkj.com/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; + $notifyurl = 'https://' . $_SERVER ['HTTP_HOST'] . '/callback.php/Notify2/notify/apitype/alipay/methodtype/notify'; } - Log::write($notifyurl, Log::DEBUG); $request->setNotifyUrl($notifyurl); switch ($type) { From 4fc5b08289e6152bcebd49df54a9ce97688fe97b Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 28 Nov 2019 09:41:32 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Tool/PlistParser.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Tool/PlistParser.class.php b/Application/Base/Tool/PlistParser.class.php index 96b19fe7b..9f9bf8a3f 100644 --- a/Application/Base/Tool/PlistParser.class.php +++ b/Application/Base/Tool/PlistParser.class.php @@ -37,7 +37,7 @@ class PlistParser $this->xml = $xml; } else { $plist = new CFPropertyList(); - $plist->parseBinary($content); + $plist->parse($content); $this->plist = $plist; } return true; From 1881d11d0938ae4a51acb328b1390cf63410396f Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 28 Nov 2019 09:57:52 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E7=BB=91=E5=B8=81=E6=94=B6=E5=9B=9E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/DeductBindRecordController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Admin/Controller/DeductBindRecordController.class.php b/Application/Admin/Controller/DeductBindRecordController.class.php index f0534ea09..02236b4e2 100644 --- a/Application/Admin/Controller/DeductBindRecordController.class.php +++ b/Application/Admin/Controller/DeductBindRecordController.class.php @@ -41,6 +41,8 @@ class DeductBindRecordController extends ThinkController { public function deductBindBalance(){ if(IS_POST){ + $_REQUEST['user_id'] = (M('user','tab_')->field('id')->where(['account'=>$_REQUEST['user_id']])->find())['id']; + if(!isset($_REQUEST['user_id']) || $_REQUEST['user_id']<1){ $this->error("请选择账号"); } From 88e5ec6db97ab6430871b6d7ff659b36b3697f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E7=94=A8lww?= <“529520975@qq.com> Date: Thu, 28 Nov 2019 10:01:21 +0800 Subject: [PATCH 20/25] =?UTF-8?q?pc=E5=AE=98=E7=BD=91=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Index/hezuo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Media/View/default/Index/hezuo.html b/Application/Media/View/default/Index/hezuo.html index 54afc010c..58045ff5c 100644 --- a/Application/Media/View/default/Index/hezuo.html +++ b/Application/Media/View/default/Index/hezuo.html @@ -77,7 +77,7 @@ - + From f3baedb948b03254ba9a19b982241b5de6d46393 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Thu, 28 Nov 2019 10:10:49 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Index/hezuo.html | 1 - 1 file changed, 1 deletion(-) diff --git a/Application/Media/View/default/Index/hezuo.html b/Application/Media/View/default/Index/hezuo.html index 58045ff5c..c357556ae 100644 --- a/Application/Media/View/default/Index/hezuo.html +++ b/Application/Media/View/default/Index/hezuo.html @@ -76,7 +76,6 @@ - From 34d424887d01d7f0397c44598f816747ecbf8bb7 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 28 Nov 2019 10:24:32 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/DeductBindRecord/deductBindBalance.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/DeductBindRecord/deductBindBalance.html b/Application/Admin/View/DeductBindRecord/deductBindBalance.html index c6a001e74..01a6956bb 100644 --- a/Application/Admin/View/DeductBindRecord/deductBindBalance.html +++ b/Application/Admin/View/DeductBindRecord/deductBindBalance.html @@ -69,7 +69,7 @@ 账户余额： - 0.00平台币 + 0.00绑定币 From 7a767466ef2a6ed08f29149436d156e8c8a448a2 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 28 Nov 2019 10:36:39 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E9=94=81=E5=8F=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/MemberController.class.php | 4 ++-- Application/Admin/View/Member/user_info.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index fd7a178c4..afde5599c 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -837,8 +837,8 @@ class MemberController extends ThinkController */ public function lock_status($id="", $lock_status, $accounts = "") { - if ($accounts) $map['account'] = ['in', array_unique(explode(',', $accounts))]; - if ($id) $map['id'] = ['in', array_unique(explode(',', $id))]; + if ($accounts) $map['account'] = ['in', array_unique(explode("\n", $accounts))]; + if ($id) $map['id'] = ['in', array_unique(explode("\n", $id))]; $users = M('user', 'tab_')->where($map)->field('id')->select(); $res = M('user', 'tab_')->where($map)->setField(['lock_status' => $lock_status]); if ($res) { diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index 1dfdca0d9..62cb6dc49 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -501,7 +501,7 @@ $(function(){ function shenhe(status){ var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { return $(elem).val(); - }).get().join(','); + }).get().join("\n"); var desc = ''; if (status == 0) { desc = '锁定'; @@ -511,8 +511,8 @@ $(function(){ layer.prompt({ formType: 2, value: text, - placeholder : '玩家账号（英文逗号隔开）', - title: '请输入要'+desc+'的玩家账号(英文逗号隔开)', + placeholder : '玩家账号（一个账号一行）', + title: '请输入要'+desc+'的玩家账号（一个账号一行）', area: ['800px', '350px'] //自定义文本域宽高 }, function(value, index, elem){ if(value=='') { From e1df740572ac8f0e1f45f76ea148dbba4d823cc1 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 28 Nov 2019 11:01:10 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 2a31f76fb..033e7dc7f 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -79,7 +79,7 @@ success: function(response) { if (response.status) { wx.config({ - // debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 + debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 appId: response.data.appid, timestamp: response.data.time, nonceStr: response.data.randStr, From efd32351db0b4044a9c72c49caea1c30b608556e Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 28 Nov 2019 11:08:35 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 033e7dc7f..2a31f76fb 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -79,7 +79,7 @@ success: function(response) { if (response.status) { wx.config({ - debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 + // debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。 appId: response.data.appid, timestamp: response.data.time, nonceStr: response.data.randStr,