|
@@ -27,6 +27,7 @@ import com.webflux.launchadmin.mysql.service.planNew.structure.Item;
|
|
|
import com.webflux.launchadmin.mysql.service.readBookPlan.ReadBookPlanServicesInterface;
|
|
import com.webflux.launchadmin.mysql.service.readBookPlan.ReadBookPlanServicesInterface;
|
|
|
import com.webflux.launchadmin.mysql.service.sourceMaterial.materialManagement.MaterialManagementInterface;
|
|
import com.webflux.launchadmin.mysql.service.sourceMaterial.materialManagement.MaterialManagementInterface;
|
|
|
import com.webflux.launchadmin.mysql.service.takeaway.TakeawayServicesInterface;
|
|
import com.webflux.launchadmin.mysql.service.takeaway.TakeawayServicesInterface;
|
|
|
|
|
+import com.webflux.launchadmin.utils.RandomStr;
|
|
|
import com.webflux.launchcommon.returnObj.RStatus;
|
|
import com.webflux.launchcommon.returnObj.RStatus;
|
|
|
import com.webflux.launchcommon.utils.StringUtils;
|
|
import com.webflux.launchcommon.utils.StringUtils;
|
|
|
import jakarta.annotation.Resource;
|
|
import jakarta.annotation.Resource;
|
|
@@ -510,7 +511,7 @@ public class PlanNewCommonOutController {
|
|
|
.onErrorResume(throwable -> Mono.error(new BaseException("transferPageDomain 域名查詢為空 group_type_id:::" + f.transferPageDomain()))).collectList().flatMap(fff -> {
|
|
.onErrorResume(throwable -> Mono.error(new BaseException("transferPageDomain 域名查詢為空 group_type_id:::" + f.transferPageDomain()))).collectList().flatMap(fff -> {
|
|
|
if (!fff.isEmpty()) {
|
|
if (!fff.isEmpty()) {
|
|
|
DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
|
|
DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
|
|
|
- String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
|
|
|
|
|
|
|
+ String string = RandomStr.getRandomStr();
|
|
|
String domain1 = domainSelect.domain();
|
|
String domain1 = domainSelect.domain();
|
|
|
return Mono.just(string + "." + domain1);
|
|
return Mono.just(string + "." + domain1);
|
|
|
|
|
|
|
@@ -532,7 +533,7 @@ public class PlanNewCommonOutController {
|
|
|
.onErrorResume(throwable -> Mono.error(new BaseException("backgroupDomain 域名查询为空 group_type_id" + f.backgroupDomain()))).collectList().flatMap(fff -> {
|
|
.onErrorResume(throwable -> Mono.error(new BaseException("backgroupDomain 域名查询为空 group_type_id" + f.backgroupDomain()))).collectList().flatMap(fff -> {
|
|
|
if (!fff.isEmpty()) {
|
|
if (!fff.isEmpty()) {
|
|
|
DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
|
|
DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
|
|
|
- String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
|
|
|
|
|
|
|
+ String string = RandomStr.getRandomStr();
|
|
|
String domain1 = domainSelect.domain();
|
|
String domain1 = domainSelect.domain();
|
|
|
return Mono.just(string + "." + domain1);
|
|
return Mono.just(string + "." + domain1);
|
|
|
} else {
|
|
} else {
|
|
@@ -552,7 +553,7 @@ public class PlanNewCommonOutController {
|
|
|
// DomainSelectRes domainSelectRes = new DomainSelectRes();
|
|
// DomainSelectRes domainSelectRes = new DomainSelectRes();
|
|
|
int i = RandomUtil.randomInt(0, fm.size());
|
|
int i = RandomUtil.randomInt(0, fm.size());
|
|
|
String domain = fm.get(i).domain();
|
|
String domain = fm.get(i).domain();
|
|
|
- String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
|
|
|
|
|
|
|
+ String string = RandomStr.getRandomStr();
|
|
|
return Mono.just(string + "." + domain);
|
|
return Mono.just(string + "." + domain);
|
|
|
});
|
|
});
|
|
|
return Mono.zip(stringMono2, stringMono1, stringMono).flatMap(fff -> {
|
|
return Mono.zip(stringMono2, stringMono1, stringMono).flatMap(fff -> {
|
|
@@ -587,7 +588,7 @@ public class PlanNewCommonOutController {
|
|
|
DomainSelectRes domainSelectRes = new DomainSelectRes();
|
|
DomainSelectRes domainSelectRes = new DomainSelectRes();
|
|
|
int i = RandomUtil.randomInt(0, fm.size());
|
|
int i = RandomUtil.randomInt(0, fm.size());
|
|
|
String domain = fm.get(i).domain();
|
|
String domain = fm.get(i).domain();
|
|
|
- String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
|
|
|
|
|
|
|
+ String string = RandomStr.getRandomStr();
|
|
|
domainSelectRes.setDomain(string + "." + domain);
|
|
domainSelectRes.setDomain(string + "." + domain);
|
|
|
domainSelectRes.setPath("");
|
|
domainSelectRes.setPath("");
|
|
|
domainSelectRes.setUnique(IdUtil.fastSimpleUUID());
|
|
domainSelectRes.setUnique(IdUtil.fastSimpleUUID());
|
|
@@ -614,7 +615,7 @@ public class PlanNewCommonOutController {
|
|
|
.collectList().flatMap(fm -> {
|
|
.collectList().flatMap(fm -> {
|
|
|
int i = RandomUtil.randomInt(0, fm.size());
|
|
int i = RandomUtil.randomInt(0, fm.size());
|
|
|
String domain = fm.get(i).domain();
|
|
String domain = fm.get(i).domain();
|
|
|
- String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
|
|
|
|
|
|
|
+ String string = RandomStr.getRandomStr();
|
|
|
return Mono.just(string + "." + domain);
|
|
return Mono.just(string + "." + domain);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
@@ -629,7 +630,7 @@ public class PlanNewCommonOutController {
|
|
|
.onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()))).collectList().flatMap(fff -> {
|
|
.onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()))).collectList().flatMap(fff -> {
|
|
|
if (!fff.isEmpty()) {
|
|
if (!fff.isEmpty()) {
|
|
|
DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
|
|
DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
|
|
|
- String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
|
|
|
|
|
|
|
+ String string = RandomStr.getRandomStr();
|
|
|
String domain1 = domainSelect.domain();
|
|
String domain1 = domainSelect.domain();
|
|
|
return Mono.just(string + "." + domain1);
|
|
return Mono.just(string + "." + domain1);
|
|
|
} else {
|
|
} else {
|
|
@@ -650,7 +651,7 @@ public class PlanNewCommonOutController {
|
|
|
.onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()))).collectList().flatMap(fff -> {
|
|
.onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()))).collectList().flatMap(fff -> {
|
|
|
if (!fff.isEmpty()) {
|
|
if (!fff.isEmpty()) {
|
|
|
DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
|
|
DomainSelect domainSelect = fff.get(RandomUtil.randomInt(0, fff.size()));
|
|
|
- String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
|
|
|
|
|
|
|
+ String string = RandomStr.getRandomStr();
|
|
|
String domain1 = domainSelect.domain();
|
|
String domain1 = domainSelect.domain();
|
|
|
return Mono.just(string + "." + domain1);
|
|
return Mono.just(string + "." + domain1);
|
|
|
} else {
|
|
} else {
|
|
@@ -687,7 +688,7 @@ public class PlanNewCommonOutController {
|
|
|
.collectList().flatMap(fm -> {
|
|
.collectList().flatMap(fm -> {
|
|
|
int i = RandomUtil.randomInt(0, fm.size());
|
|
int i = RandomUtil.randomInt(0, fm.size());
|
|
|
String domain = fm.get(i).domain();
|
|
String domain = fm.get(i).domain();
|
|
|
- String string = RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
|
|
|
|
|
|
|
+ String string = RandomStr.getRandomStr();
|
|
|
return Mono.just(string + "." + domain);
|
|
return Mono.just(string + "." + domain);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
@@ -959,7 +960,7 @@ public class PlanNewCommonOutController {
|
|
|
// 交友裂变无清水分类
|
|
// 交友裂变无清水分类
|
|
|
isQs = false;
|
|
isQs = false;
|
|
|
}
|
|
}
|
|
|
- if (Objects.nonNull(request.getRedirectType()) && request.getRedirectType() == 2) {
|
|
|
|
|
|
|
+ if (Objects.nonNull(request.getRedirectType()) && request.getRedirectType() == 2 ) {
|
|
|
stringBuilderMono = goGenerateService.byPlanNewIdGetUrlCommon(request.getRedirectPlanId(), isQs, request.getGroupIdQs());
|
|
stringBuilderMono = goGenerateService.byPlanNewIdGetUrlCommon(request.getRedirectPlanId(), isQs, request.getGroupIdQs());
|
|
|
} else {
|
|
} else {
|
|
|
stringBuilderMono = Mono.just(new StringBuilder(request.getLink() == null ? "" : request.getLink()));
|
|
stringBuilderMono = Mono.just(new StringBuilder(request.getLink() == null ? "" : request.getLink()));
|
|
@@ -1439,7 +1440,7 @@ public class PlanNewCommonOutController {
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
private String get6Str() {
|
|
private String get6Str() {
|
|
|
- return RandomUtil.randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 6);
|
|
|
|
|
|
|
+ return RandomStr.getRandomStr();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|