Skip to content

Commit

Permalink
🏇 fix const CLASSPATH on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
hellokaton committed Aug 2, 2017
1 parent 48fc246 commit 31365a9
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ Grab via `Maven`:
<dependency>
<groupId>com.bladejava</groupId>
<artifactId>blade-mvc</artifactId>
<version>2.0.1-alpha2</version>
<version>2.0.1-alpha3</version>
</dependency>
```

or `Gradle`:

```sh
compile 'com.bladejava:blade-mvc:2.0.1-alpha2'
compile 'com.bladejava:blade-mvc:2.0.1-alpha3'
```

Create `Main` method like this:
Expand Down
4 changes: 2 additions & 2 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ Blade是一款简洁优雅的轻量级MVC框架。如果你喜欢它请为它 [
<dependency>
<groupId>com.bladejava</groupId>
<artifactId>blade-mvc</artifactId>
<version>2.0.1-alpha2</version>
<version>2.0.1-alpha3</version>
</dependency>
```

或者 `Gradle`:

```sh
compile 'com.bladejava:blade-mvc:2.0.1-alpha2'
compile 'com.bladejava:blade-mvc:2.0.1-alpha3'
```

编写 `Main`函数:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.bladejava</groupId>
<artifactId>blade-mvc</artifactId>
<version>2.0.1-alpha2</version>
<version>2.0.1-alpha3</version>
<packaging>jar</packaging>

<name>blade</name>
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/blade/mvc/Const.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package com.blade.mvc;

import java.io.File;
import java.util.Arrays;
import java.util.List;

Expand All @@ -28,9 +29,9 @@ public interface Const {

int DEFAULT_SERVER_PORT = 9000;
String DEFAULT_SERVER_ADDRESS = "0.0.0.0";
String VERSION = "2.0.1-alpha2";
String VERSION = "2.0.1-alpha3";
String WEB_JARS = "/webjars/";
String CLASSPATH = Const.class.getResource("/").getPath();
String CLASSPATH = new File(Const.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getPath();
String CONTENT_TYPE_HTML = "text/html; charset=UTF-8";
String CONTENT_TYPE_JSON = "application/json; charset=UTF-8";
String CONTENT_TYPE_TEXT = "text/plain; charset=UTF-8";
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/blade/mvc/ui/template/DefaultEngine.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class DefaultEngine implements TemplateEngine {
public void render(ModelAndView modelAndView, Writer writer) throws BladeException {
String view = modelAndView.getView();
String viewPath = Const.CLASSPATH + TEMPLATE_PATH + File.separator + view;
viewPath = viewPath.replace("//", "/");
viewPath = viewPath.replace("[//]", "/");
try {
Request request = WebContext.request();
String body = IOKit.readToString(viewPath);
Expand Down

0 comments on commit 31365a9

Please sign in to comment.