From 020efa54d651b0a1364b480460a4354587b64fcc Mon Sep 17 00:00:00 2001 From: zhangyq Date: Fri, 3 May 2024 20:12:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=AF=81=E4=B9=A6=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=AF=81=E4=B9=A6=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cym/controller/api/CertApiController.java | 26 +++++++++++++++++++ .../java/com/cym/service/CertService.java | 6 +++++ 2 files changed, 32 insertions(+) diff --git a/src/main/java/com/cym/controller/api/CertApiController.java b/src/main/java/com/cym/controller/api/CertApiController.java index 046bebad..a2229468 100644 --- a/src/main/java/com/cym/controller/api/CertApiController.java +++ b/src/main/java/com/cym/controller/api/CertApiController.java @@ -31,6 +31,15 @@ public class CertApiController extends BaseController { @Inject CertService certService; + /** + * 获取证书列表 + * + */ + @Mapping("getAll") + public JsonResult> getAll() { + return renderSuccess(certService.findAll()); + } + /** * 获取证书分页列表 * @@ -116,6 +125,23 @@ public class CertApiController extends BaseController { return certController.del(id); } + /** + * 删除全部证书 + * + */ + @Mapping("delAll") + public JsonResult delAll() { + List certs = certService.findAll(); + String id = ""; + for(Cert cert : certs) { + if(!StrUtil.isEmpty(id)) { + id += ","; + } + id += cert.getId(); + } + return certController.del(id); + } + /** * 执行申请 * diff --git a/src/main/java/com/cym/service/CertService.java b/src/main/java/com/cym/service/CertService.java index ffc695f3..104fbf44 100644 --- a/src/main/java/com/cym/service/CertService.java +++ b/src/main/java/com/cym/service/CertService.java @@ -3,6 +3,8 @@ package com.cym.service; import java.io.File; import java.util.List; +import com.cym.model.Stream; +import com.cym.sqlhelper.bean.Sort; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; import org.slf4j.Logger; @@ -68,6 +70,10 @@ public class CertService { } + public List findAll() { + return sqlHelper.findAll(new Sort("id", Sort.Direction.ASC), Cert.class); + } + public Page getPage(String keywords, Page page) { ConditionAndWrapper conditionAndWrapper = new ConditionAndWrapper(); if (StrUtil.isNotEmpty(keywords)) { -- Gitee From 0055fe9c20b19cbd49d13d5bcf7b13f5f27da722 Mon Sep 17 00:00:00 2001 From: zhangyq Date: Fri, 3 May 2024 20:15:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B0=86=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8E=A5=E5=8F=A3=E7=9A=84URL=E4=BB=8E=20"/api/upload?= =?UTF-8?q?/upload"=20=E4=BF=AE=E6=94=B9=E4=B8=BA=20"/api/main/upload"?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/controller/api/UploadController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cym/controller/api/UploadController.java b/src/main/java/com/cym/controller/api/UploadController.java index 975e1b6e..33326ffc 100644 --- a/src/main/java/com/cym/controller/api/UploadController.java +++ b/src/main/java/com/cym/controller/api/UploadController.java @@ -40,7 +40,7 @@ import cn.hutool.http.HttpUtil; * @author CYM * */ -@Mapping("/api/upload") +@Mapping("/api/main") @Controller public class UploadController extends BaseController { Logger logger = LoggerFactory.getLogger(this.getClass()); -- Gitee From 2e4a73132ada2968e7a7d8562668ef02074012e8 Mon Sep 17 00:00:00 2001 From: zhangyq Date: Fri, 3 May 2024 20:18:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0stream=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/StreamApiController.java | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 src/main/java/com/cym/controller/api/StreamApiController.java diff --git a/src/main/java/com/cym/controller/api/StreamApiController.java b/src/main/java/com/cym/controller/api/StreamApiController.java new file mode 100644 index 00000000..5c7b6171 --- /dev/null +++ b/src/main/java/com/cym/controller/api/StreamApiController.java @@ -0,0 +1,75 @@ +package com.cym.controller.api; + +import cn.hutool.core.util.StrUtil; +import com.cym.controller.adminPage.StreamController; +import com.cym.model.Stream; +import com.cym.service.StreamService; +import com.cym.utils.BaseController; +import com.cym.utils.JsonResult; +import org.noear.solon.annotation.Controller; +import org.noear.solon.annotation.Inject; +import org.noear.solon.annotation.Mapping; + +import java.util.List; + +/** + * Stream接口 + * + */ +@Mapping("/api/stream") +@Controller +public class StreamApiController extends BaseController { + + @Inject + StreamController streamController; + @Inject + StreamService streamService; + + /** + * 获取stream配置列表 + * + */ + @Mapping("getAll") + public JsonResult> getAll() { + return renderSuccess(streamService.findAll()); + } + + /** + * 添加或编辑stream + * + * @param stream 流转发 + * + */ + @Mapping("addOver") + public JsonResult addOver(Stream stream) { + return streamController.addOver(stream); + } + + /** + * 删除指定的stream配置 + * + * @param id stream标识符 + * + */ + @Mapping("del") + public JsonResult del(String id) { + return streamController.del(id); + } + + /** + * 删除全部stream配置 + * + */ + @Mapping("delAll") + public JsonResult delAll() { + List streams = streamService.findAll(); + String id = ""; + for(Stream stream : streams) { + if(!StrUtil.isEmpty(id)) { + id += ","; + } + id += stream.getId(); + } + return streamController.del(id); + } +} -- Gitee