release: 9.5.0

Author: modstart

app/Constant/AppConstant.php

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

module/AdminManager/View/widget/serverInfo.blade.php

@@ -16,7 +16,7 @@
             <div class="col-lg-4 col-md-6">
                 <div class="tw-flex ub-border-bottom tw-p-2">
                     <div class="tw-w-24 tw-flex-shrink-0 tw-font-bold">MSCore</div>
-                    <div class="tw-flex-grow">V{{\ModStart\ModStart::$version}} ( With <b>{{strtoupper(\ModStart\Module\ModuleManager::getEnv())}}</b> )</div>
+                    <div class="tw-flex-grow">V{{\ModStart\ModStart::$version}} ( With <b>{{strtoupper(ModStart\ModStart::env())}}</b> )</div>
                 </div>
             </div>
             <div class="col-lg-4 col-md-6">

module/ModuleStore/Util/ModuleStoreUtil.php

@@ -170,13 +170,11 @@ public static function checkPackage($token, $module, $version)
         if (empty($config['env'])) {
             $config['env'] = ['laravel5'];
         }
-        if (method_exists(ModuleManager::class, 'getEnv')) {
-            $env = ModuleManager::getEnv();
-            BizException::throwsIf(
-                L('Module %s:%s compatible with env %s, current is %s', $module, $config['version'], join(',', $config['env']), $env),
-                !in_array($env, $config['env'])
-            );
-        }
+        $env = ModStart::env();
+        BizException::throwsIf(
+            L('Module %s:%s compatible with env %s, current is %s', $module, $config['version'], join(',', $config['env']), $env),
+            !in_array($env, $config['env'])
+        );
 
         return Response::generateSuccessData([
             'requires' => $requires,

module/Vendor/Provider/Captcha/CaptchaProvider.php

@@ -50,6 +50,16 @@ public static function nameTitleMap()
         });
     }
 
+    public static function nameTitleMapWithNone()
+    {
+        $value = [];
+        $value[''] = L('Empty');
+        foreach (self::nameTitleMap() as $k => $v) {
+            $value[$k] = $v;
+        }
+        return $value;
+    }
+
     /**
      * @param $name
      * @return AbstractCaptchaProvider

module/Vendor/Provider/ProviderTrait.php

@@ -109,4 +109,10 @@ public static function first()
         }
         return null;
     }
+
+    public static function titleByName($name)
+    {
+        $item = self::getByName($name);
+        return $item ? $item->title() : $name;
+    }
 }

module/Vendor/Util/AtomicUtil.php

@@ -5,6 +5,7 @@
 use ModStart\Core\Dao\ModelUtil;
 use ModStart\Core\Util\RandomUtil;
 use ModStart\Core\Util\RedisUtil;
+use Module\Vendor\Model\Atomic;
 
 /**
  * Class AtomicUtil
@@ -20,7 +21,7 @@ class AtomicUtil
     private static function autoCleanDB()
     {
         if (RandomUtil::percent(20)) {
-            ModelUtil::model('atomic')->where('expire', '<', time())->delete();
+            ModelUtil::model(Atomic::class)->where('expire', '<', time())->delete();
         }
     }
 
@@ -38,10 +39,10 @@ public static function produce($name, $value, $expire = 3600)
             RedisUtil::set($hash, $value);
             RedisUtil::expire($hash, $expire);
         } else {
-            if (ModelUtil::exists('atomic', ['name' => $name,])) {
-                ModelUtil::update('atomic', ['name' => $name,], ['value' => $value, 'expire' => time() + $expire]);
+            if (ModelUtil::exists(Atomic::class, ['name' => $name])) {
+                ModelUtil::update(Atomic::class, ['name' => $name], ['value' => $value, 'expire' => time() + $expire]);
             } else {
-                ModelUtil::insert('atomic', ['name' => $name, 'value' => $value, 'expire' => time() + $expire]);
+                ModelUtil::insertIgnoreUnique(Atomic::class, ['name' => $name, 'value' => $value, 'expire' => time() + $expire]);
             }
             self::autoCleanDB();
         }
@@ -63,17 +64,17 @@ public static function consume($name)
         } else {
             self::autoCleanDB();
             ModelUtil::transactionBegin();
-            $atomic = ModelUtil::getWithLock('atomic', ['name' => $name]);
+            $atomic = ModelUtil::getWithLock(Atomic::class, ['name' => $name]);
             if (empty($atomic)) {
                 ModelUtil::transactionCommit();
                 return false;
             }
             if ($atomic['expire'] < time() || $atomic['value'] < 0) {
-                ModelUtil::delete('atomic', ['name' => $name]);
+                ModelUtil::delete(Atomic::class, ['name' => $name]);
                 ModelUtil::transactionCommit();
                 return false;
             }
-            ModelUtil::update('atomic', ['name' => $name], ['value' => $atomic['value'] - 1]);
+            ModelUtil::update(Atomic::class, ['name' => $name], ['value' => $atomic['value'] - 1]);
             ModelUtil::transactionCommit();
             return true;
         }
@@ -89,7 +90,7 @@ public static function remove($name)
             $hash = "Atomic:$name";
             RedisUtil::delete($hash);
         } else {
-            ModelUtil::delete('atomic', ['name' => $name]);
+            ModelUtil::delete(Atomic::class, ['name' => $name]);
         }
     }
 
@@ -117,10 +118,10 @@ public static function acquire($name, $expire = 30)
         } else {
             self::autoCleanDB();
             ModelUtil::transactionBegin();
-            $atomic = ModelUtil::getWithLock('atomic', ['name' => $name]);
+            $atomic = ModelUtil::getWithLock(Atomic::class, ['name' => $name]);
             $ts = time() + $expire;
             if (empty($atomic)) {
-                ModelUtil::insert('atomic', [
+                ModelUtil::insert(Atomic::class, [
                     'name' => $name,
                     'value' => 1,
                     'expire' => $ts
@@ -129,7 +130,7 @@ public static function acquire($name, $expire = 30)
                 return true;
             }
             if ($atomic['expire'] < time()) {
-                ModelUtil::update('atomic', ['name' => $name], [
+                ModelUtil::update(Atomic::class, ['name' => $name], [
                     'value' => 1,
                     'expire' => $ts
                 ]);
@@ -151,7 +152,7 @@ public static function release($name)
             $key = "Atomic:$name";
             RedisUtil::delete($key);
         } else {
-            ModelUtil::delete('atomic', ['name' => $name]);
+            ModelUtil::delete(Atomic::class, ['name' => $name]);
         }
     }
 }

module/Vendor/View/widget/captcha/default.blade.php

@@ -4,7 +4,7 @@
              data-captcha
              class="tw-rounded tw-cursor-pointer"
              onclick="this.src='{{modstart_web_url('captcha/image')}}?'+Math.random();"
-             style="height:1.8rem;width:100%;" />
+             style="height:2rem;width:100%;" />
     </div>
     <div class="input tw-flex-grow">
         <input type="text" style="width:100%;" class="form-lg" name="captcha" placeholder="图片验证" />

module/VisitStatistic/Admin/Widget/VisitStatisticReport.vue

@@ -58,12 +58,18 @@ export default {
                     "data": this.pv,
                     "type": "line",
                     "smooth": true,
+                    "areaStyle": {
+                        opacity: 0.1
+                    },
                     "itemStyle": {"normal": {"color": "#4F7FF3", "lineStyle": {"color": "#4F7FF3"}}}
                 }, {
                     "name": "访客数",
                     "data": this.uv,
                     "type": "line",
                     "smooth": true,
+                    "areaStyle": {
+                        opacity: 0.1
+                    },
                     "itemStyle": {"normal": {"color": "#6A46BD", "lineStyle": {"color": "#6A46BD"}}}
                 }]
             });

module/VisitStatistic/Docs/release.md

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

module/VisitStatistic/config.json

@@ -15,11 +15,9 @@
     ],
     "suggest": [],
     "version": "1.2.0",
-    "modstartVersion": ">=3.7.0",
+    "modstartVersion": ">=3.9.0",
     "author": "ModStart",
     "description": "提供内置的网站访问记录功能",
-    "providers": [
-    ],
-    "config": {
-    }
-}
+    "providers": [],
+    "config": {}
+}