From 20e6c7c944e9220abd7443a24828e1911cff1524 Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Mon, 30 Mar 2020 17:15:59 +0800
Subject: [PATCH] Merge branch 'master' into dev

# Conflicts:
#	src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java
#	src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java
#	src/main/java/com/rymcu/vertical/util/BaiDuUtils.java
#	src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java
---
 .../{dynProps4Files => props}/DynProps4FilesService.java        | 2 +-
 .../vertical/core/service/redis/impl/RedisServiceImpl.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/main/java/com/rymcu/vertical/core/service/{dynProps4Files => props}/DynProps4FilesService.java (99%)

diff --git a/src/main/java/com/rymcu/vertical/core/service/dynProps4Files/DynProps4FilesService.java b/src/main/java/com/rymcu/vertical/core/service/props/DynProps4FilesService.java
similarity index 99%
rename from src/main/java/com/rymcu/vertical/core/service/dynProps4Files/DynProps4FilesService.java
rename to src/main/java/com/rymcu/vertical/core/service/props/DynProps4FilesService.java
index a34e634..c9b3349 100644
--- a/src/main/java/com/rymcu/vertical/core/service/dynProps4Files/DynProps4FilesService.java
+++ b/src/main/java/com/rymcu/vertical/core/service/props/DynProps4FilesService.java
@@ -1,4 +1,4 @@
-package com.rymcu.vertical.core.service.dynProps4Files;
+package com.rymcu.vertical.core.service.props;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisServiceImpl.java b/src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisServiceImpl.java
index a2a2858..caff003 100644
--- a/src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisServiceImpl.java
+++ b/src/main/java/com/rymcu/vertical/core/service/redis/impl/RedisServiceImpl.java
@@ -3,7 +3,7 @@ package com.rymcu.vertical.core.service.redis.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
-import com.rymcu.vertical.core.service.dynProps4Files.DynProps4FilesService;
+import com.rymcu.vertical.core.service.props.DynProps4FilesService;
 import com.rymcu.vertical.core.service.redis.RedisResult;
 import com.rymcu.vertical.core.service.redis.RedisService;
 import org.apache.commons.io.IOUtils;