Date: Tue, 9 Oct 2018 15:31:25 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=97=B6=E6=94=AF?=
=?UTF-8?q?=E6=8C=81=E4=BF=AE=E6=94=B9MYSQL=E7=AB=AF=E5=8F=A3=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/install.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/public/install.php b/public/install.php
index 26873acf..4009bfae 100644
--- a/public/install.php
+++ b/public/install.php
@@ -95,7 +95,7 @@ if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'POST') {
}
$err = '';
$mysqlHostname = isset($_POST['mysqlHost']) ? $_POST['mysqlHost'] : '127.0.0.1';
- $mysqlHostport = 3306;
+ $mysqlHostport = isset($_POST['mysqlHostport']) ? $_POST['mysqlHostport'] : 3306;
$hostArr = explode(':', $mysqlHostname);
if (count($hostArr) > 1) {
$mysqlHostname = $hostArr[0];
@@ -374,6 +374,11 @@ if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'POST') {
+
+
+
+
+
From 2c366f06b33af347364960e883b34059d88f8e02 Mon Sep 17 00:00:00 2001
From: Chrisleung
Date: Wed, 10 Oct 2018 11:25:37 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=A7=E8=A1=8C?=
=?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E6=97=B6,fast\Form?=
=?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=AE=9A=E4=B9=89=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/common/behavior/Common.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/application/common/behavior/Common.php b/application/common/behavior/Common.php
index 0b16877a..7e436948 100644
--- a/application/common/behavior/Common.php
+++ b/application/common/behavior/Common.php
@@ -59,7 +59,9 @@ class Common
\think\Cookie::set('think_var', $request->get('lang'));
}
// Form别名
- class_alias('fast\\Form', 'Form');
+ if (!class_exists('Form')) {
+ class_alias('fast\\Form', 'Form');
+ }
}
public function addonBegin(&$request)
From 3250a5f965bb3af5b7dc16fb7ee651011e188bca Mon Sep 17 00:00:00 2001
From: zhang <870110809@qq.com>
Date: Thu, 11 Oct 2018 11:31:57 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E5=8D=87win=E4=B8=8B=E7=AC=AC?=
=?UTF-8?q?=E4=B8=80=E6=AC=A1=E4=BD=BF=E7=94=A8=E5=8E=8B=E7=BC=A9=E6=89=93?=
=?UTF-8?q?=E5=8C=85=E7=9A=84=E6=88=90=E5=8A=9F=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/command/Min.php | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/application/admin/command/Min.php b/application/admin/command/Min.php
index 209d2081..aa434bb8 100644
--- a/application/admin/command/Min.php
+++ b/application/admin/command/Min.php
@@ -60,7 +60,14 @@ class Min extends Command
if (IS_WIN)
{
// Winsows下请手动配置配置该值,一般将该值配置为 '"C:\Program Files\nodejs\node.exe"'，除非你的Node安装路径有变更
- $nodeExec = '"C:\Program Files\nodejs\node.exe"';
+ $nodeExec = 'C:\Program Files\nodejs\node.exe';
+ if (file_exists($nodeExec)){
+ $nodeExec = '"' . $nodeExec . '"';
+ }else{
+ // 如果 '"C:\Program Files\nodejs\node.exe"' 不存在，可能是node安装路径有变更
+ // 但安装node会自动配置环境变量，直接执行 '"node.exe"' 提高第一次使用压缩打包的成功率
+ $nodeExec = '"node.exe"';
+ }
}
else
{
From 571ef508ca5dd9d11b9bdbda6d8b1983dd650fa4 Mon Sep 17 00:00:00 2001
From: Karson
Date: Fri, 19 Oct 2018 17:39:23 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E6=99=AE=E9=80=9A=E6=96=87=E4=BB=B6=E6=97=A0=E9=A2=84=E8=A7=88?=
=?UTF-8?q?=E7=9A=84BUG=20=E4=BF=AE=E5=A4=8DAPI=E6=96=87=E6=A1=A3=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E7=9A=84BUG=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8Tab=E5=88=87=E6=8D=A2?=
=?UTF-8?q?=E5=90=8E=E6=99=AE=E9=80=9A=E6=90=9C=E7=B4=A2=E5=A4=B1=E6=95=88?=
=?UTF-8?q?=E7=9A=84BUG=20=E4=BF=AE=E5=A4=8DBootcss=E7=9B=B8=E5=85=B3?=
=?UTF-8?q?=E9=93=BE=E6=8E=A5=20=E4=BF=AE=E5=A4=8D=E5=89=8D=E5=8F=B0?=
=?UTF-8?q?=E4=BC=9A=E5=91=98=E5=A4=B4=E5=83=8F=E5=9C=A8=E5=90=AF=E7=94=A8?=
=?UTF-8?q?=E4=BA=91=E5=82=A8=E5=AD=98=E4=B8=A2=E5=A4=B1=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/command/Api/template/index.html | 31 ++++++++++++----
application/admin/command/Crud.php | 5 +--
.../command/Crud/stubs/html/heading-js.stub | 18 ---------
.../admin/command/Crud/stubs/javascript.stub | 2 -
application/api/controller/Common.php | 2 +-
application/index/view/layout/default.html | 2 +-
application/index/view/user/index.html | 2 +-
application/index/view/user/profile.html | 2 +-
public/api.html | 37 ++++++++++++++-----
public/assets/js/require-backend.min.js | 21 +++++++----
public/assets/js/require-table.js | 8 ++++
public/assets/js/require-upload.js | 8 ++--
public/install.php | 4 +-
13 files changed, 83 insertions(+), 59 deletions(-)
delete mode 100644 application/admin/command/Crud/stubs/html/heading-js.stub
diff --git a/application/admin/command/Api/template/index.html b/application/admin/command/Api/template/index.html
index 62389bcb..153ad48a 100755
--- a/application/admin/command/Api/template/index.html
+++ b/application/admin/command/Api/template/index.html
@@ -7,8 +7,19 @@
{$config.title}
-
-
+
+
+
+
+
+
+
+
+
+