From d0478a8fc4afb6f3cf5d6a36f3205e9cdd99cefe Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 17 Aug 2022 18:25:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BC=94=E7=A4=BA?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../additional-spring-configuration-metadata.json | 5 +++++ .../java/com/hxkj/generator/controller/GenController.java | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/server/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/server/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 6a59a7b2..379bbd72 100644 --- a/server/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/server/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -4,6 +4,11 @@ "name": "like.upload-directory", "type": "java.lang.String", "description": "Description for like.upload-directory." + }, + { + "name": "like.production", + "type": "java.lang.String", + "description": "Description for like.production." } ] } \ No newline at end of file diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index 4fbfc4de..228316a6 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -3,6 +3,9 @@ package com.hxkj.generator.controller; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; +import com.hxkj.common.exception.OperateException; +import com.hxkj.common.utils.StringUtil; +import com.hxkj.common.utils.YmlUtil; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.generator.service.IGenerateService; import com.hxkj.generator.validate.GenParam; @@ -159,6 +162,11 @@ public class GenController { */ @GetMapping("/downloadCode") public void downloadCode(HttpServletResponse response, String tables) throws IOException { + String production = YmlUtil.get("like.production"); + if (StringUtil.isNull(production) || StringUtil.isEmpty(production) || production.equals("true")) { + throw new OperateException("抱歉,演示环境不允许操作！"); + } + Assert.notNull(tables, "请选择要生成的表"); String[] tableNames = tables.split(","); byte[] data = iGenerateService.downloadCode(tableNames); From 5e5a2f5afb61bf24ed53a474bd447fbf05d2e12e Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 17 Aug 2022 18:28:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BC=94=E7=A4=BA?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxkj/generator/controller/GenController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index 228316a6..ef4bdae7 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -163,7 +163,7 @@ public class GenController { @GetMapping("/downloadCode") public void downloadCode(HttpServletResponse response, String tables) throws IOException { String production = YmlUtil.get("like.production"); - if (StringUtil.isNull(production) || StringUtil.isEmpty(production) || production.equals("true")) { + if (StringUtil.isNotEmpty(production) && production.equals("true")) { throw new OperateException("抱歉,演示环境不允许操作！"); }