Просмотр исходного кода

[ueditor支持][修改]:

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
5c2ecdb289
4 измененных файлов: 9 добавлений и 8 удалений
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +1
    -3
      mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java
  3. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/UeditorController.java
  4. +5
    -4
      mallinkAdmin/src/main/java/com/iformall/ueditor/ActionEnter.java

+ 2
- 0
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");


+ 1
- 3
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);
}


}

+ 1
- 1
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);
}



+ 5
- 4
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:


Загрузка…
Отмена
Сохранить