From 4af9cd9622044c6b97af4e92a53ce39534631cce Mon Sep 17 00:00:00 2001 From: biezhi Date: Thu, 26 Sep 2019 11:27:23 +0800 Subject: [PATCH] :bookmark: release 2.0.15.BETA --- README.md | 4 ++-- README_CN.md | 4 ++-- pom.xml | 2 +- src/main/java/com/blade/mvc/Const.java | 2 +- src/main/java/com/blade/mvc/RouteContext.java | 18 ------------------ 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index d82604e88..efcfd2bc8 100644 --- a/README.md +++ b/README.md @@ -65,14 +65,14 @@ Run with `Maven`: com.bladejava blade-mvc - 2.0.15.ALPHA + 2.0.15.BETA ``` or `Gradle`: ```sh -compile 'com.bladejava:blade-mvc:2.0.15.ALPHA' +compile 'com.bladejava:blade-mvc:2.0.15.BETA' ``` Write the `main` method and the `Hello World`: diff --git a/README_CN.md b/README_CN.md index c694aee3e..e90fd8b86 100644 --- a/README_CN.md +++ b/README_CN.md @@ -61,7 +61,7 @@ com.bladejava blade-mvc - 2.0.15.ALPHA + 2.0.15.BETA ``` @@ -70,7 +70,7 @@ 或者 `Gradle`: ```sh -compile 'com.bladejava:blade-mvc:2.0.15.ALPHA' +compile 'com.bladejava:blade-mvc:2.0.15.BETA' ``` 编写 `main` 函数写一个 `Hello World`: diff --git a/pom.xml b/pom.xml index 989976ccb..9ba7ad0d9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.bladejava blade-mvc - 2.0.15.ALPHA + 2.0.15.BETA jar blade diff --git a/src/main/java/com/blade/mvc/Const.java b/src/main/java/com/blade/mvc/Const.java index df2c118dd..a18ce3f21 100644 --- a/src/main/java/com/blade/mvc/Const.java +++ b/src/main/java/com/blade/mvc/Const.java @@ -31,7 +31,7 @@ public interface Const { int DEFAULT_SERVER_PORT = 9000; String DEFAULT_SERVER_ADDRESS = "0.0.0.0"; String LOCAL_IP_ADDRESS = "127.0.0.1"; - String VERSION = "2.0.15.ALPHA"; + String VERSION = "2.0.15.BETA"; String WEB_JARS = "/webjars/"; String CLASSPATH = BladeKit.getCurrentClassPath(); String CONTENT_TYPE_HTML = "text/html; charset=UTF-8"; diff --git a/src/main/java/com/blade/mvc/RouteContext.java b/src/main/java/com/blade/mvc/RouteContext.java index f4195a682..c2b99f8e8 100644 --- a/src/main/java/com/blade/mvc/RouteContext.java +++ b/src/main/java/com/blade/mvc/RouteContext.java @@ -577,24 +577,6 @@ public boolean isAbort() { public void initRoute(Route route) { this.request.initPathParams(route); this.route = route; -// if (null != route.getTarget() && route.getTargetType().equals(RouteHandler.class)) { -// return; -// } -// boolean singleton = IocKit.isSingleton(route.getTargetType()); -// -// if (singleton) { -// BeanDefine beanDefine = WebContext.blade().ioc().getBeanDefine(route.getTargetType()); -// if (beanDefine.isFieldHasPrototype()) { -// // reset initialize -// IocKit.injection(WebContext.blade().ioc(), beanDefine); -// } else { -// Object target = WebContext.blade().ioc().getBean(route.getTargetType()); -// this.route.setTarget(target); -// } -// } else { -// Object target = WebContext.blade().ioc().createBean(route.getTargetType()); -// this.route.setTarget(target); -// } } public void injectParameters() {