mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
TinyAnts 2022-08-17 18:29:02 +08:00
parent d0848acf72 24ce27cf6c
commit 55e75fba7e
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -4,6 +4,11 @@
"name": "like.upload-directory", "name": "like.upload-directory",
"type": "java.lang.String", "type": "java.lang.String",
"description": "Description for like.upload-directory." "description": "Description for like.upload-directory."
},
{
"name": "like.production",
"type": "java.lang.String",
"description": "Description for like.production."
} }
] ]
} }

8
server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java
View File

@ -3,6 +3,9 @@ package com.hxkj.generator.controller;
import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.AjaxResult;
import com.hxkj.common.core.PageResult; 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.common.validator.annotation.IDMust;
import com.hxkj.generator.service.IGenerateService; import com.hxkj.generator.service.IGenerateService;
import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.GenParam;
@ -159,6 +162,11 @@ public class GenController {
*/ */
@GetMapping("/downloadCode") @GetMapping("/downloadCode")
public void downloadCode(HttpServletResponse response, String tables) throws IOException { public void downloadCode(HttpServletResponse response, String tables) throws IOException {
String production = YmlUtil.get("like.production");
if (StringUtil.isNotEmpty(production) && production.equals("true")) {
throw new OperateException("抱歉,演示环境不允许操作！");
}
Assert.notNull(tables, "请选择要生成的表"); Assert.notNull(tables, "请选择要生成的表");
String[] tableNames = tables.split(","); String[] tableNames = tables.split(",");
byte[] data = iGenerateService.downloadCode(tableNames); byte[] data = iGenerateService.downloadCode(tableNames);