From 950dbe761cf171ecff8831acee2177398fee23a9 Mon Sep 17 00:00:00 2001
From: handy <handyplus@163.com>
Date: Mon, 13 Nov 2023 17:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=89=8B=E5=8A=A8=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/adminPage/CertController.java  |  2 +-
 .../WEB-INF/view/adminPage/cert/index.html    | 12 +++++++
 .../static/js/adminPage/cert/index.js         | 31 +++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/cym/controller/adminPage/CertController.java b/src/main/java/com/cym/controller/adminPage/CertController.java
index c2fb0c09..133542c2 100644
--- a/src/main/java/com/cym/controller/adminPage/CertController.java
+++ b/src/main/java/com/cym/controller/adminPage/CertController.java
@@ -58,7 +58,7 @@ public class CertController extends BaseController {
 				cert.setDomain(cert.getDomain() + "(" + cert.getEncryption() + ")");
 			}
 
-			if (cert.getMakeTime() != null) {
+			if (cert.getMakeTime() != null && cert.getType() != 1) {
 				cert.setEndTime(cert.getMakeTime() + 90 * 24 * 60 * 60 * 1000l);
 			}
 		}
diff --git a/src/main/resources/WEB-INF/view/adminPage/cert/index.html b/src/main/resources/WEB-INF/view/adminPage/cert/index.html
index 5b311ecd..6d534be2 100644
--- a/src/main/resources/WEB-INF/view/adminPage/cert/index.html
+++ b/src/main/resources/WEB-INF/view/adminPage/cert/index.html
@@ -324,6 +324,18 @@
 							<div class="layui-form-mid layui-word-aux" id="keyPath"></div>
 						</div>
 					</div>
+					<div class="layui-form-item">
+						<label class="layui-form-label">${certStr.signTime}</label>
+						<div class="layui-input-block">
+							<input type="text" name="makeTime" id="makeTime" class="layui-input">
+						</div>
+					</div>
+					<div class="layui-form-item">
+						<label class="layui-form-label">${certStr.endTime}</label>
+						<div class="layui-input-block">
+							<input type="text" name="endTime" id="endTime" class="layui-input">
+						</div>
+					</div>
 				</div>
 
 
diff --git a/src/main/resources/static/js/adminPage/cert/index.js b/src/main/resources/static/js/adminPage/cert/index.js
index 77a469ca..f5006754 100644
--- a/src/main/resources/static/js/adminPage/cert/index.js
+++ b/src/main/resources/static/js/adminPage/cert/index.js
@@ -132,6 +132,9 @@ function add() {
 	$("#encryption").attr("disabled", false);
 	$("#encryption").removeClass("disabled");
 
+	$("#makeTime").val("");
+	$("#endTime").val("");
+
 	checkType(0);
 	checkDnsType('ali');
 
@@ -139,6 +142,14 @@ function add() {
 	showWindow(certStr.add);
 }
 
+layui.use(['laydate'], function () {
+	const layDate = layui.laydate;
+	layDate.render({
+		elem: '#makeTime, #endTime',
+		type: 'datetime',
+		format: 'yyyy-MM-dd HH:mm:ss'
+	});
+});
 
 function edit(id, clone) {
 	$("#id").val(id);
@@ -195,6 +206,16 @@ function edit(id, clone) {
 					$("#pemPath").html(path[path.length - 1]);
 					path = cert.key.split('/');
 					$("#keyPath").html(path[path.length - 1]);
+
+					layui.use('util', function () {
+						const util = layui.util;
+						if (cert.makeTime != null) {
+							$("#makeTime").val(util.toDateString(cert.makeTime, 'yyyy-MM-dd HH:mm:ss'));
+						}
+						if (cert.endTime != null) {
+							$("#endTime").val(util.toDateString(cert.endTime, 'yyyy-MM-dd HH:mm:ss'));
+						}
+					});
 				} else {
 					$("#domain").attr("disabled", false);
 					$("#domain").removeClass("disabled");
@@ -207,6 +228,8 @@ function edit(id, clone) {
 					$("#key").val("");
 					$("#pemPath").html("");
 					$("#keyPath").html("");
+					$("#makeTime").val("");
+					$("#endTime").val("");
 				}
 
 				checkType(cert.type);
@@ -278,6 +301,14 @@ function addOver() {
 		return;
 	}
 
+	// 将时间字段的值转换为时间戳
+	if ($("#makeTime").val() !== '') {
+		$("#makeTime").val(new Date($("#makeTime").val()).getTime());
+	}
+	if ($("#endTime").val() !== '') {
+		$("#endTime").val(new Date($("#endTime").val()).getTime());
+	}
+
 	$.ajax({
 		type: 'POST',
 		url: ctx + '/adminPage/cert/addOver',
-- 
Gitee