Skip to content

Commit

Permalink
20240603
Browse files Browse the repository at this point in the history
  • Loading branch information
@ldcsaa
ldcsaa committed Jun 3, 2024
1 parent 4c3e3b3 commit 1bfd4a7
Show file tree
Hide file tree
Showing 26 changed files with 360 additions and 244 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<artifactId>hp-soa-starter-web-cloud</artifactId>
</dependency>
-->
<!-- Dubbo项目引用 hp-soa-starter-web-dubbo -->
<!-- Dubbo 项目引用 hp-soa-starter-web-dubbo -->
<!--
<dependency>
<groupId>io.github.hpsocket</groupId>
Expand Down
4 changes: 4 additions & 0 deletions hp-demo/hp-demo-bff-elasticsearch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<groupId>io.github.hpsocket</groupId>
<artifactId>hp-soa-starter-data-elasticsearch</artifactId>
</dependency>
<dependency>
<groupId>io.github.hpsocket</groupId>
<artifactId>hp-soa-starter-skywalking</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
4 changes: 4 additions & 0 deletions hp-demo/hp-demo-bff-mongodb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<groupId>io.github.hpsocket</groupId>
<artifactId>hp-soa-starter-nacos</artifactId>
</dependency>
<dependency>
<groupId>io.github.hpsocket</groupId>
<artifactId>hp-soa-starter-skywalking</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
4 changes: 4 additions & 0 deletions hp-demo/hp-demo-infra-elasticsearch/hp-demo-infra-elasticsearch-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
<groupId>io.github.hpsocket</groupId>
<artifactId>hp-soa-starter-data-elasticsearch</artifactId>
</dependency>
<dependency>
<groupId>io.github.hpsocket</groupId>
<artifactId>hp-soa-starter-skywalking</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
4 changes: 4 additions & 0 deletions hp-demo/hp-demo-infra-mongodb/hp-demo-infra-mongodb-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
<groupId>io.github.hpsocket</groupId>
<artifactId>hp-soa-starter-data-mongodb</artifactId>
</dependency>
<dependency>
<groupId>io.github.hpsocket</groupId>
<artifactId>hp-soa-starter-skywalking</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
4 changes: 2 additions & 2 deletions ...afka/src/main/java/io/github/hpsocket/demo/kafka/contract/req/DemoCreateOrderReuqest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
public class DemoCreateOrderReuqest
{
@NotNull(message = "区域不能为空")
@Range(min = 0, max = 2, message = "区域超出范围 [0 ~ 3]")
@Range(min = 0, max = 2, message = "区域超出范围 [0 ~ 2]")
@Schema(description = "区域", example = "1", requiredMode = RequiredMode.REQUIRED, nullable = false)
private Integer regionId;

@NotBlank(message = "orderNumber is empty")
@NotBlank(message = "订单号不能为空")
@Schema(description = "订单号", example = "1234567890987654", requiredMode = RequiredMode.REQUIRED, minLength = 16, nullable = false)
private String orderNumber;

Expand Down
209 changes: 55 additions & 154 deletions hp-soa-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,86 +16,78 @@
<url>https://github.com/ldcsaa/hp-soa</url>

<properties>
<dubbo.version>3.2.11</dubbo.version>
<nacos-client.version>2.2.4</nacos-client.version>
<netty.version>4.1.106.Final</netty.version>
<zookeeper.version>3.9.1</zookeeper.version>
<spring-boot.version>3.1.12</spring-boot.version>
<spring-security.version>6.1.9</spring-security.version>
<spring-cloud.version>2022.0.5</spring-cloud.version>
<spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
<spring-amqp.version>3.0.14</spring-amqp.version>
<spring-kafka.version>3.0.17</spring-kafka.version>
<spring-retry.version>2.0.6</spring-retry.version>

<dubbo.version>3.2.13</dubbo.version>
<nacos-client.version>2.3.2</nacos-client.version>
<netty.version>4.1.110.Final</netty.version>
<zookeeper.version>3.9.2</zookeeper.version>
<kryo.version>5.6.0</kryo.version>
<fst.version>3.0.4-jdk17</fst.version>
<xxl-job.version>2.4.0</xxl-job.version>
<xxl-job.version>2.4.1</xxl-job.version>
<sentinel.version>1.8.7</sentinel.version>

<spring.version>6.0.16</spring.version>
<spring-boot.version>3.1.8</spring-boot.version>
<spring-security.version>6.1.6</spring-security.version>
<spring-cloud.version>2022.0.5</spring-cloud.version>
<spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
<caffeine.version>3.1.8</caffeine.version>
<spring-retry.version>2.0.5</spring-retry.version>
<spring-amqp.version>3.0.10</spring-amqp.version>
<spring-kafka.version>3.0.13</spring-kafka.version>
<kafka-clients.version>3.6.1</kafka-clients.version>
<zstd-jni.version>1.5.5-11</zstd-jni.version>
<feign.version>13.1</feign.version>
<druid.version>1.2.21</druid.version>
<jedis.version>5.1.0</jedis.version>
<lettuce.version>6.3.1.RELEASE</lettuce.version>
<redisson.version>3.26.0</redisson.version>
<amqp-client.version>5.20.0</amqp-client.version>
<stream-client.version>0.15.0</stream-client.version>
<mysql-connector-j.version>8.3.0</mysql-connector-j.version>
<kafka-clients.version>3.7.0</kafka-clients.version>
<zstd-jni.version>1.5.6-3</zstd-jni.version>
<feign.version>13.2.1</feign.version>
<druid.version>1.2.23</druid.version>
<jedis.version>5.1.3</jedis.version>
<lettuce.version>6.3.2.RELEASE</lettuce.version>
<redisson.version>3.31.0</redisson.version>
<amqp-client.version>5.21.0</amqp-client.version>
<stream-client.version>0.16.0</stream-client.version>
<mysql-connector-j.version>8.4.0</mysql-connector-j.version>
<mybatis.version>3.5.16</mybatis.version>
<mybatis-spring.version>3.0.3</mybatis-spring.version>
<mybatis.version>3.5.15</mybatis.version>
<mybatis-spring-boot-starter.version>3.0.3</mybatis-spring-boot-starter.version>
<mybatis-plus.version>3.5.5</mybatis-plus.version>
<mybatis-plus.version>3.5.6</mybatis-plus.version>
<dynamic-datasource-spring-boot3-starter.version>4.3.0</dynamic-datasource-spring-boot3-starter.version>
<shardingsphere-jdbc-core.version>5.4.1</shardingsphere-jdbc-core.version>
<shardingsphere-jdbc-core-spring-boot-starter.version>5.2.1</shardingsphere-jdbc-core-spring-boot-starter.version>
<ehcache.version>3.10.8</ehcache.version>

<commons-io.version>2.15.1</commons-io.version>
<commons-net.version>3.10.0</commons-net.version>
<commons-io.version>2.16.1</commons-io.version>
<commons-net.version>3.11.0</commons-net.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-codec.version>1.16.0</commons-codec.version>
<commons-codec.version>1.17.0</commons-codec.version>
<commons-pool.version>1.6</commons-pool.version>
<commons-pool2.version>2.12.0</commons-pool2.version>
<commons-httpclient.version>3.1</commons-httpclient.version>

<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
<jakarta.el-api.version>5.0.1</jakarta.el-api.version>
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
<jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
<jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
<jakarta.mail-api.version>2.1.2</jakarta.mail-api.version>
<jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
<jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>

<javax-javaee-api.version>8.0.1</javax-javaee-api.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<javax-el-api.version>3.0.1-b06</javax-el-api.version>
<javax-el.version>3.0.1-b12</javax-el.version>
<javax-validation-api.version>2.0.1.Final</javax-validation-api.version>
<javax-mail.version>1.6.2</javax-mail.version>

<jsr305.version>3.0.2</jsr305.version>

<mqttv5.client.version>1.2.5</mqttv5.client.version>
<bcpkix.version>1.77</bcpkix.version>
<bcpkix.version>1.78.1</bcpkix.version>

<slf4j.version>2.0.11</slf4j.version>
<log4j.version>2.22.1</log4j.version>
<slf4j.version>2.0.13</slf4j.version>
<log4j.version>2.23.1</log4j.version>
<disruptor.version>3.4.4</disruptor.version>
<log4j2-redis-appender.version>0.14.0</log4j2-redis-appender.version>
<skywalking.apm-toolkit.version>9.1.0</skywalking.apm-toolkit.version>
<log4j2-redis-appender.version>0.16.0</log4j2-redis-appender.version>
<skywalking.apm-toolkit.version>9.2.0</skywalking.apm-toolkit.version>
<junit.version>4.13.2</junit.version>
<junit5.version>5.10.1</junit5.version>
<junit5.version>5.10.2</junit5.version>

<fastjson.version>2.0.46</fastjson.version>
<protobuf-java.version>3.25.2</protobuf-java.version>
<fastjson.version>2.0.51</fastjson.version>
<protobuf-java.version>4.27.0</protobuf-java.version>
<quartz.version>2.3.2</quartz.version>
<httpclient.version>4.5.14</httpclient.version>
<httpclient5.version>5.3.1</httpclient5.version>
Expand All @@ -104,38 +96,38 @@
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<velocity.version>2.3</velocity.version>
<freemarker.version>2.3.32</freemarker.version>
<beetl.version>3.15.13.RELEASE</beetl.version>
<beetl.version>3.16.1.RELEASE</beetl.version>
<resilience4j.version>2.2.0</resilience4j.version>

<geoip2.version>4.2.0</geoip2.version>
<gson.version>2.10.1</gson.version>
<jackson.version>2.16.1</jackson.version>
<gson.version>2.11.0</gson.version>
<jackson.version>2.17.1</jackson.version>
<hessian.version>4.0.66</hessian.version>
<zxing-javase.version>3.5.2</zxing-javase.version>
<zxing-javase.version>3.5.3</zxing-javase.version>
<okhttp2.version>2.7.5</okhttp2.version>
<okhttp3.version>4.12.0</okhttp3.version>
<guava.version>33.0.0-jre</guava.version>
<guava.version>33.2.1-jre</guava.version>

<jsoup.version>1.17.2</jsoup.version>
<selenium.version>4.17.0</selenium.version>
<selenium.version>4.21.0</selenium.version>

<poi.version>5.2.5</poi.version>
<easyexcel.version>3.3.3</easyexcel.version>
<easyexcel.version>3.3.4</easyexcel.version>
<xerces.version>2.12.2</xerces.version>
<aviator.version>5.4.1</aviator.version>
<springdoc-openapi.version>2.3.0</springdoc-openapi.version>
<springdoc-openapi.version>2.5.0</springdoc-openapi.version>

<curator.version>5.6.0</curator.version>
<hutool.version>5.8.25</hutool.version>
<jjwt.version>0.12.3</jjwt.version>
<hutool.version>5.8.28</hutool.version>
<jjwt.version>0.12.5</jjwt.version>

<log4j-1.version>1.2.17</log4j-1.version>
<jboss-logmanager.version>3.0.4.Final</jboss-logmanager.version>
<jboss-logmanager.version>3.0.6.Final</jboss-logmanager.version>

<seata.version>2.0.0</seata.version>

<micrometer-tracing.version>1.2.2</micrometer-tracing.version>
<micrometer-bom.version>1.12.2</micrometer-bom.version>
<micrometer-tracing.version>1.2.6</micrometer-tracing.version>
<micrometer-bom.version>1.12.6</micrometer-bom.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -376,39 +368,6 @@
<version>${jakarta.xml.bind-api.version}</version>
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>${javax-javaee-api.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api.version}</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>${javax-el-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>${javax-el.version}</version>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${javax-validation-api.version}</version>
</dependency>

<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javax-mail.version}</version>
</dependency>

<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down Expand Up @@ -614,53 +573,10 @@

<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId>
<version>${feign.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-httpclient</artifactId>
<version>${feign.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-hystrix</artifactId>
<version>${feign.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-ribbon</artifactId>
<version>${feign.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-form</artifactId>
<version>${feign.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-form-spring</artifactId>
<version>${feign.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-jackson</artifactId>
<version>${feign.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-slf4j</artifactId>
<version>${feign.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-micrometer</artifactId>
<version>${feign.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-core</artifactId>
<artifactId>feign-bom</artifactId>
<version>${feign.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -919,12 +835,6 @@
<version>${commons-pool2.version}</version>
</dependency>

<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${commons-httpclient.version}</version>
</dependency>

<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
Expand Down Expand Up @@ -1023,15 +933,6 @@
<artifactId>hessian</artifactId>
<version>${hessian.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-bom</artifactId>
Expand Down
Loading

0 comments on commit 1bfd4a7

Please sign in to comment.