From 54d289c8f1a54084e4953fb1c313f5f1d508fe55 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Mon, 9 Oct 2023 23:18:09 +0800 Subject: [PATCH] :sparkles: Feature: built-in server will listen to 0.0.0.0 other than 127.0.0.1 --- README.md | 3 ++- README_cn.md | 3 ++- currentVersion.md | 10 ++++------ currentVersion_en.md | 10 ++++------ package.json | 2 +- src/main/server/index.ts | 10 ++++++++-- yarn.lock | 8 ++++---- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 4fab5a5..6b9aee1 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ PicList `V1.5.0` and above versions provide the `one-click migration` function. ## PicList-Core -The core of PicList is based on the original PicGo-Core [PicList-core](https://github.com/Kuingsmile/PicList-Core), which is adapted for cloud deletion and other functions, and adds watermark addition and image compression / scaling / rotation / format conversion functions, which can be called through CLI command line, as well as some other function changes. +The core of PicList is based on the original PicGo-Core [PicList-core](https://github.com/Kuingsmile/PicList-Core), which is adapted for cloud deletion and other functions, and adds watermark addition and image compression / scaling / rotation / format conversion functions, which can be called through CLI command line, support starting the built-in upload server through `picgo-server`，as well as some other function changes. if you want to use PicList-core, please go to [https://github.com/Kuingsmile/PicList-Core](https://github.com/Kuingsmile/PicList-Core), or go to [npm official address](https://www.npmjs.com/package/piclist) to view the installation instructions. @@ -38,6 +38,7 @@ if you want to use PicList-core, please go to [https://github.com/Kuingsmile/Pic - Within the album, you can synchronize the deletion of cloud images. This is supported across all built-in image hosts and multiple plugins. - The album now offers advanced search and sorting features, as well as batch URL modification. - Built-in tools for adding watermarks, compressing images, scaling images, rotating images, and converting image formats are now available. Advanced renaming is also supported. +- Upload interface supports form upload files, can be shared by multiple computers - Configuration can be synchronized to Github or Gitee repositories. - Manages over ten types of image hosting platforms, allowing online viewing of cloud directories, file searching, batch uploading, batch downloading, file deletion, and more. - Support previewing multiple formats of files, including pictures, videos, plain text files and markdown files, etc. For the specific formats supported, please refer to [Supported file format list](https://github.com/Kuingsmile/PicList/blob/dev/supported_format.md) diff --git a/README_cn.md b/README_cn.md index e3dadc1..3f65d77 100644 --- a/README_cn.md +++ b/README_cn.md @@ -27,7 +27,7 @@ PicList `V1.5.0`以上版本提供 `一键迁移`功能，进入 `设置`页面 ## PicList-Core -PicList的内核使用的是原版PicGo-Core基础上修改的[PicList-core](https://github.com/Kuingsmile/PicList-Core)，为云端删除等功能做了适配，同时，新增了水印添加和图片压缩/缩放/旋转/格式转换等功能，可以通过CLI命令行调用，还有一些其他的功能改动。 +PicList的内核使用的是原版PicGo-Core基础上修改的[PicList-core](https://github.com/Kuingsmile/PicList-Core)，为云端删除等功能做了适配，同时，新增了水印添加和图片压缩/缩放/旋转/格式转换等功能，可以通过CLI命令行调用，支持通过`picgo-server`命令开启上传服务器，还有一些其他的功能改动。 如果您希望使用PicList-core，请前往[https://github.com/Kuingsmile/PicList-Core](https://github.com/Kuingsmile/PicList-Core)，或者前往[npm官方地址](https://www.npmjs.com/package/piclist)查看安装说明。 @@ -38,6 +38,7 @@ PicList的内核使用的是原版PicGo-Core基础上修改的[PicList-core](htt - 相册中可同步删除云端图片，支持所有内置图床和多个插件 - 相册新增了高级搜索和排序，批量修改URL等功能 - 内置水印添加、图片压缩、图片缩放、图片旋转和图片格式转换等功能，同时支持高级重命名 +- 上传接口支持表单上传文件，可多电脑共用 - 支持配置同步至Github或Gitee仓库 - 支持管理十余种图床，可以在线进行云端目录查看、文件搜索、批量上传、批量下载、删除文件等 - 支持预览多种格式的文件，包括图片、视频、纯文本文件和markdown文件等，具体支持的格式请参考[支持的文件格式列表](https://github.com/Kuingsmile/PicList/blob/dev/supported_format.md) diff --git a/currentVersion.md b/currentVersion.md index 60bda47..461390d 100644 --- a/currentVersion.md +++ b/currentVersion.md @@ -1,11 +1,9 @@ ✨ Features -- 相册页面只显示最后一级文件名，不包含额外的路径 -- 现在更新提示窗口会显示更新日志，方便用户查看 +- 现在已经设置了水印字体文件路径或者使用图片水印时，不再检查内置字体文件 +- PicList和PicList-Core的内置服务器现在均支持通过`formData`的方式上传图片文件 +- PicList-Core现在支持通过`picgo-server`启动内置上传服务器，使用方式与PicList的内置服务器相同 🐛 Bug Fixes -- 修复了从Obsidian插件删除图片时，webdav图床和SFTP图床无法删除的问题 -- 修复了用户无ssh权限时，sftp图床无法进行云端删除的问题 -- 修复了sftp图床上传时，即使出错仍然会判断为上传成功的问题 -- 修复了sftp图床上传时，会额外创建空文件夹的问题 \ No newline at end of file +- 修复了没有新建临时文件夹导致本地图床上传失败的问题 diff --git a/currentVersion_en.md b/currentVersion_en.md index dac0d31..93b09b2 100644 --- a/currentVersion_en.md +++ b/currentVersion_en.md @@ -1,11 +1,9 @@ ✨ Features -- Now the album page only displays the last level file name, without additional path -- Now the update prompt window will display the update log, which is convenient for users to view +- Now that the watermark font file path has been set or the image watermark is used, the built-in font file is no longer checked +- The built-in server of PicList and PicList-Core now support uploading image files through `formData` +- PicList-Core now supports starting the built-in upload server through `picgo-server`, and the usage is the same as the built-in server of PicList 🐛 Bug Fixes -- Fixed the problem that webdav and SFTP cannot be deleted when deleting pictures from Obsidian plugin -- Fixed the problem that sftp image bed cannot be deleted in the cloud when the user has no ssh permission -- Fixed the problem that when uploading to sftp image bed, it will still be judged as upload success even if there is an error -- Fixed the problem that when uploading to sftp image bed, an empty folder will be created additionally +- Fix the problem that the local image bed upload fails due to not creating a new temporary folder \ No newline at end of file diff --git a/package.json b/package.json index 2a32fe4..1ec7a47 100644 --- a/package.json +++ b/package.json @@ -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.3.1", + "piclist": "^1.3.3", "pinia": "^2.1.6", "pinia-plugin-persistedstate": "^3.2.0", "qiniu": "^7.9.0", diff --git a/src/main/server/index.ts b/src/main/server/index.ts index d726469..1e14681 100644 --- a/src/main/server/index.ts +++ b/src/main/server/index.ts @@ -40,10 +40,13 @@ class Server { const result = this.checkIfConfigIsValid(config) if (result) { this.config = config + if (this.config.host === '127.0.0.1') { + this.config.host = '0.0.0.0' + } } else { config = { port: 36677, - host: '127.0.0.1', + host: '0.0.0.0', enable: true } this.config = config @@ -141,7 +144,7 @@ class Server { // port as string is a bug private listen = (port: number | string) => { - logger.info(`[PicList Server] is listening at ${port}`) + logger.info(`[PicList Server] is listening at ${port} of ${this.config.host}`) if (typeof port === 'string') { port = parseInt(port, 10) } @@ -177,6 +180,9 @@ class Server { restart () { this.config = picgo.getConfig('settings.server') + if (this.config.host === '127.0.0.1') { + this.config.host = '0.0.0.0' + } this.shutdown() this.startup() } diff --git a/yarn.lock b/yarn.lock index 3b29dad..9a7d614 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12688,10 +12688,10 @@ performance-now@^2.1.0: resolved "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -piclist@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.3.1.tgz#1a626a3c5cf253c47fe88207a4b9822f6a89c580" - integrity sha512-huF+IOm9R7AwO7OZexHUsv9y5pJuHUlLE1W1FTVJCB0bkdUMw4hCz2OiXcujIXXSJxQ6UUUSE4F8GK7MvTD8YQ== +piclist@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.3.3.tgz#3e56e807f931c24e8b39009c4d63e26f809371a9" + integrity sha512-k716fioNvkq+VMU2q+YCR/Hi4IO5/0x8p6ghhw86sQBchDSxg8aQ7mqmgKCMSc39+iOQCZGVamBjSsueDEe+Aw== dependencies: "@picgo/i18n" "^1.0.0" "@picgo/store" "^2.1.0"