Merge branch 'dev' into release

CHANGELOG.md

@@ -1,3 +1,36 @@
+## :tada: 2.8.1 (2024-04-09)
+
+
+### :sparkles: Features
+
+* **custom:** add api doc for 36677 port ([872a1a7](https://github.com/Kuingsmile/piclist/commit/872a1a7))
+* **custom:** add buildin web server ([ab8b62e](https://github.com/Kuingsmile/piclist/commit/ab8b62e)), closes [#180](https://github.com/Kuingsmile/piclist/issues/180)
+* **custom:** add log for image processing ([e4c1c7f](https://github.com/Kuingsmile/piclist/commit/e4c1c7f))
+* **custom:** add u flag for gallery regexp match ([aa9e535](https://github.com/Kuingsmile/piclist/commit/aa9e535))
+* **custom:** change buildin rename md5 calculate ([bf8d7b4](https://github.com/Kuingsmile/piclist/commit/bf8d7b4)), closes [#178](https://github.com/Kuingsmile/piclist/issues/178)
+* **custom:** exclude svg from watermarker ([75b0c7f](https://github.com/Kuingsmile/piclist/commit/75b0c7f)), closes [#182](https://github.com/Kuingsmile/piclist/issues/182)
+* **custom:** optimize the processing of upload path and custom url ([ae40a16](https://github.com/Kuingsmile/piclist/commit/ae40a16))
+* **custom:** optimize webServer ([e6e9472](https://github.com/Kuingsmile/piclist/commit/e6e9472))
+* **custom:** refactor upload and delete api ([475b85e](https://github.com/Kuingsmile/piclist/commit/475b85e))
+* **custom:** update api doc ([922f04f](https://github.com/Kuingsmile/piclist/commit/922f04f))
+
+
+### :bug: Bug Fixes
+
+* **custom:** fix compatiblity with typora ([762913c](https://github.com/Kuingsmile/piclist/commit/762913c))
+* **custom:** fix error handling in server startup ([cf0450f](https://github.com/Kuingsmile/piclist/commit/cf0450f))
+* **custom:** fix image watermark bug ([8e5e6d4](https://github.com/Kuingsmile/piclist/commit/8e5e6d4))
+
+
+### :pencil: Documentation
+
+* **custom:** add tg group qr code ([5cd34a6](https://github.com/Kuingsmile/piclist/commit/5cd34a6))
+* **custom:** prepare for 2.8.1 ([f73badd](https://github.com/Kuingsmile/piclist/commit/f73badd))
+* **custom:** prepare for 2.81 ([0476346](https://github.com/Kuingsmile/piclist/commit/0476346))
+* **custom:** update tg group link ([20f6acc](https://github.com/Kuingsmile/piclist/commit/20f6acc))
+
+
+
 # :tada: 2.8.0 (2024-03-14)
 
 

README.md

@@ -231,9 +231,11 @@ If you need to build it yourself, you can start building with `yarn run build`.
 
 ## Communication group
 
-If you have any questions, you can join the WeChat group for communication. 
+If you have any questions, you can join the TG group for communication.
 
-![wechat](https://pichoro.msq.pub/wechat.png)
+[PicList TG Group](https://t.me/+rq8y7wsj7Pg5ZTg1)
+
+![tg](https://pichoro.msq.pub/wechat.png)
 
 ## License
 

README_cn.md

@@ -221,9 +221,11 @@ brew uninstall piclist
 
 ## 交流群
 
-如果有任何问题，可以加入微信群进行交流.
+如果有任何问题，可以加入TG群进行交流.
 
-![wechat](https://pichoro.msq.pub/wechat.png)
+[PicList交流群](https://t.me/+rq8y7wsj7Pg5ZTg1)
+
+![tg](https://pichoro.msq.pub/wechat.png)
 
 ## License
 

currentVersion.md

@@ -1,15 +1,22 @@
-💥 Breaking Change
-
-- 由于[C1N短网址](https://www.c1n.cn/)的收费策略修改，预期可使用API的团队版在1000元/年，作者承担费用压力较大，现在修改为自己提供API token
-- 原软件内置提供的c1n token即时失效
-
 ✨ Features
 
-- 新增对cf workers 短链接项目[xyTom/Url-Shorten-Worker](https://github.com/xyTom/Url-Shorten-Worker)的支持
-- 现在相册页面支持强制无视缓存刷新
-- 优化了阿里云图床对无扩增名文件的上传处理
-- 优化了短网址功能的错误日志记录
+- 图床功能优化
+  - 优化了github等图床路径设置为`/`时的处理
+  - 现在会自动对上传路径开始和结尾的`/`进行处理，大部分图床不再强制要求路径以`/`结尾
+  - 优化了对自定义网站的处理，现在会自动去除最后多余的`/`
+- 上传服务器
+  - 现在来自本机的上传请求不再进行鉴权
+  - 现在浏览器访问36677端口会显示API文档（支持`/`和`/upload`路径）
+  - 现在`heartbeat`接口支持`GET`请求
+- 新增内置web服务支持，默认在37777端口开启一个简易web服务器，类似`EasyWebSvr`
+- 现在不再对`svg`图片进行水印处理
+- 现在内置高级重命名中`{md5}`使用文件内容而非文件名字符串计算
+- 现在相册URL修改功能的正则匹配增加了`u`修饰符
+- 现在设置界面的弹出窗口支持拖拽调整位置
+- 现在图片处理过程会记录错误日志
 
 🐛 Bug Fixes
 
-- 修复了buffer上传时的文件名错误
+- 修复了设置了服务器鉴权密钥后，Typora上传失败的问题
+- 修复了未设置水印文字时，图片水印功能无法生效的bug
+- 修复了server端口被占用时，端口探测功能没有正常发挥作用的问题

currentVersion_en.md

@@ -1,15 +1,22 @@
-💥 Breaking Change
-
-- Due to the upcoming changes in the charging policy of [C1N short URL](https://www.c1n.cn/), the expected team version that can use the API will be around 1000 yuan/year, and the author bears a greater pressure on the cost. Now it is changed to provide the API token by yourself
-- The c1n token provided by the original software is immediately invalid
-
 ✨ Features
 
-- Added support for the cf workers short link project [xyTom/Url-Shorten-Worker](https://github.com/xyTom/Url-Shorten-Worker)
-- Now the album page supports forced cache refresh
-- Optimized the upload processing of files without extension names for Aliyun image bed
-- Optimized error log recording for short URL function
+- Picture bed function optimization
+  - Optimized the processing of the path set to `/` for github and other picture beds
+  - Now it will automatically process the `/` at the beginning and end of the upload path, and most picture beds no longer require the path to end with `/`
+  - Optimized the processing of custom websites, now it will automatically remove the extra `/` at the end
+- Upload server
+  - Now the upload requests from the local machine no longer require authentication
+  - Now browsing port 36677 will display the API document (support `/` and `/upload` paths)
+  - Now the `heartbeat` interface supports `GET` requests
+- Added built-in web service support, a simple web server is opened by default on port 37777, similar to `EasyWebSvr`
+- Now no longer watermark `svg` images
+- Now the `{md5}` in the advanced rename uses the file content instead of the file name string for calculation
+- The regular expression matching of the album URL modification function now adds the `u` modifier
+- Now the pop-up window in the settings interface supports dragging to adjust the position
+- Now the image processing process will record error logs
 
 🐛 Bug Fixes
 
-- Fixed the file name error when uploading buffer
+- Fix the problem of Typora upload failure after setting the server authentication key
+- Fixed the bug that the image watermark function does not take effect when the watermark text is not set
+- Fixed the problem that the port detection function does not work properly when the server port is occupied

package.json

@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "author": {
     "name": "Kuingsmile",
     "email": "[email protected]"
@@ -46,7 +46,7 @@
     "@smithy/node-http-handler": "^2.1.6",
     "@videojs-player/vue": "^1.0.0",
     "ali-oss": "^6.18.1",
-    "axios": "^1.6.2",
+    "axios": "^1.6.8",
     "compare-versions": "^4.1.3",
     "core-js": "^3.33.3",
     "cos-nodejs-sdk-v5": "^2.12.5",
@@ -68,7 +68,7 @@
     "multer": "^1.4.5-lts.1",
     "node-ssh-no-cpu-features": "^1.0.1",
     "nodejs-file-downloader": "^4.12.1",
-    "piclist": "^1.7.12",
+    "piclist": "^1.8.3",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.0",
     "proxy-agent": "^5.0.0",

public/i18n/en.yml

@@ -209,6 +209,14 @@ SETTINGS_ENABLE_SERVER: Enable Server
 SETTINGS_SET_SERVER_HOST: Set Server Host
 SETTINGS_SET_SERVER_PORT: Set Server Port
 SETTINGS_SET_SERVER_KEY: Set Auth Key
+SETTINGS_SET_WEB_SERVER: Set Web Server
+SETTINGS_TIPS_WEB_SERVER_NOTICE: If you don't know what is the web server's function, please read the document, or don't modify the configuration.
+SETTINGS_SET_ENABLE_WEB_SERVER: Enable Web Server
+SETTINGS_SET_WEB_SERVER_HOST: Set Web Server Host
+SETTINGS_SET_WEB_SERVER_PORT: Set Web Server Port
+SETTINGS_SET_WEB_SERVER_PATH: Set Web Server Path
+SETTINGS_TIP_PLACEHOLDER_WEB_HOST: Default:127.0.0.1
+SETTINGS_TIP_PLACEHOLDER_WEB_PORT: Default:37777
 SETTINGS_TIP_PLACEHOLDER_HOST: Default:127.0.0.1
 SETTINGS_TIP_PLACEHOLDER_PORT: Default:36677
 SETTINGS_TIP_PLACEHOLDER_KEY: This key is used to avoid malicious requests, through urlParams '?key=xxx' to pass

public/i18n/zh-CN.yml

@@ -211,6 +211,14 @@ SETTINGS_ENABLE_SERVER: 是否开启Server
 SETTINGS_SET_SERVER_HOST: 设置监听地址
 SETTINGS_SET_SERVER_PORT: 设置监听端口
 SETTINGS_SET_SERVER_KEY: 设置鉴权密钥
+SETTINGS_SET_WEB_SERVER: 设置Web服务
+SETTINGS_TIPS_WEB_SERVER_NOTICE: 如果你不知道Web服务的作用，请阅读文档，或者不用修改配置。
+SETTINGS_SET_ENABLE_WEB_SERVER: 是否开启Web服务
+SETTINGS_SET_WEB_SERVER_HOST: 设置Web服务监听地址
+SETTINGS_SET_WEB_SERVER_PORT: 设置Web服务监听端口
+SETTINGS_SET_WEB_SERVER_PATH: 设置Web服务路径
+SETTINGS_TIP_PLACEHOLDER_WEB_HOST: 推荐默认地址:127.0.0.1
+SETTINGS_TIP_PLACEHOLDER_WEB_PORT: 推荐默认端口:37777
 SETTINGS_TIP_PLACEHOLDER_HOST: 推荐默认地址:127.0.0.1
 SETTINGS_TIP_PLACEHOLDER_PORT: 推荐默认端口:36677
 SETTINGS_TIP_PLACEHOLDER_KEY: 用于接口鉴权, 通过url参数添加'?key=xxx'

public/i18n/zh-TW.yml

@@ -209,6 +209,14 @@ SETTINGS_ENABLE_SERVER: 是否開啟Server
 SETTINGS_SET_SERVER_HOST: 設定監聽地址
 SETTINGS_SET_SERVER_PORT: 設定監聽端口
 SETTINGS_SET_SERVER_KEY: 設定鑒權密鑰
+SETTINGS_SET_WEB_SERVER: 設定Web服務
+SETTINGS_TIPS_WEB_SERVER_NOTICE: 如果你不知道Web服務的作用，請閱讀文檔，或者不用修改設定。
+SETTINGS_SET_ENABLE_WEB_SERVER: 是否開啟Web服務
+SETTINGS_SET_WEB_SERVER_HOST: 設定Web服務地
+SETTINGS_SET_WEB_SERVER_PORT: 設定Web服務端口
+SETTINGS_SET_WEB_SERVER_PATH: 設定Web服務路徑
+SETTINGS_TIP_PLACEHOLDER_WEB_HOST: 推薦預設地址:127.0.0.1
+SETTINGS_TIP_PLACEHOLDER_WEB_PORT: 推薦預設端口:37777
 SETTINGS_TIP_PLACEHOLDER_HOST: 推薦預設地址:127.0.0.1
 SETTINGS_TIP_PLACEHOLDER_PORT: 推薦預設端口:36677
 SETTINGS_TIP_PLACEHOLDER_KEY: 用於接口鑒權, 通過url參數添加'?key=xxx'

src/main/apis/app/shortKey/shortKeyHandler.ts

@@ -18,6 +18,7 @@ import shortKeyService from './shortKeyService'
 
 // External utility functions
 import { TOGGLE_SHORTKEY_MODIFIED_MODE } from '#/events/constants'
+import { configPaths } from '~/universal/utils/configPaths'
 
 class ShortKeyHandler {
   private isInModifiedMode: boolean = false
@@ -33,7 +34,7 @@ class ShortKeyHandler {
   }
 
   private initBuiltInShortKey () {
-    const commands = db.get('settings.shortKey') as IShortKeyConfigs
+    const commands = db.get(configPaths.settings.shortKey._path) as IShortKeyConfigs
     Object.keys(commands)
       .filter(item => item.includes('picgo:'))
       .forEach(command => {
@@ -175,7 +176,7 @@ class ShortKeyHandler {
   }
 
   unregisterPluginShortKey (pluginName: string) {
-    const commands = db.get('settings.shortKey') as IShortKeyConfigs
+    const commands = db.get(configPaths.settings.shortKey._path) as IShortKeyConfigs
     const keyList = Object.keys(commands)
       .filter(command => command.includes(pluginName))
       .map(command => {
@@ -187,7 +188,7 @@ class ShortKeyHandler {
     keyList.forEach(item => {
       globalShortcut.unregister(item.key)
       shortKeyService.unregisterCommand(item.command)
-      db.unset('settings.shortKey', item.command)
+      db.unset(configPaths.settings.shortKey._path, item.command)
     })
   }
 }