Merge remote-tracking branch 'origin/dev' into dev

main
wb1608 2024-06-06 16:03:27 +08:00
commit b52f7c2b3a
9 changed files with 32 additions and 27 deletions

View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-sdk</artifactId> <artifactId>scfs-api-sdk</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
<name>scfs-api-sdk</name> <name>scfs-api-sdk</name>
<description>scfs-api-sdk</description> <description>scfs-api-sdk</description>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -105,7 +105,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId> <artifactId>spring-boot-autoconfigure</artifactId>
<version>2.7.18</version> <version>2.7.16</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

View File

@ -5,11 +5,11 @@
<parent> <parent>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-sdk</artifactId> <artifactId>scfs-api-sdk</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</parent> </parent>
<artifactId>scfs-api-core</artifactId> <artifactId>scfs-api-core</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
<name>scfs-api-core:核心模块</name> <name>scfs-api-core:核心模块</name>
<description>scfs-api-core</description> <description>scfs-api-core</description>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -5,11 +5,11 @@
<parent> <parent>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-sdk</artifactId> <artifactId>scfs-api-sdk</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</parent> </parent>
<artifactId>scfs-api-rsa</artifactId> <artifactId>scfs-api-rsa</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
<name>scfs-api-rsa:RSA模块</name> <name>scfs-api-rsa:RSA模块</name>
<description>封装RSA、AES国密算法</description> <description>封装RSA、AES国密算法</description>
@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-core</artifactId> <artifactId>scfs-api-core</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -5,11 +5,11 @@
<parent> <parent>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-sdk</artifactId> <artifactId>scfs-api-sdk</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</parent> </parent>
<artifactId>scfs-api-service-cat</artifactId> <artifactId>scfs-api-service-cat</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
<name>scfs-api-service-cat:肥猫定制化接口</name> <name>scfs-api-service-cat:肥猫定制化接口</name>
<description>肥猫SDK</description> <description>肥猫SDK</description>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-core</artifactId> <artifactId>scfs-api-core</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -5,11 +5,11 @@
<parent> <parent>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-sdk</artifactId> <artifactId>scfs-api-sdk</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</parent> </parent>
<artifactId>scfs-api-service</artifactId> <artifactId>scfs-api-service</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
<name>scfs-api-service:通用类接口</name> <name>scfs-api-service:通用类接口</name>
<description>通用类接口</description> <description>通用类接口</description>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -24,7 +24,7 @@
<dependency> <dependency>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-core</artifactId> <artifactId>scfs-api-core</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -5,11 +5,11 @@
<parent> <parent>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-sdk</artifactId> <artifactId>scfs-api-sdk</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</parent> </parent>
<artifactId>scfs-api-sm</artifactId> <artifactId>scfs-api-sm</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
<name>scfs-api-sm:国密模块</name> <name>scfs-api-sm:国密模块</name>
<description>封装SM2、SM4国密算法</description> <description>封装SM2、SM4国密算法</description>
@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-core</artifactId> <artifactId>scfs-api-core</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.tencent.kona/kona-crypto --> <!-- https://mvnrepository.com/artifact/com.tencent.kona/kona-crypto -->

View File

@ -5,11 +5,11 @@
<parent> <parent>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-sdk</artifactId> <artifactId>scfs-api-sdk</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</parent> </parent>
<artifactId>scfs-api-spring-boot-starter</artifactId> <artifactId>scfs-api-spring-boot-starter</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
<name>scfs-spring-boot-starter</name> <name>scfs-spring-boot-starter</name>
<description>scfs-spring-boot-starter</description> <description>scfs-spring-boot-starter</description>
@ -17,22 +17,22 @@
<dependency> <dependency>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-core</artifactId> <artifactId>scfs-api-core</artifactId>
<version>${project.parent.version}</version> <version>2.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-service</artifactId> <artifactId>scfs-api-service</artifactId>
<version>${project.parent.version}</version> <version>2.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-rsa</artifactId> <artifactId>scfs-api-rsa</artifactId>
<version>${project.parent.version}</version> <version>2.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-sm</artifactId> <artifactId>scfs-api-sm</artifactId>
<version>${project.parent.version}</version> <version>2.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

View File

@ -5,14 +5,19 @@
<parent> <parent>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
<artifactId>scfs-api-sdk</artifactId> <artifactId>scfs-api-sdk</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
</parent> </parent>
<artifactId>scfs-api-test</artifactId> <artifactId>scfs-api-test</artifactId>
<version>2.0.3-snapshot</version> <version>2.0.3</version>
<name>scfs-api-test</name> <name>scfs-api-test</name>
<description>scfs-api-test</description> <description>scfs-api-test</description>
<properties>
<sonar.skip>true</sonar.skip>
<maven.test.skip>true</maven.test.skip>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.czcb.scfs</groupId> <groupId>com.czcb.scfs</groupId>
@ -26,7 +31,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>2.7.18</version> <version>2.7.16</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -25,8 +25,8 @@ public class CommunalDataServiceTest {
request.setChannelNo("0000"); request.setChannelNo("0000");
request.setAppNo("10"); request.setAppNo("10");
request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); request.setSerialNo(UUID.randomUUID().toString().replace("-", ""));
request.setSysTime("2024-03-20"); request.setTransDate("2024-03-20");
request.setSysDate("2024-03-20"); request.setTransTradeTime("2024-03-20");
request.setZoningCode("110101001000000"); request.setZoningCode("110101001000000");
FiveCascadeQueryResponse response = communalDataService.fiveCascadeQuery(request); FiveCascadeQueryResponse response = communalDataService.fiveCascadeQuery(request);