From 1ec2ae1de380e7e4d6095384b3e87dc52ae2c572 Mon Sep 17 00:00:00 2001 From: jasminexz <491548320@qq.com> Date: Wed, 23 Aug 2023 18:19:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blossom-backend/README.md | 4 +- .../backend/base/auth/AuthService.java | 1 - .../backend/base/param/ParamMapper.java | 2 - .../backend/base/user/UserService.java | 3 - .../backend/base/user/pojo/UserUpdReq.java | 1 - .../config/SpringTaskExecutorConfig.java | 2 - .../java/com/blossom/backend/config/Test.java | 5 -- .../reference/ArticleReferenceController.java | 1 - .../article/stat/ArticleStatController.java | 1 - .../server/article/stat/ArticleStatJob.java | 1 - .../server/folder/FolderController.java | 1 - .../blossom/common/base/caffeine/Test.java | 2 +- .../common/base/util/PrimaryKeyUtil.java | 2 - .../common/cache/pojo/RedisInfoEnum.java | 85 ------------------- .../common/cache/pojo/RedisInfoRes.java | 25 ------ .../blossom/common/db/p6spy/P6SpyLogger.java | 26 ------ .../blossom/common/db/p6spy/spy.properties | 47 ---------- .../blossom/common/iaas/IaasProperties.java | 2 - 18 files changed, 3 insertions(+), 208 deletions(-) delete mode 100644 blossom-backend/common/common-cache/src/main/java/com/blossom/common/cache/pojo/RedisInfoEnum.java delete mode 100644 blossom-backend/common/common-cache/src/main/java/com/blossom/common/cache/pojo/RedisInfoRes.java delete mode 100644 blossom-backend/common/common-db/src/main/java/com/blossom/common/db/p6spy/P6SpyLogger.java delete mode 100644 blossom-backend/common/common-db/src/main/java/com/blossom/common/db/p6spy/spy.properties diff --git a/blossom-backend/README.md b/blossom-backend/README.md index 968303c..0f7e6ff 100644 --- a/blossom-backend/README.md +++ b/blossom-backend/README.md @@ -2,13 +2,12 @@ Blossom 笔记软件的后台服务 -[博客后台的使用文档](https://www.wangyunf.com/blossom-doc/doc/backend) +[Blossom 后台的使用文档](https://www.wangyunf.com/blossom-doc/doc/backend) # 模块说明 ``` root - ├─ aodc 脚本 ├─ backend 后台应用，当不需要多应用部署时，默认使用该应用对外提供所有服务，该应用只写 Controller 层。 ├─ common 项目公共模块 | ├─ common-base 基础对象（如公共响应 R.class），工具类，异常捕获，动态日志级别。 @@ -18,4 +17,5 @@ root | ├─ expand-sentinel 对 Alibaba Sentinel 的封装，拓展了一些功能，实现了一些本地流量查询接口。 └─ expand-tracker 自研的链路追踪核心模块, 源自 tracker-core, 仅提供本地日志记录和日志中插入 Trace 的功能。 + └─ script 数据库与启动脚本 ``` diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/base/auth/AuthService.java b/blossom-backend/backend/src/main/java/com/blossom/backend/base/auth/AuthService.java index c08ccdd..4daab13 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/base/auth/AuthService.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/base/auth/AuthService.java @@ -11,7 +11,6 @@ import com.blossom.backend.base.auth.repo.TokenRepository; import com.blossom.backend.base.auth.token.TokenEncoder; import com.blossom.backend.base.user.UserService; import com.blossom.backend.base.user.pojo.UserEntity; -import com.blossom.common.base.enums.YesNo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/base/param/ParamMapper.java b/blossom-backend/backend/src/main/java/com/blossom/backend/base/param/ParamMapper.java index d45683f..e20b58f 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/base/param/ParamMapper.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/base/param/ParamMapper.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.blossom.backend.base.param.pojo.ParamEntity; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - /** * 系统参数信息的持久化层 * diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/UserService.java b/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/UserService.java index 04fb219..23640ff 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/UserService.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/UserService.java @@ -3,17 +3,14 @@ package com.blossom.backend.base.user; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.blossom.backend.base.auth.AuthContext; import com.blossom.backend.base.auth.security.PasswordEncoder; import com.blossom.backend.base.user.pojo.UserAddReq; import com.blossom.backend.base.user.pojo.UserEntity; import com.blossom.backend.base.user.pojo.UserUpdPwdReq; import com.blossom.common.base.exception.XzException400; -import com.blossom.common.base.exception.XzException404; import com.blossom.common.base.util.security.SaltUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.omg.PortableInterceptor.USER_EXCEPTION; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/pojo/UserUpdReq.java b/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/pojo/UserUpdReq.java index 4b68141..9c54429 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/pojo/UserUpdReq.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/base/user/pojo/UserUpdReq.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * 用户请求 diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/config/SpringTaskExecutorConfig.java b/blossom-backend/backend/src/main/java/com/blossom/backend/config/SpringTaskExecutorConfig.java index c1b3e5c..7f76c02 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/config/SpringTaskExecutorConfig.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/config/SpringTaskExecutorConfig.java @@ -9,8 +9,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.scheduling.TaskScheduler; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/config/Test.java b/blossom-backend/backend/src/main/java/com/blossom/backend/config/Test.java index 84f9e27..c7b736f 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/config/Test.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/config/Test.java @@ -6,11 +6,6 @@ import lombok.extern.slf4j.Slf4j; public class Test { public static void main(String[] args) { - String s = - "**JSR (JavaSpecification Requests)**\\n\\nJSR的意思是“Java 规范提案”。是指向JCP(Java Community Process)提出新增一个标准化技术规范的正式请求。任何人都可以提交JSR，以向Java平台增添新的API和服务。JSR已成为Java界的一个重要标准。简单的就是jsr是java开发者以及授权者指定的标准，而java开发者以及授权者形成一个jcp国际组织。职能是指定java标准。\\n\\n目前已经有超过300个JSR，常见的JSR有：\\n\\n| JSR | Specification or Technology |\\n|-----|-------------------------------------------------------------------------------------------------------------------------------------|\\n| 1 | Real-Time Specification for Java (RTSJ) 1.0 |\\n| 3 | Java Management Extensions (JMX) 1.0, 1.1, & 1.2[1] |\\n| 5 | Java API for XML Processing (JAXP) 1.0 |\\n| 8 | OSGI Open Services Gateway Specification |\\n| 9 | Jiro (Federated Management Architecture Specification) 1.0 |\\n| 12 | Java Data Objects (JDO) 1.0 |\\n| 13 | Improved BigDecimal (Java Platform, Standard Edition#java.math) |\\n| 14 | Add Generic Types To The Java Programming Language (as of J2SE 5.0) |\\n| 16 | J2EE连接器架构 (Java EE Connector Architecture, JCA) 1.0 |\\n| 19 | Enterprise JavaBeans (EJB) 2.0 |\\n| 22 | JAIN SLEE API Specification (JSLEE) 1.0 |\\n| 30 | Connected Limited Device Configuration (CLDC) 1.0 for Java ME |\\n| 31 | Java Architecture for XML Binding (JAXB) 1.0 |\\n| 32 | JAIN SIP API Specification (JSIP) 1.0, 1.1 and 1.2 for Java ME |\\n| 36 | Connected Device Configuration (CDC) 1.0 for Java ME |\\n| 37 | 移动信息设备描述 (Mobile Information Device Profile, MIDP) 1.0 for Java ME |\\n| 40 | Java Metadata Interface (JMI) 1.0 |\\n| 41 | A Simple Assertion Facility (as of J2SE 1.4) |\\n| 47 | Logging API Specification (as of J2SE 1.4) |\\n| 48 | WBEM Services Specification (as of J2SE 1.4) |\\n| 51 | New I/O APIs for the Java Platform (NIO) (as of J2SE 1.4) |\\n| 52 | JavaServer Pages Standard Tag Library (JSTL) 1.0 and 1.1[2] |\\n| 53 | Java Servlet 2.3 and JavaServer Pages (JSP) 1.2 Specifications |\\n| 54 | Java Database Connectivity (JDBC) 3.0 |\\n| 56 | Java Network Launching Protocol and API (JNLP) 1.0, 1.5 and 6.0[3] (Java Web Start) |\\n| 58 | Java 2 Platform, Enterprise Edition (J2EE) 1.3 |\\n| 59 | Java 2 Platform, Standard Edition (J2SE) 1.4 (Merlin) |\\n| 63 | Java API for XML Processing (JAXP) 1.1 and 1.2[4] |\\n| 68 | Java Platform, Micro Edition (Java ME) 1.0 |\\n| 73 | Java Data Mining API (JDM) 1.0 |\\n| 75 | PDA Optional Packages for the J2ME Platform |\\n| 80 | Java USB API |\\n| 82 | Java APIs for Bluetooth |\\n| 88 | Java EE Application Deployment |\\n| 93 | Java API for XML Registries (JAXR) 1.0 |\\n| 94 | Java Rules Engine API |\\n| 102 | Java Document Object Model (JDOM) 1.0 |\\n| 110 | Java APIs for WSDL (WSDL4J) 1.0 |\\n| 112 | J2EE连接器架构 (Java EE Connector Architecture, JCA) 1.5 |\\n| 114 | Java Database Connectivity (JDBC) Rowset Implementations |\\n| 116 | SIP Servlet API 1.0 |\\n| 118 | Mobile Information Device Profile (MIDP) 2.0 for Java ME |\\n| 120 | Wireless Messaging API (WMA) |\\n| 121 | Application Isolation API |\\n| 127 | JavaServer Faces (JSF) 1.0 and 1.1[5] |\\n| 133 | Java Memory Model and Thread Specification Revision |\\n| 135 | Java Mobile Media API (MMAPI) for Java ME |\\n| 139 | Connected Limited Device Configuration (CLDC) 1.1 for Java ME |\\n| 140 | Service Location Protocol (SLP) API for Java |\\n| 141 | 会话描述协议 (Session Description Protocol, SDP) API for Java |\\n| 151 | Java 2 Platform, Enterprise Edition (J2EE) 1.4 |\\n| 152 | JavaServer Pages (JSP) 2.0 |\\n| 153 | Enterprise JavaBeans (EJB) 2.1 |\\n| 154 | Java Servlet 2.4 and 2.5 Specifications[6] |\\n| 160 | Java Management Extensions (JMX) Remote API 1.0 |\\n| 166 | Concurrency Utilities (as of J2SE 5.0 java.util.concurrent, java.util.concurrent.atomic and java.util.concurrent.locks) |\\n| 168 | Portlet specification 1.0 |\\n| 170 | Content repository API for Java (JCR) 1.0 |\\n| 172 | Web Services Specification for Java ME |\\n| 173 | StAX (Streaming API for XML) |\\n| 175 | A Metadata Facility for the Java Programming Language |\\n| 176 | Java 2 Platform, Standard Edition (J2SE) 5.0 (Tiger) |\\n| 177 | Security and Trust Services API for J2ME (SATSA) |\\n| 179 | Location API 1.0 for Java ME |\\n| 180 | Session Initiation Protocol (SIP) API for Java ME |\\n| 181 | Web Services Metadata for the Java Platform |\\n| 184 | Mobile 3D Graphics API for Java ME 1.0 and 1.1 |\\n| 185 | Java Technology for the Wireless Industry (JTWI) |\\n| 187 | 即时通讯(Instant messaging) (Java ME and Java SE) |\\n| 198 | 集成开发环境的标准扩展API |\\n| 199 | Java Compiler API |\\n| 201 | Extending the Java Programming Language with Enumerations, Autoboxing, Enhanced for loops and Static Import (as of J2SE 5.0) |\\n| 202 | Java Class File Specification Update |\\n| 203 | More New I/O APIs for the Java Platform (NIO2) |\\n| 204 | Unicode Supplementary Character Support (as of J2SE 5.0 adds support for Unicode 3.1) |\\n| 205 | Wireless Messaging API 2.0 (WMA) 2.0 |\\n| 206 | Java API for XML Processing (JAXP) 1.3 |\\n| 208 | Java Business Integration (JBI) 1.0 |\\n| 215 | Java Community Process (JCP) 2.6 |\\n| 218 | Connected Device Configuration (CDC) 1.1 for Java ME |\\n| 220 | Enterprise JavaBeans (EJB) 3.0 |\\n| 221 | Java Database Connectivity (JDBC) 4.0 |\\n| 222 | Java Architecture for XML Binding (JAXB) 2.0 |\\n| 223 | Scripting for the Java Platform for Java SE 6 |\\n| 224 | Java API for XML Web Services (JAX-WS), successor of JAX-RPC |\\n| 225 | XQuery API for Java (XQJ) |\\n| 226 | Scalable 2D Vector Graphics API for Java ME |\\n| 229 | Payment API (PAPI) |\\n| 231 | Java Bindings for OpenGL |\\n| 234 | Advanced Multimedia Supplements API for Java ME |\\n| 235 | Service Data Objects (SDO) |\\n| 239 | Java Bindings for OpenGL ES |\\n| 240 | JAIN SLEE API Specification (JSLEE) 1.1 |\\n| 241 | The Groovy Programming Language |\\n| 243 | Java Data Objects (JDO) 2.0 |\\n| 244 | Java Platform, Enterprise Edition (Java EE) 5 |\\n| 245 | JavaServer Pages (JSP) 2.1 |\\n| 247 | Java Data Mining API (JDM) 2.0 |\\n| 248 | Mobile Service Architecture |\\n| 249 | Mobile Service Architecture 2 |\\n| 250 | Common Annotations for the Java Platform (for the Metadata facility for Java) |\\n| 252 | JavaServer Faces (JSF) 1.2 |\\n| 253 | Mobile Telephony API (MTA) |\\n| 255 | Java Management Extensions (JMX) 2.0 |\\n| 256 | Mobile Sensor API |\\n| 257 | Contactless Communication API (NFC) |\\n| 260 | Javadoc Tag Technology Update |\\n| 269 | Pluggable Annotations Processing API (for the Metadata facility for Java) |\\n| 270 | Java Platform, Standard Edition (Java SE) 6 (Mustang) |\\n| 271 | Mobile Information Device Profile (MIDP) 3.0 for Java ME |\\n| 274 | The BeanShell Scripting Language |\\n| 275 | Units specification (see Units of Measurement) |\\n| 276 | Design-time Metadata for JavaServer Faces Components |\\n| 277 | Java Module System |\\n| 280 | XML API for Java ME |\\n| 281 | IMS Services API (See IMS) |\\n| 282 | Real-Time Specification for Java (RTSJ) 1.1 |\\n| 283 | Content Repository for Java Technology 2.0 |\\n| 286 | Portlet Specification 2.0 |\\n| 289 | SIP Servlet API 1.1 |\\n| 290 | Java Language & XML User Interface Markup Integration (XML-UI) |\\n| 291 | Dynamic Component Support for Java SE (see OSGi) |\\n| 292 | Supporting Dynamically Typed Languages on the JavaTM Platform |\\n| 293 | Location API 2.0 for Java ME |\\n| 294 | Improved Modularity Support in the Java Programming Language |\\n| 296 | Swing Application Framework (Java SE 7) |\\n| 299 | Java Contexts and Dependency Injection (Weld) |\\n| 301 | JSF Portlet Bridge |\\n| 303 | Bean Validation |\\n| 307 | Network Mobility and Mobile Data API (not official as of July, 20th, 2007 but official release is planned for 2. Q. 2008 |\\n| 308 | Annotations on Java Types (Java SE 8) |\\n| 311 | Java API for RESTful Web Services (JAX-RS) 1.0 and 1.1 |\\n| 314 | JavaServer Faces (JSF) 2.0 |\\n| 316 | Java Platform, Enterprise Edition (Java EE) 6 |\\n| 317 | Java Persistence API (JPA) 2.0 |\\n| 325 | IMS Communication Enablers (ICE) (See IMS) |\\n| 901 | The Java Language Specification, Third Edition (JLS) (as of J2SE 5.0 incorporates changes from JSRs 14, 41, 133, 175, 201, and 204) |\\n| 907 | Java Transaction API (JTA) 1.0 and 1.1 |\\n| 912 | Java 3D API 1.3 |\\n| 913 | Java Community Process (JCP) 2.0, 2.1 & 2.5[7]. |\\n| 914 | Java Message Service (JMS) API 1.0 and 1.1 |\\n| 924 | Java Virtual Machine Specification, Second Edition (JVM) (as of J2SE 5.0)[8]. |\\n| 926 | Java 3D API 1.5 |\\n\\n\\n\\n## JSR 250\\n\\nJSR-250 注释，它包括\\n\\n- javax.annotation.＠PostConstruct\\n- javax.annotation.＠PreDestroy\\n- javax.annotation.＠Resource\\n\\n### ＠PostConstruct 和 ＠PreDestroy 注释：\\n\\n为了定义一个 bean 的安装和卸载，我们使用 init-method 和/或 destroy-method 参数简单的声明一下 。\\ninit-method 属性指定了一个方法，该方法在 bean 的实例化阶段会立即被调用。同样地，destroy-method 指定了一个方法，该方法只在一个 bean 从容器中删除之前被调用。\\n\\n你可以使用 ＠PostConstruct 注释作为初始化回调函数的一个替代，＠PreDestroy 注释作为销毁回调函数的一个替代\\n\\n## JSR 292\\n\\n添加一个字节码 **invokedynamic** 。用于提供在缺乏静态类型信息时高效和灵活的执行方法调用。\\n\\n**invokedynamic** 是针对 JVM 的，用于更好的支持动态 JVM 语言的函数调用； **JSR292** 实现则提供在 Java 语言层面上的 **invokedynamic** 调用。\\n\\n主要用法：一些比反射更快速，更安全的动态方法调用支持，在很多框架中，创建接口的动态代理对象后，会通过这种方法来调用动态对象方法，如`Feign`\\n\\n```java\\n└─java\\n └─lang\\n ├─invoke\\n | ├─CallSite\\n | ├─ConstantCallSite\\n | ├─MethodHandle\\n | ├─MethodHandleProxies\\n | ├─MethodHandles\\n | ├─MethodHandles.Lookup\\n | ├─MethodType\\n | ├─MutableCallSite\\n | ├─SwitchPoint\\n | └─VolatileCallSite\\n ├─ClassValue\\n └─BootstrapMethodError\\n```\\n\\n"; - - System.out.println(s.replaceAll("\\\\n","\n")); - } } diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/reference/ArticleReferenceController.java b/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/reference/ArticleReferenceController.java index 1ff6d14..a39bfbe 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/reference/ArticleReferenceController.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/reference/ArticleReferenceController.java @@ -1,7 +1,6 @@ package com.blossom.backend.server.article.reference; import com.blossom.backend.base.auth.AuthContext; -import com.blossom.backend.base.auth.annotation.AuthIgnore; import com.blossom.common.base.pojo.R; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/stat/ArticleStatController.java b/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/stat/ArticleStatController.java index 3d7a1c9..5cfff4f 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/stat/ArticleStatController.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/stat/ArticleStatController.java @@ -1,7 +1,6 @@ package com.blossom.backend.server.article.stat; import com.blossom.backend.base.auth.AuthContext; -import com.blossom.backend.base.user.pojo.BlossomUserRes; import com.blossom.backend.config.BlConstants; import com.blossom.backend.server.article.draft.pojo.ArticleStatRes; import com.blossom.backend.server.article.stat.pojo.ArticleHeatmapRes; diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/stat/ArticleStatJob.java b/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/stat/ArticleStatJob.java index 75ab3de..6148f25 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/stat/ArticleStatJob.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/server/article/stat/ArticleStatJob.java @@ -1,7 +1,6 @@ package com.blossom.backend.server.article.stat; import cn.hutool.core.collection.CollUtil; -import com.blossom.backend.base.user.UserController; import com.blossom.backend.base.user.UserService; import com.blossom.backend.base.user.pojo.UserEntity; import com.blossom.backend.server.article.draft.pojo.ArticleStatRes; diff --git a/blossom-backend/backend/src/main/java/com/blossom/backend/server/folder/FolderController.java b/blossom-backend/backend/src/main/java/com/blossom/backend/server/folder/FolderController.java index 560d140..c6fe3c3 100644 --- a/blossom-backend/backend/src/main/java/com/blossom/backend/server/folder/FolderController.java +++ b/blossom-backend/backend/src/main/java/com/blossom/backend/server/folder/FolderController.java @@ -3,7 +3,6 @@ package com.blossom.backend.server.folder; import cn.hutool.core.util.ObjUtil; import com.blossom.backend.base.auth.AuthContext; import com.blossom.backend.config.BlConstants; -import com.blossom.backend.server.article.stat.pojo.ArticleLineRes; import com.blossom.backend.server.folder.pojo.*; import com.blossom.backend.server.utils.DocUtil; import com.blossom.common.base.exception.XzException404; diff --git a/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/caffeine/Test.java b/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/caffeine/Test.java index c8bd64a..dce3a73 100644 --- a/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/caffeine/Test.java +++ b/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/caffeine/Test.java @@ -16,7 +16,7 @@ public class Test { .initialCapacity(100) .expireAfterWrite(10, TimeUnit.SECONDS) .removalListener((String key, String value, RemovalCause cause) -> System.out.println(key + " 被删除")) - .build();; + .build(); private static final ScheduledExecutorService clearUpScheduled = Executors.newScheduledThreadPool(1); public Test() { diff --git a/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/util/PrimaryKeyUtil.java b/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/util/PrimaryKeyUtil.java index 3edd564..399d941 100644 --- a/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/util/PrimaryKeyUtil.java +++ b/blossom-backend/common/common-base/src/main/java/com/blossom/common/base/util/PrimaryKeyUtil.java @@ -4,9 +4,7 @@ package com.blossom.common.base.util; import lombok.extern.slf4j.Slf4j; import java.net.InetAddress; -import java.net.SocketException; import java.net.UnknownHostException; -import java.util.Date; /** * 主键工具类 diff --git a/blossom-backend/common/common-cache/src/main/java/com/blossom/common/cache/pojo/RedisInfoEnum.java b/blossom-backend/common/common-cache/src/main/java/com/blossom/common/cache/pojo/RedisInfoEnum.java deleted file mode 100644 index ad8a6a0..0000000 --- a/blossom-backend/common/common-cache/src/main/java/com/blossom/common/cache/pojo/RedisInfoEnum.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.blossom.common.cache.pojo; - -import cn.hutool.core.util.StrUtil; -import lombok.Getter; - -@SuppressWarnings("all") -public enum RedisInfoEnum { - - active_defrag_hits ("[碎片整理] 活动碎片整理进程每分钟执行的值重新分配数。"), - active_defrag_key_hits ("[碎片整理] 主动碎片整理的键数"), - active_defrag_key_misses ("[碎片整理] 活动碎片整理进程跳过的键数"), - active_defrag_misses ("[碎片整理] "), - active_defrag_running ("[碎片整理] "), - - rdb_changes_since_last_save("[RDB备份] 自上次转储以来的更改数"), - rdb_bgsave_in_progress ("[RDB备份] 是否正在进行RDB保存; 0:否; 1:是;"), - rdb_last_save_time ("[RDB备份] 上次创建RDB文件时间"), - rdb_last_bgsave_status ("[RDB备份] 上次创建RDB文件的结果, ok:成功"), - rdb_last_bgsave_time_sec ("[RDB备份] 上次创建RDB文件用时, 单位:秒"), - rdb_current_bgsave_time_sec("[RDB备份] 正在创建RDB文件的持续时间"), - rdb_last_cow_size ("[RDB备份] 上次创建RDB文件大小, 单位:byte"), - rdb_last_load_keys_expired ("[RDB备份] 7.0属性"), - rdb_last_load_keys_loaded ("[RDB备份] 7.0属性"), - - os ("宿主系统版本"), - arch_bits ("[64/32]位"), - run_id ("随机标识符"), - tcp_port ("端口"), - uptime_in_seconds ("启动秒数"), - uptime_in_days ("启动天数"), - connected_clients ("客户端数"), - blocked_clients ("等待阻塞命令"), - redis_mode ("Redis模式"), - role ("服务器角色,如果该实例不是任何实例的副本,则值为“master”; 如果该实例是某个主实例的副本,则值为“slave”.; 注意: 一个副本可以是另一个副本的主副本(链式复制)."), - connected_slaves ("从服务器数量"), - - used_memory_overhead ("[内存] 服务器为管理其内部数据结构而分配的所有开销(以字节为单位)的总和"), - used_memory ("[内存] Redis分配的内存总量"), - used_memory_human ("[内存] Redis分配的内存总量"), - used_memory_dataset ("[内存] 数据集的大小, 单位:byte; (used_memory - used_memory_overhead)"), - used_memory_dataset_perc ("[内存] used_memory_dataset 占净内存使用量的百分比 (used_memory_dataset / (used_memory - used_memory_startup))"), - used_memory_peak ("[内存] Redis内存消耗峰值"), - used_memory_peak_human ("[内存] Redis内存消耗峰值"), - used_memory_peak_perc ("[内存] 当前内存占峰值的百分比, 即[used_memory/used_memory_peak]"), - used_memory_rss ("[内存] 从操作系统的角度，返回Redis已分配的内存总量(俗称常驻集大小), 这个值和[top/ps]等命令的输出一致."), - used_memory_rss_human ("[内存] 从操作系统的角度，返回Redis已分配的内存总量(俗称常驻集大小), 这个值和[top/ps]等命令的输出一致."), - used_memory_lua ("[内存] Lua脚本占用的内存"), - used_memory_lua_human ("[内存] Lua脚本占用的内存"), - used_memory_scripts ("[内存] 缓存的Lua脚本使用的内存, 单位:byte"), - used_memory_scripts_human ("[内存] 缓存的Lua脚本使用的内存, 单位:byte"), - used_memory_startup ("[内存] Redis在启动时消耗的初始内存量, 单位:byte"), - - total_system_memory_human ("系统总内存"), - total_commands_processed ("服务器已执行的命令数"), - instantaneous_ops_per_sec ("每秒执行的命令数"), - expired_keys ("过期自定删除的键数量"), - evicted_keys ("因为容量限制而驱逐的键数量"), - keyspace_hits ("命中成功的数量"), - keyspace_misses ("命中失败的数量"), - - pubsub_channels("目前被订阅的频道数"), - ; - - @Getter - private String desc; - - RedisInfoEnum(String desc) { - this.desc = desc; - } - - public static String getDesc(String key) { - if (StrUtil.isBlank(key)) { - return ""; - } - - for (RedisInfoEnum value : RedisInfoEnum.values()) { - if (value.name().equals(key)) { - return value.desc; - } - } - - return ""; - } -} - diff --git a/blossom-backend/common/common-cache/src/main/java/com/blossom/common/cache/pojo/RedisInfoRes.java b/blossom-backend/common/common-cache/src/main/java/com/blossom/common/cache/pojo/RedisInfoRes.java deleted file mode 100644 index e1ea0c3..0000000 --- a/blossom-backend/common/common-cache/src/main/java/com/blossom/common/cache/pojo/RedisInfoRes.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.blossom.common.cache.pojo; - -import lombok.Data; - -/** - * redis 信息 - * - * @author xzzz - */ -@Data -public class RedisInfoRes { - - /** - * redis 键 - */ - private String key; - /** - * redis 值 - */ - private String value; - /** - * redis 说明 - */ - private String desc; -} diff --git a/blossom-backend/common/common-db/src/main/java/com/blossom/common/db/p6spy/P6SpyLogger.java b/blossom-backend/common/common-db/src/main/java/com/blossom/common/db/p6spy/P6SpyLogger.java deleted file mode 100644 index 3039fe9..0000000 --- a/blossom-backend/common/common-db/src/main/java/com/blossom/common/db/p6spy/P6SpyLogger.java +++ /dev/null @@ -1,26 +0,0 @@ -//package com.blossom.common.db.p6spy; -// -//import cn.hutool.core.util.StrUtil; -// -//public class P6SpyLogger implements MessageFormattingStrategy { -// -// /** -// * 格式化日志 -// * -// * @param connectionId 链接ID -// * @param now 当前时间 -// * @param elapsed 用时 -// * @param category 科目 -// * @param prepared error,info,batch,debug,statement,commit,rollback,result,resultset -// * @param sql sql -// * @param url 数据库连接 -// * @return 日志格式 -// */ -// @Override -// public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) { -// if (StrUtil.isNotBlank(sql)) { -// return String.format("SQL >> [% 4dms]%s", elapsed, sql.replaceAll("[\\s]+", " ")); -// } -// return ""; -// } -//} \ No newline at end of file diff --git a/blossom-backend/common/common-db/src/main/java/com/blossom/common/db/p6spy/spy.properties b/blossom-backend/common/common-db/src/main/java/com/blossom/common/db/p6spy/spy.properties deleted file mode 100644 index d9b2259..0000000 --- a/blossom-backend/common/common-db/src/main/java/com/blossom/common/db/p6spy/spy.properties +++ /dev/null @@ -1,47 +0,0 @@ -module.log=com.p6spy.engine.logging.P6LogFactory,com.p6spy.engine.outage.P6OutageFactory -# -# -# ==================================================================================== -# ־Ĵӡʽ -# -# Զ־ӡʽ -logMessageFormat=com.blossom.common.db.p6spy.P6SpyLogger -# ֻڿ̨ʾ־ -# appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger -# ѡʹ־ϵͳ¼־ -appender=com.p6spy.engine.spy.appender.Slf4JLogger -# -# -# ==================================================================================== -# p6spy driver -deregisterdrivers=true -# -# -# ==================================================================================== -# ȡJDBC URLǰ׺ -useprefix=true -# -# -# ==================================================================================== -# ü¼ Log ,ȥĽerror,info,batch,debug,statement,commit,rollback,result,resultset. -excludecategories=info,debug,result,batch,resultset -# -# -# ==================================================================================== -# ڸʽ -dateformat=yyyy-MM-dd HH:mm:ss -# -# -# ==================================================================================== -# ʵɶ -#driverlist=org.h2.Driver -# -# -# ==================================================================================== -# ǷSQL¼ -outagedetection=true -# -# -# ==================================================================================== -# SQL¼׼ 1 -outagedetectioninterval=1 \ No newline at end of file diff --git a/blossom-backend/common/common-iaas/src/main/java/com/blossom/common/iaas/IaasProperties.java b/blossom-backend/common/common-iaas/src/main/java/com/blossom/common/iaas/IaasProperties.java index becee6d..b5b4ad3 100644 --- a/blossom-backend/common/common-iaas/src/main/java/com/blossom/common/iaas/IaasProperties.java +++ b/blossom-backend/common/common-iaas/src/main/java/com/blossom/common/iaas/IaasProperties.java @@ -2,7 +2,6 @@ package com.blossom.common.iaas; import cn.hutool.core.util.StrUtil; import lombok.Data; -import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -14,7 +13,6 @@ import javax.annotation.PostConstruct; * * @author xzzz */ -@Slf4j @Data @Configuration @ConfigurationProperties(prefix = "project.iaas")