gavin/blossom
1
0
Fork 0
mirror of https://github.com/blossom-editor/blossom.git synced 2026-03-12 17:41:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

版本变更

Browse Source
This commit is contained in:
xiaozzzi
2023-10-03 00:22:03 +08:00
parent ca6912d144
commit 26ac48fbc0
25 changed files with 61 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
README.md
View File

@@ -2,7 +2,7 @@
<img src="./doc/imgs/icon.png" height="200">
</p>
<p align="center" style="font-size: 30px;font-weight:500;">
Blossom 1.4.1
Blossom 1.5.0
</p>
<p align="center">
<a href="https://www.wangyunf.com/blossom-doc/doc/tryuse">💻️ 试用</a> | <a href="https://www.wangyunf.com/blossom-doc/index">📃 文档</a> | <a href="https://github.com/blossom-editor/blossom/releases">📥 下载</a>
@@ -17,6 +17,7 @@ Blossom 是一个支持**私有部署**的**云端存储双链笔记软件**，
</p>
- 你可以先进行[试用](https://www.wangyunf.com/blossom-doc/doc/tryuse)，我们提供了一个试用账号帮你体验该应用。
- 使用 [Docker / Docker Compose](http://localhost:5174/blossom-doc/doc/backend) 进行部署。
- 阅读[文档](https://www.wangyunf.com/blossom-doc/index)来查看更多使用细节。
---
@@ -25,13 +26,14 @@ Blossom 是一个支持**私有部署**的**云端存储双链笔记软件**，
1. **不再需要为同步设备数量付费**。
2. **不再需要为公网访问付费**。
3. **不再需要为软件付费**,基于[MIT协议](https://choosealicense.com/licenses/mit/)完全开源
3. **不再需要为软件付费**,基于MIT协议完全开源
4. **文章与图片都在你的服务器存储**，不需要再使用任何三方图床，不需要购买任何对象存储。
5. **没有任何私有协议**，基于 Markdown 语法，采用约定格式拓展样式。迁移到其他软件可以正常显示。
6. **多账号权限**，可以和你的朋友一起使用。或者将自己的生活/工作笔记存放在不同账号中。
7. **一键导出**，可以一键导出所有文章和图片，并将图片链接转换为图片路径，轻松转为本地笔记。
8. **网页转换**，可以一键将指定或全部文章转换为网页，方便分享。
9. **丰富的功能拓展**，包含日历计划，待办事项清单，一个完善的个人管理工具。
10. **支持 Docker / Docker Compose 部署**。
#### Blossom 具有以下功能:
1. **文章编辑**：Markdown 文章编写，文章公网访问权限，文章分类管理。
@@ -47,7 +49,14 @@ Blossom 是一个支持**私有部署**的**云端存储双链笔记软件**，
11. **网站收藏**：常用网站快捷访问，或者说是一个书签功能。
12. 笔记总字数折线图，笔记编辑数量热力图，服务器请求量折线图等多种统计。
# 更多 Blossom 图片
# 🚀 Docker Compose 一键部署
```
docker compose -f docker/compose/blossom-mysql8.yaml up -d
```
# 🌄 更多 Blossom 图片
!["编辑器"](./doc/imgs/editor_intro.png)
<p align="center">编辑器</p>
@@ -86,4 +95,10 @@ Blossom 是一个支持**私有部署**的**云端存储双链笔记软件**，
<img src="./doc/imgs/blog_home_m.png" height="700">
<img src="./doc/imgs/home_article_m.png" height="700" style="margin-left: 30px">
</p>
<p align="center">博客移动端</p>
<p align="center">博客移动端</p>
# 🥳 加入群聊
加入群聊进行沟通，反馈问题。
<img src="./doc/imgs/qq.png" height="350">

2
blossom-backend/backend/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>blossom-backend</artifactId>
<groupId>com.blossom</groupId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blossom-backend/common/common-base/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.blossom</groupId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

2
blossom-backend/common/common-cache/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.blossom</groupId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blossom-backend/common/common-db/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.blossom</groupId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blossom-backend/common/common-iaas/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>common</artifactId>
<groupId>com.blossom</groupId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blossom-backend/common/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.blossom</groupId>
<artifactId>blossom-backend</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

2
blossom-backend/expand-sentinel/expand-sentinel-metric/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.blossom</groupId>
<artifactId>expand-sentinel</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blossom-backend/expand-sentinel/expand-sentinel-springmvc/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.blossom</groupId>
<artifactId>expand-sentinel</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blossom-backend/expand-sentinel/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>blossom-backend</artifactId>
<groupId>com.blossom</groupId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

2
blossom-backend/expand-tracker/expand-tracker-core/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>expand-tracker</artifactId>
<groupId>com.blossom</groupId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blossom-backend/expand-tracker/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>blossom-backend</artifactId>
<groupId>com.blossom</groupId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blossom-backend/pom.xml
View File

@@ -14,11 +14,11 @@
<groupId>com.blossom</groupId>
<artifactId>blossom-backend</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
<!-- 版本控制 -->
<properties>
<revision>1.4.1-SNAPSHOT</revision>
<revision>1.5.0-SNAPSHOT</revision>
<!-- 编译设置 -->
<java.version>1.8</java.version>

2
blossom-editor/README.md
View File

@@ -2,7 +2,7 @@
<img src="../doc/imgs/icon.png" height="200">
</p>
<p align="center" style="font-size: 30px;font-weight:500;">
Blossom 1.4.1
Blossom 1.5.0
</p>
<p align="center">
<a href="https://www.wangyunf.com/blossom-doc/doc/tryuse">💻️ 试用</a> | <a href="https://www.wangyunf.com/blossom-doc/index">📃 文档</a> | <a href="https://github.com/blossom-editor/blossom/releases">📥 下载</a>

4
blossom-editor/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "blossom",
"version": "1.4.1",
"version": "1.5.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "blossom",
"version": "1.4.1",
"version": "1.5.0",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {

2
blossom-editor/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "blossom",
"version": "1.4.1",
"version": "1.5.0",
"description": "A markdown editor",
"license": "MIT",
"main": "./out/main/index.js",

10
blossom-editor/src/renderer/index.html
View File

@@ -26,20 +26,17 @@
}
.html-loading {
justify-content: center;
align-items: center;
-webkit-app-region: drag;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
/* background-image: linear-gradient(to bottom right, #8070a1, #3F296A); */
background-image: linear-gradient(to bottom right, #a59aca, #5f479a);
/* background-image: linear-gradient(to bottom right, #7c739f, #c3272b); */
/* background-image: linear-gradient(to bottom right, #1e3b7a, #ca462f); */
z-index: 999999;
display: flex;
justify-content: center;
align-items: center;
}
@@ -58,6 +55,7 @@
}
.html-loading-version {
font-family: 'Jetbrains Mono', 'Consolas', 'Menlo', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
font-size: 15px;
color: #FFF;
opacity: 0.5;
@@ -168,7 +166,7 @@
<br>
<span style="font-size: 13px;">加载中...</span>
</div>
<div class="html-loading-version">V1.4.1</div>
<div class="html-loading-version">V1.5.0</div>
</div>
<script type="module" src="/src/main.ts"></script>
</div>

5
blossom-editor/src/renderer/src/assets/constants/system.ts
View File

@@ -5,12 +5,11 @@ const blossom: any = {
SYS: {
NAME: 'Blossom',
FULL_NAME: 'BLOSSOM-EDITOR',
VERSION: 'v1.4.1',
DATETIME: '2023-09-24',
VERSION: 'v1.5.0',
//
DOC: 'https://www.wangyunf.com/blossom-doc/index',
CONTACT: 'QQ: 491548320 / Email: kuamax888@qq.com',
CONTACT: 'QQ群:522359970 / Email: kuamax888@qq.com',
GITHUB_REPO: 'https://github.com/blossom-editor/blossom',
GITHUB_RELEASE: 'https://github.com/blossom-editor/blossom/releases',
GITEE_REPO: 'https://gitee.com/blossom-editor/blossom'

17
blossom-editor/src/renderer/src/views/index/SettingAbout.vue
View File

@@ -4,16 +4,25 @@
Blossom <span style="font-size: 13px;color: var(--bl-text-color-light);">{{ CONFIG.SYS.VERSION }}</span>
</div>
<bl-row just="center" style="margin-top: 10px;filter: drop-shadow(0 0 3px rgb(184, 184, 184));">
<div @click="toView(CONFIG.SYS.GITHUB_REPO)">
<bl-col @click="toView(CONFIG.SYS.GITHUB_REPO)">
<svg style="width: 25px;height: 25px;cursor: pointer;" aria-hidden="true">
<use xlink:href="#wl-github2"></use>
</svg>
</div>
<div @click="toView(CONFIG.SYS.GITEE_REPO)" style="margin-left: 20px;">
<img alt="GitHub Repo stars" style="margin-top: 10px;"
src="https://img.shields.io/github/stars/blossom-editor/blossom?logo=github&label=Stars&labelColor=AD8CF2&color=fff&cacheSeconds=60">
</bl-col>
<bl-col @click="toView(CONFIG.SYS.GITEE_REPO)" style="margin-left: 20px;">
<svg style="width: 25px;height: 25px;cursor: pointer;" aria-hidden="true">
<use xlink:href="#wl-gitee"></use>
</svg>
</div>
<img style="margin-top: 10px;" src="https://gitee.com/blossom-editor/blossom/badge/star.svg?theme=white">
</bl-col>
</bl-row>
<div class="bl-preview">
<p class="paragraph">

2
blossom-editor/src/renderer/src/views/index/SettingIndex.vue
View File

@@ -20,7 +20,7 @@
</el-tabs>
</div>
<div class="version">
<span>{{ CONFIG.SYS.NAME + ' | ' + CONFIG.SYS.VERSION + ' | ' + CONFIG.SYS.DATETIME }}</span>
<span>{{ CONFIG.SYS.NAME + ' | ' + CONFIG.SYS.VERSION }}</span>
</div>
<bl-row class="footer">
<WaveFooter></WaveFooter>

4
blossom-web/index.html
View File

@@ -103,9 +103,7 @@
<div class="index-html-loading">
<div class="index-html-loading-div"></div>
<div class="index-html-loading-title">
正在加载 Blossom...
<br>
<span>v1.4.1</span>
正在进入 Blossom...
</div>
</div>
<script type="module" src="/src/main.ts"></script>

4
blossom-web/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "blossom-web",
"version": "1.4.1",
"version": "1.5.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "blossom-web",
"version": "1.4.1",
"version": "1.5.0",
"dependencies": {
"axios": "^1.4.0",
"echarts": "^5.4.3",

2
blossom-web/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "blossom-web",
"version": "1.4.1",
"version": "1.5.0",
"private": true,
"scripts": {
"dev": "vite",

2
blossom-web/src/assets/constants/blossom.ts
View File

@@ -6,7 +6,7 @@ const blossom: any = {
NAME: 'Blossom',
SHORT_NAME: 'BLOSSOM-WEB',
// 版本
VERSION: 'v1.4.1',
VERSION: 'v1.5.0',
// 公网安备号
GONG_WANG_AN_BEI: "X公网安备 XXXXXXXXXX号",
// ICP 备案号

BIN
doc/imgs/qq.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 KiB