Compare commits

..
6 changed files with 11900 additions and 357 deletions
+6 -3
View File
@@ -9,7 +9,7 @@
"ghcr.io/devcontainers/features/java:1": { "ghcr.io/devcontainers/features/java:1": {
"version":"8.0.402-librca", "version":"8.0.402-librca",
"installMaven": "true", "installMaven": "true",
// "mavenVersion": "3.8.6", "mavenVersion": "3.9.6",
"installGradle": "false" "installGradle": "false"
} }
}, },
@@ -20,13 +20,16 @@
"vscode": { "vscode": {
"settings": {}, "settings": {},
"extensions": [ "extensions": [
"streetsidesoftware.code-spell-checker" "redhat.java",
"vmware.vscode-spring-boot",
// "streetsidesoftware.code-spell-checker",
"DotJoshJohnson.xml"
] ]
} }
}, },
"mounts": [ "mounts": [
"source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached", "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached",
"source=${localEnv:HOME}/.m2,target=/home/vscode/.m2,type=bind,consistency=cached", "source=${localEnv:HOME}/.m2,target=/home/vscode/.m2,type=bind,consistency=cached"
] ]
// Use 'forwardPorts' to make a list of ports inside the container available locally. // Use 'forwardPorts' to make a list of ports inside the container available locally.
+11521
View File
File diff suppressed because it is too large Load Diff
+41 -29
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gzzn.omms</groupId> <groupId>com.gzzn.omms</groupId>
@@ -14,7 +15,8 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.17.RELEASE</version> <version>1.5.17.RELEASE</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/>
<!-- lookup parent from repository -->
</parent> </parent>
<properties> <properties>
@@ -86,12 +88,12 @@
<version>4.1</version> <version>4.1</version>
</dependency> </dependency>
<!-- java 17 build--> <!-- java 17 build-->
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version> <version>2.3.3</version>
</dependency> </dependency>
<!-- <dependency> <!-- <dependency>
<groupId>com.fasterxml.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
@@ -99,13 +101,13 @@
<version>5.4.0</version> <version>5.4.0</version>
</dependency> --> </dependency> -->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>com.oracle</groupId>--> <!-- <groupId>com.oracle</groupId>-->
<!-- <artifactId>ojdbc6</artifactId>--> <!-- <artifactId>ojdbc6</artifactId>-->
<!-- <version>11.2.0.3</version>--> <!-- <version>11.2.0.3</version>-->
<!-- <scope>system</scope>--> <!-- <scope>system</scope>-->
<!-- <systemPath>${project.basedir}/src/main/resources/libs/ojdbc6-11.2.0.3.jar</systemPath>--> <!-- <systemPath>${project.basedir}/src/main/resources/libs/ojdbc6-11.2.0.3.jar</systemPath>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <dependency>
<groupId>com.oracle.database.jdbc</groupId> <groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc6</artifactId> <artifactId>ojdbc6</artifactId>
@@ -215,23 +217,23 @@
<!--jdk 17 compile --> <!--jdk 17 compile -->
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>2.3.0</version> <version>2.3.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<!-- <plugin> <!--plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration> <configuration>
<mainClass>com.gzzn.omms.msgexchangeapi.MsgexchangeApiApplication</mainClass> <mainClass>com.gzzn.omms.msgexchangeapi.MsgexchangeApiApplication</mainClass>
</configuration> </configuration>
</plugin> --> </plugin-->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@@ -258,8 +260,18 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration> <configuration>
<includeSystemScope>true</includeSystemScope> <layers>
<enabled>true</enabled>
<configuration>${project.basedir}/src/layers.xml</configuration>
</layers>
</configuration> </configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
@@ -300,11 +312,11 @@
</resource> </resource>
</resources> </resources>
<extensions> <extensions>
<extension> <!--extension>
<groupId>org.apache.maven.extensions</groupId> <groupId>org.apache.maven.extensions</groupId>
<artifactId>maven-build-cache-extension</artifactId> <artifactId>maven-build-cache-extension</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
</extension> </extension-->
</extensions> </extensions>
</build> </build>
+5 -14
View File
@@ -275,25 +275,16 @@ under the License.
</profile> </profile>
--> -->
<profile> <profile>
<id>archiva</id> <id>reposilite</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<repositories> <repositories>
<repository> <repository>
<id>archiva.internal</id> <id>reposilite-releases</id>
<name>Archiva Managed Internal Repository</name> <name>GZZN JVM</name>
<url>https://repo.int.it2000.com.cn/repository/internal/</url> <url>https://repo.int.it2000.com.cn/releases</url>
<releases><enabled>true</enabled><updatePolicy>always</updatePolicy></releases> </repository>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>archiva.snapshots</id>
<name>Archiva Managed Internal Repository</name>
<url>https://repo.int.it2000.com.cn/repository/snapshots/</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots>
</repository>
</repositories> </repositories>
</profile> </profile>
</profiles> </profiles>
+27
View File
@@ -0,0 +1,27 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/boot/layers/layers-2.3.xsd">
<application>
<into layer="spring-boot-loader">
<include>org/springframework/boot/loader/**</include>
</into>
<into layer="application" />
</application>
<dependencies>
<into layer="snapshot-dependencies">
<include>*:*:*SNAPSHOT</include>
</into>
<into layer="internal-dependencies">
<include>com.baeldung.docker:*:*</include>
</into>
<into layer="dependencies" />
</dependencies>
<layerOrder>
<layer>dependencies</layer>
<layer>spring-boot-loader</layer>
<layer>internal-dependencies</layer>
<layer>snapshot-dependencies</layer>
<layer>application</layer>
</layerOrder>
</layers>
@@ -1,24 +1,13 @@
package com.gzzn.omms.msgexchangeapi.scheduled; package com.gzzn.omms.msgexchangeapi.scheduled;
import java.util.Date;
import java.util.List;
import java.util.stream.Collector;
import java.util.stream.Collectors;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao; import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao;
import com.gzzn.omms.msgexchangeapi.dao.CminmsgHstDao; import com.gzzn.omms.msgexchangeapi.dao.CminmsgHstDao;
import com.gzzn.omms.msgexchangeapi.entity.Cminmsg;
import com.gzzn.omms.msgexchangeapi.entity.CminmsgHst;
import com.gzzn.omms.msgexchangeapi.service.ICminmsgHstService; import com.gzzn.omms.msgexchangeapi.service.ICminmsgHstService;
/** /**