From b8603fa092bf651db194acb527bf4e9d7ede6eab Mon Sep 17 00:00:00 2001 From: hzzhero Date: Wed, 27 Jul 2022 09:50:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 14 +- .../src/main/resources/template.json | 152 ++--------- .../src/main/resources/template2.json | 253 ++++++++++++++++++ .../src/main/resources/templates/index.html | 56 ++-- 4 files changed, 312 insertions(+), 163 deletions(-) create mode 100644 generator-web/src/main/resources/template2.json diff --git a/generator-web/src/main/resources/application-dev.yml b/generator-web/src/main/resources/application-dev.yml index 42869ce0..6d6c2491 100644 --- a/generator-web/src/main/resources/application-dev.yml +++ b/generator-web/src/main/resources/application-dev.yml @@ -52,11 +52,11 @@ OEM: keywords: sql转实体类,sql转DAO,SQL转service,SQL转JPA实现,SQL转MYBATIS实现 title: JAVA代码生成平台 slogan: For reducing the repetitive CRUD work - description: SpringBootCodeGenerator(JAVA代码生成平台)，又名`大狼狗代码生成器`、`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。 - author: zhengkai.blog.csdn.net - packageName: com.software.system - copyright: powered by Moshow郑锴(大狼狗) - returnUtilSuccess: ReturnT.success - returnUtilFailure: ReturnT.error - outputStr: zhengkai.blog.csdn.net + description: SpringBootCodeGenerator(JAVA代码生成平台)，`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。 + author: genius + packageName: com.example + copyright: powered by Moshow + returnUtilSuccess: CommonResult.success + returnUtilFailure: CommonResult.error + outputStr: com.example mode: local diff --git a/generator-web/src/main/resources/template.json b/generator-web/src/main/resources/template.json index 13c6cb21..8a05b93a 100644 --- a/generator-web/src/main/resources/template.json +++ b/generator-web/src/main/resources/template.json @@ -1,32 +1,28 @@ -[{ - "group": "ui", - "templates": [{ - "id": "10", - "name": "swagger-ui", - "description": "swagger-ui" - }, - { - "id": "11", - "name": "element-ui", - "description": "element-ui" - }, - { - "id": "12", - "name": "bootstrap-ui", - "description": "bootstrap-ui" - }, - { - "id": "13", - "name": "layui-edit", - "description": "layui-edit" +[ + { + "group": "mybatis-plus", + "templates": [{ + "id": "60", + "name": "pluscontroller", + "description": "pluscontroller" }, - { - "id": "14", - "name": "layui-list", - "description": "layui-list" - } - ] -}, + { + "id": "61", + "name": "plusservice", + "description": "plusservice" + }, + { + "id": "62", + "name": "plusmapper", + "description": "plusmapper" + }, + { + "id": "63", + "name": "plusentity", + "description": "plusentity" + } + ] + }, { "group": "mybatis", "templates": [{ @@ -121,31 +117,6 @@ ] }, - { - "group": "mybatis-plus", - "templates": [{ - "id": "60", - "name": "pluscontroller", - "description": "pluscontroller" - }, - { - "id": "61", - "name": "plusservice", - "description": "plusservice" - }, - { - "id": "62", - "name": "plusmapper", - "description": "plusmapper" - }, - { - "id": "63", - "name": "plusentity", - "description": "plusentity" - } - ] - }, - { "group": "util", "templates": [{ @@ -174,80 +145,5 @@ "description": "swagger-yml" } ] - }, - - { - "group": "common-mapper", - "templates": [{ - "id": "81", - "name": "tkentity", - "description": "tkentity" - }, - { - "id": "82", - "name": "tkmapper", - "description": "tkmapper" - } - ] - }, - - { - "group": "renren-fast", - "templates": [{ - "id": "91", - "name": "menu-sql", - "description": "menu-sql" - }, - { - "id": "92", - "name": "vue-list", - "description": "vue-list" - }, - { - "id": "93", - "name": "vue-edit", - "description": "vue-edit" - }, - { - "id": "94", - "name": "rr-controller", - "description": "rr-controller" - }, - { - "id": "95", - "name": "rr-dao", - "description": "rr-dao" - }, - { - "id": "96", - "name": "rr-daoxml", - "description": "rr-daoxml" - }, - { - "id": "97", - "name": "rr-service", - "description": "rr-service" - } - ] - }, - - { - "group": "jpa-starp", - "templates": [{ - "id": "101", - "name": "starp-entity", - "description": "entity" - }, - { - "id": "102", - "name": "starp-repository", - "description": "repository" - }, - { - "id": "103", - "name": "starp-jpa-controller", - "description": "jpacontroller" - } - ] } ] diff --git a/generator-web/src/main/resources/template2.json b/generator-web/src/main/resources/template2.json new file mode 100644 index 00000000..13c6cb21 --- /dev/null +++ b/generator-web/src/main/resources/template2.json @@ -0,0 +1,253 @@ +[{ + "group": "ui", + "templates": [{ + "id": "10", + "name": "swagger-ui", + "description": "swagger-ui" + }, + { + "id": "11", + "name": "element-ui", + "description": "element-ui" + }, + { + "id": "12", + "name": "bootstrap-ui", + "description": "bootstrap-ui" + }, + { + "id": "13", + "name": "layui-edit", + "description": "layui-edit" + }, + { + "id": "14", + "name": "layui-list", + "description": "layui-list" + } + ] +}, + { + "group": "mybatis", + "templates": [{ + "id": "20", + "name": "controller", + "description": "controller" + }, + { + "id": "21", + "name": "service", + "description": "service" + }, + { + "id": "22", + "name": "service_impl", + "description": "service_impl" + }, + { + "id": "23", + "name": "mapper", + "description": "mapper" + }, + { + "id": "24", + "name": "mybatis", + "description": "mybatis" + }, + { + "id": "25", + "name": "model", + "description": "model" + }, + { + "id": "26", + "name": "mapper2", + "description": "mapper annotation" + } + ] + }, + { + "group": "jpa", + "templates": [{ + "id": "30", + "name": "entity", + "description": "entity" + }, + { + "id": "31", + "name": "repository", + "description": "repository" + }, + { + "id": "32", + "name": "jpacontroller", + "description": "jpacontroller" + } + ] + }, + + { + "group": "jdbc-template", + "templates": [{ + "id": "40", + "name": "jtdao", + "description": "jtdao" + }, + { + "id": "41", + "name": "jtdaoimpl", + "description": "jtdaoimpl" + } + ] + }, + + { + "group": "beetlsql", + "templates": [{ + "id": "50", + "name": "beetlmd", + "description": "beetlmd" + }, + { + "id": "51", + "name": "beetlentity", + "description": "beetlentity" + }, + { + "id": "52", + "name": "beetlcontroller", + "description": "beetlcontroller" + } + ] + }, + + { + "group": "mybatis-plus", + "templates": [{ + "id": "60", + "name": "pluscontroller", + "description": "pluscontroller" + }, + { + "id": "61", + "name": "plusservice", + "description": "plusservice" + }, + { + "id": "62", + "name": "plusmapper", + "description": "plusmapper" + }, + { + "id": "63", + "name": "plusentity", + "description": "plusentity" + } + ] + }, + + { + "group": "util", + "templates": [{ + "id": "70", + "name": "beanutil", + "description": "beanutil" + }, + { + "id": "71", + "name": "json", + "description": "json" + }, + { + "id": "72", + "name": "xml", + "description": "xml" + }, + { + "id": "73", + "name": "sql", + "description": "sql" + }, + { + "id": "74", + "name": "swagger-yml", + "description": "swagger-yml" + } + ] + }, + + { + "group": "common-mapper", + "templates": [{ + "id": "81", + "name": "tkentity", + "description": "tkentity" + }, + { + "id": "82", + "name": "tkmapper", + "description": "tkmapper" + } + ] + }, + + { + "group": "renren-fast", + "templates": [{ + "id": "91", + "name": "menu-sql", + "description": "menu-sql" + }, + { + "id": "92", + "name": "vue-list", + "description": "vue-list" + }, + { + "id": "93", + "name": "vue-edit", + "description": "vue-edit" + }, + { + "id": "94", + "name": "rr-controller", + "description": "rr-controller" + }, + { + "id": "95", + "name": "rr-dao", + "description": "rr-dao" + }, + { + "id": "96", + "name": "rr-daoxml", + "description": "rr-daoxml" + }, + { + "id": "97", + "name": "rr-service", + "description": "rr-service" + } + ] + }, + + { + "group": "jpa-starp", + "templates": [{ + "id": "101", + "name": "starp-entity", + "description": "entity" + }, + { + "id": "102", + "name": "starp-repository", + "description": "repository" + }, + { + "id": "103", + "name": "starp-jpa-controller", + "description": "jpacontroller" + } + ] + } +] diff --git a/generator-web/src/main/resources/templates/index.html b/generator-web/src/main/resources/templates/index.html index 81006149..b47f6f21 100644 --- a/generator-web/src/main/resources/templates/index.html +++ b/generator-web/src/main/resources/templates/index.html @@ -12,28 +12,28 @@
-
- - - -
+ + + + + + + + + + + + + + + + + + + + + +
@@ -50,12 +50,12 @@
- + + + + + + From a71cdc049a0ccbfcf845e2c48f3e2ebb5bc4ffe2 Mon Sep 17 00:00:00 2001 From: hzzhero Date: Wed, 27 Jul 2022 10:47:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generator-web/src/main/resources/statics/css/main.css | 3 +++ generator-web/src/main/resources/statics/js/index.js | 2 +- generator-web/src/main/resources/statics/js/main.js | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/generator-web/src/main/resources/statics/css/main.css b/generator-web/src/main/resources/statics/css/main.css index 87fc54a0..a3ce99b7 100644 --- a/generator-web/src/main/resources/statics/css/main.css +++ b/generator-web/src/main/resources/statics/css/main.css @@ -52,4 +52,7 @@ tbody > tr > th {font-weight: normal; } .form-horizontal{ /*width:550px;*/ padding-top:20px; +} +.skin-blue .wrapper, .skin-blue .main-sidebar, .skin-blue .left-side { + background-color: #fff; } \ No newline at end of file diff --git a/generator-web/src/main/resources/statics/js/index.js b/generator-web/src/main/resources/statics/js/index.js index 002c8f8a..d48d8b57 100644 --- a/generator-web/src/main/resources/statics/js/index.js +++ b/generator-web/src/main/resources/statics/js/index.js @@ -1,7 +1,7 @@ //iframe自适应 $(window).on('resize', function() { const $content = $('.content'); - $content.height($(this).height() - 154); + $content.height($(this).height() - 30); $content.find('iframe').each(function() { $(this).height($content.height()); }); diff --git a/generator-web/src/main/resources/statics/js/main.js b/generator-web/src/main/resources/statics/js/main.js index fd01eb03..4da2dbb3 100644 --- a/generator-web/src/main/resources/statics/js/main.js +++ b/generator-web/src/main/resources/statics/js/main.js @@ -47,10 +47,10 @@ const vm = new Vue({ returnUtilFailure: "${(value.returnUtilFailure)!!}", isPackageType: true, - isSwagger: false, - isAutoImport: false, - isWithPackage: false, - isComment: true, + isSwagger: true, + isAutoImport: true, + isWithPackage: true, + isComment: false, isLombok: true, ignorePrefix:"sys_", From 3b0abae0b96c179e0cc3afe183e62cfcdae694f2 Mon Sep 17 00:00:00 2001 From: hzzhero Date: Wed, 27 Jul 2022 14:59:45 +0800 Subject: [PATCH 3/3] renren --- .../src/main/resources/template.json | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/generator-web/src/main/resources/template.json b/generator-web/src/main/resources/template.json index 8a05b93a..b6b861c0 100644 --- a/generator-web/src/main/resources/template.json +++ b/generator-web/src/main/resources/template.json @@ -117,6 +117,46 @@ ] }, + { + "group": "renren-fast", + "templates": [{ + "id": "91", + "name": "menu-sql", + "description": "menu-sql" + }, + { + "id": "92", + "name": "vue-list", + "description": "vue-list" + }, + { + "id": "93", + "name": "vue-edit", + "description": "vue-edit" + }, + { + "id": "94", + "name": "rr-controller", + "description": "rr-controller" + }, + { + "id": "95", + "name": "rr-dao", + "description": "rr-dao" + }, + { + "id": "96", + "name": "rr-daoxml", + "description": "rr-daoxml" + }, + { + "id": "97", + "name": "rr-service", + "description": "rr-service" + } + ] + }, + { "group": "util", "templates": [{