Merge remote-tracking branch 'origin/draft' into fix_20230911_UAT

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java

@@ -28,7 +28,7 @@ import com.jero.common.util.oConvertUtils;
 public class JwtUtil {
 
 	// Token过期时间30分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准）
-	public static final long EXPIRE_TIME = 240 * 60 * 1000;
+	public static final long EXPIRE_TIME = 7 * 24 * 60 * 60 * 1000L;
 
 	/**
 	 * 校验token是否正确

jero-boot/jero-boot-single-startup/src/main/java/com/jero/config/TomcatWebConfiguration.java

@@ -15,7 +15,7 @@ public class TomcatWebConfiguration extends WebMvcConfigurerAdapter {
     @Bean
     public TomcatServletWebServerFactory servletContainer(TomcatSslConnectorProperties properties) {
         TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
-        factory.addAdditionalTomcatConnectors(createSslConnector(properties));
+        //factory.addAdditionalTomcatConnectors(createSslConnector(properties));
         return factory;
     }