diff --git a/src/main/java/com/cym/controller/api/CertApiController.java b/src/main/java/com/cym/controller/api/CertApiController.java index 046bebada9e7fe0b4e0443d8869bc41ef4fe6c16..a222946886f5c113a2252f4f231c36d3e4b088e7 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/controller/api/StreamApiController.java b/src/main/java/com/cym/controller/api/StreamApiController.java new file mode 100644 index 0000000000000000000000000000000000000000..5c7b6171591f32a0d194585b22761a9036d981ba --- /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); + } +} diff --git a/src/main/java/com/cym/controller/api/UploadController.java b/src/main/java/com/cym/controller/api/UploadController.java index 975e1b6ebddd430b89955a4da90234573fe622c9..33326ffc1979c069865824a87c8d51ec2afa7440 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()); diff --git a/src/main/java/com/cym/service/CertService.java b/src/main/java/com/cym/service/CertService.java index ffc695f3586b124f18f82638d8822f15dde49303..104fbf44b402ad6c032acd73b8dbde176836ab7a 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)) {