Merge branch 'master' into 重构/1078

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	数据库/2.7.3/初始化-mysql-2.7.3.sql
#	数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql

src/main/java/com/genersoft/iot/vmp/conf/CivilCodeFileConf.java

@@ -15,6 +15,7 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
 /**
@@ -54,7 +55,7 @@ public class CivilCodeFileConf implements CommandLineRunner {
             inputStream = Files.newInputStream(civilCodeFile.toPath());
         }
 
-        BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(inputStream));
+        BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
         int index = -1;
         String line;
         while ((line = inputStreamReader.readLine()) != null) {

src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java

@@ -34,6 +34,7 @@ public class DynamicTask {
         threadPoolTaskScheduler.setPoolSize(300);
         threadPoolTaskScheduler.setWaitForTasksToCompleteOnShutdown(true);
         threadPoolTaskScheduler.setAwaitTerminationSeconds(10);
+        threadPoolTaskScheduler.setThreadNamePrefix("dynamicTask-");
         threadPoolTaskScheduler.initialize();
     }
 

src/main/java/com/genersoft/iot/vmp/conf/ScheduleConfig.java

@@ -1,13 +1,18 @@
 package com.genersoft.iot.vmp.conf;
 
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import static com.genersoft.iot.vmp.conf.ThreadPoolTaskConfig.cpuNum;
+
 /**
  * "@Scheduled"是Spring框架提供的一种定时任务执行机制，默认情况下它是单线程的，在同时执行多个定时任务时可能会出现阻塞和性能问题。
  * 为了解决这种单线程瓶颈问题，可以将定时任务的执行机制改为支持多线程
@@ -15,16 +20,21 @@ import java.util.concurrent.ThreadPoolExecutor;
 @Configuration
 public class ScheduleConfig implements SchedulingConfigurer {
 
-	public static final int cpuNum = Runtime.getRuntime().availableProcessors();
+	/**
+	 * 核心线程数（默认线程数）
+	 */
+	private static final int corePoolSize = Math.max(cpuNum, 20);
 
-	private static final int corePoolSize = cpuNum;
-
-	private static final String threadNamePrefix = "scheduled-task-pool-%d";
+	/**
+	 * 线程池名前缀
+	 */
+	private static final String threadNamePrefix = "schedule";
 
 	@Override
 	public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-		taskRegistrar.setScheduler(new ScheduledThreadPoolExecutor(corePoolSize,
+		ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(corePoolSize,
 				new BasicThreadFactory.Builder().namingPattern(threadNamePrefix).daemon(true).build(),
-				new ThreadPoolExecutor.CallerRunsPolicy()));
+				new ThreadPoolExecutor.CallerRunsPolicy());
+		taskRegistrar.setScheduler(scheduledThreadPoolExecutor);
 	}
 }

src/main/java/com/genersoft/iot/vmp/conf/ThreadPoolTaskConfig.java

@@ -28,11 +28,11 @@ public class ThreadPoolTaskConfig {
     /**
      * 核心线程数（默认线程数）
      */
-    private static final int corePoolSize = cpuNum;
+    private static final int corePoolSize = Math.max(cpuNum * 2, 16);
     /**
      * 最大线程数
      */
-    private static final int maxPoolSize = cpuNum*2;
+    private static final int maxPoolSize = corePoolSize * 10;
     /**
      * 允许线程空闲时间（单位：默认为秒）
      */
@@ -45,12 +45,9 @@ public class ThreadPoolTaskConfig {
     /**
      * 线程池名前缀
      */
-    private static final String threadNamePrefix = "wvp-";
+    private static final String threadNamePrefix = "async-";
+
 
-    /**
-     *
-     * @return
-     */
     @Bean("taskExecutor") // bean的名称，默认为首字母小写的方法名
     public ThreadPoolTaskExecutor taskExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();

src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java

@@ -170,4 +170,9 @@ public class UserSetting {
      */
     private int gbDeviceOnline = 1;
 
+    /**
+     *    登录超时时间(分钟)，
+     */
+    private long loginTimeout = 30;
+
 }

src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java

@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.conf.security;
 
+import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.security.dto.JwtUser;
 import com.genersoft.iot.vmp.service.IUserApiKeyService;
 import com.genersoft.iot.vmp.service.IUserService;
@@ -46,13 +47,15 @@ public class JwtUtils implements InitializingBean {
     /**
      * token过期时间(分钟)
      */
-    public static final long EXPIRATION_TIME = 30 * 24 * 60;
+    public static final long EXPIRATION_TIME = 30;
 
     private static RsaJsonWebKey rsaJsonWebKey;
 
     private static IUserService userService;
 
     private static IUserApiKeyService userApiKeyService;
+    
+    private static UserSetting userSetting;
 
     public static String getApiKeyHeader() {
         return API_KEY_HEADER;
@@ -68,6 +71,11 @@ public class JwtUtils implements InitializingBean {
         JwtUtils.userApiKeyService = userApiKeyService;
     }
 
+    @Resource
+    public void setUserSetting(UserSetting userSetting) {
+        JwtUtils.userSetting = userSetting;
+    }
+
     @Override
     public void afterPropertiesSet() {
         try {
@@ -153,7 +161,7 @@ public class JwtUtils implements InitializingBean {
     }
 
     public static String createToken(String username) {
-        return createToken(username, EXPIRATION_TIME);
+        return createToken(username, userSetting.getLoginTimeout());
     }
 
     public static String getHeader() {