diff --git a/src/main/java/com/cym/controller/adminPage/CertController.java b/src/main/java/com/cym/controller/adminPage/CertController.java index 0e81f952ce63c3c2961bd45562c5368e016a4768..d0271d6c923cecc70a29c2096ffdbd4cd78483c0 100644 --- a/src/main/java/com/cym/controller/adminPage/CertController.java +++ b/src/main/java/com/cym/controller/adminPage/CertController.java @@ -10,8 +10,10 @@ import java.util.List; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Mapping; +import org.noear.solon.core.handle.Context; import org.noear.solon.core.handle.DownloadedFile; import org.noear.solon.core.handle.ModelAndView; +import org.noear.solon.core.handle.UploadedFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,6 +67,42 @@ public class CertController extends BaseController { return modelAndView; } + @Mapping("uploadKey") + public JsonResult uploadKey(Context context, UploadedFile file) { + try { + if (!"key".equals(file.getExtension())){ + return renderError("只能上传key文件"); + } + + File temp = new File(FileUtil.getTmpDir() + "/" + file.getName()); + file.transferTo(temp); + + return renderSuccess(temp.getPath().replace("\\", "/")); + } catch (IllegalStateException | IOException e) { + logger.error(e.getMessage(), e); + } + + return renderError(); + } + + @Mapping("uploadPem") + public JsonResult uploadPem(Context context, UploadedFile file) { + try { + if (!"pem".equals(file.getExtension())){ + return renderError("只能上传pem文件"); + } + + File temp = new File(FileUtil.getTmpDir() + "/" + file.getName()); + file.transferTo(temp); + + return renderSuccess(temp.getPath().replace("\\", "/")); + } catch (IllegalStateException | IOException e) { + logger.error(e.getMessage(), e); + } + + return renderError(); + } + @Mapping("addOver") public JsonResult addOver(Cert cert, String[] domains, String[] types, String[] values) { Integer type = cert.getType(); diff --git a/src/main/java/com/cym/controller/adminPage/MainController.java b/src/main/java/com/cym/controller/adminPage/MainController.java index d918b7a3aae3ac3f6808d694dd1caeafa25f2355..f4ecf04922da9b9e1e87151dfb86d87192ab024b 100644 --- a/src/main/java/com/cym/controller/adminPage/MainController.java +++ b/src/main/java/com/cym/controller/adminPage/MainController.java @@ -53,6 +53,10 @@ public class MainController extends BaseController { @Mapping("/adminPage/main/upload") public JsonResult upload(Context context, UploadedFile file) { try { + if (!"zip".equals(file.getExtension())){ + return renderError("只能上传zip文件"); + } + File temp = new File(FileUtil.getTmpDir() + "/" + file.getName()); file.transferTo(temp); diff --git a/src/main/resources/static/js/adminPage/cert/index.js b/src/main/resources/static/js/adminPage/cert/index.js index 1bf4d401ba9a3b5813408c511c1cf33a565a0829..0728a12c9c20f19146d4c37ea45c56304deac17f 100644 --- a/src/main/resources/static/js/adminPage/cert/index.js +++ b/src/main/resources/static/js/adminPage/cert/index.js @@ -26,15 +26,23 @@ $(function() { var upload = layui.upload; upload.render({ elem: '#pemBtn', - url: '/adminPage/main/upload', + url: '/adminPage/cert/uploadPem', accept: 'file', done: function(res) { // 上传完毕回调 if (res.success) { $("#pem").val(res.obj); var path = res.obj.split('/'); + if(path[path.length-1].indexOf('.pem')==-1){ + layer.alert("只能上传pem文件"); + return; + } $("#pemPath").html(path[path.length-1]); } + else { + layer.alert(res.msg); + return; + } }, error: function() { @@ -44,15 +52,23 @@ $(function() { upload.render({ elem: '#keyBtn', - url: '/adminPage/main/upload', + url: '/adminPage/cert/uploadKey', accept: 'file', done: function(res) { // 上传完毕回调 if (res.success) { $("#key").val(res.obj); var path = res.obj.split('/'); + if(path[path.length-1].indexOf('.key')==-1){ + layer.alert("只能上传key文件"); + return; + } $("#keyPath").html(path[path.length-1]); } + else { + layer.alert(res.msg); + return; + } }, error: function() { // 请求异常回调 diff --git a/src/main/resources/static/js/adminPage/www/index.js b/src/main/resources/static/js/adminPage/www/index.js index cb8a74b3e8824466820a2ba49706763229276c16..d93064fd26d19e898ebd4adba5a005863bc66fb3 100644 --- a/src/main/resources/static/js/adminPage/www/index.js +++ b/src/main/resources/static/js/adminPage/www/index.js @@ -22,6 +22,10 @@ $(function(){ $("#fileName").html(path[path.length-1]); $("#dirTemp").val(res.obj); } + else { + layer.alert(res.msg); + return; + } }, error : function() {