From 39a41cc9fabd752311112adfe05330a8abe21e27 Mon Sep 17 00:00:00 2001
From: Weasley J <1432689025@qq.com>
Date: Tue, 11 Jul 2023 00:58:07 +0800
Subject: [PATCH] =?UTF-8?q?-=20POM=E4=BC=98=E5=8C=96=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B=E8=87=B3=E4=B8=AD?=
 =?UTF-8?q?=E5=A4=AE=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chinaport-data-signature-app/pom.xml          |  2 +-
 .../signature/core/CertificateHandler.java    |  4 ++--
 chinaport-data-signature-data-model/pom.xml   | 21 ++++++++++++-------
 .../deploy.sh => deploy.sh                    |  0
 4 files changed, 17 insertions(+), 10 deletions(-)
 rename chinaport-data-signature-data-model/deploy.sh => deploy.sh (100%)

diff --git a/chinaport-data-signature-app/pom.xml b/chinaport-data-signature-app/pom.xml
index 0b33f93..7915c92 100644
--- a/chinaport-data-signature-app/pom.xml
+++ b/chinaport-data-signature-app/pom.xml
@@ -53,7 +53,7 @@
     <dependencies>
         <!-- 海关 179 数据抓取，CEB311Message/CEB621Message等数据模型 -->
         <dependency>
-            <groupId>o.github.weasleyj.china.eport.sign</groupId>
+            <groupId>io.github.weasley-j</groupId>
             <artifactId>chinaport-data-signature-data-model</artifactId>
             <version>${signature-data-model.version}</version>
         </dependency>
diff --git a/chinaport-data-signature-app/src/main/java/cn/alphahub/eport/signature/core/CertificateHandler.java b/chinaport-data-signature-app/src/main/java/cn/alphahub/eport/signature/core/CertificateHandler.java
index c484bcd..bd8cff5 100644
--- a/chinaport-data-signature-app/src/main/java/cn/alphahub/eport/signature/core/CertificateHandler.java
+++ b/chinaport-data-signature-app/src/main/java/cn/alphahub/eport/signature/core/CertificateHandler.java
@@ -1,6 +1,7 @@
 package cn.alphahub.eport.signature.core;
 
 import cn.alphahub.eport.signature.config.SignatureAlgorithm;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
@@ -10,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Map;
 
 import static cn.alphahub.eport.signature.config.SignatureAlgorithm.RSA_SHA1;
@@ -39,7 +39,7 @@ public class CertificateHandler implements Serializable {
     /**
      * 暂定2022-07-01为第一个时间分界
      */
-    public static final LocalDateTime DATE_TIME_202207 = LocalDateTime.parse("2022-07-01", DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+    public static final LocalDateTime DATE_TIME_202207 = LocalDateTimeUtil.parse("2022-07-01", "yyyy-MM-dd");
 
     /**
      * u-key的.cer证书是否存在
diff --git a/chinaport-data-signature-data-model/pom.xml b/chinaport-data-signature-data-model/pom.xml
index 44aef15..c99af75 100644
--- a/chinaport-data-signature-data-model/pom.xml
+++ b/chinaport-data-signature-data-model/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>o.github.weasleyj.china.eport.sign</groupId>
+    <groupId>io.github.weasley-j</groupId>
     <artifactId>chinaport-data-signature-data-model</artifactId>
     <version>1.0.0</version>
     <name>chinaport-data-signature-data-model</name>
@@ -32,7 +32,7 @@
     </developers>
 
     <scm>
-        <url>https://github.com/Weasley-J/chinaport-data-signature</url>
+        <url>https://github.com/Weasley-J/chinaport-data-signature/tree/main/chinaport-data-signature-data-model</url>
         <connection>https://github.com/Weasley-J/chinaport-data-signature.git</connection>
         <developerConnection>https://github.com/Weasley-J/chinaport-data-signature</developerConnection>
     </scm>
@@ -72,7 +72,19 @@
         </dependency>
     </dependencies>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
     <build>
+        <finalName>${project.artifactId}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -89,7 +101,6 @@
                 <configuration>
                     <source>8</source>
                     <target>8</target>
-                    <compilerVersion>1.8</compilerVersion>
                 </configuration>
             </plugin>
             <plugin>
@@ -109,7 +120,6 @@
                 <executions>
                     <execution>
                         <id>attach-sources</id>
-                        <phase>package</phase>
                         <goals>
                             <goal>jar-no-fork</goal>
                         </goals>
@@ -126,9 +136,6 @@
                     <charset>UTF-8</charset>
                     <encoding>UTF-8</encoding>
                     <docencoding>UTF-8</docencoding>
-                    <additionalJOptions>
-                        <additionalJOption>-Xdoclint:none</additionalJOption>
-                    </additionalJOptions>
                     <tags>
                         <tag>
                             <name>date</name>
diff --git a/chinaport-data-signature-data-model/deploy.sh b/deploy.sh
similarity index 100%
rename from chinaport-data-signature-data-model/deploy.sh
rename to deploy.sh