diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 4b628cfac..d0fac2521 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -96,6 +96,8 @@ public class ShiroConfig { //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 filterChainDefinitionMap.put("/logout", "anon"); + filterChainDefinitionMap.put("/ue/**", "anon"); + filterChainDefinitionMap.put("/config.json", "anon"); filterChainDefinitionMap.put("/doLogin/**", "anon"); filterChainDefinitionMap.put("/bHidLogin/**", "anon"); filterChainDefinitionMap.put("/css/**", "anon"); diff --git a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java index c817424a3..5bd391b9f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java @@ -88,7 +88,7 @@ public class WebConfig implements WebMvcConfigurer { // ueditor registry.addResourceHandler("/upload/**") .addResourceLocations("file:" + uEditorConfig.getUploadPath()); - //registry.addResourceHandler("/app/**").addResourceLocations("classpath:/app/"); + registry.addResourceHandler("/config.json").addResourceLocations("classpath:/config.json"); } @@ -133,6 +133,4 @@ public class WebConfig implements WebMvcConfigurer { jackson2HttpMessageConverter.setObjectMapper(objectMapper); converters.add(jackson2HttpMessageConverter); } - - } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/UeditorController.java b/mallinkAdmin/src/main/java/com/iformall/controller/UeditorController.java index 32e9c1ca7..45ef54696 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/UeditorController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/UeditorController.java @@ -18,7 +18,7 @@ public class UeditorController { @ResponseBody @RequestMapping("/ueditor/exec") - public String exe(HttpServletRequest request){ + public Object exe(HttpServletRequest request){ return actionEnter.exec(request); } diff --git a/mallinkAdmin/src/main/java/com/iformall/ueditor/ActionEnter.java b/mallinkAdmin/src/main/java/com/iformall/ueditor/ActionEnter.java index b2eb2a842..be78d3668 100644 --- a/mallinkAdmin/src/main/java/com/iformall/ueditor/ActionEnter.java +++ b/mallinkAdmin/src/main/java/com/iformall/ueditor/ActionEnter.java @@ -23,7 +23,7 @@ public class ActionEnter { this.configManager = configManager; } - public String exec(HttpServletRequest request) { + public Object exec(HttpServletRequest request) { this.request = request; this.actionType = request.getParameter("action"); String callbackName = this.request.getParameter("callback"); @@ -34,7 +34,8 @@ public class ActionEnter { return new BaseState(false, AppInfo.ILLEGAL).toJSONString(); } - return callbackName + "(" + this.invoke() + ");"; + //return callbackName + "(" + this.invoke() + ");"; + return this.invoke(); } else { return this.invoke(); @@ -42,7 +43,7 @@ public class ActionEnter { } - public String invoke() { + public Object invoke() { if (actionType == null || !ActionMap.mapping.containsKey(actionType)) { return new BaseState(false, AppInfo.INVALID_ACTION).toJSONString(); @@ -61,7 +62,7 @@ public class ActionEnter { switch (actionCode) { case ActionMap.CONFIG: - return this.configManager.getAllConfig().toString(); + return this.configManager.getAllConfig(); case ActionMap.UPLOAD_IMAGE: case ActionMap.UPLOAD_SCRAWL: