From 1cb79223ff44062c461712ecb11f5d3b0c8514fb Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 01 八月 2021 11:03:56 +0800
Subject: [PATCH] update feign-okhttp 11.0 => 11.2 update okhttp 3.19.4 => 4.9.1 update minio 8.2.0 => 8.3.0
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 76073c7..641cf1d 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -132,9 +132,7 @@
List<String> templates = new ArrayList<String>();
templates.add("vm/java/domain.java.vm");
templates.add("vm/java/vo.java.vm");
- templates.add("vm/java/queryBo.java.vm");
- templates.add("vm/java/addBo.java.vm");
- templates.add("vm/java/editBo.java.vm");
+ templates.add("vm/java/bo.java.vm");
templates.add("vm/java/mapper.java.vm");
templates.add("vm/java/service.java.vm");
templates.add("vm/java/serviceImpl.java.vm");
@@ -184,20 +182,12 @@
}
if (template.contains("vo.java.vm"))
{
- fileName = StrUtil.format("{}/vo/{}Vo.java", javaPath, className);
+ fileName = StrUtil.format("{}/domain/vo/{}Vo.java", javaPath, className);
}
- if (template.contains("queryBo.java.vm"))
- {
- fileName = StrUtil.format("{}/bo/{}QueryBo.java", javaPath, className);
- }
- if (template.contains("addBo.java.vm"))
- {
- fileName = StrUtil.format("{}/bo/{}AddBo.java", javaPath, className);
- }
- if (template.contains("editBo.java.vm"))
- {
- fileName = StrUtil.format("{}/bo/{}EditBo.java", javaPath, className);
- }
+ if (template.contains("bo.java.vm"))
+ {
+ fileName = StrUtil.format("{}/domain/bo/{}Bo.java", javaPath, className);
+ }
if (template.contains("sub-domain.java.vm") && StrUtil.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
{
fileName = StrUtil.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
--
Gitblit v1.9.3