diff --git a/short-server-common/src/main/java/com/by/constants/SymbolConstant.java b/short-server-common/src/main/java/com/by/constants/SymbolConstant.java new file mode 100644 index 0000000..f76f2b4 --- /dev/null +++ b/short-server-common/src/main/java/com/by/constants/SymbolConstant.java @@ -0,0 +1,9 @@ +package com.by.constants; + +public class SymbolConstant { + + /** + * 常用的分隔符 + */ + public static final String SPLIT_VERTICAL = "|"; +} diff --git a/short-server-common/src/main/java/com/by/constants/SystemConstant.java b/short-server-common/src/main/java/com/by/constants/SystemConstant.java index 6efe987..e9dba55 100644 --- a/short-server-common/src/main/java/com/by/constants/SystemConstant.java +++ b/short-server-common/src/main/java/com/by/constants/SystemConstant.java @@ -11,4 +11,6 @@ public class SystemConstant { */ public static final String DEFAULT_IP = "0.0.0.0"; + + } diff --git a/short-server-pojo/src/main/java/com/by/dto/ShortChainPointJsonDTO.java b/short-server-pojo/src/main/java/com/by/dto/ShortChainPointJsonDTO.java index 93791d1..741980c 100644 --- a/short-server-pojo/src/main/java/com/by/dto/ShortChainPointJsonDTO.java +++ b/short-server-pojo/src/main/java/com/by/dto/ShortChainPointJsonDTO.java @@ -16,8 +16,8 @@ public class ShortChainPointJsonDTO { /** * 原始链接 */ - @JSONField(name = "originUrl") - private String originUrl; + @JSONField(name = "shortUrl") + private String shortUrl; /** * 点击标识 0-未点击 1-点击 diff --git a/short-server-service/src/main/java/com/by/api/ShortServerOpenApiController.java b/short-server-service/src/main/java/com/by/api/ShortServerOpenApiController.java index 9f864a1..71b7265 100644 --- a/short-server-service/src/main/java/com/by/api/ShortServerOpenApiController.java +++ b/short-server-service/src/main/java/com/by/api/ShortServerOpenApiController.java @@ -5,6 +5,7 @@ import com.by.api.common.CommonResponse; import com.by.api.convert.ShortChainVOToDTOConvert; import com.by.api.vo.ShortChainRequestVO; import com.by.api.vo.ShortChainResponseVO; +import com.by.constants.SymbolConstant; import com.by.constants.SystemConstant; import com.by.dto.ShortChainDTO; import com.by.entity.ShortUrl; @@ -82,7 +83,7 @@ public class ShortServerOpenApiController { if (!Objects.isNull(shortUrl)){ // 异步进行更新数据库中的点击记录及推送给之前的调用方(可以走消息) shortChainTask.doRunTask(shortUrl); - originUrl = shortUrl.getOriginUrl(); + originUrl = StringUtils.substringBefore(shortUrl.getOriginUrl(), SymbolConstant.SPLIT_VERTICAL); } return new ModelAndView("redirect:" + originUrl); diff --git a/short-server-service/src/main/java/com/by/api/convert/ShortChainVOToDTOConvert.java b/short-server-service/src/main/java/com/by/api/convert/ShortChainVOToDTOConvert.java index 1d194b0..82fa6d6 100644 --- a/short-server-service/src/main/java/com/by/api/convert/ShortChainVOToDTOConvert.java +++ b/short-server-service/src/main/java/com/by/api/convert/ShortChainVOToDTOConvert.java @@ -2,6 +2,7 @@ package com.by.api.convert; import cn.hutool.core.collection.CollectionUtil; import com.by.api.vo.ShortChainRequestVO; +import com.by.constants.SymbolConstant; import com.by.dto.ShortChainDTO; import org.apache.commons.lang3.StringUtils; @@ -11,6 +12,7 @@ import java.util.Set; /** * VO -> DTO + * @author q */ public class ShortChainVOToDTOConvert { @@ -31,7 +33,7 @@ public class ShortChainVOToDTOConvert { String baseUrlAddr = shortChainRequestVO.getBaseUrlAddr(); shortChainRequestVO.getVariableList().forEach( each -> { - originsUrlSet.add(checkUrlAllowed(baseUrlAddr) + each); + originsUrlSet.add(checkUrlAllowed(baseUrlAddr) + SymbolConstant.SPLIT_VERTICAL + each); } ); diff --git a/short-server-service/src/main/java/com/by/task/ShortChainTask.java b/short-server-service/src/main/java/com/by/task/ShortChainTask.java index ce5cd3a..17e242d 100644 --- a/short-server-service/src/main/java/com/by/task/ShortChainTask.java +++ b/short-server-service/src/main/java/com/by/task/ShortChainTask.java @@ -63,7 +63,7 @@ public class ShortChainTask { // 转成json字符串 ShortChainPointJsonDTO shortChainPointJsonDTO = - new ShortChainPointJsonDTO(shortUrl.getOriginUrl(), DBDefaultConstant.ONE_NUM_TAG); + new ShortChainPointJsonDTO(shortUrl.getShortUrl(), DBDefaultConstant.ONE_NUM_TAG); String jsonSendContent = JSON.toJSONString(shortChainPointJsonDTO); // 失败重发请求3次