diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 241cb85e..d8e2ca2a 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ BladeX org.springblade - 2.0.0.RC3 + 2.0.0.RC4 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 6b31171f..f4bbccce 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.0.0.RC3 + 2.0.0.RC4 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index c532d073..00f803a1 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.0.0.RC3 + 2.0.0.RC4 4.0.0 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 85c542fc..837acf18 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.0.0.RC3 + 2.0.0.RC4 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 0fe0b841..cf57c4f5 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.0.0.RC3 + 2.0.0.RC4 4.0.0 diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/support/BladeGenerator.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/support/BladeGenerator.java index 6d7456e1..b0a6c221 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/develop/support/BladeGenerator.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/support/BladeGenerator.java @@ -171,10 +171,10 @@ public class BladeGenerator { private InjectionConfig getInjectionConfig() { String servicePackage = serviceName.split("-").length > 1 ? serviceName.split("-")[1] : serviceName; // 自定义配置 + Map map = new HashMap<>(16); InjectionConfig cfg = new InjectionConfig() { @Override public void initMap() { - Map map = new HashMap<>(16); map.put("serviceName", serviceName); map.put("servicePackage", servicePackage); this.setMap(map); @@ -184,6 +184,7 @@ public class BladeGenerator { focList.add(new FileOutConfig("/templates/entityVO.java.vm") { @Override public String outputFile(TableInfo tableInfo) { + map.put("entityKey", StringUtil.humpToLine(tableInfo.getEntityName())); return getOutputDir() + "/" + packageName.replace(".", "/") + "/" + "vo" + "/" + tableInfo.getEntityName() + "VO" + StringPool.DOT_JAVA; } }); diff --git a/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm b/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm index 6f19caa3..b95f2048 100644 --- a/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm +++ b/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm @@ -53,7 +53,7 @@ import java.util.List; */ @RestController @AllArgsConstructor -@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{table.entityPath}") +@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{cfg.entityKey}") @Api(value = "$!{table.comment}", tags = "$!{table.comment}接口") #if($!{superControllerClass}) public class $!{table.controllerName} extends $!{superControllerClass} { diff --git a/blade-ops/blade-develop/src/main/resources/templates/saber/api.js.vm b/blade-ops/blade-develop/src/main/resources/templates/saber/api.js.vm index 1c65e554..0ea8f9c0 100644 --- a/blade-ops/blade-develop/src/main/resources/templates/saber/api.js.vm +++ b/blade-ops/blade-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}/$!{table.entityPath}/list', + url: '/api/$!{cfg.serviceName}/$!{cfg.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}/$!{table.entityPath}/detail', + url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/detail', method: 'get', params: { id @@ -24,7 +24,7 @@ export const getDetail = (id) => { export const remove = (ids) => { return request({ - url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/remove', + url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/remove', method: 'post', params: { ids, @@ -34,7 +34,7 @@ export const remove = (ids) => { export const add = (row) => { return request({ - url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/submit', + url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit', method: 'post', data: row }) @@ -42,7 +42,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/$!{cfg.serviceName}/$!{table.entityPath}/submit', + url: '/api/$!{cfg.serviceName}/$!{cfg.entityKey}/submit', method: 'post', data: row }) diff --git a/blade-ops/blade-develop/src/main/resources/templates/saber/crud.vue.vm b/blade-ops/blade-develop/src/main/resources/templates/saber/crud.vue.vm index 616be75e..ac87e54b 100644 --- a/blade-ops/blade-develop/src/main/resources/templates/saber/crud.vue.vm +++ b/blade-ops/blade-develop/src/main/resources/templates/saber/crud.vue.vm @@ -27,7 +27,7 @@