Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
b3f42ba4
Commit
b3f42ba4
authored
Jun 09, 2019
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复modularName为空生成代码错误的问题
parent
fac01647
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
5 deletions
+11
-5
guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/modular/controller/GeneratorController.java
+7
-1
guns-vip-gen/src/main/resources/gunsTemplates/controller.java.btl
+1
-1
guns-vip-gen/src/main/resources/gunsTemplates/page.html.btl
+1
-1
guns-vip-gen/src/main/resources/gunsTemplates/page_add.html.btl
+1
-1
guns-vip-gen/src/main/resources/gunsTemplates/page_edit.html.btl
+1
-1
No files found.
guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/modular/controller/GeneratorController.java
View file @
b3f42ba4
...
...
@@ -14,6 +14,7 @@ import cn.stylefeng.guns.generator.modular.service.TableService;
import
cn.stylefeng.roses.core.reqres.response.ResponseData
;
import
cn.stylefeng.roses.core.reqres.response.SuccessResponseData
;
import
cn.stylefeng.roses.core.util.HttpContext
;
import
cn.stylefeng.roses.core.util.ToolUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.IdWorker
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -165,7 +166,12 @@ public class GeneratorController {
contextParam
.
setJdbcUserName
(
databaseInfo
.
getUserName
());
contextParam
.
setJdbcPassword
(
databaseInfo
.
getPassword
());
contextParam
.
setJdbcUrl
(
databaseInfo
.
getJdbcUrl
());
contextParam
.
setModularName
(
modularName
);
//处理modularName,如果modularName传值不为空,则待上左斜杠路径
if
(
ToolUtil
.
isNotEmpty
(
modularName
))
{
modularName
=
"/"
+
modularName
;
contextParam
.
setModularName
(
modularName
);
}
//获取临时目录
long
fileName
=
IdWorker
.
getId
();
...
...
guns-vip-gen/src/main/resources/gunsTemplates/controller.java.btl
View file @
b3f42ba4
...
...
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
@
RequestMapping
(
"/${lowerEntity}"
)
public
class
${
entity
}
Controller
extends
BaseController
{
private
String
PREFIX
=
"
/
${context.modularName}/${lowerEntity}"
;
private
String
PREFIX
=
"${context.modularName}/${lowerEntity}"
;
@
Autowired
private
${
entity
}
Service
${
lowerEntityService
};
...
...
guns-vip-gen/src/main/resources/gunsTemplates/page.html.btl
View file @
b3f42ba4
@layout("/common/_container.html",{js:["/assets
/
${context.modularName}/${lowerEntity}/${lowerEntity}.js"]}){
@layout("/common/_container.html",{js:["/assets${context.modularName}/${lowerEntity}/${lowerEntity}.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">${tableComment}管理</span>
...
...
guns-vip-gen/src/main/resources/gunsTemplates/page_add.html.btl
View file @
b3f42ba4
@layout("/common/_container.html",{js:["/assets
/
${context.modularName}/${lowerEntity}/${lowerEntity}_add.js"]}){
@layout("/common/_container.html",{js:["/assets${context.modularName}/${lowerEntity}/${lowerEntity}_add.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">添加</span>
...
...
guns-vip-gen/src/main/resources/gunsTemplates/page_edit.html.btl
View file @
b3f42ba4
@layout("/common/_container.html",{js:["/assets
/
${context.modularName}/${lowerEntity}/${lowerEntity}_edit.js"]}){
@layout("/common/_container.html",{js:["/assets${context.modularName}/${lowerEntity}/${lowerEntity}_edit.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">修改</span>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment