diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java index 4e6f05c..71dee05 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java @@ -72,10 +72,15 @@ public class SendBigDataTask { */ private static final int FINISH_SEND_TAG = 1; + /** + * 集群模式标识 + */ + public static final String CLUSTER_TAG = "999"; + /** * 用于随机选的环境代替字符, 如果添加环境就进行自动添加 */ - public static final String BASE_URL_CHAR_NUMBER = "12345678910"; + public static final String BASE_URL_CHAR_NUMBER = "1234567891011"; /** * 下游发送url @@ -89,6 +94,12 @@ public class SendBigDataTask { @Value(value = "${req.db.host}") private String host; + /** + * 集群模式完整路径 + */ + @Value(value = "${req.db.cluster}") + private String cluster; + /** * 加密请求需要的各种配置信息 */ @@ -448,17 +459,22 @@ public class SendBigDataTask { } private String preSendReqAddress(String tag) { - StringBuilder builder = new StringBuilder(); + // 集群模式 + if(CLUSTER_TAG.equalsIgnoreCase(tag)){ + return cluster; + } // 处理环境选择问题, 只接受单个 a, b, c 中的任意一个输入,如果不输入就进行随机返回 tag = (StringUtils.isNotBlank(tag) && StringUtils.countMatches(BASE_URL_CHAR_NUMBER, tag.trim()) >= 1)? tag.trim(): String.valueOf(RandomUtil.randomChar(BASE_URL_CHAR_NUMBER)); // 拼接成需要的URL进行返回 + StringBuilder builder = new StringBuilder(); builder.append(host) .append(tag) .append(url); // 返回拼接结果 return builder.toString(); } + //发给文件系统短信内容 private void sendSmsContent(RemoteRecord resource,TbSendSmsContentDto tbSendSmsContentDto){ // 组装成JSON diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/vo/TaskRecordSendVO.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/vo/TaskRecordSendVO.java index d354d79..bad739a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/vo/TaskRecordSendVO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/vo/TaskRecordSendVO.java @@ -26,7 +26,7 @@ public class TaskRecordSendVO implements Serializable { private Long taskId; /** - * 对应下游推送环境标识, 占时用数字来进行标识 0 标识为测试环境,1-5为正式环境 + * 对应下游推送环境标识, 占时用数字来进行标识 0 标识为测试环境,1-11 为正式环境 集群模式 999 代表集群模式 */ private String addressTag; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/task/SendRecordTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/task/SendRecordTask.java index 857b458..0c1ad79 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/task/SendRecordTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/task/SendRecordTask.java @@ -53,10 +53,15 @@ public class SendRecordTask { */ private static final int FINISH_SEND_TAG = 1; + /** + * 集群模式标识 + */ + public static final String CLUSTER_TAG = "999"; + /** * 用于随机选的环境代替字符, 如果添加环境就进行自动添加 */ - public static final String BASE_URL_CHAR_NUMBER = "12345678910"; + public static final String BASE_URL_CHAR_NUMBER = "1234567891011"; /** * 下游发送url @@ -70,6 +75,12 @@ public class SendRecordTask { @Value(value = "${req.db.host}") private String host; + /** + * 集群模式完整路径 + */ + @Value(value = "${req.db.cluster}") + private String cluster; + @Autowired private TaskRecordService taskRecordService; @@ -189,11 +200,15 @@ public class SendRecordTask { } private String preSendReqAddress(String tag) { - StringBuilder builder = new StringBuilder(); - // 处理环境选择问题, 只接受单个 a, b, c 中的任意一个输入,如果不输入就进行随机返回 + // 集群模式 + if(CLUSTER_TAG.equalsIgnoreCase(tag)){ + return cluster; + } + // 处理环境选择问题, 通配集群模式和非集群模式 tag = (StringUtils.isNotBlank(tag) && StringUtils.countMatches(BASE_URL_CHAR_NUMBER, tag.trim()) >= 1)? tag.trim(): String.valueOf(RandomUtil.randomChar(BASE_URL_CHAR_NUMBER)); // 拼接成需要的URL进行返回 + StringBuilder builder = new StringBuilder(); builder.append(host) .append(tag) .append(url); diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml index f45a2b2..8c85336 100644 --- a/eladmin-system/src/main/resources/config/application-dev.yml +++ b/eladmin-system/src/main/resources/config/application-dev.yml @@ -175,6 +175,7 @@ req: # 设置给大坝回传号码的地址 host: http://api.hzdaba.cn/aibot url: /api/activity/addclient + cluster: http://ai.hzdaba.cn/api/activity/addclient # 线程池的相关配置 produce: task: diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index ed9e29a..3ec5c5d 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.yml @@ -130,6 +130,7 @@ req: # 设置给大坝回传号码的地址 host: http://api.hzdaba.cn/aibot url: /api/activity/addclient + cluster: http://ai.hzdaba.cn/api/activity/addclient # 线程池的相关配置 produce: task: diff --git a/eladmin-system/src/main/resources/config/application-single.yml b/eladmin-system/src/main/resources/config/application-single.yml index dfb10f9..054fd06 100644 --- a/eladmin-system/src/main/resources/config/application-single.yml +++ b/eladmin-system/src/main/resources/config/application-single.yml @@ -117,6 +117,7 @@ req: # 设置给大坝回传号码的地址 host: http://api.hzdaba.cn/aibot url: /api/activity/addclient + cluster: http://ai.hzdaba.cn/api/activity/addclient # 线程池的相关配置 produce: task: diff --git a/eladmin-system/src/main/resources/config/application-stg.yml b/eladmin-system/src/main/resources/config/application-stg.yml index 70bf60b..9c6e5a8 100644 --- a/eladmin-system/src/main/resources/config/application-stg.yml +++ b/eladmin-system/src/main/resources/config/application-stg.yml @@ -172,6 +172,7 @@ req: # 设置给大坝回传号码的地址 host: http://api.hzdaba.cn/aibot url: /api/activity/addclient + cluster: http://ai.hzdaba.cn/api/activity/addclient # 线程池的相关配置 produce: task: diff --git a/eladmin-system/src/main/resources/config/application-test.yml b/eladmin-system/src/main/resources/config/application-test.yml index c052295..d81b1e4 100644 --- a/eladmin-system/src/main/resources/config/application-test.yml +++ b/eladmin-system/src/main/resources/config/application-test.yml @@ -176,6 +176,7 @@ req: # 设置给大坝回传号码的地址 host: http://api.hzdaba.cn/aibot url: /api/activity/addclient + cluster: http://ai.hzdaba.cn/api/activity/addclient # 线程池的相关配置 produce: task: diff --git a/eladmin-system/src/test/java/me/zhengjie/TempTest.java b/eladmin-system/src/test/java/me/zhengjie/TempTest.java index 0f04f24..124f0c6 100644 --- a/eladmin-system/src/test/java/me/zhengjie/TempTest.java +++ b/eladmin-system/src/test/java/me/zhengjie/TempTest.java @@ -185,4 +185,10 @@ public class TempTest { System.out.println(FileUtil.del(dirPath)); } + + public static final String BASE_URL_CHAR_NUMBER = "1234567891011"; + @Test + public void test(){ + System.out.println(StringUtils.countMatches(BASE_URL_CHAR_NUMBER, "13")); + } } diff --git a/pom.xml b/pom.xml index 6ec9dcd..ec40d84 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ - org.apache.shardingsphere + org.apache.shardingSphere sharding-jdbc-spring-boot-starter 4.0.0-RC1