|
|
|
@ -67,6 +67,7 @@ public class CustomManageServiceImpl implements CustomManageService {
|
|
|
|
|
|
|
|
|
|
private final Integer[] TAG_TYPE = {1, 2, 4, 5};
|
|
|
|
|
private final String VPOINT_URL = "&vpoint=";
|
|
|
|
|
private final String TAG_URL = "&tag=";
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@ -303,18 +304,19 @@ public class CustomManageServiceImpl implements CustomManageService {
|
|
|
|
|
tagUrl = tagUrl.concat("-v2");
|
|
|
|
|
}
|
|
|
|
|
//生成链接
|
|
|
|
|
String fullLink = configurationUrl.concat(url).concat(tagUrl);
|
|
|
|
|
String fullLink = configurationUrl.concat(url);
|
|
|
|
|
if (Arrays.asList(TAG_TYPE).contains(type) && CollUtil.isNotEmpty(vpoIntList)) {
|
|
|
|
|
for (String vpoIntStr : vpoIntList) {
|
|
|
|
|
String newUrl = fullLink.concat(VPOINT_URL).concat(vpoIntStr);
|
|
|
|
|
if (StringUtils.isNotBlank(aKey)) {
|
|
|
|
|
newUrl = newUrl.concat("&akey=").concat(aKey);
|
|
|
|
|
}
|
|
|
|
|
CreateLinkUrlVO createLinkUrlVO = new CreateLinkUrlVO(newUrl, type, vpoIntStr);
|
|
|
|
|
// 如果百度有aKey 链接生成aKey
|
|
|
|
|
if (StringUtils.isNotBlank(aKey)) newUrl = newUrl.concat("&akey=").concat(aKey);
|
|
|
|
|
String newTag = newUrl.concat(TAG_URL).concat(tagUrl);
|
|
|
|
|
CreateLinkUrlVO createLinkUrlVO = new CreateLinkUrlVO(newTag, type, vpoIntStr);
|
|
|
|
|
returnList.add(createLinkUrlVO);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
CreateLinkUrlVO createLinkUrlVO = new CreateLinkUrlVO(fullLink, type, "");
|
|
|
|
|
String newFullLink = fullLink.concat(TAG_URL).concat(tagUrl);
|
|
|
|
|
CreateLinkUrlVO createLinkUrlVO = new CreateLinkUrlVO(newFullLink, type, "");
|
|
|
|
|
returnList.add(createLinkUrlVO);
|
|
|
|
|
}
|
|
|
|
|
return returnList;
|
|
|
|
@ -507,27 +509,4 @@ public class CustomManageServiceImpl implements CustomManageService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// /**
|
|
|
|
|
// * 拼接参数 向returnList集合中add
|
|
|
|
|
// *
|
|
|
|
|
// * @param vpoIntList vpoint集合
|
|
|
|
|
// * @param aKey 百度需要的值
|
|
|
|
|
// * @param url 要拼接的路径
|
|
|
|
|
// */
|
|
|
|
|
// public List<Map<String, Object>> montageParameter(List<String> vpoIntList, String aKey, String url, Integer type) {
|
|
|
|
|
// List<Map<String, Object>> list = new ArrayList<>();
|
|
|
|
|
// for (String vpoIntStr : vpoIntList) {
|
|
|
|
|
// String newUrl = url.concat(VPOINT_URL).concat(vpoIntStr);
|
|
|
|
|
// if (StringUtils.isNotBlank(aKey)) {
|
|
|
|
|
// newUrl = newUrl.concat("&akey=").concat(aKey);
|
|
|
|
|
// }
|
|
|
|
|
// Map<String, Object> map = new HashMap<>();
|
|
|
|
|
// map.put("url", newUrl);
|
|
|
|
|
// map.put("type", type);
|
|
|
|
|
// map.put("vpoInt", vpoIntStr);
|
|
|
|
|
// list.add(map);
|
|
|
|
|
// }
|
|
|
|
|
// return list;
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|