From 81ea06f947aebd8ad7a3cb89808afc0ec20497eb Mon Sep 17 00:00:00 2001 From: liudonghua123 Date: Wed, 14 Nov 2018 14:56:48 +0800 Subject: [PATCH 01/14] add check for function and menu --- .../core/service/CoreCodeGenService.java | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java index 6b927a05..0444cd28 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java @@ -121,27 +121,39 @@ public class CoreCodeGenService { public Long insertFunction(Entity data,String urlBase){ String preffix = urlBase.replace('/', '.'); String functionCode = preffix+"."+data.getCode(); - String indexFunctonCode = functionCode+".query"; - CoreFunction query = new CoreFunction(); - query.setCode(indexFunctonCode); - Object o = sqlManager.templateOne(query); - if(o != null){ - return -1l; - } - - //设置父功能点 + + //检测父功能是否已存在，如果已存在，则不再添加 CoreFunction rootFunction = new CoreFunction(); rootFunction.setName(data.getDisplayName()); rootFunction.setCode(functionCode); rootFunction.setCreateTime(new Date()); rootFunction.setParentId(0L); rootFunction.setType("FN0"); + + CoreFunction rootFunctionPersisted = sqlManager.templateOne(rootFunction); + if(rootFunctionPersisted != null) { + log.warn("已存在功能点:"+rootFunctionPersisted.getCode()); + // 返回query的功能点id + CoreFunction indexFunction = new CoreFunction(); + indexFunction.setName("查询"+data.getDisplayName()); + String indexFunctonCode = functionCode+".query"; + indexFunction.setCode(indexFunctonCode); + indexFunction.setParentId(rootFunctionPersisted.getId()); + indexFunction.setType("FN1"); + CoreFunction indexFunctionPersisted = sqlManager.templateOne(indexFunction); + if(indexFunctionPersisted != null) { + return indexFunctionPersisted.getId(); + } + } + + //设置父功能点 sqlManager.insert(rootFunction,true); Long parentId =rootFunction.getId(); - //设置曾删改查功能点 + //设置增删改查功能点 CoreFunction indexFunction = new CoreFunction(); indexFunction.setName("查询"+data.getDisplayName()); + String indexFunctonCode = functionCode+".query"; indexFunction.setCode(indexFunctonCode); indexFunction.setCreateTime(new Date()); indexFunction.setParentId(parentId); @@ -203,6 +215,14 @@ public class CoreCodeGenService { newMenu.setType("MENU_M"); //任意设置一个顺序 newMenu.setSeq(3); + + // 判断是否已存在 + CoreMenu newMenuPersisted = this.sqlManager.templateOne(newMenu); + if(newMenuPersisted != null) { + log.warn("已存在此菜单:"+query.getName()); + return false ; + } + this.sqlManager.insert(newMenu); this.platformService.clearMenuCache(); return true; -- Gitee From 20b7425a848bf7bc317e17276c5315ceffd92510 Mon Sep 17 00:00:00 2001 From: liudonghua123 Date: Wed, 14 Nov 2018 15:26:57 +0800 Subject: [PATCH 02/14] fix pom version could not use property value issue --- admin-console/pom.xml | 2 +- admin-core/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin-console/pom.xml b/admin-console/pom.xml index 99ee2bf0..8b16b0a6 100644 --- a/admin-console/pom.xml +++ b/admin-console/pom.xml @@ -6,7 +6,7 @@ com.ibeetl admin - ${plus.version} + 1.2.1 ../pom.xml diff --git a/admin-core/pom.xml b/admin-core/pom.xml index 7fbef3b6..e2714c56 100644 --- a/admin-core/pom.xml +++ b/admin-core/pom.xml @@ -6,7 +6,7 @@ com.ibeetl admin - ${plus.version} + 1.2.1 ../pom.xml diff --git a/pom.xml b/pom.xml index e3bee437..76141b8b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.ibeetl admin - ${plus.version} + 1.2.1 pom 1.8 -- Gitee From 579ee3dc3d67529a93e7f763f470af8e73b05a64 Mon Sep 17 00:00:00 2001 From: liudonghua123 Date: Thu, 15 Nov 2018 10:19:00 +0800 Subject: [PATCH 03/14] fix entity name rewrite by codeGenService.getEntityInfo --- .../java/com/ibeetl/admin/core/web/CoreCodeGenController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java index 66e8b7b5..b1aaed23 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java @@ -332,6 +332,7 @@ public class CoreCodeGenController { String urlBase = data.getUrlBase(); String basePackage = data.getBasePackage(); Entity entity = codeGenService.getEntityInfo(info.getTableName()); + entity.setName(info.getName()); entity.setCode(info.getCode()); entity.setDisplayName(info.getDisplayName()); entity.setSystem(info.getSystem()); -- Gitee From 534ec5077543a139faf9236b5ba2b26bec2f9bf1 Mon Sep 17 00:00:00 2001 From: liudonghua123 Date: Thu, 15 Nov 2018 10:23:40 +0800 Subject: [PATCH 04/14] set default value for path and basePackage from last subsystem generation --- .../src/main/resources/static/js/core/codeGen/codeApi.js | 5 +++++ .../src/main/resources/static/js/core/codeGen/edit.js | 7 +++++++ .../src/main/resources/static/js/core/codeGen/project.js | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/admin-core/src/main/resources/static/js/core/codeGen/codeApi.js b/admin-core/src/main/resources/static/js/core/codeGen/codeApi.js index 88064b7f..1ccd2032 100644 --- a/admin-core/src/main/resources/static/js/core/codeGen/codeApi.js +++ b/admin-core/src/main/resources/static/js/core/codeGen/codeApi.js @@ -8,6 +8,11 @@ layui.define([], function(exports) { }, gen:function(callback){ Common.post("/core/codeGen/getPath.json", {}, function(path){ + // 优先使用本地子项目的path + var pathInLocalStorage = localStorage.getItem('path'); + if(pathInLocalStorage) { + path = pathInLocalStorage; + } Common.openPrompt("代码保存路径?",path,function(newPath){ var url ="/core/codeGen/gen.json"; Lib.submitForm(url,$('#updateForm'),{path:newPath},callback) diff --git a/admin-core/src/main/resources/static/js/core/codeGen/edit.js b/admin-core/src/main/resources/static/js/core/codeGen/edit.js index 41c40b66..7bdb7eac 100644 --- a/admin-core/src/main/resources/static/js/core/codeGen/edit.js +++ b/admin-core/src/main/resources/static/js/core/codeGen/edit.js @@ -5,8 +5,15 @@ layui.define([ 'form', 'laydate', 'table','codeApi'], function(exports) { var view = { init:function(){ Lib.initGenrealForm($("#updateForm"),form); + this.initDefaultConfiguration(); this.initSubmit(); }, + initDefaultConfiguration:function() { + var basePackage = localStorage.getItem('basePackage'); + if(basePackage) { + $("input[name='basePackage']").val(basePackage); + } + }, initSubmit:function(){ var that = this; toolbar = { diff --git a/admin-core/src/main/resources/static/js/core/codeGen/project.js b/admin-core/src/main/resources/static/js/core/codeGen/project.js index 00ccb4d8..90ebb457 100644 --- a/admin-core/src/main/resources/static/js/core/codeGen/project.js +++ b/admin-core/src/main/resources/static/js/core/codeGen/project.js @@ -9,7 +9,10 @@ layui.define([ 'form','codeApi'], function(exports) { initSubmit:function(){ $("#genProject").click(function(){ codeApi.genProject($('#projectForm'),function(){ - Common.info("生成项目成功，请用IDE导入新的项目"); + // 本地localstorage保存最近一次子系统代码生产路径、包名，方便后续代码生成作为默认路径、包名使用 + localStorage.setItem('path', $("input[name='path']").val()); + localStorage.setItem('basePackage', $("input[name='basePackage']").val()); + Common.info("生成项目成功，请用IDE导入新的项目"); }); -- Gitee From a182c41dd72780a01dee93479d6f0f38450d85fb Mon Sep 17 00:00:00 2001 From: liudonghua123 Date: Fri, 16 Nov 2018 13:30:38 +0800 Subject: [PATCH 05/14] fix table not found --- admin-core/src/main/resources/codeTemplate/java/pojo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin-core/src/main/resources/codeTemplate/java/pojo.java b/admin-core/src/main/resources/codeTemplate/java/pojo.java index ccbedd28..2bc284fa 100644 --- a/admin-core/src/main/resources/codeTemplate/java/pojo.java +++ b/admin-core/src/main/resources/codeTemplate/java/pojo.java @@ -6,6 +6,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Null; +import org.beetl.sql.core.annotatoin.*; + import org.beetl.sql.core.annotatoin.AutoID; import org.beetl.sql.core.annotatoin.SeqID; @@ -26,6 +28,7 @@ import org.beetl.sql.core.annotatoin.LogicDelete; * ${comment} * gen by Spring Boot2 Admin ${date(),"yyyy-MM-dd"} */ +\@Table(name="${entity.tableName}") public class ${className} extends BaseEntity{ @for(attr in attrs){ -- Gitee From 21d428da02919215c16db901258478af4086f473 Mon Sep 17 00:00:00 2001 From: liudonghua123 Date: Fri, 16 Nov 2018 13:33:00 +0800 Subject: [PATCH 06/14] add booleanCheckBox support --- .../com/ibeetl/admin/core/annotation/Query.java | 1 + .../com/ibeetl/admin/core/gen/model/Attribute.java | 14 ++++++++++++++ .../src/main/resources/codeTemplate/html/add.html | 6 ++++++ .../src/main/resources/codeTemplate/html/edit.html | 6 ++++++ .../main/resources/codeTemplate/java/query.java | 3 +++ .../main/resources/static/js/core/codeGen/edit.js | 1 + 6 files changed, 31 insertions(+) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/annotation/Query.java b/admin-core/src/main/java/com/ibeetl/admin/core/annotation/Query.java index cbfd58eb..ada6c6af 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/annotation/Query.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/annotation/Query.java @@ -18,6 +18,7 @@ public @interface Query { public static final int TYPE_DICT = 5; //用户自己定义 public static final int TYPE_CONTROL = 6; + public static final int TYPE_BOOLEAN_CHECKBOX = 7; /** diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/gen/model/Attribute.java b/admin-core/src/main/java/com/ibeetl/admin/core/gen/model/Attribute.java index 39c5d9bc..7d5e8d28 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/gen/model/Attribute.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/gen/model/Attribute.java @@ -16,6 +16,7 @@ public class Attribute { // 是否范围 private boolean isDateRange; private boolean isDateTimeRange; + private boolean isBooleanCheckbox; //校验对象 private List verifyList = new ArrayList<>(); @@ -106,4 +107,17 @@ public class Attribute { public void setDateTimeRange(boolean dateTimeRange) { isDateTimeRange = dateTimeRange; } + + public boolean isBooleanCheckbox() { + for(Verify verify: verifyList) { + if(verify.getName().equals("booleanCheckBox")) { + return true; + } + } + return false; + } + + public void setBooleanCheckbox(boolean booleanCheckbox) { + isBooleanCheckbox = booleanCheckbox; + } } diff --git a/admin-core/src/main/resources/codeTemplate/html/add.html b/admin-core/src/main/resources/codeTemplate/html/add.html index 90081df8..ef8a2e54 100644 --- a/admin-core/src/main/resources/codeTemplate/html/add.html +++ b/admin-core/src/main/resources/codeTemplate/html/add.html @@ -15,6 +15,12 @@ @if(item.name=="delFlag"){continue;} @if(item.name=="version"){continue;} @if(item.name=="attachmentId"){continue;} + @if(item.isBooleanCheckbox){ +
+ +
+ @continue; + @}
diff --git a/admin-core/src/main/resources/codeTemplate/html/edit.html b/admin-core/src/main/resources/codeTemplate/html/edit.html index d8ea6bf1..1d27873e 100644 --- a/admin-core/src/main/resources/codeTemplate/html/edit.html +++ b/admin-core/src/main/resources/codeTemplate/html/edit.html @@ -15,6 +15,12 @@ @if(item.name=="delFlag"){continue;} @if(item.name=="version"){continue;} @if(item.name=="attachmentId"){continue;} + @if(item.isBooleanCheckbox){ +
+ +
+ @continue; + @}
diff --git a/admin-core/src/main/resources/codeTemplate/java/query.java b/admin-core/src/main/resources/codeTemplate/java/query.java index ba3bdb29..4b381abe 100644 --- a/admin-core/src/main/resources/codeTemplate/java/query.java +++ b/admin-core/src/main/resources/codeTemplate/java/query.java @@ -24,6 +24,9 @@ public class ${entity.name}Query extends PageParam { private String ${attr.name}; private Date ${strutil.replace (attr.name,"Range","")}Start; private Date ${strutil.replace (attr.name,"Range","")}End; + @} else if(attr.isBooleanCheckbox) { + \@Query(name = "${attr.displayName}", display = true,type=Query.TYPE_BOOLEAN_CHECKBOX) + private ${attr.javaType} ${attr.name}; @} else { \@Query(name = "${attr.displayName}", display = true) private ${attr.javaType} ${attr.name}; diff --git a/admin-core/src/main/resources/static/js/core/codeGen/edit.js b/admin-core/src/main/resources/static/js/core/codeGen/edit.js index 7bdb7eac..de954e1c 100644 --- a/admin-core/src/main/resources/static/js/core/codeGen/edit.js +++ b/admin-core/src/main/resources/static/js/core/codeGen/edit.js @@ -76,6 +76,7 @@ layui.define([ 'form', 'laydate', 'table','codeApi'], function(exports) { '
'+ '
'+ ''+ + ''+ '
'+ '
', success: function(layero, index){ -- Gitee From f2357c06cfbdafdbdf0acf489140be5cb8d8ddac Mon Sep 17 00:00:00 2001 From: liudonghua123 Date: Fri, 16 Nov 2018 14:01:02 +0800 Subject: [PATCH 07/14] exclude filesystem directory --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e20bd98f..35139e37 100755 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ admin-core/target/* admin-console/target/* .* !.gitignore -*.iml \ No newline at end of file +*.iml +filesystem +admin-console/filesystem \ No newline at end of file -- Gitee From c321a05501d54290dbcd71d58e4e1c5d52acbb5a Mon Sep 17 00:00:00 2001 From: liudonghua123 Date: Fri, 16 Nov 2018 14:56:47 +0800 Subject: [PATCH 08/14] tidy verfiy fields --- .../resources/static/js/core/codeGen/edit.js | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/admin-core/src/main/resources/static/js/core/codeGen/edit.js b/admin-core/src/main/resources/static/js/core/codeGen/edit.js index de954e1c..977ac6ff 100644 --- a/admin-core/src/main/resources/static/js/core/codeGen/edit.js +++ b/admin-core/src/main/resources/static/js/core/codeGen/edit.js @@ -55,28 +55,33 @@ layui.define([ 'form', 'laydate', 'table','codeApi'], function(exports) { var type = $(this).data('type'); toolbar[type] ? toolbar[type].call(this) : ''; }); + + // 点击校验按钮快速删除 + $(document).on('click', '.verifybtn', function () { + $(this).remove(); + }); $(".addVerify").click(function(){ var _this = $(this),verifyGroup = _this.parent('.verifyGroup'); layer.open({ title: '添加校验类型', - content: '
'+ + content: '
'+ + '
校验类型（可多选）
'+ '
'+ - ''+ - ''+ - ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ '
'+ + '
特殊校验类型（只可选择一项，与上面的不兼容，自动忽略上面校验特性）
'+ '
'+ - ''+ - ''+ - ''+ - ''+ - ''+ - ''+ - '
'+ - '
'+ - ''+ - ''+ + ''+ + ''+ + ''+ + ''+ + ''+ '
'+ '
', success: function(layero, index){ -- Gitee From 171e567c663d8e9b5a0e990ac53d7b2b187849f6 Mon Sep 17 00:00:00 2001 From: liudonghua123 Date: Sat, 17 Nov 2018 20:33:13 +0800 Subject: [PATCH 09/14] add save entity configuration in code generation --- .../com/ibeetl/admin/core/util/JSONUtils.java | 76 +++++++++++++++++++ .../admin/core/web/CoreCodeGenController.java | 10 ++- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 admin-core/src/main/java/com/ibeetl/admin/core/util/JSONUtils.java diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/JSONUtils.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/JSONUtils.java new file mode 100644 index 00000000..54f68bcf --- /dev/null +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/JSONUtils.java @@ -0,0 +1,76 @@ +package com.ibeetl.admin.core.util; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +public class JSONUtils { + public static boolean save(String tableName, T object) { + // create the mapper + ObjectMapper mapper = new ObjectMapper(); + // enable pretty printing + mapper.enable(SerializationFeature.INDENT_OUTPUT); + // serialize the object + try { + mapper.writeValue(new File(getEntityCachePath() + tableName + ".json"), object); + return true; + } catch (IOException e) { + e.printStackTrace(); + return false; + } + } + + public static T get(Class clazz, String tableName) { + // create the mapper + ObjectMapper mapper = new ObjectMapper(); + // de-serialize JSON to object + File file = new File(getEntityCachePath() + tableName + ".json"); + T object = null; + if(file.exists()) { + String json = readFile(file, StandardCharsets.UTF_8.name()); + try { + object = mapper.readValue(json, clazz); + } catch (IOException e) { + e.printStackTrace(); + } + } + return object; + } + + static String readFile(File file, String charset) { + byte[] buffer = new byte[0]; + int length = 0; + FileInputStream fileInputStream = null; + try { + fileInputStream = new FileInputStream(file); + buffer = new byte[fileInputStream.available()]; + length = fileInputStream.read(buffer); + return new String(buffer, 0, length, charset); + } catch (IOException e) { + e.printStackTrace(); + } finally { + if(fileInputStream != null) { + try { + fileInputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return null; + } + + static String getEntityCachePath() { + String userDir = System.getProperty("user.dir"); + String entityCachePath = userDir + File.separator + "entityCache" + File.separator ; + File f = new File(entityCachePath); + if (!f.exists()) { + f.mkdirs(); + } + return entityCachePath; + } +} diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java index b1aaed23..ee8a11ce 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java @@ -12,6 +12,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import com.ibeetl.admin.core.util.JSONUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,7 +66,11 @@ public class CoreCodeGenController { @GetMapping(MODEL + "/tableDetail.do") public ModelAndView tableDetail(String table) { ModelAndView view = new ModelAndView("/core/codeGen/edit.html"); - Entity entity = codeGenService.getEntityInfo(table); + Entity entity = JSONUtils.get(Entity.class, table); + log.info("JSONUtils.get entity is " + entity); + if(entity == null) { + entity = codeGenService.getEntityInfo(table); + } view.addObject("entity", entity); return view; @@ -192,7 +197,10 @@ public class CoreCodeGenController { @PostMapping(MODEL + "/gen.json") @ResponseBody public JsonResult gen(EntityInfo data,String path) { + // 保存 代码生产时的entity信息，以便下次编辑使用，使用表名作为key Entity entity = getEntitiyInfo(data); + JSONUtils.save(entity.getTableName(), entity); + log.info("JSONUtils.save entity is " + entity); String urlBase = data.getUrlBase(); String basePackage = data.getBasePackage(); -- Gitee From 5386421f2633fba456c174531f0eec59df268000 Mon Sep 17 00:00:00 2001 From: lch0203 <59508381@qq.com> Date: Sat, 15 Dec 2018 13:45:01 +0800 Subject: [PATCH 10/14] fix set default value for path and basePackage from last subsystem generation --- .../src/main/resources/static/js/core/codeGen/codeApi.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin-core/src/main/resources/static/js/core/codeGen/codeApi.js b/admin-core/src/main/resources/static/js/core/codeGen/codeApi.js index 1ccd2032..0b673b70 100644 --- a/admin-core/src/main/resources/static/js/core/codeGen/codeApi.js +++ b/admin-core/src/main/resources/static/js/core/codeGen/codeApi.js @@ -16,6 +16,9 @@ layui.define([], function(exports) { Common.openPrompt("代码保存路径?",path,function(newPath){ var url ="/core/codeGen/gen.json"; Lib.submitForm(url,$('#updateForm'),{path:newPath},callback) + // 本地localstorage保存最近一次子系统代码生产路径、包名，方便后续代码生成作为默认路径、包名使用 + localStorage.setItem('path', newPath); + localStorage.setItem('basePackage', $("input[name='basePackage']").val()); }) }); }, -- Gitee From 2929d133dcc9025f3a7e3f2751660d163a1d6d78 Mon Sep 17 00:00:00 2001 From: lch0203 <59508381@qq.com> Date: Sat, 15 Dec 2018 16:34:37 +0800 Subject: [PATCH 11/14] update datetime input --- admin-core/src/main/resources/static/js/lib.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/admin-core/src/main/resources/static/js/lib.js b/admin-core/src/main/resources/static/js/lib.js index 4bb486fe..600a8423 100644 --- a/admin-core/src/main/resources/static/js/lib.js +++ b/admin-core/src/main/resources/static/js/lib.js @@ -201,6 +201,15 @@ var Lib = { laydate.render({ elem : $(this)[0], }); + }); + + + $(form).find(".input-datetime").each(function() { + laydate = layui.laydate; + laydate.render({ + elem : $(this)[0], + type: 'datetime', + }); }) -- Gitee From d5f55880b405d401cc7e63b74d76321c5e066acb Mon Sep 17 00:00:00 2001 From: lch0203 <59508381@qq.com> Date: Sun, 16 Dec 2018 09:32:47 +0800 Subject: [PATCH 12/14] modify admin-core/src/main/resources/templates/common/tag/submitButtons.tag.html --- .../main/resources/templates/common/tag/submitButtons.tag.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin-core/src/main/resources/templates/common/tag/submitButtons.tag.html b/admin-core/src/main/resources/templates/common/tag/submitButtons.tag.html index f4e63b1b..2ed49dc0 100644 --- a/admin-core/src/main/resources/templates/common/tag/submitButtons.tag.html +++ b/admin-core/src/main/resources/templates/common/tag/submitButtons.tag.html @@ -1,5 +1,6 @@
-
+ +
-- Gitee From 60a21b4d87ba8d7ec3f01e12229c82025fadd25c Mon Sep 17 00:00:00 2001 From: lch0203 <59508381@qq.com> Date: Sun, 16 Dec 2018 15:24:59 +0800 Subject: [PATCH 13/14] modified: admin-core/src/main/resources/templates/help.html as show bespeak_view --- .../src/main/resources/templates/help.html | 42 ++++++++++++++----- .../src/main/resources/templates/index.html | 2 +- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/admin-core/src/main/resources/templates/help.html b/admin-core/src/main/resources/templates/help.html index cd3fab59..b8aa6883 100644 --- a/admin-core/src/main/resources/templates/help.html +++ b/admin-core/src/main/resources/templates/help.html @@ -1,12 +1,32 @@ -
本系统演示了Spring Boot 搭建系统开发框架，能构建适合集团规模的系统，也能搭建小微系统
-
- 配置: -
-
- 搭建子系统 -
- -
- 禁止缓存，为了开发方便，需要禁止JS缓存 -
\ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/admin-core/src/main/resources/templates/index.html b/admin-core/src/main/resources/templates/index.html index 186a620c..1e55d0f6 100644 --- a/admin-core/src/main/resources/templates/index.html +++ b/admin-core/src/main/resources/templates/index.html @@ -87,7 +87,7 @@
    -
  • 系统说明
    • +
  • 预约视图
-- Gitee From 7f367c7bfc1a015e6d30bfd469efcece37137628 Mon Sep 17 00:00:00 2001 From: lch0203 <59508381@qq.com> Date: Sun, 16 Dec 2018 15:53:15 +0800 Subject: [PATCH 14/14] modify logo link --- admin-core/src/main/resources/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-core/src/main/resources/templates/index.html b/admin-core/src/main/resources/templates/index.html index 1e55d0f6..e0dcee3f 100644 --- a/admin-core/src/main/resources/templates/index.html +++ b/admin-core/src/main/resources/templates/index.html @@ -2,7 +2,7 @@
- +
-- Gitee