diff --git a/.gitignore b/.gitignore index c4023a16c..685fe3db6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ Runtime/ Uploads/ Application/Common/Conf/env.php +Application/Common/Conf/pay_config.php .idea/ \ No newline at end of file diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 0abfb29a0..f1feb8ee7 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -549,6 +549,7 @@ function think_ucenter_md5($str, $key = 'ThinkUCenter'){ public function rolelist() { + $map = []; if (isset($_REQUEST['game_name'])) { $map['game_name'] = trim($_REQUEST['game_name']); unset($_REQUEST['game_name']); @@ -562,7 +563,7 @@ function think_ucenter_md5($str, $key = 'ThinkUCenter'){ unset($_REQUEST['role_name']); } empty(I('user_account')) || $map['user_account'] = ['like',"%".I('user_account')."%"]; - $list = $this->lists(M('user_play_info', 'tab_'), $map); + $list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc'); $this->assign('list', $list); $this->meta_title = '角色数据'; diff --git a/Application/Admin/Event/SourceEvent.class.php b/Application/Admin/Event/SourceEvent.class.php index 1a0735ac1..0e43f2823 100644 --- a/Application/Admin/Event/SourceEvent.class.php +++ b/Application/Admin/Event/SourceEvent.class.php @@ -306,7 +306,7 @@ class SourceEvent extends Controller //$ossClient->multiuploadFile($bucket, $url, $file, $options); } catch (OssException $e) { printf(__FUNCTION__ . ": initiateMultipartUpload FAILED\n"); - $this -> error($e -> getMessage() . "\n"); + $this -> error('1' . $e -> getMessage() . "\n"); return; } /* diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index 8c25ebc62..a6b8e04ab 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -108,7 +108,7 @@