diff --git a/dtp-example/pom.xml b/dtp-example/pom.xml index 9fe4a08b..8bd3ffb0 100644 --- a/dtp-example/pom.xml +++ b/dtp-example/pom.xml @@ -10,7 +10,7 @@ dtp-example - 0.0.1-SNAPSHOT + jar dtp-example Demo project for Spring Boot @@ -25,6 +25,11 @@ spring-boot-starter + + org.springframework.boot + spring-boot-starter-web + + org.springframework.boot spring-boot-starter-test diff --git a/dtp-example/src/main/java/io/dtp/example/config/ThreadPoolConfig.java b/dtp-example/src/main/java/io/dtp/example/config/ThreadPoolConfig.java index 98a82420..8f0df004 100644 --- a/dtp-example/src/main/java/io/dtp/example/config/ThreadPoolConfig.java +++ b/dtp-example/src/main/java/io/dtp/example/config/ThreadPoolConfig.java @@ -15,7 +15,7 @@ public class ThreadPoolConfig { @Bean public DynamicThreadPoolWrap messageCenterConsumeThreadPool() { - return new DynamicThreadPoolWrap("message-consume"); + return new DynamicThreadPoolWrap("common", "message", "message-consume"); } } diff --git a/dtp-server/src/main/java/io/dtp/server/mapper/RowMapperManager.java b/dtp-server/src/main/java/io/dtp/server/mapper/RowMapperManager.java index 89f2d49a..86be0478 100644 --- a/dtp-server/src/main/java/io/dtp/server/mapper/RowMapperManager.java +++ b/dtp-server/src/main/java/io/dtp/server/mapper/RowMapperManager.java @@ -19,10 +19,11 @@ public final class RowMapperManager { public static class ConfigAllInfoRowMapper implements RowMapper { + @Override public ConfigAllInfo mapRow(ResultSet rs, int rowNum) throws SQLException { ConfigAllInfo configAllInfo = new ConfigAllInfo(); - configAllInfo.setDataId(rs.getString("data_id")); - configAllInfo.setGroupId(rs.getString("group_id")); + configAllInfo.setTpId(rs.getString("tp_id")); + configAllInfo.setItemId(rs.getString("item_id")); configAllInfo.setTenant(rs.getString("tenant_id")); configAllInfo.setContent(rs.getString("content")); configAllInfo.setMd5(rs.getString("md5")); diff --git a/dtp-server/src/main/java/io/dtp/server/model/ConfigInfoBase.java b/dtp-server/src/main/java/io/dtp/server/model/ConfigInfoBase.java index 63f65484..82434e05 100644 --- a/dtp-server/src/main/java/io/dtp/server/model/ConfigInfoBase.java +++ b/dtp-server/src/main/java/io/dtp/server/model/ConfigInfoBase.java @@ -16,14 +16,14 @@ public class ConfigInfoBase implements Serializable { private static final long serialVersionUID = -1892597426099265730L; /** - * DataId + * TpId */ - private String dataId; + private String tpId; /** - * GroupId + * ItemId */ - private String groupId; + private String itemId; /** * 内容 diff --git a/dtp-server/src/main/java/io/dtp/server/service/impl/ConfigServiceImpl.java b/dtp-server/src/main/java/io/dtp/server/service/impl/ConfigServiceImpl.java index 2dfabc7d..f07eb4c4 100644 --- a/dtp-server/src/main/java/io/dtp/server/service/impl/ConfigServiceImpl.java +++ b/dtp-server/src/main/java/io/dtp/server/service/impl/ConfigServiceImpl.java @@ -19,6 +19,7 @@ public class ConfigServiceImpl implements ConfigService { @Autowired private JdbcTemplate jdbcTemplate; + @Override public ConfigAllInfo findConfigAllInfo(String tpId, String itemId, String tenant) { ConfigAllInfo configAllInfo = jdbcTemplate.queryForObject( "select * from config_info where tp_id = ? and item_id = ? and tenant_id = ?", diff --git a/dtp-spring-boot-starter/pom.xml b/dtp-spring-boot-starter/pom.xml index 04748ed2..bad53b25 100644 --- a/dtp-spring-boot-starter/pom.xml +++ b/dtp-spring-boot-starter/pom.xml @@ -33,7 +33,6 @@ com.squareup.okhttp3 logging-interceptor - true diff --git a/dtp-spring-boot-starter/src/main/java/io/dtp/starter/config/OkHttpClientConfig.java b/dtp-spring-boot-starter/src/main/java/io/dtp/starter/config/OkHttpClientConfig.java index 88f58587..b8bc92bb 100644 --- a/dtp-spring-boot-starter/src/main/java/io/dtp/starter/config/OkHttpClientConfig.java +++ b/dtp-spring-boot-starter/src/main/java/io/dtp/starter/config/OkHttpClientConfig.java @@ -1,5 +1,6 @@ package io.dtp.starter.config; +import io.dtp.starter.toolkit.HttpClientUtil; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; @@ -37,6 +38,11 @@ public class OkHttpClientConfig { return build.build(); } + @Bean + public HttpClientUtil httpClientUtil() { + return new HttpClientUtil(); + } + /** * 支持 Https * diff --git a/dtp-spring-boot-starter/src/main/java/io/dtp/starter/core/ThreadPoolRunListener.java b/dtp-spring-boot-starter/src/main/java/io/dtp/starter/core/ThreadPoolRunListener.java index ae75ae29..4ebc020c 100644 --- a/dtp-spring-boot-starter/src/main/java/io/dtp/starter/core/ThreadPoolRunListener.java +++ b/dtp-spring-boot-starter/src/main/java/io/dtp/starter/core/ThreadPoolRunListener.java @@ -55,7 +55,7 @@ public class ThreadPoolRunListener implements ApplicationRunner { } private String buildUrl() { - return "http://127.0.0.1/v1/cs/configs"; + return "http://127.0.0.1:6691/v1/cs/configs"; } private String buildOnlyId(DynamicThreadPoolWrap poolWrap) { diff --git a/dtp-spring-boot-starter/src/main/java/io/dtp/starter/toolkit/HttpClientUtil.java b/dtp-spring-boot-starter/src/main/java/io/dtp/starter/toolkit/HttpClientUtil.java index 265dadf3..8dffd790 100644 --- a/dtp-spring-boot-starter/src/main/java/io/dtp/starter/toolkit/HttpClientUtil.java +++ b/dtp-spring-boot-starter/src/main/java/io/dtp/starter/toolkit/HttpClientUtil.java @@ -16,7 +16,6 @@ import java.util.Map; * @date 2021/6/10 13:30 */ @Slf4j -@Component public class HttpClientUtil { @Autowired diff --git a/dtp-spring-boot-starter/src/main/java/io/dtp/starter/wrap/DynamicThreadPoolWrap.java b/dtp-spring-boot-starter/src/main/java/io/dtp/starter/wrap/DynamicThreadPoolWrap.java index 47940e8a..85416d5d 100644 --- a/dtp-spring-boot-starter/src/main/java/io/dtp/starter/wrap/DynamicThreadPoolWrap.java +++ b/dtp-spring-boot-starter/src/main/java/io/dtp/starter/wrap/DynamicThreadPoolWrap.java @@ -27,19 +27,25 @@ public class DynamicThreadPoolWrap { /** * 首选服务端线程池, 为空使用默认线程池 {@link CommonThreadPool#getInstance(String)} * + * @param tenant + * @param itemId * @param threadPoolId */ - public DynamicThreadPoolWrap(String threadPoolId) { + public DynamicThreadPoolWrap(String tenant, String itemId, String threadPoolId) { + this.tenant = tenant; + this.itemId = itemId; this.tpId = threadPoolId; } /** * 首选服务端线程池, 为空使用 threadPoolExecutor * + * @param tenant + * @param itemId * @param threadPoolId * @param threadPoolExecutor */ - public DynamicThreadPoolWrap(String threadPoolId, ThreadPoolExecutor threadPoolExecutor) { + public DynamicThreadPoolWrap(String tenant, String itemId, String threadPoolId, ThreadPoolExecutor threadPoolExecutor) { this.tpId = threadPoolId; this.pool = threadPoolExecutor; } diff --git a/pom.xml b/pom.xml index 1de4d06e..253cdbbe 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,9 @@ - dtp-spring-boot-starter dtp-server + dtp-example + dtp-spring-boot-starter @@ -72,6 +73,16 @@ org.springframework.boot spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + +