Browse Source

代码优化

mxd 3 years ago
parent
commit
1a3b8e20e8
15 changed files with 52 additions and 20 deletions
  1. 2 1
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/BackupConfig.java
  2. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/CacheConfig.java
  3. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ClusterConfig.java
  4. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/DebugConfig.java
  5. 14 14
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
  6. 6 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIProperties.java
  7. 5 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicJsonAutoConfiguration.java
  8. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicMongoAutoConfiguration.java
  9. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicRedisAutoConfiguration.java
  10. 5 5
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicSwaggerConfiguration.java
  11. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/PageConfig.java
  12. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ResourceConfig.java
  13. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ResponseCodeConfig.java
  14. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/SecurityConfig.java
  15. 2 0
      magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/SwaggerConfig.java

+ 2 - 1
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/BackupConfig.java

@@ -3,9 +3,10 @@ package org.ssssssss.magicapi.spring.boot.starter;
 /**
  * 备份配置
  *
+ * @author mxd
  * @since 1.3.5
  */
-public class BackupConfig{
+public class BackupConfig {
 
 	/**
 	 * 存储类型,可选 file, database

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/CacheConfig.java

@@ -2,6 +2,8 @@ package org.ssssssss.magicapi.spring.boot.starter;
 
 /**
  * 缓存配置
+ *
+ * @author mxd
  */
 public class CacheConfig {
 

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ClusterConfig.java

@@ -4,6 +4,8 @@ import java.util.UUID;
 
 /**
  * 集群配置
+ *
+ * @author mxd
  * @since 1.2.0
  */
 public class ClusterConfig {

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/DebugConfig.java

@@ -2,6 +2,8 @@ package org.ssssssss.magicapi.spring.boot.starter;
 
 /**
  * Debug配置
+ *
+ * @author mxd
  */
 public class DebugConfig {
 

+ 14 - 14
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java

@@ -70,10 +70,15 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 
+/**
+ * magic-api自动配置类
+ *
+ * @author mxd
+ */
 @Configuration
 @ConditionalOnClass({RequestMappingHandlerMapping.class})
 @EnableConfigurationProperties(MagicAPIProperties.class)
@@ -144,7 +149,8 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 	@Autowired(required = false)
 	private MultipartResolver multipartResolver;
 
-	private String ALL_CLASS_TXT;
+	private String allClassTxt;
+	private DefaultAuthorizationInterceptor defaultAuthorizationInterceptor;
 
 	public MagicAPIAutoConfiguration(MagicAPIProperties properties,
 									 ObjectProvider<List<Dialect>> dialectsProvider,
@@ -187,15 +193,15 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 
 	@ResponseBody
 	private String readClass() {
-		if (ALL_CLASS_TXT == null) {
+		if (allClassTxt == null) {
 			try {
-				ALL_CLASS_TXT = StringUtils.join(ClassScanner.scan(), "\r\n");
+				allClassTxt = StringUtils.join(ClassScanner.scan(), "\r\n");
 			} catch (Throwable t) {
 				logger.warn("扫描Class失败", t);
-				ALL_CLASS_TXT = "";
+				allClassTxt = "";
 			}
 		}
-		return ALL_CLASS_TXT;
+		return allClassTxt;
 	}
 
 	@Bean
@@ -248,7 +254,6 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 		return new MagicDatabaseBackupService(new JdbcTemplate(dataSourceNode.getDataSource()), backupConfig.getTableName());
 	}
 
-
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		String web = properties.getWeb();
@@ -280,7 +285,6 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 		}
 	}
 
-
 	@Bean
 	@ConditionalOnProperty(prefix = "magic-api", value = "support-cross-domain", havingValue = "true", matchIfMissing = true)
 	public FilterRegistrationBean<MagicCorsFilter> magicCorsFilterRegistrationBean() {
@@ -328,7 +332,6 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 		return new MappingHandlerMapping(prefix, properties.isAllowOverride());
 	}
 
-
 	@Bean
 	@ConditionalOnMissingBean(FunctionServiceProvider.class)
 	public FunctionServiceProvider functionServiceProvider(GroupServiceProvider groupServiceProvider, Resource magicResource) {
@@ -373,7 +376,6 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 		return new MagicFunctionManager(groupServiceProvider, functionServiceProvider);
 	}
 
-
 	/**
 	 * 注入API调用Service
 	 */
@@ -406,7 +408,7 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 		sqlModule.setResultProvider(resultProvider);
 		sqlModule.setPageProvider(pageProvider);
 		List<SQLInterceptor> sqlInterceptors = sqlInterceptorsProvider.getIfAvailable(ArrayList::new);
-		if(properties.isShowSql()){
+		if (properties.isShowSql()) {
 			sqlInterceptors.add(new DefaultSqlInterceptor());
 		}
 		sqlModule.setSqlInterceptors(sqlInterceptors);
@@ -585,7 +587,7 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 		if (properties.getBackupConfig().getMaxHistory() > 0) {
 			long interval = properties.getBackupConfig().getMaxHistory() * 86400000L;
 			// 1小时执行1次
-			Executors.newScheduledThreadPool(1).scheduleAtFixedRate(() -> {
+			new ScheduledThreadPoolExecutor(1, r -> new Thread(r, "magic-api-clean-task")).scheduleAtFixedRate(() -> {
 				try {
 					long count = magicBackupService.removeBackupByTimestamp(System.currentTimeMillis() - interval);
 					if (count > 0) {
@@ -599,8 +601,6 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 		return configuration;
 	}
 
-	private DefaultAuthorizationInterceptor defaultAuthorizationInterceptor;
-
 	public AuthorizationInterceptor createAuthorizationInterceptor() {
 		if (defaultAuthorizationInterceptor != null) {
 			return defaultAuthorizationInterceptor;

+ 6 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIProperties.java

@@ -9,6 +9,11 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+/**
+ * magic-api配置信息
+ *
+ * @author mxd
+ */
 @ConfigurationProperties(prefix = "magic-api")
 public class MagicAPIProperties {
 
@@ -104,6 +109,7 @@ public class MagicAPIProperties {
 
 	/**
 	 * 是否要打印SQL
+	 *
 	 * @since 1.5.0
 	 */
 	private boolean showSql = true;

+ 5 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicJsonAutoConfiguration.java

@@ -16,6 +16,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.function.Function;
 
+/**
+ * JSON自动配置
+ *
+ * @author mxd
+ */
 @Configuration
 @AutoConfigureBefore(MagicAPIAutoConfiguration.class)
 public class MagicJsonAutoConfiguration {

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicMongoAutoConfiguration.java

@@ -14,6 +14,8 @@ import org.ssssssss.script.reflection.JavaReflection;
 
 /**
  * mongo配置
+ *
+ * @author mxd
  */
 @Configuration
 @ConditionalOnBean(MongoTemplate.class)

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicRedisAutoConfiguration.java

@@ -25,6 +25,8 @@ import java.util.Objects;
 
 /**
  * redis配置
+ *
+ * @author mxd
  */
 @ConditionalOnClass(RedisConnectionFactory.class)
 @Configuration

+ 5 - 5
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicSwaggerConfiguration.java

@@ -26,6 +26,8 @@ import java.util.Map;
 
 /**
  * Swagger配置类
+ *
+ * @author mxd
  */
 @Configuration
 @AutoConfigureAfter({MagicAPIAutoConfiguration.class})
@@ -33,15 +35,13 @@ import java.util.Map;
 @ConditionalOnClass(name = "springfox.documentation.swagger.web.SwaggerResourcesProvider")
 public class MagicSwaggerConfiguration {
 
+	private final MagicAPIProperties properties;
+	private final ApplicationContext applicationContext;
 	@Autowired
 	@Lazy
 	private RequestMappingHandlerMapping requestMappingHandlerMapping;
 
-	private final MagicAPIProperties properties;
-
-	private final ApplicationContext applicationContext;
-
-	public MagicSwaggerConfiguration(MagicAPIProperties properties,ApplicationContext applicationContext) {
+	public MagicSwaggerConfiguration(MagicAPIProperties properties, ApplicationContext applicationContext) {
 		this.properties = properties;
 		this.applicationContext = applicationContext;
 	}

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/PageConfig.java

@@ -2,6 +2,8 @@ package org.ssssssss.magicapi.spring.boot.starter;
 
 /**
  * 分页配置
+ *
+ * @author mxd
  */
 public class PageConfig {
 

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ResourceConfig.java

@@ -2,6 +2,8 @@ package org.ssssssss.magicapi.spring.boot.starter;
 
 /**
  * 接口存储配置
+ *
+ * @author mxd
  */
 public class ResourceConfig {
 

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/ResponseCodeConfig.java

@@ -2,6 +2,8 @@ package org.ssssssss.magicapi.spring.boot.starter;
 
 /**
  * json结果code配置
+ *
+ * @author mxd
  * @since 1.1.2
  */
 public class ResponseCodeConfig {

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/SecurityConfig.java

@@ -2,6 +2,8 @@ package org.ssssssss.magicapi.spring.boot.starter;
 
 /**
  * 安全配置
+ *
+ * @author mxd
  * @since 0.4.0
  */
 public class SecurityConfig {

+ 2 - 0
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/SwaggerConfig.java

@@ -5,6 +5,8 @@ import org.ssssssss.magicapi.swagger.SwaggerEntity;
 
 /**
  * Swagger 配置
+ *
+ * @author mxd
  */
 public class SwaggerConfig {