:tada: 2.2.2.RELEASE

blade-core-boot/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-tool</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-core-cloud/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-core-develop/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-core-develop/src/main/java/org/springblade/develop/CodeGenerator.java

@@ -40,7 +40,7 @@ public class CodeGenerator {
 	/**
 	 * 前端代码生成所属系统
 	 */
-	public static String SYSTEM_NAME = "saber";
+	public static String SYSTEM_NAME = "templates/saber";
 	/**
 	 * 前端代码生成地址
 	 */

blade-core-develop/src/main/java/org/springblade/develop/constant/DevelopConstant.java

@@ -24,10 +24,10 @@ public interface DevelopConstant {
 	/**
 	 * sword 系统名
 	 */
-	String SWORD_NAME = "sword";
+	String SWORD_NAME = "templates/sword";
 
 	/**
 	 * saber 系统名
 	 */
-	String SABER_NAME = "saber";
+	String SABER_NAME = "templates/saber";
 }

blade-core-develop/src/main/java/org/springblade/develop/support/BladeCodeGenerator.java

@@ -194,7 +194,7 @@ public class BladeCodeGenerator {
 			@Override
 			public String outputFile(TableInfo tableInfo) {
 				map.put("entityKey", (tableInfo.getEntityName().toLowerCase()));
-				return getOutputDir() + "/" + "/sql/" + tableInfo.getEntityName().toLowerCase() + ".menu.mysql";
+				return getOutputDir() + "/" + "/templates/sql/" + tableInfo.getEntityName().toLowerCase() + ".menu.mysql";
 			}
 		});
 		focList.add(new FileOutConfig("/templates/entityVO.java.vm") {

blade-core-develop/src/main/resources/saber/crud.vue.vm → blade-core-develop/src/main/resources/templates/saber/crud.vue.vm

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/$!{cfg.servicePackage}/$!{cfg.entityKey}";
+  import {getList, getDetail, add, update, remove} from "templates/saber/crud.vue$!{cfg.servicePackage}/$!{cfg.entityKey}";
   import {mapGetters} from "vuex";
 
   export default {

blade-core-develop/src/main/resources/sword/add.js.vm → blade-core-develop/src/main/resources/templates/sword/add.js.vm

@@ -4,7 +4,7 @@ import { Form, Input, Card, Button } from 'antd';
 import { connect } from 'dva';
 import Panel from '../../../components/Panel';
 import styles from '../../../layouts/Sword.less';
-import { $!{upperEntityPath}_SUBMIT } from '../../../actions/$!{table.entityPath}';
+import { $!{upperEntityPath}_SUBMIT } from './add.js$!{table.entityPath}';
 
 const FormItem = Form.Item;
 

blade-core-develop/src/main/resources/sword/edit.js.vm → blade-core-develop/src/main/resources/templates/sword/edit.js.vm

@@ -4,7 +4,7 @@ import { Form, Input, Card, Button } from 'antd';
 import { connect } from 'dva';
 import Panel from '../../../components/Panel';
 import styles from '../../../layouts/Sword.less';
-import { $!{upperEntityPath}_DETAIL, $!{upperEntityPath}_SUBMIT } from '../../../actions/$!{table.entityPath}';
+import { $!{upperEntityPath}_DETAIL, $!{upperEntityPath}_SUBMIT } from './edit.js$!{table.entityPath}';
 
 const FormItem = Form.Item;
 

blade-core-develop/src/main/resources/sword/list.js.vm → blade-core-develop/src/main/resources/templates/sword/list.js.vm

@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 import { connect } from 'dva';
 import { Button, Col, Form, Input, Row } from 'antd';
 import Panel from '../../../components/Panel';
-import { $!{upperEntityPath}_LIST } from '../../../actions/$!{table.entityPath}';
+import { $!{upperEntityPath}_LIST } from './list.js$!{table.entityPath}';
 import Grid from '../../../components/Sword/Grid';
 
 const FormItem = Form.Item;

blade-core-develop/src/main/resources/sword/model.js.vm → blade-core-develop/src/main/resources/templates/sword/model.js.vm

@@ -1,8 +1,8 @@
 #set($upperEntityPath=$table.entityPath.toUpperCase())
 import { message } from 'antd';
 import router from 'umi/router';
-import { $!{upperEntityPath}_NAMESPACE } from '../actions/$!{table.entityPath}';
-import { list, submit, detail, remove } from '../services/$!{table.entityPath}';
+import { $!{upperEntityPath}_NAMESPACE } from './model.js$!{table.entityPath}';
+import { list, submit, detail, remove } from './model.js$!{table.entityPath}';
 
 export default {
   namespace: $!{upperEntityPath}_NAMESPACE,

blade-core-develop/src/main/resources/sword/view.js.vm → blade-core-develop/src/main/resources/templates/sword/view.js.vm

@@ -5,7 +5,7 @@ import { Form, Card, Button } from 'antd';
 import { connect } from 'dva';
 import Panel from '../../../components/Panel';
 import styles from '../../../layouts/Sword.less';
-import { $!{upperEntityPath}_DETAIL } from '../../../actions/$!{table.entityPath}';
+import { $!{upperEntityPath}_DETAIL } from './view.js$!{table.entityPath}';
 
 const FormItem = Form.Item;
 

blade-core-launch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-core-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-core-mybatis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-core-secure/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-core-swagger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-tool</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-core-tool/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-tool</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>blade-tool</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
     <packaging>pom</packaging>
     <name>blade-tool</name>
     <description>
@@ -36,7 +36,7 @@
     </scm>
 
     <properties>
-        <blade.tool.version>2.2.1</blade.tool.version>
+        <blade.tool.version>2.2.2</blade.tool.version>
 
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.0</maven.plugin.version>