diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index 1c4ac267..5de7bbfe 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -172,6 +172,7 @@
japidocs
${japidocs.version}
+
io.jsonwebtoken
jjwt-api
diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Index/Controller/IndexController.java b/dsBase/src/main/java/com/dsideal/dsBase/Index/Controller/IndexController.java
index 19f9606c..1329bbec 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/Index/Controller/IndexController.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/Index/Controller/IndexController.java
@@ -8,6 +8,6 @@ import com.jfinal.kit.PropKit;
public class IndexController extends Controller {
@Before({GET.class})
public void index() {
- redirect(PropKit.get("first_page"));
+ renderText("Welcome to dsBase World!");
}
}
\ No newline at end of file
diff --git a/dsBase/src/main/resources/undertow.properties b/dsBase/src/main/resources/undertow.properties
index 7580d44c..d5ff7821 100644
--- a/dsBase/src/main/resources/undertow.properties
+++ b/dsBase/src/main/resources/undertow.properties
@@ -2,7 +2,7 @@
undertow.devMode=false
undertow.port=8001
undertow.host=0.0.0.0
-
+undertow.resourcePath=D:/dsWork/dsProject/dsBase/WebRoot,classpath:static
# 目录名称
undertow.contextPath=/dsBase
diff --git a/dsGw/pom.xml b/dsGw/pom.xml
index 34706c26..db8134e3 100644
--- a/dsGw/pom.xml
+++ b/dsGw/pom.xml
@@ -129,11 +129,23 @@
${snakeyaml.version}
-
+
io.jsonwebtoken
jjwt-api
- ${jjwt.version}
+ ${jsonwebtoken.version}
+
+
+ io.jsonwebtoken
+ jjwt-impl
+ ${jsonwebtoken.version}
+ runtime
+
+
+ io.jsonwebtoken
+ jjwt-jackson
+ 0.11.5
+ runtime
diff --git a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java
index 926da5b6..1ce4bddf 100644
--- a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java
+++ b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java
@@ -110,7 +110,7 @@ public class RouterHandler extends Handler {
}
- // 方法2:使用Set集合(推荐,性能更好)
+ // 使用Set集合(推荐,性能更好)
private static final Set STATIC_EXTENSIONS = new HashSet<>(Arrays.asList(
"html", "js", "css", "png", "jpg", "jpeg", "gif", "ico", "svg",
"woff", "woff2", "ttf", "eot", "map", "json", "xml", "txt"
@@ -138,15 +138,15 @@ public class RouterHandler extends Handler {
return;
}
+ //微服务间的调用视为内部调用
+ if (req.getServletPath().endsWith("_Internal")) {
+ renderJson(res, new RetBean(RetBean.ERROR, "微服务间内部接口调用,是不需要走网关的!").toString());
+ isHandled[0] = true; //停止filter
+ return;
+ }
+
//如果是白名单,不检查jwt,否则需要检查jwt
if (!GwApplication.whiteSet.contains(servletPath)) {
- //微服务间的调用视为内部调用
- if (req.getServletPath().endsWith("_Internal")) {
- renderJson(res, new RetBean(RetBean.ERROR, "微服务间内部接口调用,是不需要走网关的!").toString());
- isHandled[0] = true; //停止filter
- return;
- }
-
//是不是通过了登录检查?
boolean canPass = true;
//1、存在Session,检查是不是正确的Session
diff --git a/dsGw/src/main/java/com/dsideal/gw/Util/JwtUtil.java b/dsGw/src/main/java/com/dsideal/gw/Util/JwtUtil.java
index 7ec9f8fd..f26f5e2d 100644
--- a/dsGw/src/main/java/com/dsideal/gw/Util/JwtUtil.java
+++ b/dsGw/src/main/java/com/dsideal/gw/Util/JwtUtil.java
@@ -57,6 +57,7 @@ public class JwtUtil {
.parseClaimsJws(token)
.getBody();
} catch (Exception e) {
+ System.out.println(e.toString());
claims = null;
}
return claims;