Java：Demo 系列都新增自定义端口的示例代码；连接池 Demo 都新增 Java 代码动态设置连接池属性的注释

TommyLemon · TommyLemon · commit e02a014e810e · 2021-11-14T23:58:17.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoDataSourceConfig.java b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoDataSourceConfig.java
@@ -27,30 +27,39 @@
  */
 @Configuration
 public class DemoDataSourceConfig {
-	
-	  @Bean
-	  @ConfigurationProperties(prefix = "spring.datasource.hikari")
-	  public HikariDataSource hikaricpDataSource() {
-	      return new HikariDataSource();
-	  }
-	  
-	  
-	  @Bean
-	  @ConfigurationProperties(prefix = "spring.datasource.druid")
-	  public DruidDataSource druidDataSource() {
-	      return new DruidDataSource();
-	  }
-	  
-	  @Bean
-	  @ConfigurationProperties(prefix = "spring.datasource.druid-test")
-	  public DruidDataSource druidTestDataSource(){
-		  return new DruidDataSource();
-	  }
-	  
-	  @Bean
-	  @ConfigurationProperties(prefix = "spring.datasource.druid-online")
-	  public DruidDataSource druidOnlineDataSource(){
-		  return new DruidDataSource();
-	  }
+
+	/** 数据源配置，对应 application.yml 的数据库连接池 datasource 配置。
+	 * 也可以直接 new 再 set 属性，具体见 HikariCP 的文档  
+	 * https://github.com/brettwooldridge/HikariCP#rocket-initialization
+	 */
+	@Bean
+	@ConfigurationProperties(prefix = "spring.datasource.hikari")
+	public HikariDataSource hikaricpDataSource() {
+		return new HikariDataSource();
+	}
+
+
+	/**数据源配置，对应 application.yml 的数据库连接池 datasource 配置。
+	 * 也可以直接 new 再 set 属性，具体见 Druid 的 DbTestCase  
+	 * https://github.com/alibaba/druid/blob/master/src/test/java/com/alibaba/druid/DbTestCase.java
+	 * @author Lemon
+	 */
+	@Bean
+	@ConfigurationProperties(prefix = "spring.datasource.druid")
+	public DruidDataSource druidDataSource() {
+		return new DruidDataSource();
+	}
+
+	@Bean
+	@ConfigurationProperties(prefix = "spring.datasource.druid-test")
+	public DruidDataSource druidTestDataSource(){
+		return new DruidDataSource();
+	}
+
+	@Bean
+	@ConfigurationProperties(prefix = "spring.datasource.druid-online")
+	public DruidDataSource druidOnlineDataSource(){
+		return new DruidDataSource();
+	}
 
 }
diff --git a/APIJSON-Java-Server/APIJSONDemo-Druid/src/main/java/apijson/demo/DemoApplication.java b/APIJSON-Java-Server/APIJSONDemo-Druid/src/main/java/apijson/demo/DemoApplication.java
@@ -19,6 +19,8 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
@@ -41,7 +43,7 @@
 @SpringBootApplication
 @EnableAutoConfiguration
 @EnableConfigurationProperties
-public class DemoApplication implements ApplicationContextAware {
+public class DemoApplication implements ApplicationContextAware, WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
 
 	static {
 		APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator() {
@@ -78,13 +80,6 @@ public SQLExecutor createSQLExecutor() {
 
 	}
 	
-	public static void main(String[] args) throws Exception {
-		SpringApplication.run(DemoApplication.class, args);
-
-        Log.DEBUG = true;
-		APIJSONApplication.init(false);  // 4.4.0 以上需要这句来保证以上 static 代码块中给 DEFAULT_APIJSON_CREATOR 赋值会生效
-	}
-	
 	// 全局 ApplicationContext 实例，方便 getBean 拿到 Spring/SpringBoot 注入的类实例
 	private static ApplicationContext APPLICATION_CONTEXT;
 	public static ApplicationContext getApplicationContext() {
@@ -96,6 +91,20 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 	}
 
 	
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(DemoApplication.class, args);
+
+        Log.DEBUG = true;
+		APIJSONApplication.init(false);  // 4.4.0 以上需要这句来保证以上 static 代码块中给 DEFAULT_APIJSON_CREATOR 赋值会生效
+	}
+	
+	
+	// SpringBoot 2.x 自定义端口方式
+	@Override
+	public void customize(ConfigurableServletWebServerFactory server) {
+		server.setPort(8080);
+	}
+	
 	// 支持 APIAuto 中 JavaScript 代码跨域请求 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 	@Bean
diff --git a/APIJSON-Java-Server/APIJSONDemo-Druid/src/main/java/apijson/demo/DemoDataSourceConfig.java b/APIJSON-Java-Server/APIJSONDemo-Druid/src/main/java/apijson/demo/DemoDataSourceConfig.java
@@ -21,16 +21,18 @@
 import com.alibaba.druid.pool.DruidDataSource;
 
 
-/**数据源配置，对应 application.yml 的数据库连接池 datasource 配置
+/**数据源配置，对应 application.yml 的数据库连接池 datasource 配置。
+ * 也可以直接 new 再 set 属性，具体见 Druid 的 DbTestCase  
+ * https://github.com/alibaba/druid/blob/master/src/test/java/com/alibaba/druid/DbTestCase.java
  * @author Lemon
  */
 @Configuration
 public class DemoDataSourceConfig {
-	  
-	  @Bean
-	  @ConfigurationProperties(prefix = "spring.datasource.druid")
-	  public DruidDataSource druidDataSource() {
-	      return new DruidDataSource();
-	  }
+
+	@Bean
+	@ConfigurationProperties(prefix = "spring.datasource.druid")
+	public DruidDataSource druidDataSource() {
+		return new DruidDataSource();
+	}
 
 }
diff --git a/APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoApplication.java b/APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoApplication.java
@@ -19,6 +19,8 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
@@ -41,7 +43,7 @@
 @SpringBootApplication
 @EnableAutoConfiguration
 @EnableConfigurationProperties
-public class DemoApplication implements ApplicationContextAware {
+public class DemoApplication implements ApplicationContextAware, WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
 
 	static {
 		APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator() {
@@ -78,13 +80,6 @@ public SQLExecutor createSQLExecutor() {
 
 	}
 	
-	public static void main(String[] args) throws Exception {
-		SpringApplication.run(DemoApplication.class, args);
-
-        Log.DEBUG = true;
-		APIJSONApplication.init(false);  // 4.4.0 以上需要这句来保证以上 static 代码块中给 DEFAULT_APIJSON_CREATOR 赋值会生效
-	}
-	
 	// 全局 ApplicationContext 实例，方便 getBean 拿到 Spring/SpringBoot 注入的类实例
 	private static ApplicationContext APPLICATION_CONTEXT;
 	public static ApplicationContext getApplicationContext() {
@@ -96,6 +91,20 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 	}
 
 	
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(DemoApplication.class, args);
+
+        Log.DEBUG = true;
+		APIJSONApplication.init(false);  // 4.4.0 以上需要这句来保证以上 static 代码块中给 DEFAULT_APIJSON_CREATOR 赋值会生效
+	}
+	
+	
+	// SpringBoot 2.x 自定义端口方式
+	@Override
+	public void customize(ConfigurableServletWebServerFactory server) {
+		server.setPort(8080);
+	}
+	
 	// 支持 APIAuto 中 JavaScript 代码跨域请求 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 	@Bean
diff --git a/APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoDataSourceConfig.java b/APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoDataSourceConfig.java
@@ -18,20 +18,22 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
- 
+
 import javax.sql.DataSource;
 
 
-/**数据源配置，对应 application.yml 的数据库连接池 datasource 配置
+/**数据源配置，对应 application.yml 的数据库连接池 datasource 配置。
+ * 也可以直接 new 再 set 属性，具体见 HikariCP 的文档  
+ * https://github.com/brettwooldridge/HikariCP#rocket-initialization
  * @author Lemon
  */
 @Configuration
 public class DemoDataSourceConfig {
-	
-	  @Bean
-	  @ConfigurationProperties(prefix = "spring.datasource.hikari")
-	  public DataSource dataSource() {
-	      return new HikariDataSource();
-	  }
- 
+
+	@Bean
+	@ConfigurationProperties(prefix = "spring.datasource.hikari")
+	public DataSource dataSource() {
+		return new HikariDataSource();
+	}
+
 }
diff --git a/APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoSQLExecutor.java b/APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoSQLExecutor.java
@@ -15,16 +15,10 @@
 package apijson.demo;
 
 import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.util.Map;
 
 import javax.sql.DataSource;
 
-import com.alibaba.fastjson.JSONObject;
-
 import apijson.Log;
-import apijson.demo.DemoApplication;
 import apijson.framework.APIJSONSQLExecutor;
 import apijson.orm.SQLConfig;
 
diff --git a/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/DemoApplication.java b/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/DemoApplication.java
@@ -16,6 +16,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -32,7 +34,7 @@
  */
 @Configuration
 @SpringBootApplication
-public class DemoApplication {
+public class DemoApplication implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
 
 	static {
 		APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator() {
@@ -71,6 +73,12 @@ public static void main(String[] args) throws Exception {
 	}
 	
 	
+	// SpringBoot 2.x 自定义端口方式
+	@Override
+	public void customize(ConfigurableServletWebServerFactory server) {
+		server.setPort(8080);
+	}
+	
 	// 支持 APIAuto 中 JavaScript 代码跨域请求 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 	@Bean
