From f48954ddece0222d5787592b959e17f60c5c7e0a Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 2 Apr 2022 00:44:30 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=203.3.1.RELEASE=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-core-boot/pom.xml | 2 +- blade-core-boot/src/main/resources/bootstrap.yml | 2 +- blade-core-cloud/pom.xml | 2 +- blade-core-datascope/pom.xml | 2 +- blade-core-develop/pom.xml | 2 +- .../develop/support/BladeCodeGenerator.java | 6 +++--- .../main/resources/templates/controller.java.vm | 4 ++-- .../src/main/resources/templates/entity.java.vm | 2 +- .../src/main/resources/templates/mapper.xml.vm | 2 +- .../src/main/resources/templates/saber/api.js.vm | 10 +++++----- .../src/main/resources/templates/saber/crud.vue.vm | 14 +++++++------- .../src/main/resources/templates/sword/add.js.vm | 4 ++-- .../src/main/resources/templates/sword/edit.js.vm | 4 ++-- .../src/main/resources/templates/sword/list.js.vm | 2 +- .../src/main/resources/templates/sword/model.js.vm | 2 +- .../main/resources/templates/sword/service.js.vm | 8 ++++---- .../src/main/resources/templates/sword/view.js.vm | 6 +++--- blade-core-launch/pom.xml | 2 +- .../core/launch/constant/AppConstant.java | 2 +- blade-core-log/pom.xml | 2 +- blade-core-mybatis/pom.xml | 2 +- blade-core-oss/pom.xml | 2 +- blade-core-report/pom.xml | 2 +- blade-core-secure/pom.xml | 2 +- blade-core-social/pom.xml | 2 +- blade-core-swagger/pom.xml | 2 +- .../core/swagger/SwaggerProperties.java | 2 +- blade-core-test/pom.xml | 2 +- blade-core-tool/pom.xml | 2 +- blade-core-transaction/pom.xml | 2 +- pom.xml | 8 ++++---- 31 files changed, 54 insertions(+), 54 deletions(-) diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml index cf6a508..4f03760 100644 --- a/blade-core-boot/pom.xml +++ b/blade-core-boot/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 3.3.0 + 3.3.1 4.0.0 diff --git a/blade-core-boot/src/main/resources/bootstrap.yml b/blade-core-boot/src/main/resources/bootstrap.yml index 03797f2..767b561 100644 --- a/blade-core-boot/src/main/resources/bootstrap.yml +++ b/blade-core-boot/src/main/resources/bootstrap.yml @@ -101,7 +101,7 @@ mybatis-plus: swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 3.3.0 + version: 3.3.1 license: Powered By SpringBlade licenseUrl: https://bladex.vip terms-of-service-url: https://bladex.vip diff --git a/blade-core-cloud/pom.xml b/blade-core-cloud/pom.xml index fc7d4f6..631c995 100644 --- a/blade-core-cloud/pom.xml +++ b/blade-core-cloud/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.3.0 + 3.3.1 4.0.0 diff --git a/blade-core-datascope/pom.xml b/blade-core-datascope/pom.xml index 473b9c2..ee094da 100644 --- a/blade-core-datascope/pom.xml +++ b/blade-core-datascope/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.3.0 + 3.3.1 4.0.0 diff --git a/blade-core-develop/pom.xml b/blade-core-develop/pom.xml index fe35caf..ed3ac06 100644 --- a/blade-core-develop/pom.xml +++ b/blade-core-develop/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.3.0 + 3.3.1 4.0.0 diff --git a/blade-core-develop/src/main/java/org/springblade/develop/support/BladeCodeGenerator.java b/blade-core-develop/src/main/java/org/springblade/develop/support/BladeCodeGenerator.java index 74655d8..1f960b8 100644 --- a/blade-core-develop/src/main/java/org/springblade/develop/support/BladeCodeGenerator.java +++ b/blade-core-develop/src/main/java/org/springblade/develop/support/BladeCodeGenerator.java @@ -160,7 +160,7 @@ public class BladeCodeGenerator { .packageConfig(builder -> builder.parent(packageName).controller("controller").entity("entity").service("service").serviceImpl("service.impl").mapper("mapper").xml("mapper")) .strategyConfig(builder -> builder.addTablePrefix(tablePrefix).addInclude(includeTables).addExclude(excludeTables) .entityBuilder().naming(NamingStrategy.underline_to_camel).columnNaming(NamingStrategy.underline_to_camel).enableLombok().superClass("org.springblade.core.mp.base.BaseEntity").addSuperEntityColumns(superEntityColumns) - .serviceBuilder().superServiceClass("org.springblade.core.mp.base.BaseService").superServiceImplClass("org.springblade.core.mp.base.BaseService").formatServiceFileName("I%sService").formatServiceImplFileName("%sServiceImpl") + .serviceBuilder().superServiceClass("org.springblade.core.mp.base.BaseService").superServiceImplClass("org.springblade.core.mp.base.BaseServiceImpl").formatServiceFileName("I%sService").formatServiceImplFileName("%sServiceImpl") .mapperBuilder().enableMapperAnnotation().enableBaseResultMap().enableBaseColumnList().formatMapperFileName("%sMapper").formatXmlFileName("%sMapper") .controllerBuilder().superClass("org.springblade.core.boot.ctrl.BladeController").formatFileName("%sController").enableRestStyle().enableHyphenStyle() ) @@ -169,7 +169,7 @@ public class BladeCodeGenerator { .service("/templates/service.java.vm") .serviceImpl("/templates/serviceImpl.java.vm") .mapper("/templates/mapper.java.vm") - .mapperXml("/templates/mapper.xml.vm") + .xml("/templates/mapper.xml.vm") .controller("/templates/controller.java.vm")) .injectionConfig(builder -> builder.beforeOutputFile( (tableInfo, objectMap) -> System.out.println("tableInfo: " + tableInfo.getEntityName() + " objectMap: " + objectMap.size()) @@ -239,7 +239,7 @@ public class BladeCodeGenerator { if (StringUtil.equals(key, "crud.vue")) { outputPath = getOutputWebDir() + StringPool.SLASH + "views" + StringPool.SLASH + servicePackage.toLowerCase() + StringPool.SLASH + entityNameLower + ".vue"; } - outputFile(new File(String.valueOf(outputPath)), objectMap, value); + outputFile(new File(String.valueOf(outputPath)), objectMap, value, Boolean.TRUE); }); } }) diff --git a/blade-core-develop/src/main/resources/templates/controller.java.vm b/blade-core-develop/src/main/resources/templates/controller.java.vm index 032523f..a869a87 100644 --- a/blade-core-develop/src/main/resources/templates/controller.java.vm +++ b/blade-core-develop/src/main/resources/templates/controller.java.vm @@ -35,7 +35,7 @@ import $!{package.Entity}.$!{entity}; #set($voPackage=$package.Entity.replace("entity","vo")) import $!{voPackage}.$!{entity}VO; #set($wrapperPackage=$package.Entity.replace("entity","wrapper")) -#if($!{cfg.hasWrapper}) +#if($!{hasWrapper}) import $!{wrapperPackage}.$!{entity}Wrapper; #end import $!{package.Service}.$!{table.serviceName}; @@ -63,7 +63,7 @@ public class $!{table.controllerName} { private $!{table.serviceName} $!{table.entityPath}Service; -#if($!{cfg.hasWrapper}) +#if($!{hasWrapper}) /** * 详情 */ diff --git a/blade-core-develop/src/main/resources/templates/entity.java.vm b/blade-core-develop/src/main/resources/templates/entity.java.vm index 9ad9054..d4992e7 100644 --- a/blade-core-develop/src/main/resources/templates/entity.java.vm +++ b/blade-core-develop/src/main/resources/templates/entity.java.vm @@ -58,7 +58,7 @@ public class $!{entity} implements Serializable { ## ---------- BEGIN 字段循环遍历 ---------- #foreach($field in $!{table.fields}) -#if($!{field.name}!=$!{cfg.tenantColumn}) +#if($!{field.name}!=$!{tenantColumn}) #if($!{field.keyFlag}) #set($keyPropertyName=$!{field.propertyName}) #end diff --git a/blade-core-develop/src/main/resources/templates/mapper.xml.vm b/blade-core-develop/src/main/resources/templates/mapper.xml.vm index 9384ff7..e2fae2a 100644 --- a/blade-core-develop/src/main/resources/templates/mapper.xml.vm +++ b/blade-core-develop/src/main/resources/templates/mapper.xml.vm @@ -19,7 +19,7 @@ #end #foreach($field in $!{table.fields}) -#if(!$!{field.keyFlag} && $!{field.name} != $!{cfg.tenantColumn})##生成普通字段 +#if(!$!{field.keyFlag} && $!{field.name} != $!{tenantColumn})##生成普通字段 #end #end diff --git a/blade-core-develop/src/main/resources/templates/saber/api.js.vm b/blade-core-develop/src/main/resources/templates/saber/api.js.vm index 0ea8f9c..67cd22c 100644 --- a/blade-core-develop/src/main/resources/templates/saber/api.js.vm +++ b/blade-core-develop/src/main/resources/templates/saber/api.js.vm @@ -2,7 +2,7 @@ import request from '@/router/axios'; export const getList = (current, size, params) => { return request({ - url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/list', + url: '/api/$!{serviceName}/$!{entityKey}/list', method: 'get', params: { ...params, @@ -14,7 +14,7 @@ export const getList = (current, size, params) => { export const getDetail = (id) => { return request({ - url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/detail', + url: '/api/$!{serviceName}/$!{entityKey}/detail', method: 'get', params: { id @@ -24,7 +24,7 @@ export const getDetail = (id) => { export const remove = (ids) => { return request({ - url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/remove', + url: '/api/$!{serviceName}/$!{entityKey}/remove', method: 'post', params: { ids, @@ -34,7 +34,7 @@ export const remove = (ids) => { export const add = (row) => { return request({ - url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit', + url: '/api/$!{serviceName}/$!{entityKey}/submit', method: 'post', data: row }) @@ -42,7 +42,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit', + url: '/api/$!{serviceName}/$!{entityKey}/submit', method: 'post', data: row }) diff --git a/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm b/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm index 6a24667..385d78a 100644 --- a/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm +++ b/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm @@ -22,7 +22,7 @@ size="small" icon="el-icon-delete" plain - v-if="permission.$!{cfg.entityKey}_delete" + v-if="permission.$!{entityKey}_delete" @click="handleDelete">删 除 @@ -31,7 +31,7 @@