Merge 2210e42e48 into e6d454301f

pom.xml

@@ -28,14 +28,14 @@
     <groupId>org.apache.rocketmq</groupId>
     <artifactId>rocketmq-dashboard</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
     <name>rocketmq-dashboard</name>
 
     <scm>
         <url>git@github.com:apache/rocketmq-dashboard.git</url>
         <connection>scm:git:git@github.com:apache/rocketmq-dashboard.git</connection>
         <developerConnection>scm:git:git@github.com:apache/rocketmq-dashboard.git</developerConnection>
-        <tag>rocketmq-dashboard-2.0.0</tag>
+        <tag>1.0.0</tag>
     </scm>
 
     <mailingLists>

src/main/java/org/apache/rocketmq/dashboard/permisssion/PermissionAspect.java

@@ -18,6 +18,8 @@ package org.apache.rocketmq.dashboard.permisssion;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.dashboard.config.RMQConfigure;
 import org.apache.rocketmq.dashboard.exception.ServiceException;
 import org.apache.rocketmq.dashboard.model.UserInfo;
@@ -27,6 +29,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -38,6 +41,9 @@ public class PermissionAspect {
     @Resource
     private RMQConfigure configure;
 
+    @Resource
+    private ServerProperties serverProperties;
+
     @Resource
     private PermissionService permissionService;
 
@@ -55,6 +61,7 @@ public class PermissionAspect {
         if (configure.isLoginRequired()) {
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String url = request.getRequestURI();
+            url = StringUtils.removeStart(url, serverProperties.getServlet().getContextPath());
             UserInfo userInfo = (UserInfo) request.getSession().getAttribute(WebUtil.USER_INFO);
             if (userInfo == null || userInfo.getUser() == null) {
                 throw new ServiceException(-1, "user not login");