From 95073d8e6591744ec3402d7c051a3d86ab9e40a2 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 17 Apr 2019 15:55:08 +0800
Subject: [PATCH] :tada: 2.2.3.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 ++--
 .../src/main/resources/templates/saber/crud.vue.vm            | 2 +-
 .../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/view.js.vm             | 2 +-
 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 ++--
 18 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml
index 2da6a39..0195473 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.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-cloud/pom.xml b/blade-core-cloud/pom.xml
index 3c11577..4d341ce 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.2</version>
+        <version>2.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/blade-core-develop/pom.xml b/blade-core-develop/pom.xml
index ff9c164..f80f1d9 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.2</version>
+        <version>2.2.3</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 48e38c1..483dcec 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 = "templates/saber";
+	public static String SYSTEM_NAME = "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 bc7b667..53be4ac 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 = "templates/sword";
+	String SWORD_NAME = "sword";
 
 	/**
 	 * saber 系统名
 	 */
-	String SABER_NAME = "templates/saber";
+	String SABER_NAME = "saber";
 }
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 2dc227a..24dad04 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
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "templates/saber/crud.vue$!{cfg.servicePackage}/$!{cfg.entityKey}";
+  import {getList, getDetail, add, update, remove} from "@/api/$!{cfg.servicePackage}/$!{cfg.entityKey}";
   import {mapGetters} from "vuex";
 
   export default {
diff --git a/blade-core-develop/src/main/resources/templates/sword/add.js.vm b/blade-core-develop/src/main/resources/templates/sword/add.js.vm
index badf48e..459b1bb 100644
--- a/blade-core-develop/src/main/resources/templates/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 './add.js$!{table.entityPath}';
+import { $!{upperEntityPath}_SUBMIT } from '../../../actions/$!{table.entityPath}';
 
 const FormItem = Form.Item;
 
diff --git a/blade-core-develop/src/main/resources/templates/sword/edit.js.vm b/blade-core-develop/src/main/resources/templates/sword/edit.js.vm
index aea7a94..ba2657c 100644
--- a/blade-core-develop/src/main/resources/templates/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 './edit.js$!{table.entityPath}';
+import { $!{upperEntityPath}_DETAIL, $!{upperEntityPath}_SUBMIT } from '../../../actions/$!{table.entityPath}';
 
 const FormItem = Form.Item;
 
diff --git a/blade-core-develop/src/main/resources/templates/sword/list.js.vm b/blade-core-develop/src/main/resources/templates/sword/list.js.vm
index f7c5b68..ddb851b 100644
--- a/blade-core-develop/src/main/resources/templates/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 './list.js$!{table.entityPath}';
+import { $!{upperEntityPath}_LIST } from '../../../actions/$!{table.entityPath}';
 import Grid from '../../../components/Sword/Grid';
 
 const FormItem = Form.Item;
diff --git a/blade-core-develop/src/main/resources/templates/sword/model.js.vm b/blade-core-develop/src/main/resources/templates/sword/model.js.vm
index 2bd3a4b..9390b88 100644
--- a/blade-core-develop/src/main/resources/templates/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 './model.js$!{table.entityPath}';
-import { list, submit, detail, remove } from './model.js$!{table.entityPath}';
+import { $!{upperEntityPath}_NAMESPACE } from '../actions/$!{table.entityPath}';
+import { list, submit, detail, remove } from '../services/$!{table.entityPath}';
 
 export default {
   namespace: $!{upperEntityPath}_NAMESPACE,
diff --git a/blade-core-develop/src/main/resources/templates/sword/view.js.vm b/blade-core-develop/src/main/resources/templates/sword/view.js.vm
index 09181a3..1104856 100644
--- a/blade-core-develop/src/main/resources/templates/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 './view.js$!{table.entityPath}';
+import { $!{upperEntityPath}_DETAIL } from '../../../actions/$!{table.entityPath}';
 
 const FormItem = Form.Item;
 
diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml
index 82186cd..c672867 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.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml
index fa45507..5aa854c 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.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml
index fa54f23..ee72317 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.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml
index c16c494..41e1d8c 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.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml
index f1e2869..7736604 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.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml
index af3bfcf..b5ee338 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.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 11f63b2..e20d9a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>blade-tool</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3</version>
     <packaging>pom</packaging>
     <name>blade-tool</name>
     <description>
@@ -36,7 +36,7 @@
     </scm>
 
     <properties>
-        <blade.tool.version>2.2.2</blade.tool.version>
+        <blade.tool.version>2.2.3</blade.tool.version>
 
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.0</maven.plugin.version>