From f75188f9526f720fa26d1b32315b936d6028f4c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E7=94=A8lww?= <“529520975@qq.com>
Date: Mon, 25 Nov 2019 11:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=AF=BC=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=A2=9E=E5=8A=A0=E5=86=85=E5=AD=98=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=88=B0512M?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index a12055796..15e65f361 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -5,6 +5,17 @@ use Think\Controller;
 
 class ExportController extends Controller
 {
+
+    /**
+     * ExportController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        set_time_limit(0);
+        ini_set('memory_limit', '512M');
+    }
+
     public function exportExcel($expTitle, $expCellName, $expTableData)
     {
         $xlsTitle = iconv('utf-8', 'gb2312', $expTitle);//文件名称
@@ -38,7 +49,6 @@ class ExportController extends Controller
     //导出Excel
     function expUser($id)
     {
-        ini_set("memory_limit","256M"); //升级为256M内存
                 $xlsName = $_REQUEST['xlsname'];
         switch ($id) {
             case 1:
@@ -5563,8 +5573,8 @@ if ($key == 'model'){
 
     function gameFinanceDetail() {
 
-        set_time_limit(0);
-        ini_set('memory_limit', '512M');
+//        set_time_limit(0);
+//        ini_set('memory_limit', '512M');
         $month = I("game_name");
         $xlsName = $month.'充值流水';