Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 zhiqiang feng
|
eb72a668bb | ||
|
zhiqiang feng
|
1451f86640 | ||
|
zhiqiang feng
|
2bb0e294f3 | ||
|
zhiqiang feng
|
9429d38ee6 | ||
|
zhiqiang feng
|
ce29001309 | ||
|
zhiqiang feng
|
90dd05b56e | ||
|
zhiqiang feng
|
cbd749b619 | ||
|
zhiqiang feng
|
6a5655da73 | ||
|
zhiqiang feng
|
d9ddd13eea | ||
|
zhiqiang feng
|
a9ddbb12c0 |
@@ -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
File diff suppressed because it is too large
Load Diff
@@ -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,28 +217,28 @@
|
|||||||
|
|
||||||
<!--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>
|
||||||
<version>3.12.1</version>
|
<version>3.12.1</version>
|
||||||
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<verbose>false</verbose>
|
<verbose>false</verbose>
|
||||||
<fork>true</fork>
|
<fork>true</fork>
|
||||||
@@ -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>
|
||||||
|
|
||||||
|
|||||||
+303
-312
@@ -1,312 +1,303 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Licensed to the Apache Software Foundation (ASF) under one
|
Licensed to the Apache Software Foundation (ASF) under one
|
||||||
or more contributor license agreements. See the NOTICE file
|
or more contributor license agreements. See the NOTICE file
|
||||||
distributed with this work for additional information
|
distributed with this work for additional information
|
||||||
regarding copyright ownership. The ASF licenses this file
|
regarding copyright ownership. The ASF licenses this file
|
||||||
to you under the Apache License, Version 2.0 (the
|
to you under the Apache License, Version 2.0 (the
|
||||||
"License"); you may not use this file except in compliance
|
"License"); you may not use this file except in compliance
|
||||||
with the License. You may obtain a copy of the License at
|
with the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing,
|
Unless required by applicable law or agreed to in writing,
|
||||||
software distributed under the License is distributed on an
|
software distributed under the License is distributed on an
|
||||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
KIND, either express or implied. See the License for the
|
KIND, either express or implied. See the License for the
|
||||||
specific language governing permissions and limitations
|
specific language governing permissions and limitations
|
||||||
under the License.
|
under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
| This is the configuration file for Maven. It can be specified at two levels:
|
| This is the configuration file for Maven. It can be specified at two levels:
|
||||||
|
|
|
|
||||||
| 1. User Level. This settings.xml file provides configuration for a single user,
|
| 1. User Level. This settings.xml file provides configuration for a single user,
|
||||||
| and is normally provided in ${user.home}/.m2/settings.xml.
|
| and is normally provided in ${user.home}/.m2/settings.xml.
|
||||||
|
|
|
|
||||||
| NOTE: This location can be overridden with the CLI option:
|
| NOTE: This location can be overridden with the CLI option:
|
||||||
|
|
|
|
||||||
| -s /path/to/user/settings.xml
|
| -s /path/to/user/settings.xml
|
||||||
|
|
|
|
||||||
| 2. Global Level. This settings.xml file provides configuration for all Maven
|
| 2. Global Level. This settings.xml file provides configuration for all Maven
|
||||||
| users on a machine (assuming they're all using the same Maven
|
| users on a machine (assuming they're all using the same Maven
|
||||||
| installation). It's normally provided in
|
| installation). It's normally provided in
|
||||||
| ${maven.conf}/settings.xml.
|
| ${maven.conf}/settings.xml.
|
||||||
|
|
|
|
||||||
| NOTE: This location can be overridden with the CLI option:
|
| NOTE: This location can be overridden with the CLI option:
|
||||||
|
|
|
|
||||||
| -gs /path/to/global/settings.xml
|
| -gs /path/to/global/settings.xml
|
||||||
|
|
|
|
||||||
| The sections in this sample file are intended to give you a running start at
|
| The sections in this sample file are intended to give you a running start at
|
||||||
| getting the most out of your Maven installation. Where appropriate, the default
|
| getting the most out of your Maven installation. Where appropriate, the default
|
||||||
| values (values used when the setting is not specified) are provided.
|
| values (values used when the setting is not specified) are provided.
|
||||||
|
|
|
|
||||||
|-->
|
|-->
|
||||||
<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
|
<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">
|
||||||
<!-- localRepository
|
<!-- localRepository
|
||||||
| The path to the local repository maven will use to store artifacts.
|
| The path to the local repository maven will use to store artifacts.
|
||||||
|
|
|
|
||||||
| Default: ${user.home}/.m2/repository
|
| Default: ${user.home}/.m2/repository
|
||||||
<localRepository>/path/to/local/repo</localRepository>
|
<localRepository>/path/to/local/repo</localRepository>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- interactiveMode
|
<!-- interactiveMode
|
||||||
| This will determine whether maven prompts you when it needs input. If set to false,
|
| This will determine whether maven prompts you when it needs input. If set to false,
|
||||||
| maven will use a sensible default value, perhaps based on some other setting, for
|
| maven will use a sensible default value, perhaps based on some other setting, for
|
||||||
| the parameter in question.
|
| the parameter in question.
|
||||||
|
|
|
|
||||||
| Default: true
|
| Default: true
|
||||||
<interactiveMode>true</interactiveMode>
|
<interactiveMode>true</interactiveMode>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- offline
|
<!-- offline
|
||||||
| Determines whether maven should attempt to connect to the network when executing a build.
|
| Determines whether maven should attempt to connect to the network when executing a build.
|
||||||
| This will have an effect on artifact downloads, artifact deployment, and others.
|
| This will have an effect on artifact downloads, artifact deployment, and others.
|
||||||
|
|
|
|
||||||
| Default: false
|
| Default: false
|
||||||
<offline>false</offline>
|
<offline>false</offline>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- pluginGroups
|
<!-- pluginGroups
|
||||||
| This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
|
| This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
|
||||||
| when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
|
| when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
|
||||||
| "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
|
| "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
|
||||||
|-->
|
|-->
|
||||||
<pluginGroups>
|
<pluginGroups>
|
||||||
<!-- pluginGroup
|
<!-- pluginGroup
|
||||||
| Specifies a further group identifier to use for plugin lookup.
|
| Specifies a further group identifier to use for plugin lookup.
|
||||||
<pluginGroup>com.your.plugins</pluginGroup>
|
<pluginGroup>com.your.plugins</pluginGroup>
|
||||||
-->
|
-->
|
||||||
</pluginGroups>
|
</pluginGroups>
|
||||||
|
|
||||||
<!-- proxies
|
<!-- proxies
|
||||||
| This is a list of proxies which can be used on this machine to connect to the network.
|
| This is a list of proxies which can be used on this machine to connect to the network.
|
||||||
| Unless otherwise specified (by system property or command-line switch), the first proxy
|
| Unless otherwise specified (by system property or command-line switch), the first proxy
|
||||||
| specification in this list marked as active will be used.
|
| specification in this list marked as active will be used.
|
||||||
|-->
|
|-->
|
||||||
<proxies>
|
<proxies>
|
||||||
<!-- proxy
|
<!-- proxy
|
||||||
| Specification for one proxy, to be used in connecting to the network.
|
| Specification for one proxy, to be used in connecting to the network.
|
||||||
|
|
|
|
||||||
<proxy>
|
<proxy>
|
||||||
<id>optional</id>
|
<id>optional</id>
|
||||||
<active>true</active>
|
<active>true</active>
|
||||||
<protocol>http</protocol>
|
<protocol>http</protocol>
|
||||||
<username>proxyuser</username>
|
<username>proxyuser</username>
|
||||||
<password>proxypass</password>
|
<password>proxypass</password>
|
||||||
<host>proxy.host.net</host>
|
<host>proxy.host.net</host>
|
||||||
<port>80</port>
|
<port>80</port>
|
||||||
<nonProxyHosts>local.net|some.host.com</nonProxyHosts>
|
<nonProxyHosts>local.net|some.host.com</nonProxyHosts>
|
||||||
</proxy>
|
</proxy>
|
||||||
-->
|
-->
|
||||||
</proxies>
|
</proxies>
|
||||||
|
|
||||||
<!-- servers
|
<!-- servers
|
||||||
| This is a list of authentication profiles, keyed by the server-id used within the system.
|
| This is a list of authentication profiles, keyed by the server-id used within the system.
|
||||||
| Authentication profiles can be used whenever maven must make a connection to a remote server.
|
| Authentication profiles can be used whenever maven must make a connection to a remote server.
|
||||||
|-->
|
|-->
|
||||||
<!--server>
|
<!--server>
|
||||||
<id>local-snapshots</id>
|
<id>local-snapshots</id>
|
||||||
<username>fengzhiqiang</username>
|
<username>fengzhiqiang</username>
|
||||||
<password>dyoCYJWlv/5MdL0Khw029eVy/XlpMmuhYWT9vt9HZBmO6wsbdrQcZCYEt8a1JztX</password>
|
<password>dyoCYJWlv/5MdL0Khw029eVy/XlpMmuhYWT9vt9HZBmO6wsbdrQcZCYEt8a1JztX</password>
|
||||||
</server-->
|
</server-->
|
||||||
|
|
||||||
<servers>
|
<servers>
|
||||||
<!-- server
|
<!-- server
|
||||||
| Specifies the authentication information to use when connecting to a particular server, identified by
|
| Specifies the authentication information to use when connecting to a particular server, identified by
|
||||||
| a unique name within the system (referred to by the 'id' attribute below).
|
| a unique name within the system (referred to by the 'id' attribute below).
|
||||||
|
|
|
|
||||||
| NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
|
| NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
|
||||||
| used together.
|
| used together.
|
||||||
|
|
|
|
||||||
<server>
|
<server>
|
||||||
<id>deploymentRepo</id>
|
<id>deploymentRepo</id>
|
||||||
<username>repouser</username>
|
<username>repouser</username>
|
||||||
<password>repopwd</password>
|
<password>repopwd</password>
|
||||||
</server>
|
</server>
|
||||||
-->
|
-->
|
||||||
<server>
|
<server>
|
||||||
<username>fengzhiqiang</username>
|
<username>fengzhiqiang</username>
|
||||||
<password>admingzzn1</password>
|
<password>admingzzn1</password>
|
||||||
<id>archiva</id>
|
<id>archiva</id>
|
||||||
</server>
|
</server>
|
||||||
|
|
||||||
<!-- Another sample, using keys to authenticate.
|
<!-- Another sample, using keys to authenticate.
|
||||||
<server>
|
<server>
|
||||||
<id>siteServer</id>
|
<id>siteServer</id>
|
||||||
<privateKey>/path/to/private/key</privateKey>
|
<privateKey>/path/to/private/key</privateKey>
|
||||||
<passphrase>optional; leave empty if not used.</passphrase>
|
<passphrase>optional; leave empty if not used.</passphrase>
|
||||||
</server>
|
</server>
|
||||||
-->
|
-->
|
||||||
</servers>
|
</servers>
|
||||||
|
|
||||||
<!-- mirrors
|
<!-- mirrors
|
||||||
| This is a list of mirrors to be used in downloading artifacts from remote repositories.
|
| This is a list of mirrors to be used in downloading artifacts from remote repositories.
|
||||||
|
|
|
|
||||||
| It works like this: a POM may declare a repository to use in resolving certain artifacts.
|
| It works like this: a POM may declare a repository to use in resolving certain artifacts.
|
||||||
| However, this repository may have problems with heavy traffic at times, so people have mirrored
|
| However, this repository may have problems with heavy traffic at times, so people have mirrored
|
||||||
| it to several places.
|
| it to several places.
|
||||||
|
|
|
|
||||||
| That repository definition will have a unique id, so we can create a mirror reference for that
|
| That repository definition will have a unique id, so we can create a mirror reference for that
|
||||||
| repository, to be used as an alternate download site. The mirror site will be the preferred
|
| repository, to be used as an alternate download site. The mirror site will be the preferred
|
||||||
| server for that repository.
|
| server for that repository.
|
||||||
|-->
|
|-->
|
||||||
<mirrors>
|
<mirrors>
|
||||||
<mirror>
|
<mirror>
|
||||||
<id>alimaven</id>
|
<id>alimaven</id>
|
||||||
<name>aliyun</name>
|
<name>aliyun</name>
|
||||||
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
|
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
|
||||||
<mirrorOf>central</mirrorOf>
|
<mirrorOf>central</mirrorOf>
|
||||||
</mirror>
|
</mirror>
|
||||||
<!-- mirror
|
<!-- mirror
|
||||||
| Specifies a repository mirror site to use instead of a given repository. The repository that
|
| Specifies a repository mirror site to use instead of a given repository. The repository that
|
||||||
| this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
|
| this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
|
||||||
| for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
|
| for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
|
||||||
|
|
|
|
||||||
<mirror>
|
<mirror>
|
||||||
<id>mirrorId</id>
|
<id>mirrorId</id>
|
||||||
<mirrorOf>repositoryId</mirrorOf>
|
<mirrorOf>repositoryId</mirrorOf>
|
||||||
<name>Human Readable Name for this Mirror.</name>
|
<name>Human Readable Name for this Mirror.</name>
|
||||||
<url>http://my.repository.com/repo/path</url>
|
<url>http://my.repository.com/repo/path</url>
|
||||||
</mirror>
|
</mirror>
|
||||||
-->
|
-->
|
||||||
<mirror>
|
<mirror>
|
||||||
<id>maven-default-http-blocker</id>
|
<id>maven-default-http-blocker</id>
|
||||||
<mirrorOf>external:http:*</mirrorOf>
|
<mirrorOf>external:http:*</mirrorOf>
|
||||||
<name>Pseudo repository to mirror external repositories initially using HTTP.</name>
|
<name>Pseudo repository to mirror external repositories initially using HTTP.</name>
|
||||||
<url>http://0.0.0.0/</url>
|
<url>http://0.0.0.0/</url>
|
||||||
<blocked>true</blocked>
|
<blocked>true</blocked>
|
||||||
</mirror>
|
</mirror>
|
||||||
<!--mirror>
|
<!--mirror>
|
||||||
<id>local archiva</id>
|
<id>local archiva</id>
|
||||||
<mirrorOf>external:*</mirrorOf>
|
<mirrorOf>external:*</mirrorOf>
|
||||||
<name>gzzn office local archiva</name>
|
<name>gzzn office local archiva</name>
|
||||||
<url>https://repo.int.it2000.com.cn/repository/internal</url>
|
<url>https://repo.int.it2000.com.cn/repository/internal</url>
|
||||||
</mirror-->
|
</mirror-->
|
||||||
</mirrors>
|
</mirrors>
|
||||||
|
|
||||||
<!-- profiles
|
<!-- profiles
|
||||||
| This is a list of profiles which can be activated in a variety of ways, and which can modify
|
| This is a list of profiles which can be activated in a variety of ways, and which can modify
|
||||||
| the build process. Profiles provided in the settings.xml are intended to provide local machine-
|
| the build process. Profiles provided in the settings.xml are intended to provide local machine-
|
||||||
| specific paths and repository locations which allow the build to work in the local environment.
|
| specific paths and repository locations which allow the build to work in the local environment.
|
||||||
|
|
|
|
||||||
| For example, if you have an integration testing plugin - like cactus - that needs to know where
|
| For example, if you have an integration testing plugin - like cactus - that needs to know where
|
||||||
| your Tomcat instance is installed, you can provide a variable here such that the variable is
|
| your Tomcat instance is installed, you can provide a variable here such that the variable is
|
||||||
| dereferenced during the build process to configure the cactus plugin.
|
| dereferenced during the build process to configure the cactus plugin.
|
||||||
|
|
|
|
||||||
| As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
|
| As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
|
||||||
| section of this document (settings.xml) - will be discussed later. Another way essentially
|
| section of this document (settings.xml) - will be discussed later. Another way essentially
|
||||||
| relies on the detection of a system property, either matching a particular value for the property,
|
| relies on the detection of a system property, either matching a particular value for the property,
|
||||||
| or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
|
| or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
|
||||||
| value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
|
| value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
|
||||||
| Finally, the list of active profiles can be specified directly from the command line.
|
| Finally, the list of active profiles can be specified directly from the command line.
|
||||||
|
|
|
|
||||||
| NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
|
| NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
|
||||||
| repositories, plugin repositories, and free-form properties to be used as configuration
|
| repositories, plugin repositories, and free-form properties to be used as configuration
|
||||||
| variables for plugins in the POM.
|
| variables for plugins in the POM.
|
||||||
|
|
|
|
||||||
|-->
|
|-->
|
||||||
<profiles>
|
<profiles>
|
||||||
<!-- profile
|
<!-- profile
|
||||||
| Specifies a set of introductions to the build process, to be activated using one or more of the
|
| Specifies a set of introductions to the build process, to be activated using one or more of the
|
||||||
| mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
|
| mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
|
||||||
| or the command line, profiles have to have an ID that is unique.
|
| or the command line, profiles have to have an ID that is unique.
|
||||||
|
|
|
|
||||||
| An encouraged best practice for profile identification is to use a consistent naming convention
|
| An encouraged best practice for profile identification is to use a consistent naming convention
|
||||||
| for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
|
| for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
|
||||||
| This will make it more intuitive to understand what the set of introduced profiles is attempting
|
| This will make it more intuitive to understand what the set of introduced profiles is attempting
|
||||||
| to accomplish, particularly when you only have a list of profile id's for debug.
|
| to accomplish, particularly when you only have a list of profile id's for debug.
|
||||||
|
|
|
|
||||||
| This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
|
| This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
|
||||||
<profile>
|
<profile>
|
||||||
<id>jdk-1.4</id>
|
<id>jdk-1.4</id>
|
||||||
|
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>1.4</jdk>
|
<jdk>1.4</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>jdk14</id>
|
<id>jdk14</id>
|
||||||
<name>Repository for JDK 1.4 builds</name>
|
<name>Repository for JDK 1.4 builds</name>
|
||||||
<url>http://www.myhost.com/maven/jdk14</url>
|
<url>http://www.myhost.com/maven/jdk14</url>
|
||||||
<layout>default</layout>
|
<layout>default</layout>
|
||||||
<snapshotPolicy>always</snapshotPolicy>
|
<snapshotPolicy>always</snapshotPolicy>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
</profile>
|
</profile>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
| Here is another profile, activated by the system property 'target-env' with a value of 'dev',
|
| Here is another profile, activated by the system property 'target-env' with a value of 'dev',
|
||||||
| which provides a specific path to the Tomcat instance. To use this, your plugin configuration
|
| which provides a specific path to the Tomcat instance. To use this, your plugin configuration
|
||||||
| might hypothetically look like:
|
| might hypothetically look like:
|
||||||
|
|
|
|
||||||
| ...
|
| ...
|
||||||
| <plugin>
|
| <plugin>
|
||||||
| <groupId>org.myco.myplugins</groupId>
|
| <groupId>org.myco.myplugins</groupId>
|
||||||
| <artifactId>myplugin</artifactId>
|
| <artifactId>myplugin</artifactId>
|
||||||
|
|
|
|
||||||
| <configuration>
|
| <configuration>
|
||||||
| <tomcatLocation>${tomcatPath}</tomcatLocation>
|
| <tomcatLocation>${tomcatPath}</tomcatLocation>
|
||||||
| </configuration>
|
| </configuration>
|
||||||
| </plugin>
|
| </plugin>
|
||||||
| ...
|
| ...
|
||||||
|
|
|
|
||||||
| NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
|
| NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
|
||||||
| anything, you could just leave off the <value/> inside the activation-property.
|
| anything, you could just leave off the <value/> inside the activation-property.
|
||||||
|
|
|
|
||||||
<profile>
|
<profile>
|
||||||
<id>env-dev</id>
|
<id>env-dev</id>
|
||||||
|
|
||||||
<activation>
|
<activation>
|
||||||
<property>
|
<property>
|
||||||
<name>target-env</name>
|
<name>target-env</name>
|
||||||
<value>dev</value>
|
<value>dev</value>
|
||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<tomcatPath>/path/to/tomcat/instance</tomcatPath>
|
<tomcatPath>/path/to/tomcat/instance</tomcatPath>
|
||||||
</properties>
|
</properties>
|
||||||
</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>
|
</repositories>
|
||||||
</repository>
|
</profile>
|
||||||
<repository>
|
</profiles>
|
||||||
<id>archiva.snapshots</id>
|
|
||||||
<name>Archiva Managed Internal Repository</name>
|
<!-- activeProfiles
|
||||||
<url>https://repo.int.it2000.com.cn/repository/snapshots/</url>
|
| List of profiles that are active for all builds.
|
||||||
<releases><enabled>false</enabled></releases>
|
|
|
||||||
<snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots>
|
<activeProfiles>
|
||||||
</repository>
|
<activeProfile>alwaysActiveProfile</activeProfile>
|
||||||
</repositories>
|
<activeProfile>anotherAlwaysActiveProfile</activeProfile>
|
||||||
</profile>
|
</activeProfiles>
|
||||||
</profiles>
|
-->
|
||||||
|
<activeProfiles>
|
||||||
<!-- activeProfiles
|
<activeProfile>archiva</activeProfile>
|
||||||
| List of profiles that are active for all builds.
|
</activeProfiles>
|
||||||
|
|
</settings>
|
||||||
<activeProfiles>
|
|
||||||
<activeProfile>alwaysActiveProfile</activeProfile>
|
|
||||||
<activeProfile>anotherAlwaysActiveProfile</activeProfile>
|
|
||||||
</activeProfiles>
|
|
||||||
-->
|
|
||||||
<activeProfiles>
|
|
||||||
<activeProfile>archiva</activeProfile>
|
|
||||||
</activeProfiles>
|
|
||||||
</settings>
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user