diff --git a/pom.xml b/pom.xml
index 856d575e..dd0aa896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,6 +221,19 @@
UTF-8
+
+ org.eclipse.jetty
+ jetty-maven-plugin
+ 9.2.8.v20150217
+
+
+ manual
+
+ 80
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/smallchill/core/controller/ZTreeController.java b/src/main/java/com/smallchill/core/controller/ZTreeController.java
index 498dd112..ecb9027f 100644
--- a/src/main/java/com/smallchill/core/controller/ZTreeController.java
+++ b/src/main/java/com/smallchill/core/controller/ZTreeController.java
@@ -4,7 +4,6 @@ import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -29,8 +28,8 @@ import com.smallchill.core.toolbox.kit.StrKit;
@RequestMapping("/ztree")
public class ZTreeController extends BladeController {
- @RequestMapping("/open/{type}/{index}/{name}/{source}/{check}/{where}/{intercept}/{ext}/{val}")
- public ModelAndView open(@PathVariable String type, @PathVariable String index, @PathVariable String name, @PathVariable String source, @PathVariable String check, @PathVariable String where, @PathVariable String intercept, @PathVariable String ext, @PathVariable String val){
+ @RequestMapping("/open")
+ public ModelAndView open(@RequestParam String type, @RequestParam String index, @RequestParam String name, @RequestParam String source, @RequestParam String check, @RequestParam String where, @RequestParam String intercept, @RequestParam String ext, @RequestParam String val){
ModelAndView view = new ModelAndView("/common/_function/_ztree.html");
view.addObject("type", getTypeName(type, source));
view.addObject("index", index);
diff --git a/src/main/java/com/smallchill/system/controller/RoleController.java b/src/main/java/com/smallchill/system/controller/RoleController.java
index 4f30c0df..c8a70244 100644
--- a/src/main/java/com/smallchill/system/controller/RoleController.java
+++ b/src/main/java/com/smallchill/system/controller/RoleController.java
@@ -23,8 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.smallchill.common.base.BaseController;
+import com.smallchill.core.annotation.Permission;
import com.smallchill.core.constant.ConstShiro;
-import com.smallchill.core.shiro.ShiroKit;
import com.smallchill.core.toolbox.Func;
import com.smallchill.core.toolbox.Paras;
import com.smallchill.core.toolbox.ajax.AjaxResult;
@@ -96,13 +96,11 @@ public class RoleController extends BaseController{
return BASE_PATH + "role_view.html";
}
- @RequestMapping("/authority/{roleId}/{roleName}")
- public String authority(@PathVariable String roleId, @PathVariable String roleName, ModelMap mm) {
- if(!ShiroKit.hasAnyRoles(ConstShiro.ADMINISTRATOR + "," + ConstShiro.ADMIN)){
- return "redirect:/unauth";
- }
- mm.put("roleId", roleId);
- mm.put("roleName", Func.decodeUrl(roleName));
+ @Permission({ConstShiro.ADMINISTRATOR, ConstShiro.ADMIN})
+ @RequestMapping("/authority")
+ public String authority(ModelMap mm) {
+ mm.put("roleId", getParameter("roleId"));
+ mm.put("roleName", getParameterToDecode("roleName"));
return BASE_PATH + "role_authority.html";
}
diff --git a/src/main/webapp/WEB-INF/view/common/_widget/fileupload.tag b/src/main/webapp/WEB-INF/view/common/_widget/fileupload.tag
index 45754e2a..fbd19da7 100644
--- a/src/main/webapp/WEB-INF/view/common/_widget/fileupload.tag
+++ b/src/main/webapp/WEB-INF/view/common/_widget/fileupload.tag
@@ -13,13 +13,13 @@
-
+