develop

app/Web/Controller/IndexController.php

@@ -12,6 +12,5 @@ class IndexController extends BaseController
     {
         InstallerUtil::checkForInstallRedirect();
         return HomePageProvider::call(__METHOD__, '\\Module\\Cms\\Web\\Controller\\IndexController@index');
-
     }
 }

app/Web/routes.php

@@ -12,6 +12,7 @@ Route::group(
     ], function () {
 
     Route::match(['get', 'post'], '', 'IndexController@index');
+    Route::match(['get', 'post'], 'test', 'IndexController@test');
     Route::match(['get', 'post'], 'member', 'MemberController@index');
     Route::match(['get', 'post'], 'member/{id}', 'MemberController@show');
     Route::match(['get', 'post'], 'member_profile', 'MemberProfileController@index');

module/Cms/Api/Controller/ChannelController.php

@@ -13,8 +13,10 @@ use Module\Cms\Util\ChannelUtil;
 use Module\Cms\Util\PostUtil;
 use Module\Member\Util\MemberUtil;
 
+
 class ChannelController extends Controller
 {
+    
     public function paginate()
     {
         $input = InputPackage::buildFromInput();

module/Cms/Api/Controller/IndexController.php

@@ -9,8 +9,10 @@ use ModStart\Core\Input\Response;
 use Module\Cms\Util\ChannelUtil;
 use Module\Cms\Util\PostUtil;
 
+
 class IndexController extends Controller
 {
+    
     public function home()
     {
         $channelTree = ChannelUtil::tree();

module/Cms/Api/Controller/WriterController.php

@@ -21,8 +21,10 @@ use Module\Member\Support\MemberLoginCheck;
 use Module\Member\Util\MemberUtil;
 use Module\Vendor\Html\HtmlConverter;
 
+
 class WriterController extends Controller implements MemberLoginCheck
 {
+    
     public function settingGet()
     {
         $memberUser = MemberUser::user();
@@ -35,6 +37,7 @@ class WriterController extends Controller implements MemberLoginCheck
         return Response::generateSuccessData($setting);
     }
 
+    
     public function settingSave()
     {
         $input = InputPackage::buildFromInput();

module/ModuleStore/resources/asset/src/pages/ModuleStore.vue

@@ -106,7 +106,7 @@
                                 <div>
                                     <a :href="module.url" target="_blank"
                                        class="tw-font-bold tw-text-gray-700 ub-text-truncate tw-block">
-                                        <span v-if="module._isLocal" class="ub-tag primary sm ub-bg-a">本地插件</span>
+                                        <span v-if="module._isLocal" class="ub-tag primary sm ub-bg-a">本地模块</span>
                                         <span v-html="$highlight(module.title,search.keywords)"></span>
                                     </a>
                                     <div>

module/Vendor/Docs/release/1.6.0.md

 
 
 - 新增：SmsTemplateProvider，提供抽象的模板短信发送
+- 新增：安装引导程序版本判断，目前支持5.6.x和7.0.x

module/Vendor/Installer/function.php

@@ -22,6 +22,25 @@ if (!file_exists(ENV_FILE)) {
     file_put_contents(ENV_FILE, "APP_ENV=beta\nAPP_DEBUG=true\nAPP_KEY=" . \ModStart\Core\Util\RandomUtil::string(32));
 }
 
+function php_version_requires()
+{
+    return join(', ', [
+        '5.6.x',
+        '7.0.x',
+    ]);
+}
+
+function php_version_ok()
+{
+    if (version_compare(PHP_VERSION, '5.5.9', '<')) {
+        return false;
+    }
+    if (version_compare(PHP_VERSION, '7.1.0', '>=')) {
+        return false;
+    }
+    return true;
+}
+
 function get_env_config($key, $default = '')
 {
     static $envConfig = null;

module/Vendor/Installer/install.php

@@ -46,7 +46,7 @@ include __DIR__ . '/function.php';
             </div>
             <div class="body">
                 <?php text_success('系统：' . PHP_OS); ?>
-                <?php version_compare(PHP_VERSION, '5.5.9', '>=') ? text_success('PHP版本' . PHP_VERSION) : text_error('PHP版本>=5.5.9 当前为' . PHP_VERSION); ?>
+                <?php php_version_ok() ? text_success('PHP版本 ' . PHP_VERSION) : text_error('PHP版本要求（'.php_version_requires().'） 当前为 ' . PHP_VERSION); ?>
                 <?php text_success('最大上传：' . FileUtil::formatByte(EnvUtil::env('uploadMaxSize'))); ?>
                 <?php function_exists('openssl_open') ? text_success('OpenSSL PHP 扩展') : text_error('缺少 OpenSSL PHP 扩展'); ?>
                 <?php function_exists('exif_read_data') ? text_success('Exif PHP 扩展') : text_error('缺少 Exif PHP 扩展'); ?>

public/vendor/ModuleDeveloper/style/swagger-custom.css

+.swagger-ui .info .title small pre{background:0 0;border:0}.swagger-ui code{background:0 0;border:0;color:inherit}
\ No newline at end of file

vendor/modstart/modstart/resources/asset/src/common/uploadButton.js

@@ -82,7 +82,7 @@ var UploadButton = function (selector, option) {
         var me = this;
         var $me = $(this);
 
-        $me.html('<div style="padding:0;margin:0;display:inline-block;"><div class="picker">' + opt.text + '</div><ul class="webuploader-list"></ul></div>');
+        $me.html('<div style="padding:0;margin:0;"><div class="picker">' + opt.text + '</div><ul class="webuploader-list"></ul></div>');
 
         var $list = $me.find('.webuploader-list');
 

vendor/modstart/modstart/src/Core/Input/Response.php

@@ -247,7 +247,10 @@ class Response
 
     public static function send($code, $msg, $data = null, $redirect = null)
     {
-        if (\Illuminate\Support\Facades\Request::ajax() || Request::headerGet('is-ajax', false)) {
+        if (\Illuminate\Support\Facades\Request::ajax()
+            || Request::headerGet('is-ajax', false)
+            || (($headerAccept = Request::headerGet('accept')) && $headerAccept == 'application/json')
+        ) {
             return self::json($code, $msg, $data, $redirect);
         } else {
             if (empty($msg) && $redirect) {

vendor/modstart/modstart/views/core/grid/index.blade.php

@@ -113,6 +113,7 @@
                 search: $lister.find('[data-search]'),
                 table: $lister.find('[data-table]')
             }, {
+                hashUrl: false,
                 server: window.location.href,
                 render: function (data) {
                     listerData = data;

vendor/modstart/modstart/views/core/grid/simple.blade.php

@@ -158,6 +158,7 @@
                 search: $lister.find('[data-search]'),
                 table: $lister.find('[data-table]')
             }, {
+                hashUrl: false,
                 server: window.location.href,
                 render: function (data) {
                     listerData = data;