From 4a016d8102a1a00bb1121373cb8a038396715ba9 Mon Sep 17 00:00:00 2001
From: suxiang <2585546823@qq.com>
Date: Tue, 23 Jul 2024 14:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=9F=E5=90=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=B7=BB=E5=8A=A0SSL?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BC=BA=E5=88=B6HTTPS=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/proxy/domain.vue                | 25 ++++++++++++++++---
 .../server/constant/HttpsStatusEnum.java      | 10 ++++++++
 .../server/constant/SslStatusEnum.java        | 25 +++++++++++++++++++
 .../controller/req/proxy/DomainCreateReq.java |  5 ++++
 .../controller/req/proxy/DomainUpdateReq.java |  5 ++++
 .../controller/res/proxy/DomainListRes.java   |  7 ++++++
 .../server/dal/entity/DomainNameDO.java       |  6 ++---
 .../server/service/DomainService.java         |  3 ++-
 8 files changed, 78 insertions(+), 8 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/SslStatusEnum.java

diff --git a/neutrino-proxy-admin/src/views/proxy/domain.vue b/neutrino-proxy-admin/src/views/proxy/domain.vue
index a5a273b2..4c775827 100644
--- a/neutrino-proxy-admin/src/views/proxy/domain.vue
+++ b/neutrino-proxy-admin/src/views/proxy/domain.vue
@@ -38,6 +38,11 @@
           <span>{{scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
       </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('SSL证书状态')" width="110">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.sslStatus | statusFilter">{{scope.row.sslStatus | sslStatusName}}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column class-name="status-col" :label="$t('默认域名')" width="100">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isDefault | statusFilter">{{scope.row.isDefault | httpStatusName}}</el-tag>
@@ -77,6 +82,12 @@
         <el-form-item :label="$t('主域名')" prop="domain">
           <el-input v-model="temp.domain"></el-input>
         </el-form-item>
+        <el-form-item :label="$t('强制HTTPS')" prop="userId">
+          <el-select style="width: 280px" class="filter-item" v-model="temp.forceHttps" placeholder="请选择">
+            <el-option label="开启" :value="1"></el-option>
+            <el-option label="关闭" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item :label="$t('JKS文件上传')" prop="file">
           <el-upload
             ref="upload"
@@ -170,8 +181,7 @@
           timestamp: new Date(),
           title: '',
           type: '',
-          status: 'published',
-          fileList: []
+          status: 'published'
         },
         dialogFormVisible: false,
         dialogStatus: '',
@@ -209,6 +219,14 @@
         }
         return statusMap[status]
       },
+      sslStatusName(status) {
+        const statusMap = {
+          1: '已上传',
+          2: '未上传',
+          3: '已验证'
+        }
+        return statusMap[status]
+      },
       httpStatusName(status) {
         const statusMap = {
           1: '开启',
@@ -316,7 +334,8 @@
         this.temp = {
           domain: undefined,
           jks: undefined,
-          keyStorePassword: undefined
+          keyStorePassword: undefined,
+          forceHttps: undefined
         }
       },
       handleCreate() {
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/HttpsStatusEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/HttpsStatusEnum.java
index ab1c5981..ad25a003 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/HttpsStatusEnum.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/HttpsStatusEnum.java
@@ -3,6 +3,11 @@ package org.dromara.neutrinoproxy.server.constant;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * 仅Https状态枚举
  * @author Mirac
@@ -13,7 +18,12 @@ import lombok.Getter;
 public enum HttpsStatusEnum {
     ONLY_HTTPS(1, "仅HTTPS"),
     DISABLE_ONLY_HTTPS(2, "关闭仅HTTPS");
+    private static Map<Integer, HttpsStatusEnum> CACHE = Stream.of(HttpsStatusEnum.values()).collect(Collectors.toMap(HttpsStatusEnum::getStatus, Function.identity()));
 
     private Integer status;
     private String desc;
+
+    public static HttpsStatusEnum of(Integer status) {
+        return CACHE.get(status);
+    }
 }
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/SslStatusEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/SslStatusEnum.java
new file mode 100644
index 00000000..4664a1e2
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/SslStatusEnum.java
@@ -0,0 +1,25 @@
+package org.dromara.neutrinoproxy.server.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 仅Https状态枚举
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Getter
+@AllArgsConstructor
+public enum SslStatusEnum {
+    UPLOADED(1, "已上传"),
+    NOT_UPLOADED(2, "未上传"),
+    CERTIFIED(3, "已认证");//预留，用于证书验证
+
+    private Integer status;
+    private String desc;
+}
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/DomainCreateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/DomainCreateReq.java
index a3d92884..fe30910d 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/DomainCreateReq.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/DomainCreateReq.java
@@ -26,4 +26,9 @@ public class DomainCreateReq {
      * KeyStore密码
      */
     private String keyStorePassword;
+
+    /**
+     * 强制Https
+     */
+    private Integer forceHttps;
 }
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/DomainUpdateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/DomainUpdateReq.java
index 588c33b4..fdcd3775 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/DomainUpdateReq.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/DomainUpdateReq.java
@@ -22,4 +22,9 @@ public class DomainUpdateReq {
      * KeyStore密码
      */
     private String keyStorePassword;
+
+    /**
+     * 强制Https
+     */
+    private Integer forceHttps;
 }
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/DomainListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/DomainListRes.java
index 22947e07..12d5ecd5 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/DomainListRes.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/DomainListRes.java
@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
 import org.dromara.neutrinoproxy.server.constant.DefaultDomainStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.HttpsStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.SslStatusEnum;
 
 import java.util.Date;
 
@@ -53,6 +54,12 @@ public class DomainListRes {
      */
     private Integer enable;
 
+    /**
+     * SSLStatusEnum
+     * {@link SslStatusEnum}
+     */
+    private Integer sslStatus;
+
     /**
      * 创建时间
      */
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/DomainNameDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/DomainNameDO.java
index c01b153f..225430b2 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/DomainNameDO.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/DomainNameDO.java
@@ -28,10 +28,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.dromara.neutrinoproxy.server.constant.DefaultDomainStatusEnum;
-import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
-import org.dromara.neutrinoproxy.server.constant.HttpsStatusEnum;
-import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.*;
 import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainListRes;
 import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingListRes;
 
@@ -101,6 +98,7 @@ public class DomainNameDO {
     public DomainListRes toRes() {
         DomainListRes res = new DomainListRes();
         BeanUtil.copyProperties(this, res);
+        res.setSslStatus(this.getJks() == null ? SslStatusEnum.NOT_UPLOADED.getStatus() : SslStatusEnum.UPLOADED.getStatus());
         return res;
     }
 }
diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java
index 8295359a..9e03448c 100644
--- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java
+++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java
@@ -94,7 +94,7 @@ public class DomainService {
         Date now = new Date();
         domainNameDO.setDomain(req.getDomain());
         domainNameDO.setIsDefault(DefaultDomainStatusEnum.DISABLE.getStatus());
-        domainNameDO.setForceHttps(HttpsStatusEnum.DISABLE_ONLY_HTTPS.getStatus());
+        domainNameDO.setForceHttps(req.getForceHttps() != null ? HttpsStatusEnum.of(req.getForceHttps()).getStatus(): HttpsStatusEnum.DISABLE_ONLY_HTTPS.getStatus());
         domainNameDO.setUserId(userId);
         domainNameDO.setEnable(EnableStatusEnum.ENABLE.getStatus());
         domainNameDO.setCreateTime(now);
@@ -132,6 +132,7 @@ public class DomainService {
         }
         updateWrapper.set(DomainNameDO::getDomain, req.getDomain());
         updateWrapper.set(DomainNameDO::getUpdateTime, new Date());
+        updateWrapper.set(req.getForceHttps() != null, DomainNameDO::getForceHttps, req.getForceHttps());
         int update = domainMapper.update(updateWrapper);
         System.out.println(update);
     }