From 2a99666167c21891f288f4713f1b3751ef6336a8 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Fri, 1 Nov 2024 23:52:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9docker-ca=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E7=9A=84=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compile/default-compile/inputFiles.lst                 | 2 ++
 pom.xml                                                    | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index e0f93f78..6be65f7d 100644
--- a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -179,6 +179,7 @@
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductInfo.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/utils/ContextUtil.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreTransportItem.java
+/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/utils/DateTimeUtils.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/utils/excel/SelectedSheetWriteHandler.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/api/BindCode.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/distribution/ShopDistributionStoreBase.java
@@ -215,6 +216,7 @@
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/city/CityMarketOrderBase.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiRes.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductAssistIndex.java
+/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/ProductSimpleInfo.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/ProductSearchDTO.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/utils/JChardetFacadeUtil.java
 /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/pay/PayConsumeTrade.java
diff --git a/pom.xml b/pom.xml
index 64cf5e2e..3feb0b00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,6 +339,7 @@
 				<spring.profile>dev</spring.profile>
 				<!-- Docker 远程管理地址全局-->
 				<docker.host>https://42.194.196.179:2375</docker.host>
+				<docker.ca>/Users/panjunjie/code/docker_registry_ca_dev</docker.ca>
 				<!-- nacos配置 -->
 				<nacos.server.address>114.132.210.208:8848</nacos.server.address>
 				<nacos.namespace>public</nacos.namespace>
@@ -385,6 +386,7 @@
 				<spring.profile>test</spring.profile>
 				<!-- Docker 远程管理地址全局-->
 				<docker.host>https://42.194.196.179:2375</docker.host>
+				<docker.ca>/Users/panjunjie/code/docker_registry_ca_dev</docker.ca>
 				<!-- nacos配置 -->
 				<nacos.server.address>10.1.8.3:8848</nacos.server.address>
 				<nacos.namespace>public</nacos.namespace>
@@ -430,7 +432,8 @@
 			<properties>
 				<spring.profile>prod</spring.profile>
 				<!-- Docker 远程管理地址全局-->
-				<docker.host>https://42.194.196.179:2375888</docker.host>
+				<docker.host>https://42.194.196.179:2375</docker.host>
+				<docker.ca>/Users/panjunjie/code/docker_registry_ca_prod</docker.ca>
 				<!-- nacos配置 -->
 				<nacos.server.address>172.16.0.11:8848</nacos.server.address>
 				<nacos.namespace>public</nacos.namespace>
@@ -502,7 +505,7 @@
 						<!--定义容器启动命令-->
 						<entryPoint>["java", "-jar", "-Xms128m", "-Xmx512m", "-XX:PermSize=64M", "-XX:MaxPermSize=512M", "-Dspring.profiles.active=prod", "-Duser.timezone=Asia/Shanghai", "/${project.build.finalName}.jar"]</entryPoint>
 						<!--推送镜像仓库校验安全证书，无安全证书无法推送-->
-						<dockerCertPath>E:\docker-ca\fafamall</dockerCertPath>
+						<dockerCertPath>${docker.ca}</dockerCertPath>
 						<resources>
 							<resource>
 								<targetPath>/</targetPath>