博客端与后端集成，博客端配置外置

2025-12-06 16:58:26 +08:00 · 2023-12-12 21:39:07 +08:00 · 2023-12-12 21:39:07 +08:00 · 3a38515103
commit 3a38515103
parent 853c6866f6
41 changed files with 437 additions and 272 deletions
--- a/blossom-backend/.gitignore
+++ b/blossom-backend/.gitignore
@ -1,9 +1,16 @@
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**
+#!**/src/main/**
 !**/src/test/**

+### static ###
+/backend/src/main/resources/static/blog/**
+!/backend/src/main/resources/static/blog/README.md
+
+/backend/src/main/resources/static/editor/**
+!/backend/src/main/resources/static/editor/README.md
+
 ### STS ###
 .apt_generated
 .classpath
--- a/blossom-backend/backend/pom.xml
+++ b/blossom-backend/backend/pom.xml
@ -14,14 +14,10 @@
    <properties>
        <java-jwt.version>4.3.0</java-jwt.version> <!-- JWT -->
        <smart-doc.version>2.6.7-BL-SNAPSHOT</smart-doc.version>
+        <thumbnailator.version>0.4.20</thumbnailator.version>
    </properties>

    <dependencies>
-        <dependency>
-            <groupId>com.blossom</groupId>
-            <artifactId>blossom-web</artifactId>
-            <version>1.10.0-SNAPSHOT</version>
-        </dependency>

        <dependency>
            <groupId>com.blossom</groupId>
@ -72,14 +68,9 @@
        <dependency>
            <groupId>net.coobird</groupId>
            <artifactId>thumbnailator</artifactId>
-            <version>0.4.20</version>
+            <version>${thumbnailator.version}</version>
        </dependency>

-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-thymeleaf</artifactId>-->
-<!--        </dependency>-->
-
    </dependencies>

    <build>
--- a/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/UserController.java
+++ b/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/UserController.java
@ -1,5 +1,6 @@
 package com.blossom.backend.base.user;

+import cn.hutool.core.util.ObjUtil;
 import com.blossom.backend.base.param.ParamEnum;
 import com.blossom.backend.base.param.ParamService;
 import com.blossom.backend.base.sys.SysService;
@ -10,6 +11,7 @@ import com.blossom.backend.server.article.stat.ArticleStatService;
 import com.blossom.backend.base.auth.AuthContext;
 import com.blossom.backend.base.auth.annotation.AuthIgnore;
 import com.blossom.common.base.exception.XzException400;
+import com.blossom.common.base.exception.XzException404;
 import com.blossom.common.base.pojo.R;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@ -54,7 +56,9 @@ public class UserController {
        if (userId == null) {
            return R.ok(new BlossomUserRes());
        }
-        BlossomUserRes user = userService.selectById(userId).to(BlossomUserRes.class);
+        UserEntity u = userService.selectById(userId);
+        XzException404.throwBy(ObjUtil.isNull(u), "用户不存在");
+        BlossomUserRes user = u.to(BlossomUserRes.class);
        ArticleStatRes stat = articleService.statCount(null, null, userId);
        user.setArticleWords(stat.getArticleWords());
        user.setArticleCount(stat.getArticleCount());
--- a/blossom-backend/backend/src/main/java/com/blossom/backend/config/WebConfigurer.java
+++ b/blossom-backend/backend/src/main/java/com/blossom/backend/config/WebConfigurer.java
@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.http.CacheControl;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@ -16,6 +17,7 @@ import org.springframework.web.servlet.config.annotation.*;

 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;


 /**
@ -79,25 +81,8 @@ public class WebConfigurer implements WebMvcConfigurer {
    }

    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(userTypeInterceptor())
-                .addPathPatterns("/**")
-                .excludePathPatterns(
-                        "/blog/**",
-                        "/assets/**"
-                );
-
-    }
-
-    @Override
-    public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/blog/").setViewName("/blog/index.html");
-    }
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/blog/**").addResourceLocations("classpath:/META-INF/resources/webjars/blossom-web/");
-        registry.addResourceHandler("/assets/**").addResourceLocations("classpath:/META-INF/resources/webjars/blossom-web/assets/");
+    public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
+        configurer.setTaskExecutor(executor);
    }

    @Bean
@ -105,9 +90,36 @@ public class WebConfigurer implements WebMvcConfigurer {
        return new UserTypeInterceptor();
    }

-
    @Override
-    public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
-        configurer.setTaskExecutor(executor);
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userTypeInterceptor())
+                .addPathPatterns("/**")
+                .excludePathPatterns(
+                        "/blog/**",
+                        "/editor/**"
+                );
+
+    }
+
+    /**
+     * 页面映射
+     */
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/blog/").setViewName("/blog/index.html");
+        registry.addViewController("/editor/").setViewName("/editor/index.html");
+    }
+
+    /***
+     * 静态文件处理
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/editor/**")
+                .addResourceLocations("classpath:/static/editor/")
+                .setCacheControl(CacheControl.maxAge(48, TimeUnit.HOURS).cachePublic());
+        registry.addResourceHandler("/blog/**")
+                .addResourceLocations("classpath:/static/blog/")
+                .setCacheControl(CacheControl.maxAge(48, TimeUnit.HOURS).cachePublic());
    }
 }
--- a/blossom-backend/backend/src/main/resources/config/application-dev.yml
+++ b/blossom-backend/backend/src/main/resources/config/application-dev.yml
@ -1,3 +1,7 @@
+#server:
+#  servlet:
+#    context-path: /dev
+
 spring:
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
@ -74,9 +78,6 @@ project:
    os-type: blossom
    blos:
      # 请以 /pic 结尾, 如果你在 nginx 中配置有代理, 注意别忘了添加你的代理路径
-      domain: "http://localhost:9999/pic/"
+      domain: "http://localhost:9999/dev/pic/"
      # 请以 / 开头, / 结尾, 简短的路径在文章中有更好的显示效果, 过长一定程度会使文章内容混乱
      default-path: "/home/bl/img/"
-server:
-  servlet:
-    context-path: /dev
--- a/blossom-backend/backend/src/main/resources/config/application-prod.yml
+++ b/blossom-backend/backend/src/main/resources/config/application-prod.yml
@ -50,6 +50,7 @@ project:
    white-list: # 白名单
      - /sentinel/**
      - /blog/**
+      - /editor/**
      - /assets/**
  # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫ Cache/Redis ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
  cache: # 缓存
--- a/blossom-backend/backend/src/main/resources/config/application-test.yml
+++ b/blossom-backend/backend/src/main/resources/config/application-test.yml
@ -0,0 +1,83 @@
+server:
+  port: 9997
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/blossom-all?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&allowMultiQueries=true&useSSL=false&&serverTimezone=GMT%2B8
+    username: root
+    password: jasmine888
+    hikari:
+      max-lifetime: 120000
+
+logging:
+  level:
+    com.blossom: info
+    com.blossom.expand.tracker: info
+    com.blossom.backend.base.auth: info
+    org.springframework.boot.web.embedded.tomcat.TomcatWebServer: warn
+    com.baomidou.dynamic.datasource.DynamicRoutingDataSource: warn
+    com.zaxxer.hikari.HikariDataSource: warn
+    org.apache.coyote.http11.Http11NioProtocol: warn
+
+# ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫ project ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+project:
+  base:
+    version: @project.version@
+    ex:
+      # 异常打印格式 all/project
+      stack-trace: project
+      # format/line
+      format: format
+    # 动态日志级别配置
+    log:
+      duration: 600000 # 动态日志级别 6 分钟后失效
+      restore-duration: 30000 # 30 秒判断一次是否失效
+  db:
+    slow-interval: 200 # 慢SQL
+  # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫ Auth ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  auth: # 授权
+    enabled: true # 开启授权
+    # 请求日志: com.blossom.backend.base.auth.enums.LogTypeEnum
+    log-type: simple
+    # 授权 token 的方式, 注意, 如果使用 redis, 需要引入 redis 包, 否则会提示错误
+    # com.blossom.backend.base.auth.enums.AuthTypeEnum
+    type: caffeine
+    default-password: 123456 # 默认密码
+    password-encoder: bcrypt # 加密方式
+    clients: # 客户端
+      - client-id: blossom
+        grant-type: 'password'
+        duration: 21600 # 客户端授权时间 6 小时
+        multi-place-login: true # 客户端是否允许多地登录
+    white-list: # 白名单
+      - /sentinel/**
+      - /blog/**
+      - /editor/**
+      - /assets/**
+  # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫ Cache/Redis ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  cache: # 缓存
+    names-config: # 缓存键超时时间配置
+      - name: test_cache1
+        seconds: 10
+  # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫ Tracker ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  # 一个简易的链路追踪功能, 会在日志中输出 traceId
+  tracker:
+    collector:
+      enabled: false # 关闭收集器
+      max-cache: 5000
+      rate: 100
+    repository:
+      type: disk1 # 关闭存储
+      disk:
+        use-pid: true
+        log-dir: /logs/tracker
+  # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫  IAAS   ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  iaas:
+    os-type: blossom
+    blos:
+      # 请以 /pic 结尾, 如果你在 nginx 中配置有代理, 注意别忘了添加你的代理路径
+      # 注意：在下方示例中, /bl 即为 nginx 反向代理路径, 如果你的访问路径中不包含反向代理或路径不同, 请酌情删除或修改
+      domain: "https://www.wangyunf.com/blall/pic/"
+      # 请以 / 开头, / 结尾, 简短的路径在文章中有更好的显示效果, 过长一定程度会使文章内容混乱
+      default-path: "/home/blall/img/"
--- a/blossom-backend/backend/src/main/resources/static/blog/README.md
+++ b/blossom-backend/backend/src/main/resources/static/blog/README.md
@ -0,0 +1,7 @@
+博客静态文件放置位置，若在 blossom-web 项目中打包，需使用:
+
+```bash
+npm run build:spring
+```
+
+会自动将打包产物打包至该位置。
--- a/blossom-backend/backend/src/main/resources/static/editor/README.md
+++ b/blossom-backend/backend/src/main/resources/static/editor/README.md
@ -0,0 +1 @@
+客户端静态文件放置位置。
--- a/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/config/WebMvcConfig.java
+++ b/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/config/WebMvcConfig.java
@ -28,17 +28,6 @@ public class WebMvcConfig implements WebMvcConfigurer {
     */
    @Override
    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/editor/**")
-                .addResourceLocations("classpath:/static/editor/")
-                .setCacheControl(CacheControl.maxAge(48, TimeUnit.HOURS).cachePublic());
-
-        /*
-        博客因无法获取域名, 暂不支持集成
-        registry.addResourceHandler("/blog/**")
-                .addResourceLocations("classpath:/static/blog/")
-                .setCacheControl(CacheControl.maxAge(4, TimeUnit.MINUTES).cachePublic());
-         */
-
        registry.addResourceHandler("/favicon.ico")
                .addResourceLocations("classpath:/static/favicon.png")
                .setCacheControl(CacheControl.maxAge(10, TimeUnit.SECONDS).cachePublic());
--- a/blossom-editor/src/renderer/index.html
+++ b/blossom-editor/src/renderer/index.html
@ -389,7 +389,7 @@
              <br />
              <span style="font-size: 13px">加载中...</span>
            </div>
-            <div class="html-loading-version">Blossom | v1.9.0</div>
+            <div class="html-loading-version">Blossom | v1.10.0</div>
          </div>
        </div>
      </div>
--- a/blossom-editor/src/renderer/src/env.d.ts
+++ b/blossom-editor/src/renderer/src/env.d.ts
@ -2,9 +2,9 @@

 interface ImportMetaEnv {
  /**
-   * 使用环境
+   * 基础URL
   */
-  readonly RENDERER_VITE_MODE: string
+  readonly VITE_BLOSSOM_BASE_URI: string
 }

 interface ImportMeta {
--- a/blossom-editor/src/renderer/src/views/home/ArticleSubjects.vue
+++ b/blossom-editor/src/renderer/src/views/home/ArticleSubjects.vue
@ -160,9 +160,10 @@ $width-item: 210px;

  .subject-icon,
  .menu-icon-img {
-    @include box(55px, 55px);
-    @include absolute('', 2px, 8px, '');
+    @include box(50px, 50px);
+    @include absolute('', 5px, 8px, '');
    @include themeFilter(drop-shadow(0 0 3px rgb(62, 62, 62)), drop-shadow(0 0 3px #000000));
+    border-radius: 4px;
  }

  .infos {
--- a/blossom-editor/src/renderer/src/views/note/NoteIndex.vue
+++ b/blossom-editor/src/renderer/src/views/note/NoteIndex.vue
@ -21,7 +21,8 @@
      </bl-row>
    </div>
    <div class="note-container">
-      <section :class="['note', note.top == 1 ? 'note-top' : '']" v-for="note in notes" :key="note.id">
+      <div v-if="isEmpty(notes)" class="placeholder">无便签</div>
+      <section v-else v-for="note in notes" :key="note.id" :class="['note', note.top == 1 ? 'note-top' : '']">
        <div class="cd" @click="saveToStorage(note.content)" @click.right="copyContent(note.content)">
          <img src="@renderer/assets/imgs/note/cd.png" />
        </div>
@ -53,11 +54,12 @@
 import { nextTick, onMounted, ref } from 'vue'
 import { CopyDocument } from '@element-plus/icons-vue'
 import { noteAllApi, noteUpdApi, noteDelApi, noteTopApi } from '@renderer/api/note'
-import NoteEditor from '@renderer/views/note/NoteEditor.vue'
 import { TempTextareaKey } from '@renderer/views/article/scripts/article'
 import { Local } from '@renderer/assets/utils/storage'
 import { ElMessage } from 'element-plus'
 import { writeText } from '@renderer/assets/utils/electron'
+import { isEmpty } from 'lodash'
+import NoteEditor from '@renderer/views/note/NoteEditor.vue'

 onMounted(() => {
  getNoteList()
@ -140,6 +142,11 @@ const notes = ref<any>([])
    overflow: auto;
    overflow-y: overlay;

+    .placeholder {
+      @include font(14px, 300);
+      color: var(--bl-text-color-light);
+    }
+
    .note {
      position: relative;
      @include box(250px, 354px);
--- a/blossom-editor/src/renderer/src/views/picture/PictureBatchDel.vue
+++ b/blossom-editor/src/renderer/src/views/picture/PictureBatchDel.vue
@ -18,7 +18,7 @@
 </template>

 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
+import { ref } from 'vue'

 const isLoading = ref(false)
 const delDone = ref({ done: false, msg: '' })
--- a/blossom-web/.env
+++ b/blossom-web/.env
@ -1 +0,0 @@
-VITE_BLOSSOM_BASE_URI=/
--- a/blossom-web/.env.development
+++ b/blossom-web/.env.development
@ -1 +0,0 @@
-VITE_BLOSSOM_BASE_URI=/dev
--- a/blossom-web/env.d.ts
+++ b/blossom-web/env.d.ts
@ -1 +0,0 @@
-/// <reference types="vite/client" />
--- a/blossom-web/env/.env.spring
+++ b/blossom-web/env/.env.spring
@ -0,0 +1 @@
+VITE_BL_API_BASE_URI=../
--- a/blossom-web/env/env.d.ts
+++ b/blossom-web/env/env.d.ts
@ -0,0 +1,20 @@
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  /**
+   * API 的基础 URL
+   */
+  readonly VITE_BL_API_BASE_URI: string
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv
+}
+
+declare module '*.vue' {
+  import type { DefineComponent } from 'vue'
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  const component: DefineComponent<{}, {}, any>
+
+  export default component
+}
--- a/blossom-web/global.d.ts
+++ b/blossom-web/global.d.ts
@ -0,0 +1,32 @@
+export {}
+
+declare global {
+  interface Window {
+    blconfig: {
+      SYS: {
+        NAME: string
+        LOGO: string
+        GONG_WANG_AN_BEI: string
+        ICP_BEI_AN_HAO: string
+        EMAIL: string
+      }
+      THEME: {
+        LOGO_STYLE: {
+          'border-radius': string
+        }
+        SUBJECT_TITLE: string
+      }
+      DOMAIN: {
+        PRD: string
+        USER_ID: string
+      }
+      LINKS: [
+        {
+          NAME: string
+          URL: string
+          LOGO: string
+        }
+      ]
+    }
+  }
+}
--- a/blossom-web/index.html
+++ b/blossom-web/index.html
@ -6,6 +6,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <meta name="referrer" content="no-referrer" />
    <title>Blossom</title>
+    <script src="/config.js"></script>
    <style>
      * {
        font-family: 'ubuntu mono', 'Consolas', 'Menlo', 'PingFang SC', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
--- a/blossom-web/package.json
+++ b/blossom-web/package.json
@ -4,7 +4,9 @@
  "private": true,
  "scripts": {
    "dev": "vite",
+    "dev:spring": "vite --mode spring",
    "build": "run-p type-check build-only",
+    "build:spring": "vite build --mode spring",
    "preview": "vite preview",
    "build-only": "vite build",
    "type-check": "vue-tsc --noEmit --skipLibCheck"
--- a/blossom-web/pom.xml
+++ b/blossom-web/pom.xml
@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.blossom</groupId>
-    <artifactId>blossom-web</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
-    <distributionManagement>
-        <repository>
-            <id>github</id>
-            <name>GitHub MetaCode Apache Maven Packages</name>
-            <url>https://maven.pkg.github.com/metacode-project/metacode-maven-packages</url>
-        </repository>
-    </distributionManagement>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
-                <!-- NB! Set <version> to the latest released version of frontend-maven-plugin, like in README.md -->
-                <version>1.14.0</version>
-                <configuration>
-                    <installDirectory>target</installDirectory>
-                    <nodeVersion>v16.13.1</nodeVersion>
-                    <yarnVersion>v1.22.19</yarnVersion>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install node and yarn</id>
-                        <goals>
-                            <goal>install-node-and-yarn</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>yarn config set registry</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>yarn install</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>install</arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>yarn build</id>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>build</arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>dist</directory>
-                <targetPath>META-INF/resources/webjars/blossom-web</targetPath>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-    </build>
-
-</project>
--- a/blossom-web/src/assets/imgs/linklogo/blossom_logo.png
+++ b/blossom-web/src/assets/imgs/linklogo/blossom_logo.png
--- a/blossom-web/public/config.js
+++ b/blossom-web/public/config.js
@ -0,0 +1,51 @@
+window.blconfig = {
+  /**
+   * 基础配置
+   */
+  SYS: {
+    // 修改该值可以改变网页左上角名称, 你可以改为你的名称
+    NAME: 'Blossom',
+    // 公网安备号
+    GONG_WANG_AN_BEI: '',
+    // ICP 备案号
+    ICP_BEI_AN_HAO: '',
+    // 邮箱
+    EMAIL: ''
+  },
+  /**
+   * 博客样式，当前可设置样式如下：
+   * 1. 左上角 LOGO 样式
+   * 2. 专题文件夹的特殊样式显示
+   */
+  THEME: {
+    LOGO_STYLE: {
+      // 左上角 LOGO 的圆角设置
+      'border-radius': '50%'
+    },
+    // 是否以特殊样式显示专题文件夹
+    SUBJECT_TITLE: true
+  },
+  /**
+   * 服务器的地址
+   */
+  DOMAIN: {
+    // 将该值填写为你的后台访问地址, 与 blossom 客户端登录页面填写的地址相同
+    PRD: 'http://localhost:9999',
+    // 将该值填写你开放为博客的用户ID
+    USER_ID: 1
+  },
+  /**
+   * 可以填写你自己的网站，该信息会展示在右上角的【更多】按钮中，以及首页的【所有文章】下
+   * NAME: 网站名称
+   * URL: 网站地址
+   * LOGO: 网站LOGO地址
+   */
+  LINKS: [
+    // 下方是一个示例
+    // {
+    //   NAME: 'Blossom 双链笔记软件',
+    //   URL: 'https://www.wangyunf.com/blossom-doc/index.html',
+    //   LOGO: 'https://www.wangyunf.com/bl/pic/home/bl/img/U1/head/blossom_logo.png'
+    // }
+  ]
+}
--- a/blossom-web/src/api/request.ts
+++ b/blossom-web/src/api/request.ts
@ -6,16 +6,18 @@ import { Local } from '@/assets/utils/storage'
 import { isNotNull } from '@/assets/utils/obj'
 import pinia from '@/stores/store-config'
 import { storeKey as authKey, useUserStore } from '@/stores/user'
-import SYSTEM from '@/assets/constants/blossom'
+import { getApiBaseUrl, getUserId } from '@/scripts/env'

 const userStore = useUserStore(pinia)
+const userId = getUserId()
+const baseUrl = getApiBaseUrl()

 export class Request {
  /** axios 实例 */
  instance: AxiosInstance
  /** 基础配置，url和超时时间 */
  baseConfig: AxiosRequestConfig = {
-    baseURL: SYSTEM.DOMAIN.PRD,
+    baseURL: baseUrl,
    timeout: 60000
  }
  /**
@ -34,11 +36,10 @@ export class Request {
        if (isNotNull(tokenCache) && isNotNull(tokenCache.token)) {
          token = tokenCache.token
        }
-        console.log(config.url, 'token: ' + tokenCache.token)
        config.headers = {
          ...config.headers,
          ...{
-            'Blossom-User-Id': SYSTEM.DOMAIN.USER_ID,
+            'Blossom-User-Id': userId,
            Authorization: 'Bearer ' + token
          }
        }
--- a/blossom-web/src/assets/constants/blossom.ts
+++ b/blossom-web/src/assets/constants/blossom.ts
@ -1,57 +1,5 @@
 const blossom = {
-  /**
-   * 基础配置
-   */
-  SYS: {
-    // 修改该值可以改变网页左上角名称, 你可以改为你的名称
-    NAME: 'Blossom',
-    // 博客左上角 LOGO 文件名称, 文件需要放在 src/assets/imgs/logo/ 路径下
-    LOGO: 'blossom_logo.png',
-    // 版本
-    VERSION: 'v1.9.0',
-    // 公网安备号
-    GONG_WANG_AN_BEI: 'X公网安备 XXXXXXXXXX号',
-    // ICP 备案号
-    ICP_BEI_AN_HAO: '京ICP备123123123号',
-    // 邮箱
-    EMAIL: ''
-  },
-  /**
-   * 博客样式，当前可设置样式如下：
-   * 1. 左上角 LOGO 样式
-   * 2. 专题文件夹的特殊样式显示
-   */
-  THEME: {
-    LOGO_STYLE: {
-      // 左上角 LOGO 的圆角设置
-      'border-radius': '50%'
-    },
-    // 是否以特殊样式显示专题文件夹
-    SUBJECT_TITLE: true
-  },
-  /**
-   * 服务器的地址
-   */
-  DOMAIN: {
-    // 将该值填写为你的后台访问地址, 与 blossom 客户端登录页面填写的地址相同
-    PRD: import.meta.env.VITE_BLOSSOM_BASE_URI,
-    // 将该值填写你开放为博客的用户ID
-    USER_ID: 1
-  },
-  /**
-   * 可以填写你自己的网站，该信息会展示在右上角的【更多】按钮中，以及首页的【所有文章】下
-   * NAME: 网站名称
-   * URL: 网站地址
-   * LOGO: 网站LOGO, 放在 src/assets/imgs/linklogo/ 路径下
-   */
-  LINKS: [
-    // 下方是一个示例
-    // {
-    //   NAME: '我的个人主页',
-    //   URL: 'https://www.wangyunf.com',
-    //   LOGO: 'luban.png'
-    // }
-  ] as any[]
+  SYS: { VERSION: 'v1.10.0' }
 }

 export default blossom
--- a/blossom-web/src/assets/imgs/linklogo/guardcat_logo.jpg
+++ b/blossom-web/src/assets/imgs/linklogo/guardcat_logo.jpg
--- a/blossom-web/src/assets/imgs/linklogo/luban.png
+++ b/blossom-web/src/assets/imgs/linklogo/luban.png
--- a/blossom-web/src/assets/imgs/logo/blossom_logo.png
+++ b/blossom-web/src/assets/imgs/logo/blossom_logo.png
--- a/blossom-web/src/components/NotFound.vue
+++ b/blossom-web/src/components/NotFound.vue
@ -1,34 +1,25 @@
 <template>
  <div class="notfound-root">
-    <div class="notfount">
-      404
-    </div>
-    <div class="desc">
-      未找到该页面, 您可能想前往
-    </div>
+    <div class="notfount">404</div>
+    <div class="desc">您可能想前往....</div>
    <div class="router">
-      <div class="item" v-for="link in SYSTEM.LINKS" @click="toView(link.URL)">
-        <img :src="getImg(link.LOGO)" style="width: 25px;">{{ link.NAME }}
-      </div>
+      <div class="item" @click="toRoute('/home')"><span class="iconbl bl-a-home1-line"></span>回到首页</div>
+      <div class="item" v-for="link in getLinks()" @click="toView(link.URL)"><img :src="link.LOGO" style="width: 25px" />{{ link.NAME }}</div>
    </div>
  </div>
 </template>

 <script setup lang="ts">
-import SYSTEM from '@/assets/constants/blossom'
 import { toView } from '@/assets/utils/util'
-
-const getImg = (img: string) => {
-  return new URL(`../assets/imgs/linklogo/${img}`, import.meta.url).href
-}
+import { toRoute } from '@/router'
+import { getLinks } from '@/scripts/env'
 </script>

 <style scoped lang="scss">
 .notfound-root {
  @include box(100%, 100%);
  @include flex(column, center, center);
-  background-image: linear-gradient(to bottom right, #3e464e, #0c0c11);
-
+  background-image: linear-gradient(to right bottom, rgb(62, 70, 78), rgb(33, 33, 33));

  .notfount {
    @include font(260px, 700);
@ -37,11 +28,13 @@ const getImg = (img: string) => {

  .desc {
    @include font(30px, 300);
-    color: rgb(88, 88, 88);
+    color: #9b9b9b;
+    padding-bottom: 10px;
  }

  .router {
-    color: rgb(88, 88, 88);
+    font-weight: 300;
+    color: #9b9b9b;

    img {
      margin-right: 5px;
@ -50,7 +43,18 @@ const getImg = (img: string) => {
    .item {
      @include flex(row, flex-start, center);
      margin-top: 10px;
+      height: 35px;
      cursor: pointer;
+
+      img {
+        margin: 5px 10px 5px 0;
+      }
+
+      .iconbl {
+        font-size: 30px;
+        padding-right: 5px;
+        color: #9b9b9b;
+      }
    }
  }
 }
--- a/blossom-web/src/scripts/env.ts
+++ b/blossom-web/src/scripts/env.ts
@ -0,0 +1,90 @@
+import { isNull } from '@/assets/utils/obj'
+
+const springBaseUrl = import.meta.env.VITE_BL_API_BASE_URI
+const print = () => {
+  console.log('Blossom-web ===> 环境:', import.meta.env.MODE)
+  console.log('Blossom-web ===> window.blconfig.DOMAIN:', window.blconfig.DOMAIN.PRD)
+  console.log('Blossom-web ===> SpringBaseUrl:', springBaseUrl)
+  if (import.meta.env.DEV) {
+    console.log(window.blconfig)
+  }
+}
+
+print()
+
+/**
+ * 是否集成到 Spring 环境
+ * @returns
+ */
+export const isSpring = () => {
+  return import.meta.env.MODE === 'spring'
+}
+
+export const getApiBaseUrl = () => {
+  if (isSpring()) {
+    return '../'
+  }
+  return window.blconfig.DOMAIN.PRD
+}
+
+export const getUserId = () => {
+  if (isNull(window.blconfig.DOMAIN.USER_ID)) {
+    return 1
+  }
+  return window.blconfig.DOMAIN.USER_ID
+}
+
+//#region ------------------------------------------- 基础信息 -------------------------------------------
+
+export const getSysName = () => {
+  if (isNull(window.blconfig.SYS.NAME)) {
+    return 'Blossom'
+  }
+  return window.blconfig.SYS.NAME
+}
+
+export const getEmail = () => {
+  if (isNull(window.blconfig.SYS.EMAIL)) {
+    return ''
+  }
+  return window.blconfig.SYS.EMAIL
+}
+
+export const getGwab = () => {
+  if (isNull(window.blconfig.SYS.GONG_WANG_AN_BEI)) {
+    return ''
+  }
+  return window.blconfig.SYS.GONG_WANG_AN_BEI
+}
+
+export const getIpc = () => {
+  if (isNull(window.blconfig.SYS.ICP_BEI_AN_HAO)) {
+    return ''
+  }
+  return window.blconfig.SYS.ICP_BEI_AN_HAO
+}
+
+//#endregion
+
+export const getThemeLogoStyle = () => {
+  if (isNull(window.blconfig.THEME.LOGO_STYLE)) {
+    return {
+      'border-radius': '50%'
+    }
+  }
+  return window.blconfig.THEME.LOGO_STYLE
+}
+
+export const getThemeSubjecTitle = () => {
+  if (isNull(window.blconfig.THEME.SUBJECT_TITLE)) {
+    return true
+  }
+  return window.blconfig.THEME.SUBJECT_TITLE
+}
+
+export const getLinks = () => {
+  if (isNull(window.blconfig.LINKS)) {
+    return []
+  }
+  return window.blconfig.LINKS
+}
--- a/blossom-web/src/views/Index.vue
+++ b/blossom-web/src/views/Index.vue
@ -12,18 +12,13 @@
 </template>

 <script setup lang="ts">
-import { ref, watch, onMounted, computed } from 'vue'
+import { ref, watch, computed } from 'vue'
 import router from '@/router'
-import { checkToken } from '@/scripts/auth'
 import IndexHeader from './index/IndexHeader.vue'
 import type { RouteRecordName } from 'vue-router'

 const includeRouter = ref<any>(['Home'])

-onMounted(() => {
-  // checkToken()
-})
-
 const curRoute = ref<RouteRecordName>('Home')

 const isHome = computed(() => {
@ -42,8 +37,6 @@ watch(
  },
  { immediate: true }
 )
-
-onMounted(() => {})
 </script>
 <style scoped lang="scss">
 .index-root {
--- a/blossom-web/src/views/article/DocTitle.vue
+++ b/blossom-web/src/views/article/DocTitle.vue
@ -27,7 +27,7 @@
 import { computed } from 'vue'
 import type { PropType } from 'vue'
 import { isNotBlank } from '@/assets/utils/obj'
-import SYSTEM from '@/assets/constants/blossom'
+import { getThemeSubjecTitle } from '@/scripts/env'

 //#region ----------------------------------------< 标题信息 >--------------------------------------

@ -60,7 +60,7 @@ const tags = computed(() => {
 })

 const titleClass = computed(() => {
-  if (!SYSTEM.THEME.SUBJECT_TITLE) {
+  if (!getThemeSubjecTitle()) {
    return 'doc-title'
  }

--- a/blossom-web/src/views/index/Home.vue
+++ b/blossom-web/src/views/index/Home.vue
@ -1,8 +1,5 @@
 <template>
  <div class="blossom-home-root">
-    <!-- <div class="home-header">
-      <IndexHeader></IndexHeader>
-    </div> -->
    <div class="home-main">
      <div class="home-main-userinfo">
        <UserInfo></UserInfo>
@ -18,16 +15,16 @@
    </div>
    <div class="home-footer">
      <div class="about-us">
-        <span>{{ blossom.SYS.VERSION + (isNotBlank(blossom.SYS.EMAIL) ? ' | 邮箱：' + blossom.SYS.EMAIL : '') }}</span>
+        <span>{{ blossom.SYS.VERSION + (isNotBlank(getEmail()) ? ' | 邮箱：' + getEmail() : '') }}</span>
      </div>
      <div class="icp">
        <div style="cursor: pointer" @click="openNew('http://www.beian.gov.cn/portal/index.do')">
          <!-- <img style="height: 14px; width: 14px" src="@/assets/imgs/common/gong_wang_an_bei_img.png" /> -->
-          {{ blossom.SYS.GONG_WANG_AN_BEI }}
+          {{ getGwab() }}
        </div>
-        <div v-if="isNotBlank(blossom.SYS.GONG_WANG_AN_BEI)">|</div>
+        <div v-if="isNotBlank(getGwab())">|</div>
        <div style="cursor: pointer" @click="openNew('https://beian.miit.gov.cn/')">
-          {{ blossom.SYS.ICP_BEI_AN_HAO }}
+          {{ getIpc() }}
        </div>
      </div>
    </div>
@ -36,12 +33,12 @@

 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
-import IndexHeader from './IndexHeader.vue'
 import UserInfo from './HomeUserInfo.vue'
 import ChartLineWords from './ChartLineWords.vue'
 import HomeSubject from './HomeSubject.vue'
 import blossom from '@/assets/constants/blossom'
 import { isNotBlank } from '@/assets/utils/obj'
+import { getGwab, getIpc, getEmail } from '@/scripts/env'

 const ChartLineWordsRef = ref()
 onMounted(() => {
@ -57,8 +54,6 @@ const openNew = (url: string) => {
 .blossom-home-root {
  @include box(100%, 100%);
  @include flex(column, center, center);
-  // box-shadow: 0 0 10px #24272c;
-  // background-image: linear-gradient(to bottom right, #3e464e, #212121);
  position: relative;
  overflow: hidden;

--- a/blossom-web/src/views/index/HomeUserInfo.vue
+++ b/blossom-web/src/views/index/HomeUserInfo.vue
@ -15,7 +15,7 @@
      <div class="userinfo-content-btns">
        <ul>
          <li @click="toRoute('/articles')">所有文章 <span class="iconbl bl-sendmail-line"></span></li>
-          <li v-for="link in SYSTEM.LINKS" @click="toView(link.URL)">
+          <li v-for="link in getLinks()" @click="toView(link.URL)">
            {{ link.NAME }}
          </li>
        </ul>
@ -33,9 +33,10 @@
 import { toRoute } from '@/router'
 import { onMounted, ref } from 'vue'
 import { userinfoApi } from '@/api/blossom'
-import ChartHeatmap from './ChartHeatmap.vue'
-import SYSTEM from '@/assets/constants/blossom'
 import { toView } from '@/assets/utils/util'
+import SYSTEM from '@/assets/constants/blossom'
+import { getLinks } from '@/scripts/env'
+import ChartHeatmap from './ChartHeatmap.vue'

 const userinfo = ref({
  avatar: '',
@ -74,7 +75,7 @@ onMounted(() => {
      padding-left: 20px;

      .name {
-        @include font(38px, 200);
+        @include font(38px, 300);
        height: 65px;
        color: #ffffff;
        letter-spacing: 5px;
@ -82,7 +83,7 @@ onMounted(() => {
      }

      .desc {
-        @include font(13px, 500);
+        @include font(13px, 300);
        height: 20px;
        color: #7a7a7a;
        letter-spacing: 1px;
@ -102,7 +103,7 @@ onMounted(() => {

      ol,
      ul {
-        @include font(15px, 500);
+        @include font(15px, 300);
        color: #7a7a7a;
        text-align: left;

--- a/blossom-web/src/views/index/IndexHeader.vue
+++ b/blossom-web/src/views/index/IndexHeader.vue
@ -2,9 +2,9 @@
  <div :class="['blossom-header-root', props.bg ? 'blossom-header-bg' : '']">
    <bl-row class="head-row" width="auto" height="100%">
      <div class="blossom-logo" @click="toLogin">
-        <img :src="logo" :style="SYSTEM.THEME.LOGO_STYLE" />
+        <img src="/blog-logo.png" :style="getThemeLogoStyle()" />
      </div>
-      <div class="project-name" @click="toRoute('/home')">{{ SYSTEM.SYS.NAME }}</div>
+      <div class="project-name" @click="toRoute('/home')">{{ getSysName() }}</div>
    </bl-row>

    <bl-row class="head-row" width="auto" height="100%">
@ -17,11 +17,11 @@
        :offset="-5"
        transition="el-zoom-in-top">
        <template #reference>
-          <div v-show="SYSTEM.LINKS != undefined && SYSTEM.LINKS.length > 0" class="popper-target">更多</div>
+          <div v-show="getLinks().length > 0" class="popper-target">更多</div>
        </template>
        <div class="popper-content">
-          <div class="item" v-for="link in SYSTEM.LINKS" @click="toView(link.URL)">
-            <img :src="getImg(link.LOGO)" style="width: 25px" />{{ link.NAME }}
+          <div class="item" v-for="link in getLinks()" @click="toView(link.URL)">
+            <img :src="link.LOGO" style="width: 25px" />{{ link.NAME }}
          </div>
        </div>
      </el-popover>
@ -59,7 +59,7 @@ import { toRoute } from '@/router'
 import { toView } from '@/assets/utils/util'
 import { useUserStore } from '@/stores/user'
 import { logout } from '@/scripts/auth'
-import SYSTEM from '@/assets/constants/blossom'
+import { getLinks, getSysName, getThemeLogoStyle } from '@/scripts/env'

 const userStore = useUserStore()

@ -70,12 +70,6 @@ const props = defineProps({
  }
 })

-const logo = new URL(`../../assets/imgs/logo/${SYSTEM.SYS.LOGO}`, import.meta.url).href
-
-const getImg = (img: string) => {
-  return new URL(`../../assets/imgs/linklogo/${img}`, import.meta.url).href
-}
-
 let recount: NodeJS.Timeout | undefined
 const tryLoginCount = ref(0)

--- a/blossom-web/src/views/index/Login.vue
+++ b/blossom-web/src/views/index/Login.vue
@ -2,9 +2,9 @@
  <div class="login-root">
    <div class="login-form">
      <bl-col just="center" class="logo" height="auto">
-        <img :src="logo" :style="SYSTEM.THEME.LOGO_STYLE" />
+        <img src="/blog-logo.png" :style="getThemeLogoStyle()" />
        <br />
-        <bl-row class="title" just="center">{{ SYSTEM.SYS.NAME }}</bl-row>
+        <bl-row class="title" just="center">{{ getSysName() }}</bl-row>
      </bl-col>
      <el-input class="login-input" size="default" v-model="formLogin.username">
        <template #prepend>用户名</template>
@ -24,9 +24,7 @@
 import { ref } from 'vue'
 import { toRoute } from '@/router'
 import { login } from '@/scripts/auth'
-import SYSTEM from '@/assets/constants/blossom'
-
-const logo = new URL(`../../assets/imgs/logo/${SYSTEM.SYS.LOGO}`, import.meta.url).href
+import { getSysName, getThemeLogoStyle } from '@/scripts/env'

 const formLogin = ref({ username: '', password: '' })

--- a/blossom-web/tsconfig.json
+++ b/blossom-web/tsconfig.json
@ -1,11 +1,12 @@
 {
  "extends": "@vue/tsconfig/tsconfig.web.json",
  "include": [
-    "env.d.ts",
+    "env/env.d.ts",
    "src/**/*",
    "src/**/*.vue",
    "src/**/*.d.ts",
-    "declaration.d.ts"
+    "declaration.d.ts",
+    "global.d.ts"
  ],
  "compilerOptions": {
    "baseUrl": "./",
--- a/blossom-web/vite.config.ts
+++ b/blossom-web/vite.config.ts
@ -1,7 +1,7 @@
 import { fileURLToPath, URL } from 'node:url'

 import { defineConfig } from 'vite'
-import { visualizer } from 'rollup-plugin-visualizer';
+import { visualizer } from 'rollup-plugin-visualizer'
 import vue from '@vitejs/plugin-vue'
 import vueJsx from '@vitejs/plugin-vue-jsx'

@ -10,20 +10,23 @@ import ElementPlus from 'unplugin-element-plus/vite'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
+import { resolve } from 'path'
+
+const npm_lifecycle_event = process.env.npm_lifecycle_event
+
+const isSpring = () => {
+  return npm_lifecycle_event && npm_lifecycle_event === 'build:spring'
+}
+
+console.log('当前运行脚本: ', npm_lifecycle_event)

 // https://vitejs.dev/config/
 export default defineConfig({
  base: './',
+  envDir: resolve('env'),
  server: {
-    host: "0.0.0.0",
-    // 开发环境代理
-    proxy: {
-      '/dev': {
-        target:'http://127.0.0.1:9999/',
-      },
-    },
+    host: '0.0.0.0',
    port: 5174,
-    //vue3 vite配置热更新不用手动刷新
    hmr: true
  },
  plugins: [
@ -31,19 +34,19 @@ export default defineConfig({
    vueJsx(),
    visualizer({
      emitFile: false,
-      filename: "stats.html", //分析图生成的文件名
+      filename: 'stats.html', // 分析图生成的文件名
      open: true //如果存在本地服务端口，将在打包后自动展示
    }),
    // ElementPlus 按需引入的插件
    AutoImport({
-      resolvers: [ElementPlusResolver()],
+      resolvers: [ElementPlusResolver()]
    }),
    Components({
-      resolvers: [ElementPlusResolver()],
+      resolvers: [ElementPlusResolver()]
    }),
    ElementPlus({
      // options
-    }),
+    })
  ],
  resolve: {
    alias: {
@ -53,22 +56,24 @@ export default defineConfig({
  css: {
    preprocessorOptions: {
      scss: {
-        /**如果引入多个文件，可以使用
+        /**
+         * 如果引入多个文件，可以使用
         * '@import "@/assets/scss/globalVariable1.scss";
         * @import"@/assets/scss/globalVariable2.scss";'
-         **/
-        additionalData: '@import "@/assets/styles/config.scss";',
+         */
+        additionalData: '@import "@/assets/styles/config.scss";'
      }
    }
  },
  build: {
+    outDir: isSpring() ? '../blossom-backend/backend/src/main/resources/static/blog' : 'dist',
    // 警告大小, 单位kb
    // chunkSizeWarningLimit: 1000,
    rollupOptions: {
      output: {
        manualChunks(id) {
          if (id.includes('node_modules')) {
-            return id.toString().split('node_modules/')[1].split('/')[0].toString();
+            return id.toString().split('node_modules/')[1].split('/')[0].toString()
          }
        }
      }