blog prev next url fixed

Author: modstart

module/Blog/Api/Controller/BlogController.php

@@ -210,6 +210,7 @@ public function get()
 
 
         $recordNext = Blog::published()
+            ->where('id', '>', $record['id'])
             ->orderBy('id', 'desc')
             ->limit(1)->first();
         if ($recordNext) {
@@ -218,14 +219,15 @@ public function get()
         }
 
         $recordPrev = Blog::published()
+            ->where('id', '<', $record['id'])
             ->orderBy('id', 'asc')
             ->limit(1)->first();
         if ($recordPrev) {
             $recordPrev = ArrayUtil::keepKeys($recordPrev->toArray(), ['id', 'title']);
             $recordPrev['_url'] = UrlUtil::blog($recordPrev);
         }
 
-        ModelUtil::increase('blog', $record['id'], 'clickCount');
+        ModelUtil::increase(Blog::class, $record['id'], 'clickCount');
 
         return Response::generateSuccessData([
             'pageTitle' => $record['title'],

module/Blog/Docs/release.md

@@ -1,3 +1,9 @@
+## 3.6.0
+
+- 修复：博客上一篇下一篇链接错误问题
+
+---
+
 ## 3.5.0 博客公告，二级分类，定时发布
 
 - 新增：系统公告模块适配，支持博客公告

module/Blog/config.json

@@ -18,7 +18,7 @@
         "博客"
     ],
     "modstartVersion": ">=4.0.0",
-    "version": "3.5.0",
+    "version": "3.6.0",
     "author": "ModStart",
     "description": "提供一个基础的博客系统",
     "suggest": [

public/asset/common/admin.js

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml, yaml}]
+indent_size = 4
+
+[*.{less, css}]
+indent_size = 4
+
+[docker-compose.yml]
+indent_size = 4

vendor/modstart/modstart/asset/common/admin.js

@@ -0,0 +1 @@
+14

vendor/modstart/modstart/resources/asset/.editorconfig

@@ -37,6 +37,19 @@ window._pageTabManager = {
                 }
             }
         });
+    },
+    blurUrl: function (url) {
+        var $menu = _rootWindow.$('.ub-panel-frame .left .menu');
+        var normalUrl = _rootWindow._pageTabManager.normalTabUrl(url);
+        $menu.find('a').each(function (i, o) {
+            var url = $(o).attr('href');
+            if (url === 'javascript:;') {
+                return;
+            }
+            if (_rootWindow._pageTabManager.normalTabUrl(url) === normalUrl) {
+                $(o).parents('.menu-item').removeClass('active');
+            }
+        });
     }
 };
 
@@ -478,6 +491,9 @@ $(window).on('load', function () {
             _rootWindow._pageTabManager.open(url, title, {
                 focus: function () {
                     tabManager.activeUrl(url);
+                },
+                blur: function () {
+                    tabManager.blurUrl(url);
                 }
             });
             return false;

vendor/modstart/modstart/resources/asset/.nvmrc

@@ -211,6 +211,41 @@ public static function insertAllSafely($model, $records, $updateTimestamp = true
         }
     }
 
+    /**
+     * 根据条件新增、更新或删除已有数据
+     * @param $model string 数据表
+     * @param $records array 多条数据数组
+     * @param $where array 条件数组
+     * @param $keyName string 主键名称，默认为id
+     * @return array
+     */
+    public static function insertOrUpdateOrDelete($model, $records, $where = [], $idName = 'id')
+    {
+        if (empty($records)) {
+            return $records;
+        }
+        $existIds = self::values($model, $idName, $where);
+        $newIds = array_filter(ArrayUtil::flatItemsByKey($records, $idName));
+        list($_, $deleteIds) = ArrayUtil::diff($existIds, $newIds);
+        if (!empty($deleteIds)) {
+            self::model($model)->where($where)->whereIn($idName, $deleteIds)->delete();
+        }
+        foreach ($records as $i => $record) {
+            foreach ($where as $k => $v) {
+                $records[$i][$k] = $v;
+            }
+        }
+        foreach ($records as $i => $record) {
+            if (empty($record[$idName])) {
+                unset($record[$idName]);
+                $records[$i][$idName] = self::model($model)->insertGetId($record);
+            } else {
+                self::model($model)->where($idName, $record[$idName])->update($record);
+            }
+        }
+        return $records;
+    }
+
     /**
      * 删除记录
      * @param $model string 数据表

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

@@ -117,8 +117,8 @@ public static function isPC()
         '/detector/i' => 'Other',
 
         // 其他一些库
-        '/(curl|python|java|node-fetch|http-client|msray-plus|guzzlehttp|wget|okhttp|scrapy|panelstart|node-superagent|go-camo|https?:\\/\\/)/i' => 'Other',
-
+        '/(curl|python|java|node-fetch|http-client|msray-plus|guzzlehttp|wget|okhttp|scrapy|panelstart|node-superagent|go-camo|cpp-httplib|axios|https?:\\/\\/)/i' => 'Other',
+        '/^(node)$/i' => 'Other',
         // 其他一些爬虫
         '/(ows.eu|researchscan|github|LogStatistic|Dataprovider|facebook|YandexImages|Iframely|panscient|netcraft|yahoo|censys|Turnitin)/i' => 'Other',
     ];