Merge branch 'release' into 'master'

Release

See merge request !65

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/service/impl/TemplateTitleServiceImpl.java

@@ -19,6 +19,7 @@ import com.zhiwei.middleware.automatic.son.util.Tools;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHits;
@@ -202,10 +203,10 @@ public class TemplateTitleServiceImpl implements TemplateTitleService {
             if (redissonUtil.tryLock(lockKey, 5, 5)) {
                 String mapKey = Tools.assembleKey(GenericAttribute.REDIS_MAP_KEY, group);
                 String mapKeyValue = redissonUtil.getMapKeyValue(mapKey, title);
-                TemplateTitleVo titleVo = JSONObject.parseObject(mapKeyValue, TemplateTitleVo.class);
-                if (Objects.isNull(titleVo)) {
+                if (Strings.isEmpty(mapKeyValue)) {
                     return;
                 }
+                TemplateTitleVo titleVo = JSONObject.parseObject(mapKeyValue, TemplateTitleVo.class);
                 if (Objects.isNull(templateTitleVo)) {
                     templateTitleVo = titleVo;
                 }