From dfb6fcc1cc9771b0fd0966f1fd9f2602354c646b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 6 Mar 2018 20:37:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8B=BC=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/com/jeesite/test/CodeStatistic.java | 14 +++++++++++--- .../modules/state/web/ServerStateController.java | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/common/src/test/java/com/jeesite/test/CodeStatistic.java b/common/src/test/java/com/jeesite/test/CodeStatistic.java index 04a505b6..0aaa4797 100644 --- a/common/src/test/java/com/jeesite/test/CodeStatistic.java +++ b/common/src/test/java/com/jeesite/test/CodeStatistic.java @@ -22,11 +22,19 @@ public class CodeStatistic { */ public static void main(String[] args) { String file = CodeStatistic.class.getResource("/").getFile(); - String path = file.replace("web/target/test-classes", ""); - + String path = file.replace("/jeesite/common/target/test-classes", ""); + System.out.println("Path: " + path); ArrayList al = getFile(new File(path)); for (File f : al) { - if (f.getName().matches(".*\\.java$")){ // 匹配java格式的文件 + if (!(f.getPath().contains("4.0\\jeesite\\") + || f.getPath().contains("\\devtools\\") + || f.getPath().contains("\\framework\\")) + || f.getPath().contains("\\target\\")){ + continue; + } + if (f.getName().matches(".*\\.java$") + || f.getName().matches(".*\\.html$") + || f.getName().matches(".*\\.js$")){ count(f); System.out.println(f); } diff --git a/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java b/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java index 73eb5276..7a531efe 100644 --- a/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java +++ b/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @RequestMapping(value="${adminPath}/state/server") public class ServerStateController { - @RequiresPermissions("sys:stste:server") + @RequiresPermissions("sys:state:server") @RequestMapping(value="") public String index(){ return "modules/state/serverIndex";