From 109e5e07c814f3b0cf5367b324b0e3416418bbf0 Mon Sep 17 00:00:00 2001
From: xiaozzzi <42293085+xiaozzzi@users.noreply.github.com>
Date: Tue, 17 Oct 2023 21:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
blossom-backend/backend/pom.xml | 8 -
blossom-backend/smart-doc-2.6.7/pom.xml | 7 +
.../main/java/com/power/doc}/ApiDocGen.java | 32 +-
.../src/main/resources/dict-db.setting | 0
doc/backend-api/index.html | 2608 ++++++++---------
doc/backend-api/search.js | 188 +-
6 files changed, 1410 insertions(+), 1433 deletions(-)
rename blossom-backend/{backend/src/main/tests => smart-doc-2.6.7/src/main/java/com/power/doc}/ApiDocGen.java (88%)
rename blossom-backend/{backend => smart-doc-2.6.7}/src/main/resources/dict-db.setting (100%)
diff --git a/blossom-backend/backend/pom.xml b/blossom-backend/backend/pom.xml
index e2d1794..0c5cf0a 100644
--- a/blossom-backend/backend/pom.xml
+++ b/blossom-backend/backend/pom.xml
@@ -70,14 +70,6 @@
0.4.20
-
-
- com.github.shalousun
- smart-doc
- ${smart-doc.version}
- test
-
-
diff --git a/blossom-backend/smart-doc-2.6.7/pom.xml b/blossom-backend/smart-doc-2.6.7/pom.xml
index a1eaa62..205c11d 100644
--- a/blossom-backend/smart-doc-2.6.7/pom.xml
+++ b/blossom-backend/smart-doc-2.6.7/pom.xml
@@ -85,6 +85,13 @@
slf4j-api
2.0.5
+
+
+
+ com.blossom
+ backend
+ 1.7.0-SNAPSHOT
+
diff --git a/blossom-backend/backend/src/main/tests/ApiDocGen.java b/blossom-backend/smart-doc-2.6.7/src/main/java/com/power/doc/ApiDocGen.java
similarity index 88%
rename from blossom-backend/backend/src/main/tests/ApiDocGen.java
rename to blossom-backend/smart-doc-2.6.7/src/main/java/com/power/doc/ApiDocGen.java
index aac65c5..67a3a8d 100644
--- a/blossom-backend/backend/src/main/tests/ApiDocGen.java
+++ b/blossom-backend/smart-doc-2.6.7/src/main/java/com/power/doc/ApiDocGen.java
@@ -1,13 +1,10 @@
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.LoggerContext;
-import cn.hutool.core.lang.Dict;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+package com.power.doc;
+
+import cn.hutool.core.date.DateUtil;
import cn.hutool.db.Db;
import cn.hutool.db.Entity;
import cn.hutool.db.ds.DSFactory;
import cn.hutool.setting.Setting;
-import cn.hutool.setting.yaml.YamlUtil;
import com.blossom.backend.base.auth.enums.GrantTypeEnum;
import com.blossom.backend.base.auth.exception.AuthRCode;
import com.blossom.backend.base.user.UserTypeEnum;
@@ -15,12 +12,9 @@ import com.blossom.backend.server.doc.DocTypeEnum;
import com.blossom.backend.server.folder.FolderTypeEnum;
import com.blossom.common.base.enums.YesNo;
import com.blossom.common.base.pojo.RCode;
-import com.blossom.common.base.util.DateUtils;
-import com.blossom.common.base.util.spring.SpringUtil;
import com.power.doc.builder.HtmlApiDocBuilder;
import com.power.doc.model.*;
import lombok.extern.slf4j.Slf4j;
-import org.slf4j.LoggerFactory;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -307,28 +301,12 @@ public class ApiDocGen {
* 设置默认日志级别
*/
static {
- LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
- List loggerList = loggerContext.getLoggerList();
- loggerList.forEach(logger -> logger.setLevel(Level.WARN));
-
System.out.println(SEPARATOR);
- Dict glob = YamlUtil.loadByPath("application.yml");
- Dict deve = YamlUtil.loadByPath("config\\application-dev.yml");
-
- String globalPort = ObjectUtil.isNull(glob.getByPath(SpringUtil.SERVER_PORT)) ? "" : glob.getByPath(SpringUtil.SERVER_PORT).toString();
- String globalContext = ObjectUtil.isNull(glob.getByPath(SpringUtil.SERVLET_CONTEXT_PATH)) ? "" : glob.getByPath(SpringUtil.SERVLET_CONTEXT_PATH).toString();
-
- String devePort = ObjectUtil.isNull(deve.getByPath(SpringUtil.SERVER_PORT)) ? globalPort : deve.getByPath(SpringUtil.SERVER_PORT).toString();
-
- String deveContext = ObjectUtil.isNull(deve.getByPath(SpringUtil.SERVLET_CONTEXT_PATH)) ? globalContext : deve.getByPath(SpringUtil.SERVLET_CONTEXT_PATH).toString();
-
- IP_DEVE = IP_DEVE + ":" + devePort + (StrUtil.isBlank(deveContext) ? "" : "/" + deveContext);
-
- PROJECT_NAME = "《Blossom 接口文档》\n 文档版本:" + VERSION + "\n 文档时间:" + DateUtils.now().substring(0, 16);
+ PROJECT_NAME = "《Blossom 接口文档》\n 文档版本:" + VERSION + "\n 文档时间:" + DateUtil.now();
System.out.println(String.format("准备生成接口文档\n项目:%s \n", PROJECT_NAME));
System.out.println("环境地址:");
- System.out.println(" - DEV : " + IP_DEVE);
+ System.out.println(" - DEV : " + "127.0.0.1:9999");
System.out.println(SEPARATOR);
diff --git a/blossom-backend/backend/src/main/resources/dict-db.setting b/blossom-backend/smart-doc-2.6.7/src/main/resources/dict-db.setting
similarity index 100%
rename from blossom-backend/backend/src/main/resources/dict-db.setting
rename to blossom-backend/smart-doc-2.6.7/src/main/resources/dict-db.setting
diff --git a/doc/backend-api/index.html b/doc/backend-api/index.html
index ba2edb1..bbf81be 100644
--- a/doc/backend-api/index.html
+++ b/doc/backend-api/index.html
@@ -6,9 +6,9 @@
《Blossom 接口文档》
文档版本:v1.7.0
- 文档时间:2023-10-17 21:28
+ 文档时间:2023-10-17 21:58:05
-
+