From 5759ad4506a45bc792e71171940b3a8e412601b9 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 17 Apr 2019 11:28:03 +0800
Subject: [PATCH] :tada: 2.2.2.RELEASE

---
 blade-core-boot/pom.xml                                       | 2 +-
 blade-core-cloud/pom.xml                                      | 2 +-
 blade-core-develop/pom.xml                                    | 2 +-
 .../src/main/java/org/springblade/develop/CodeGenerator.java  | 2 +-
 .../org/springblade/develop/constant/DevelopConstant.java     | 4 ++--
 .../org/springblade/develop/support/BladeCodeGenerator.java   | 2 +-
 .../src/main/resources/{ => templates}/code.properties        | 0
 .../src/main/resources/{ => templates}/controller.java.vm     | 0
 .../src/main/resources/{ => templates}/entity.java.vm         | 0
 .../src/main/resources/{ => templates}/entityDTO.java.vm      | 0
 .../src/main/resources/{ => templates}/entityVO.java.vm       | 0
 .../src/main/resources/{ => templates}/mapper.java.vm         | 0
 .../src/main/resources/{ => templates}/mapper.xml.vm          | 0
 .../src/main/resources/{ => templates}/saber/api.js.vm        | 0
 .../src/main/resources/{ => templates}/saber/crud.vue.vm      | 2 +-
 .../src/main/resources/{ => templates}/service.java.vm        | 0
 .../src/main/resources/{ => templates}/serviceImpl.java.vm    | 0
 .../src/main/resources/{ => templates}/sql/menu.sql.vm        | 0
 .../src/main/resources/{ => templates}/sword/action.js.vm     | 0
 .../src/main/resources/{ => templates}/sword/add.js.vm        | 2 +-
 .../src/main/resources/{ => templates}/sword/edit.js.vm       | 2 +-
 .../src/main/resources/{ => templates}/sword/list.js.vm       | 2 +-
 .../src/main/resources/{ => templates}/sword/model.js.vm      | 4 ++--
 .../src/main/resources/{ => templates}/sword/service.js.vm    | 0
 .../src/main/resources/{ => templates}/sword/view.js.vm       | 2 +-
 .../src/main/resources/{ => templates}/wrapper.java.vm        | 0
 blade-core-launch/pom.xml                                     | 2 +-
 blade-core-log/pom.xml                                        | 2 +-
 blade-core-mybatis/pom.xml                                    | 2 +-
 blade-core-secure/pom.xml                                     | 2 +-
 blade-core-swagger/pom.xml                                    | 2 +-
 blade-core-tool/pom.xml                                       | 2 +-
 pom.xml                                                       | 4 ++--
 33 files changed, 22 insertions(+), 22 deletions(-)
 rename blade-core-develop/src/main/resources/{ => templates}/code.properties (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/controller.java.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/entity.java.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/entityDTO.java.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/entityVO.java.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/mapper.java.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/mapper.xml.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/saber/api.js.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/saber/crud.vue.vm (97%)
 rename blade-core-develop/src/main/resources/{ => templates}/service.java.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/serviceImpl.java.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/sql/menu.sql.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/sword/action.js.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/sword/add.js.vm (95%)
 rename blade-core-develop/src/main/resources/{ => templates}/sword/edit.js.vm (98%)
 rename blade-core-develop/src/main/resources/{ => templates}/sword/list.js.vm (96%)
 rename blade-core-develop/src/main/resources/{ => templates}/sword/model.js.vm (92%)
 rename blade-core-develop/src/main/resources/{ => templates}/sword/service.js.vm (100%)
 rename blade-core-develop/src/main/resources/{ => templates}/sword/view.js.vm (95%)
 rename blade-core-develop/src/main/resources/{ => templates}/wrapper.java.vm (100%)

diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml
index 7dcec94..2da6a39 100644
--- a/blade-core-boot/pom.xml
+++ b/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>
diff --git a/blade-core-cloud/pom.xml b/blade-core-cloud/pom.xml
index 9691897..3c11577 100644
--- a/blade-core-cloud/pom.xml
+++ b/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>
 
diff --git a/blade-core-develop/pom.xml b/blade-core-develop/pom.xml
index 1c7a5b6..ff9c164 100644
--- a/blade-core-develop/pom.xml
+++ b/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>
 
diff --git a/blade-core-develop/src/main/java/org/springblade/develop/CodeGenerator.java b/blade-core-develop/src/main/java/org/springblade/develop/CodeGenerator.java
index 483dcec..48e38c1 100644
--- a/blade-core-develop/src/main/java/org/springblade/develop/CodeGenerator.java
+++ b/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";
 	/**
 	 * 前端代码生成地址
 	 */
diff --git a/blade-core-develop/src/main/java/org/springblade/develop/constant/DevelopConstant.java b/blade-core-develop/src/main/java/org/springblade/develop/constant/DevelopConstant.java
index 53be4ac..bc7b667 100644
--- a/blade-core-develop/src/main/java/org/springblade/develop/constant/DevelopConstant.java
+++ b/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";
 }
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 e24298e..1b15266 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
@@ -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") {
diff --git a/blade-core-develop/src/main/resources/code.properties b/blade-core-develop/src/main/resources/templates/code.properties
similarity index 100%
rename from blade-core-develop/src/main/resources/code.properties
rename to blade-core-develop/src/main/resources/templates/code.properties
diff --git a/blade-core-develop/src/main/resources/controller.java.vm b/blade-core-develop/src/main/resources/templates/controller.java.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/controller.java.vm
rename to blade-core-develop/src/main/resources/templates/controller.java.vm
diff --git a/blade-core-develop/src/main/resources/entity.java.vm b/blade-core-develop/src/main/resources/templates/entity.java.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/entity.java.vm
rename to blade-core-develop/src/main/resources/templates/entity.java.vm
diff --git a/blade-core-develop/src/main/resources/entityDTO.java.vm b/blade-core-develop/src/main/resources/templates/entityDTO.java.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/entityDTO.java.vm
rename to blade-core-develop/src/main/resources/templates/entityDTO.java.vm
diff --git a/blade-core-develop/src/main/resources/entityVO.java.vm b/blade-core-develop/src/main/resources/templates/entityVO.java.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/entityVO.java.vm
rename to blade-core-develop/src/main/resources/templates/entityVO.java.vm
diff --git a/blade-core-develop/src/main/resources/mapper.java.vm b/blade-core-develop/src/main/resources/templates/mapper.java.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/mapper.java.vm
rename to blade-core-develop/src/main/resources/templates/mapper.java.vm
diff --git a/blade-core-develop/src/main/resources/mapper.xml.vm b/blade-core-develop/src/main/resources/templates/mapper.xml.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/mapper.xml.vm
rename to blade-core-develop/src/main/resources/templates/mapper.xml.vm
diff --git a/blade-core-develop/src/main/resources/saber/api.js.vm b/blade-core-develop/src/main/resources/templates/saber/api.js.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/saber/api.js.vm
rename to blade-core-develop/src/main/resources/templates/saber/api.js.vm
diff --git a/blade-core-develop/src/main/resources/saber/crud.vue.vm b/blade-core-develop/src/main/resources/templates/saber/crud.vue.vm
similarity index 97%
rename from blade-core-develop/src/main/resources/saber/crud.vue.vm
rename to blade-core-develop/src/main/resources/templates/saber/crud.vue.vm
index 24dad04..2dc227a 100644
--- a/blade-core-develop/src/main/resources/saber/crud.vue.vm
+++ b/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 {
diff --git a/blade-core-develop/src/main/resources/service.java.vm b/blade-core-develop/src/main/resources/templates/service.java.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/service.java.vm
rename to blade-core-develop/src/main/resources/templates/service.java.vm
diff --git a/blade-core-develop/src/main/resources/serviceImpl.java.vm b/blade-core-develop/src/main/resources/templates/serviceImpl.java.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/serviceImpl.java.vm
rename to blade-core-develop/src/main/resources/templates/serviceImpl.java.vm
diff --git a/blade-core-develop/src/main/resources/sql/menu.sql.vm b/blade-core-develop/src/main/resources/templates/sql/menu.sql.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/sql/menu.sql.vm
rename to blade-core-develop/src/main/resources/templates/sql/menu.sql.vm
diff --git a/blade-core-develop/src/main/resources/sword/action.js.vm b/blade-core-develop/src/main/resources/templates/sword/action.js.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/sword/action.js.vm
rename to blade-core-develop/src/main/resources/templates/sword/action.js.vm
diff --git a/blade-core-develop/src/main/resources/sword/add.js.vm b/blade-core-develop/src/main/resources/templates/sword/add.js.vm
similarity index 95%
rename from blade-core-develop/src/main/resources/sword/add.js.vm
rename to blade-core-develop/src/main/resources/templates/sword/add.js.vm
index 459b1bb..badf48e 100644
--- a/blade-core-develop/src/main/resources/sword/add.js.vm
+++ b/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;
 
diff --git a/blade-core-develop/src/main/resources/sword/edit.js.vm b/blade-core-develop/src/main/resources/templates/sword/edit.js.vm
similarity index 98%
rename from blade-core-develop/src/main/resources/sword/edit.js.vm
rename to blade-core-develop/src/main/resources/templates/sword/edit.js.vm
index ba2657c..aea7a94 100644
--- a/blade-core-develop/src/main/resources/sword/edit.js.vm
+++ b/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;
 
diff --git a/blade-core-develop/src/main/resources/sword/list.js.vm b/blade-core-develop/src/main/resources/templates/sword/list.js.vm
similarity index 96%
rename from blade-core-develop/src/main/resources/sword/list.js.vm
rename to blade-core-develop/src/main/resources/templates/sword/list.js.vm
index ddb851b..f7c5b68 100644
--- a/blade-core-develop/src/main/resources/sword/list.js.vm
+++ b/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;
diff --git a/blade-core-develop/src/main/resources/sword/model.js.vm b/blade-core-develop/src/main/resources/templates/sword/model.js.vm
similarity index 92%
rename from blade-core-develop/src/main/resources/sword/model.js.vm
rename to blade-core-develop/src/main/resources/templates/sword/model.js.vm
index 9390b88..2bd3a4b 100644
--- a/blade-core-develop/src/main/resources/sword/model.js.vm
+++ b/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,
diff --git a/blade-core-develop/src/main/resources/sword/service.js.vm b/blade-core-develop/src/main/resources/templates/sword/service.js.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/sword/service.js.vm
rename to blade-core-develop/src/main/resources/templates/sword/service.js.vm
diff --git a/blade-core-develop/src/main/resources/sword/view.js.vm b/blade-core-develop/src/main/resources/templates/sword/view.js.vm
similarity index 95%
rename from blade-core-develop/src/main/resources/sword/view.js.vm
rename to blade-core-develop/src/main/resources/templates/sword/view.js.vm
index 1104856..09181a3 100644
--- a/blade-core-develop/src/main/resources/sword/view.js.vm
+++ b/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;
 
diff --git a/blade-core-develop/src/main/resources/wrapper.java.vm b/blade-core-develop/src/main/resources/templates/wrapper.java.vm
similarity index 100%
rename from blade-core-develop/src/main/resources/wrapper.java.vm
rename to blade-core-develop/src/main/resources/templates/wrapper.java.vm
diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml
index db048bb..82186cd 100644
--- a/blade-core-launch/pom.xml
+++ b/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>
diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml
index 57ca497..fa45507 100644
--- a/blade-core-log/pom.xml
+++ b/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>
diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml
index 1517bf1..fa54f23 100644
--- a/blade-core-mybatis/pom.xml
+++ b/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>
diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml
index 1568325..c16c494 100644
--- a/blade-core-secure/pom.xml
+++ b/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>
diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml
index b0e3190..f1e2869 100644
--- a/blade-core-swagger/pom.xml
+++ b/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>
diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml
index 306c097..af3bfcf 100644
--- a/blade-core-tool/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index 8c925b3..11f63b2 100644
--- a/pom.xml
+++ b/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>