mxd 4 роки тому
батько
коміт
144dfbce4d

+ 3 - 1
src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java

@@ -442,6 +442,7 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer {
 		configuration.setResultProvider(resultProvider);
 		configuration.setThrowException(properties.isThrowException());
 		configuration.setMagicDynamicDataSource(magicDynamicDataSource);
+		configuration.setEditorConfig(properties.getEditorConfig());
 		// 注册函数
 		this.magicFunctions.forEach(function -> JavaReflection.registerFunctionClass(function.getClass()));
 		// 向页面传递配置信息时不传递用户名密码,增强安全性
@@ -465,7 +466,8 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer {
 					RequestMapping requestMapping = method.getAnnotation(RequestMapping.class);
 					if (requestMapping != null) {
 						String[] paths = Stream.of(requestMapping.value()).map(value -> base + value).toArray(String[]::new);
-						requestMappingHandlerMapping.registerMapping(RequestMappingInfo.paths(paths).build(), item, method);
+						RequestMappingInfo mappingInfo = RequestMappingInfo.paths(paths).produces(requestMapping.produces()).build();
+						requestMappingHandlerMapping.registerMapping(mappingInfo, item, method);
 					}
 				}
 			});

+ 16 - 0
src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIProperties.java

@@ -69,10 +69,18 @@ public class MagicAPIProperties {
 
 	/**
 	 * 线程核心数,需要>0,<=0时采用默认配置,即CPU核心数 * 2
+	 *
 	 * @since 0.4.5
 	 */
 	private int threadPoolExecutorSize = 0;
 
+	/**
+	 * 编辑器配置文件路径(js)
+	 *
+	 * @since 0.6.1
+	 */
+	private String editorConfig;
+
 	/**
 	 * 版本号
 	 */
@@ -94,6 +102,14 @@ public class MagicAPIProperties {
 	@NestedConfigurationProperty
 	private SwaggerConfig swaggerConfig = new SwaggerConfig();
 
+	public String getEditorConfig() {
+		return editorConfig;
+	}
+
+	public void setEditorConfig(String editorConfig) {
+		this.editorConfig = editorConfig;
+	}
+
 	public String getWeb() {
 		if (StringUtils.isBlank(web)) {
 			return null;

+ 0 - 4
src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicMongoAutoConfiguration.java

@@ -18,10 +18,6 @@ import org.ssssssss.script.reflection.AbstractReflection;
 @ConditionalOnBean(MongoTemplate.class)
 public class MagicMongoAutoConfiguration {
 
-	public MagicMongoAutoConfiguration() {
-		System.out.println("123");
-	}
-
 	/**
 	 * 注入mongo模块
 	 */