From 0a44858c89cf072ef264d4a8ab575f1854b5115e Mon Sep 17 00:00:00 2001 From: Chirs Date: Wed, 22 Nov 2017 11:38:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dwindows=E5=92=8Cunix=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C=E7=AC=A6=E4=B8=8D=E5=90=8C=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?JS=E3=80=81CSS=E6=89=93=E5=8C=85=E5=8E=8B=E7=BC=A9=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Min.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/admin/command/Min.php b/application/admin/command/Min.php index de5be1b91..d2fb4c62b 100644 --- a/application/admin/command/Min.php +++ b/application/admin/command/Min.php @@ -102,7 +102,7 @@ class Min extends Command if ($res == "js") { $content = file_get_contents($from); - preg_match("/require\.config\(\{[\n]+(.*?)\n\}\);/is", $content, $matches); + preg_match("/require\.config\(\{[\r\n]?[\n]?+(.*?)[\r\n]?[\n]?}\);/is", $content, $matches); if (!isset($matches[1])) { $output->error("js config not found!"); -- Gitee