diff --git a/pom.xml b/pom.xml index 193070370..a2ccf94d9 100755 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,6 @@ UTF-8 1.8 0.0.3 - 1.1.10 1.18.2 3.6.0 1.0 @@ -88,13 +87,6 @@ runtime - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - org.springframework.boot spring-boot-starter-cache diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java index f11a8d7d9..9acf5ae7e 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java @@ -20,7 +20,6 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HtmlUtil; -import com.alibaba.druid.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -343,7 +342,7 @@ public class PostController extends BaseController { urls.append("\n"); } String result = HaloUtils.baiduPost(blogUrl, baiduToken, urls.toString()); - if (StringUtils.isEmpty(result)) { + if (StrUtil.isEmpty(result)) { return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.post.push-to-baidu-failed")); } return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.post.push-to-baidu-success")); diff --git a/src/main/resources/application-docker.yaml b/src/main/resources/application-docker.yaml index e98f67aec..e827c48e0 100755 --- a/src/main/resources/application-docker.yaml +++ b/src/main/resources/application-docker.yaml @@ -8,7 +8,7 @@ server: directBuffers: true spring: datasource: - type: com.alibaba.druid.pool.DruidDataSource + type: com.zaxxer.hikari.HikariDataSource # H2database 配置 driver-class-name: org.h2.Driver diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 65100fbe3..dbb4f6015 100755 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -8,7 +8,7 @@ server: directBuffers: true spring: datasource: - type: com.alibaba.druid.pool.DruidDataSource + type: com.zaxxer.hikari.HikariDataSource # H2database 配置 driver-class-name: org.h2.Driver