github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

🎨 替换Druid为HikariCP

pull/41/head
ruibaby 2018-10-25 13:41:42 +08:00
parent 40c8484fe9
commit f69ee6cfaf
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -32,7 +32,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<oh-my-email.version>0.0.3</oh-my-email.version> <oh-my-email.version>0.0.3</oh-my-email.version>
<druid.version>1.1.10</druid.version>
<lombok.version>1.18.2</lombok.version> <lombok.version>1.18.2</lombok.version>
<ehcache.version>3.6.0</ehcache.version> <ehcache.version>3.6.0</ehcache.version>
<rome.version>1.0</rome.version> <rome.version>1.0</rome.version>
@ -88,13 +87,6 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!-- druid数据源 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId> <artifactId>spring-boot-starter-cache</artifactId>

3
src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
View File

@ -20,7 +20,6 @@ import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.http.HtmlUtil; import cn.hutool.http.HtmlUtil;
import com.alibaba.druid.util.StringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@ -343,7 +342,7 @@ public class PostController extends BaseController {
urls.append("\n"); urls.append("\n");
} }
String result = HaloUtils.baiduPost(blogUrl, baiduToken, urls.toString()); 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.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")); return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.post.push-to-baidu-success"));

2
src/main/resources/application-docker.yaml
View File

@ -8,7 +8,7 @@ server:
directBuffers: true directBuffers: true
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.zaxxer.hikari.HikariDataSource
# H2database 配置 # H2database 配置
driver-class-name: org.h2.Driver driver-class-name: org.h2.Driver

2
src/main/resources/application.yaml
View File

@ -8,7 +8,7 @@ server:
directBuffers: true directBuffers: true
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.zaxxer.hikari.HikariDataSource
# H2database 配置 # H2database 配置
driver-class-name: org.h2.Driver driver-class-name: org.h2.Driver