feat: module refresh all added

modstart · modstart · commit 936bc284c27d · 2023-05-31T12:00:46.000+08:00
diff --git a/module/AdminManager/View/widget/serverInfo.blade.php b/module/AdminManager/View/widget/serverInfo.blade.php
@@ -76,7 +76,7 @@
         </table>
         <script type="text/javascript">
             // 请勿删除，用于获取最新的安全通告（比如框架、模块有重大缺陷的应急通知等）
-            $('body').append('<script src="https://modstart.com/api/modstart/notice?modules={{urlencode(join(',',$modules))}}"><' + '/script>');
+            $('body').append('<script src="https://modstart.com/api/modstart/notice?modules={{urlencode($modules)}}"><' + '/script>');
         </script>
     </div>
 </div>
diff --git a/module/AdminManager/Widget/ServerInfoWidget.php b/module/AdminManager/Widget/ServerInfoWidget.php
@@ -2,6 +2,7 @@
 
 namespace Module\AdminManager\Widget;
 
+use Illuminate\Support\Str;
 use ModStart\Widget\AbstractWidget;
 use Module\AdminManager\Util\ModuleUtil;
 
@@ -12,8 +13,16 @@ class ServerInfoWidget extends AbstractWidget
     protected function variables()
     {
         $phpExtensions = get_loaded_extensions();
-        return [
+        $modules = json_encode([
             'modules' => ModuleUtil::modules(),
+        ]);
+        if (function_exists('gzdeflate')) {
+            $modules = 'V_Z_' . base64_encode(gzdeflate($modules));
+        } else {
+            $modules = 'V_' . base64_encode($modules);
+        }
+        return [
+            'modules' => $modules,
             'attributes' => $this->formatAttributes(),
             'phpExtensions' => $phpExtensions,
         ];
diff --git a/module/Blog/Docs/module/content.md b/module/Blog/Docs/module/content.md
@@ -2,8 +2,16 @@
 
 「个人博客」提供了一个简约的模块系统
 
-## 功能特性
+```mind
+功能特性
+    图文博客
+    博客分类
+    博客标签
+    友情链接
+    留言本
+    关于博主
+    暗黑/白天主题
+    模块市场扩展 
+```
 
-- 图文博客
-- 留言本
 
diff --git a/module/Blog/Docs/release.md b/module/Blog/Docs/release.md
@@ -1,4 +1,4 @@
-## 2.7.0
+## 2.7.0 界面显示优化，暗黑模式跟随系统
 
 - 新增：博客分享条增加模块ShareJS是否安装判断
 - 新增：暗黑模式跟随系统
diff --git a/module/Vendor/QuickRun/Export/ExportHandle.php b/module/Vendor/QuickRun/Export/ExportHandle.php
@@ -15,6 +15,7 @@ class ExportHandle
         'pageTitle' => '导出数据',
         'defaultExportName' => 'Export',
         'headTitles' => [],
+        'customHeadTitle' => false,
     ];
 
     private $fetchCallback;
@@ -37,6 +38,12 @@ public function withHeadTitles($headTitles)
         return $this;
     }
 
+    public function withCustomHeadTitle($enable)
+    {
+        $this->data['customHeadTitle'] = $enable;
+        return $this;
+    }
+
     public function handleFetch($callback)
     {
         $this->fetchCallback = $callback;
@@ -68,23 +75,48 @@ private function perform($ext, $view, $param = [])
         }
         $pageTitle = $this->data['pageTitle'];
         $defaultExportName = $this->data['defaultExportName'];
+        $headTitles = $this->data['headTitles'];
+        $customHeadTitle = $this->data['customHeadTitle'];
         $input = InputPackage::buildFromInput();
         $page = $input->getPage();
         $pageSize = $input->getPageSize(null, null, null, 100);
         $search = $input->getJsonAsInput('_param')->getArray('search');
         $exportName = $input->getTrimString('exportName', $defaultExportName);
         $format = $input->getTrimString('format', $ext);
+        $checkedHeadTitles = $input->getJson('checkedHeadTitles');
 
         if (Request::isPost()) {
             BizException::throwsIfEmpty('导出文件名为空', $exportName);
+            BizException::throwsIfEmpty('请选择导出列', $checkedHeadTitles);
             $paginateData = call_user_func_array($this->fetchCallback, [$page, $pageSize, $search, []]);
+            if ($customHeadTitle) {
+                $list = [];
+                foreach ($paginateData['list'] as $v) {
+                    $one = [];
+                    foreach ($v as $vi => $vv) {
+                        if (in_array($vi, $checkedHeadTitles)) {
+                            $one[] = $vv;
+                        }
+                    }
+                    $list[] = $one;
+                }
+                $exportHeadTitles = [];
+                foreach ($this->data['headTitles'] as $i => $v) {
+                    if (in_array($i, $checkedHeadTitles)) {
+                        $exportHeadTitles[] = $v;
+                    }
+                }
+            } else {
+                $list = $paginateData['list'];
+                $exportHeadTitles = $this->data['headTitles'];
+            }
             $data = [];
             $data['code'] = 0;
-            $data['list'] = $paginateData['list'];
+            $data['list'] = $list;
             $data['total'] = $paginateData['total'];
             $data['finished'] = count($paginateData['list']) != $pageSize;
             $data['exportName'] = $exportName . '.' . $format;
-            $data['exportHeadTitles'] = $this->data['headTitles'];
+            $data['exportHeadTitles'] = $exportHeadTitles;
             return Response::generateSuccessData($data);
         }
 
@@ -94,6 +126,8 @@ private function perform($ext, $view, $param = [])
             'exportName' => $exportName,
             'total' => $paginateData['total'],
             'formats' => $param['formats'],
+            'customHeadTitle' => $customHeadTitle,
+            'headTitles' => $headTitles,
         ]);
     }
 }
diff --git a/module/Vendor/View/quickRun/export/common.blade.php b/module/Vendor/View/quickRun/export/common.blade.php
@@ -15,9 +15,22 @@
                     return {
                         exportName: '{{$exportName}}',
                         format: 'xlsx',
+                        checkedHeadTitles: {!! json_encode(array_keys($headTitles)) !!}
+                    }
+                },
+                computed:{
+                    allChecked(){
+                        return this.checkedHeadTitles.length === {!! count($headTitles) !!};
                     }
                 },
                 methods: {
+                    onAllCheckChange(v){
+                        if(v){
+                            this.checkedHeadTitles = {!! json_encode(array_keys($headTitles)) !!};
+                        }else{
+                            this.checkedHeadTitles = [];
+                        }
+                    },
                     doExport() {
                         MS.importExportWork.doExportExecute(this.format, (page, cb) => {
                             MS.api.postSuccess(
@@ -26,6 +39,7 @@
                                     page: page,
                                     exportName: this.exportName,
                                     format: this.format,
+                                    checkedHeadTitles: JSON.stringify(this.checkedHeadTitles)
                                 },
                                 (res) => {
                                     cb(res.data);
@@ -56,10 +70,27 @@
                             即将导出 <span class="tw-font-bold">{{$total}}</span> 条记录
                         </div>
                     </div>
+                    @if(!empty($customHeadTitle))
+                    <div class="line">
+                        <div class="label">
+                            导出字段
+                        </div>
+                        <div class="field">
+                            <el-checkbox-group v-model="checkedHeadTitles">
+                                @foreach($headTitles as $i=>$t)
+                                    <el-checkbox style="min-width:4rem;" :label="{{$i}}" key="{{$t}}">{{$t}}</el-checkbox>
+                                @endforeach
+                            </el-checkbox-group>
+                            <div>
+                                <el-checkbox :value="allChecked" @change="onAllCheckChange">全选</el-checkbox>
+                            </div>
+                        </div>
+                    </div>
+                    @endif
                     <div class="line">
                         <div class="label">文件格式</div>
                         <div class="field">
-                            <el-radio-group v-model="format">
+                            <el-radio-group v-model="format" >
                                 @foreach($formats as $f)
                                     <el-radio label="{{$f}}">{{$f}}</el-radio>
                                 @endforeach
diff --git a/vendor/modstart/modstart/resources/asset/package.json b/vendor/modstart/modstart/resources/asset/package.json
@@ -60,6 +60,8 @@
     "vuedraggable": "^2.24.3",
     "vuex": "^3.6.2",
     "webix-routie": "^0.4.0",
-    "xlsx": "^0.16.9"
+    "xlsx": "^0.16.9",
+    "date-fns": "1.30.1",
+    "codepage": "1.14.0"
   }
 }
diff --git a/vendor/modstart/modstart/src/Command/ModuleRefreshAllCommand.php b/vendor/modstart/modstart/src/Command/ModuleRefreshAllCommand.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace ModStart\Command;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use ModStart\Core\Util\FileUtil;
+
+class ModuleRefreshAllCommand extends Command
+{
+    protected $signature = 'modstart:module-refresh-all';
+
+    public function handle()
+    {
+        $this->info("ModuleRefreshAll Start");
+
+        $this->info(">>> CleanOldAsset");
+        FileUtil::rm(public_path('asset'));
+        $this->info(">>> Finished\n");
+
+        $this->info(">>> Publish Asset");
+        $exitCode = Artisan::call('vendor:publish', [
+            '--provider' => 'ModStart\ModStartServiceProvider',
+        ]);
+        $output = trim(Artisan::output());
+        $this->info("ExitCode -> " . $exitCode);
+        $this->info($output);
+        $this->info(">>> Finished\n");
+
+        $this->info(">>> Reinstall Modules");
+        $exitCode = Artisan::call('modstart:module-install-all');
+        $output = trim(Artisan::output());
+        $this->info("ExitCode -> " . $exitCode);
+        $this->info($output);
+        $this->info(">>> Finished\n");
+
+        $this->warn("ModuleRefreshAll Finished");
+    }
+
+}
diff --git a/vendor/modstart/modstart/src/Core/Util/DBLockUtil.php b/vendor/modstart/modstart/src/Core/Util/DBLockUtil.php
@@ -5,6 +5,11 @@
 use NinjaMutex\Lock\MySqlLock;
 use NinjaMutex\MutexFabric;
 
+/**
+ * Class DBLockUtil
+ * @package ModStart\Core\Util
+ * @deprecated delete at 2023-11-30
+ */
 class DBLockUtil
 {
     static $instance = null;
diff --git a/vendor/modstart/modstart/src/Core/Util/LockUtil.php b/vendor/modstart/modstart/src/Core/Util/LockUtil.php
@@ -0,0 +1,62 @@
+<?php
+
+
+namespace ModStart\Core\Util;
+
+
+use NinjaMutex\Lock\MySqlLock;
+use NinjaMutex\MutexFabric;
+
+class LockUtil
+{
+    static $instance = null;
+
+    /**
+     * @return MutexFabric
+     */
+    private static function instance()
+    {
+        if (null === self::$instance) {
+            $mysqlLock = new MySqlLock(
+                config('env.DB_USERNAME'),
+                config('env.DB_PASSWORD'),
+                config('env.DB_HOST')
+            );
+            $mutexFabric = new MutexFabric('mysql', $mysqlLock);
+            self::$instance = $mutexFabric;
+        }
+        return self::$instance;
+    }
+
+    public static function acquire($name, $timeout = 60)
+    {
+        if (RedisUtil::isEnable()) {
+            $key = "Lock:$name";
+            if (RedisUtil::setnx($key, time() + $timeout)) {
+                RedisUtil::expire($key, $timeout);
+                return true;
+            }
+            $ts = RedisUtil::get($key);
+            if ($ts < time()) {
+                RedisUtil::delete($key);
+                return self::acquire($name, $timeout);
+            }
+            return false;
+        } else {
+            if (self::instance()->get($name)->acquireLock($timeout)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static function release($name)
+    {
+        if (RedisUtil::isEnable()) {
+            $key = "Lock:$name";
+            RedisUtil::delete($key);
+        } else {
+            self::instance()->get($name)->releaseLock();
+        }
+    }
+}
diff --git a/vendor/modstart/modstart/src/Core/Util/SessionUtil.php b/vendor/modstart/modstart/src/Core/Util/SessionUtil.php
diff --git a/vendor/modstart/modstart/src/ModStartServiceProvider.php b/vendor/modstart/modstart/src/ModStartServiceProvider.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## 2.7.0`
	`1`	`+## 2.7.0 界面显示优化，暗黑模式跟随系统`
`2`	`2`
`3`	`3`	`- 新增：博客分享条增加模块ShareJS是否安装判断`
`4`	`4`	`- 新增：暗黑模式跟随系统`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@`
`60`	`60`	`"vuedraggable": "^2.24.3",`
`61`	`61`	`"vuex": "^3.6.2",`
`62`	`62`	`"webix-routie": "^0.4.0",`
`63`		`- "xlsx": "^0.16.9"`
	`63`	`+ "xlsx": "^0.16.9",`
	`64`	`+ "date-fns": "1.30.1",`
	`65`	`+ "codepage": "1.14.0"`
`64`	`66`	`}`
`65`	`67`	`}`