新增：后台安全升级，已知问题修复

Author: modstart

app/Constant/AppConstant.php

@@ -6,6 +6,6 @@ class AppConstant
 {
     const APP = 'blog';
     const APP_NAME = 'ModStartBlog';
-    const VERSION = '9.3.0';
+    const VERSION = '9.4.0';
 }
 

artisan

@@ -17,6 +17,16 @@ require __DIR__.'/bootstrap/autoload.php';
 
 $app = require_once __DIR__.'/bootstrap/app.php';
 
+if (\ModStart\Core\Util\PlatformUtil::isLinux()) {
+    if (function_exists('posix_getuid')) {
+        $uid = posix_getuid();
+        if ($uid == 0) {
+            echo "You can't run this command as root ( uid = ${uid} ).\n";
+            exit(-1);
+        }
+    }
+}
+
 /*
 |--------------------------------------------------------------------------
 | Run The Artisan Application

module/Nav/Docs/release.md

@@ -1,4 +1,4 @@
-## 1.8.0
+## 1.8.0 导航增加变量自动替换支持
 
 - 新增：导航增加变量自动替换支持
 

module/Vendor/Admin/Controller/WidgetLinkController.php

@@ -7,6 +7,7 @@
 use Illuminate\Routing\Controller;
 use ModStart\Core\Dao\ModelManageUtil;
 use ModStart\Core\Dao\ModelUtil;
+use ModStart\Core\Input\InputPackage;
 use ModStart\Core\Util\TreeUtil;
 use ModStart\Module\ModuleManager;
 use Module\Vendor\Admin\Widget\AdminWidgetLink;
@@ -20,9 +21,23 @@ class WidgetLinkController extends Controller
 
     public function select()
     {
+        $input = InputPackage::buildFromInput();
+        $filterTypes = $input->getStringSeparatedArray('types');
+        if (empty($filterTypes)) {
+            $filterTypes = [
+                AdminWidgetLinkType::MOBILE,
+                AdminWidgetLinkType::WEB,
+            ];
+        }
         $links = AdminWidgetLink::get();
+        $links = array_values(array_filter($links, function ($link) use ($filterTypes) {
+            return in_array($link['type'], $filterTypes);
+        }));
         $types = [];
         foreach (AdminWidgetLinkType::getList() as $name => $title) {
+            if (!in_array($name, $filterTypes)) {
+                continue;
+            }
             $count = count(array_filter($links, function ($link) use ($name) {
                 return $link['type'] == $name;
             }));

module/Vendor/Provider/Schedule/AbstractScheduleBiz.php

@@ -28,12 +28,12 @@ protected function cronEveryMinute()
 
     protected function cronEvery10Minute()
     {
-        return '*/10 * * * * *';
+        return '*/10 * * * *';
     }
 
     protected function cronEvery30Minute()
     {
-        return '0,30 * * * * *';
+        return '0,30 * * * *';
     }
 
     /**
@@ -42,7 +42,7 @@ protected function cronEvery30Minute()
      */
     protected function cronEveryDayHour24($hour)
     {
-        return "0 $hour * * * *";
+        return "0 $hour * * *";
     }
 
     /**
@@ -52,16 +52,16 @@ protected function cronEveryDayHour24($hour)
      */
     protected function cronEveryDayHour24Minute($hour, $minute)
     {
-        return "$minute $hour * * * *";
+        return "$minute $hour * * *";
     }
 
     protected function cronEveryHour()
     {
-        return '0 * * * * *';
+        return '0 * * * *';
     }
 
     protected function cronEveryDay()
     {
-        return '0 0 * * * *';
+        return '0 0 * * *';
     }
 }

module/Vendor/Shell/ClosureCommand.php

@@ -32,7 +32,8 @@
             @show
         </div>
         <div id="foot">
-            {{modstart_config('siteName')}} &copy; {{modstart_config('siteDomain')}}
+            {{modstart_config('siteName')}}
+            {!! modstart_config('siteDomain','')?'&copy;'.modstart_config('siteDomain',''):'' !!}
         </div>
     @show
 </div>

module/Vendor/Shell/ShellApplication.php

@@ -1,6 +1,7 @@
 ## 1.2.0
 
 - 新增：运营报表-网站访问页面，合并设置和详细页面
+- 优化：网站统计报表实时查询数据库插入冲突问题
 
 ---
 

module/Vendor/View/mail/frame.blade.php

@@ -3,6 +3,7 @@
 namespace Module\VisitStatistic\Util;
 
 use ModStart\Core\Dao\ModelUtil;
+use ModStart\Core\Util\LockUtil;
 use ModStart\Core\Util\TimeUtil;
 use Module\VisitStatistic\Model\VisitStatisticDailyReport;
 use Module\VisitStatistic\Model\VisitStatisticItem;
@@ -36,7 +37,14 @@ public static function report($startDay = null, $endDay = null)
                 if ($t <= $today) {
                     $recordMap[$day] = self::calcReport($day);
                     if ($t < $today) {
-                        ModelUtil::insert('visit_statistic_daily_report', $recordMap[$day]);
+                        $where = ['day' => $day];
+                        $lockKey = 'VisitStatistic:DailyReport:' . $day;
+                        if (LockUtil::acquire($lockKey)) {
+                            if (!ModelUtil::exists(VisitStatisticDailyReport::class, $where)) {
+                                ModelUtil::insert(VisitStatisticDailyReport::class, $recordMap[$day]);
+                            }
+                            LockUtil::release($lockKey);
+                        }
                     }
                 } else {
                     $recordMap[$day] = [