Compare commits
10
Commits
efb68f1409
...
eb72a668bb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eb72a668bb | ||
|
|
1451f86640 | ||
|
|
2bb0e294f3 | ||
|
|
9429d38ee6 | ||
|
|
ce29001309 | ||
|
|
90dd05b56e | ||
|
|
cbd749b619 | ||
|
|
6a5655da73 | ||
|
|
d9ddd13eea | ||
|
|
a9ddbb12c0 |
@@ -9,7 +9,7 @@
|
||||
"ghcr.io/devcontainers/features/java:1": {
|
||||
"version":"8.0.402-librca",
|
||||
"installMaven": "true",
|
||||
// "mavenVersion": "3.8.6",
|
||||
"mavenVersion": "3.9.6",
|
||||
"installGradle": "false"
|
||||
}
|
||||
},
|
||||
@@ -20,13 +20,16 @@
|
||||
"vscode": {
|
||||
"settings": {},
|
||||
"extensions": [
|
||||
"streetsidesoftware.code-spell-checker"
|
||||
"redhat.java",
|
||||
"vmware.vscode-spring-boot",
|
||||
// "streetsidesoftware.code-spell-checker",
|
||||
"DotJoshJohnson.xml"
|
||||
]
|
||||
}
|
||||
},
|
||||
"mounts": [
|
||||
"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.
|
||||
|
||||
+11521
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,6 @@
|
||||
<?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>
|
||||
|
||||
<groupId>com.gzzn.omms</groupId>
|
||||
@@ -14,7 +15,8 @@
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>1.5.17.RELEASE</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
<relativePath/>
|
||||
<!-- lookup parent from repository -->
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
@@ -225,13 +227,13 @@
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- <plugin>
|
||||
<!--plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<mainClass>com.gzzn.omms.msgexchangeapi.MsgexchangeApiApplication</mainClass>
|
||||
</configuration>
|
||||
</plugin> -->
|
||||
</plugin-->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
@@ -258,8 +260,18 @@
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<includeSystemScope>true</includeSystemScope>
|
||||
<layers>
|
||||
<enabled>true</enabled>
|
||||
<configuration>${project.basedir}/src/layers.xml</configuration>
|
||||
</layers>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.spotify</groupId>
|
||||
@@ -300,11 +312,11 @@
|
||||
</resource>
|
||||
</resources>
|
||||
<extensions>
|
||||
<extension>
|
||||
<!--extension>
|
||||
<groupId>org.apache.maven.extensions</groupId>
|
||||
<artifactId>maven-build-cache-extension</artifactId>
|
||||
<version>1.1.0</version>
|
||||
</extension>
|
||||
</extension-->
|
||||
</extensions>
|
||||
</build>
|
||||
|
||||
|
||||
+4
-13
@@ -275,24 +275,15 @@ under the License.
|
||||
</profile>
|
||||
-->
|
||||
<profile>
|
||||
<id>archiva</id>
|
||||
<id>reposilite</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>archiva.internal</id>
|
||||
<name>Archiva Managed Internal Repository</name>
|
||||
<url>https://repo.int.it2000.com.cn/repository/internal/</url>
|
||||
<releases><enabled>true</enabled><updatePolicy>always</updatePolicy></releases>
|
||||
<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>
|
||||
<id>reposilite-releases</id>
|
||||
<name>GZZN JVM</name>
|
||||
<url>https://repo.int.it2000.com.cn/releases</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</profile>
|
||||
|
||||
@@ -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;
|
||||
|
||||
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.LoggerFactory;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao;
|
||||
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;
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user