From 5eb81b02916ff4ec07fead23a1d4bcdfee734121 Mon Sep 17 00:00:00 2001 From: 0027010982 Date: Sun, 25 Jun 2023 13:30:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F=E4=B8=80=E8=87=B4=E6=80=A7?= =?UTF-8?q?=E9=89=B4=E6=9D=83=EF=BC=8C=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B9=9F=E9=9C=80=E8=A6=81=E9=94=80=E6=AF=81=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cym/controller/adminPage/LoginController.java | 1 + .../java/com/cym/controller/adminPage/MainController.java | 4 ++++ src/main/resources/static/js/adminPage/www/index.js | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/src/main/java/com/cym/controller/adminPage/LoginController.java b/src/main/java/com/cym/controller/adminPage/LoginController.java index f2014938..0aa9b144 100644 --- a/src/main/java/com/cym/controller/adminPage/LoginController.java +++ b/src/main/java/com/cym/controller/adminPage/LoginController.java @@ -181,6 +181,7 @@ public class LoginController extends BaseController { } } + Context.current().sessionRemove("captcha"); Admin admin = adminService.login(name, pass); if (admin == null) { return renderError(m.get("loginStr.backError2")); // 用户名密码错误 diff --git a/src/main/java/com/cym/controller/adminPage/MainController.java b/src/main/java/com/cym/controller/adminPage/MainController.java index d918b7a3..f4ecf049 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/www/index.js b/src/main/resources/static/js/adminPage/www/index.js index cb8a74b3..d93064fd 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() { -- Gitee From d93a670cbbb4f4629c011b1b5a7b1f73a4cdeb80 Mon Sep 17 00:00:00 2001 From: 0027010982 Date: Sun, 25 Jun 2023 13:34:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F=E4=B8=80=E8=87=B4=E6=80=A7?= =?UTF-8?q?=E9=89=B4=E6=9D=83=EF=BC=8C=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B9=9F=E9=9C=80=E8=A6=81=E9=94=80=E6=AF=81=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/controller/adminPage/LoginController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cym/controller/adminPage/LoginController.java b/src/main/java/com/cym/controller/adminPage/LoginController.java index 0aa9b144..0a78eab1 100644 --- a/src/main/java/com/cym/controller/adminPage/LoginController.java +++ b/src/main/java/com/cym/controller/adminPage/LoginController.java @@ -181,7 +181,7 @@ public class LoginController extends BaseController { } } - Context.current().sessionRemove("captcha"); + Context.current().sessionRemove("captcha"); // 登录成功时也销毁验证码 Admin admin = adminService.login(name, pass); if (admin == null) { return renderError(m.get("loginStr.backError2")); // 用户名密码错误 -- Gitee From 6f2c5a31ad5646613bd6a96ef5abe47f6fbdc8e1 Mon Sep 17 00:00:00 2001 From: 0027010982 Date: Sun, 25 Jun 2023 14:44:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F=E4=B8=80=E8=87=B4=E6=80=A7?= =?UTF-8?q?=E9=89=B4=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cym/controller/adminPage/LoginController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/cym/controller/adminPage/LoginController.java b/src/main/java/com/cym/controller/adminPage/LoginController.java index 0a78eab1..f2014938 100644 --- a/src/main/java/com/cym/controller/adminPage/LoginController.java +++ b/src/main/java/com/cym/controller/adminPage/LoginController.java @@ -181,7 +181,6 @@ public class LoginController extends BaseController { } } - Context.current().sessionRemove("captcha"); // 登录成功时也销毁验证码 Admin admin = adminService.login(name, pass); if (admin == null) { return renderError(m.get("loginStr.backError2")); // 用户名密码错误 -- Gitee From 762591b9f650e2f95387de316d40069bb979fbb7 Mon Sep 17 00:00:00 2001 From: 0027010982 Date: Sun, 25 Jun 2023 17:04:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F=E4=B8=80=E8=87=B4=E6=80=A7?= =?UTF-8?q?=E9=89=B4=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/adminPage/CertController.java | 38 +++++++++++++++++++ .../static/js/adminPage/cert/index.js | 20 +++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cym/controller/adminPage/CertController.java b/src/main/java/com/cym/controller/adminPage/CertController.java index 0e81f952..d0271d6c 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/resources/static/js/adminPage/cert/index.js b/src/main/resources/static/js/adminPage/cert/index.js index 1bf4d401..0728a12c 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() { // 请求异常回调 -- Gitee