:sparkles:升级 solon 为 1.12.2

:sparkles:升级 solon 为 1.12.2

IJPay-Demo-Solon/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.noear</groupId>
 		<artifactId>solon-parent</artifactId>
-		<version>1.12.1</version>
+		<version>1.12.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.ijpay.demo</groupId>
@@ -104,6 +104,15 @@
 	</dependencies>
 
 	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>src/main/resources/${profiles.active}</directory>
+			</resource>
+		</resources>
+
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -127,5 +136,27 @@
 		</plugins>
 	</build>
 
+	<profiles>
+		<!-- 默认激活 dev 开发环境 -->
+		<!-- production使用 mvn xxx -Pproduction -->
+		<profile>
+			<!-- 本地开发环境 -->
+			<id>development</id>
+			<properties>
+				<profiles.active>dev</profiles.active>
+			</properties>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+		<profile>
+			<!-- 生产环境 -->
+			<id>production</id>
+			<properties>
+				<profiles.active>production</profiles.active>
+			</properties>
+		</profile>
+	</profiles>
+
 
 </project>

IJPay-Demo-Solon/src/main/java/com/ijpay/demo/DemoApplication.java

@@ -16,14 +16,7 @@ import org.noear.solon.Solon;
  */
 public class DemoApplication {
 	public static void main(String[] args) {
-		Solon.start(DemoApplication.class, args, app -> {
-			app.cfg().loadAdd("production/alipay.properties");
-			app.cfg().loadAdd("production/jdpay.properties");
-			app.cfg().loadAdd("production/paypal.properties");
-			app.cfg().loadAdd("production/unionpay.properties");
-			app.cfg().loadAdd("production/wxpay.properties");
-			app.cfg().loadAdd("production/wxpay_v3.properties");
-		});
+		Solon.start(DemoApplication.class, args);
 	}
 }
 

IJPay-Demo-Solon/src/main/java/com/ijpay/demo/entity/AliPayBean.java

@@ -2,6 +2,7 @@ package com.ijpay.demo.entity;
 
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
+import org.noear.solon.annotation.PropertySource;
 
 /**
  * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
@@ -17,6 +18,7 @@ import org.noear.solon.annotation.Inject;
  * @author Javen
  */
 @Inject("${alipay}")
+@PropertySource("classpath:/alipay.properties")
 @Configuration
 public class AliPayBean {
 	private String appId;

IJPay-Demo-Solon/src/main/java/com/ijpay/demo/entity/JdPayBean.java

@@ -2,6 +2,7 @@ package com.ijpay.demo.entity;
 
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
+import org.noear.solon.annotation.PropertySource;
 
 /**
  * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
@@ -17,6 +18,7 @@ import org.noear.solon.annotation.Inject;
  * @author Javen
  */
 @Inject("${jdpay}")
+@PropertySource("classpath:/jdpay.properties")
 @Configuration
 public class JdPayBean {
 	private String mchId;

IJPay-Demo-Solon/src/main/java/com/ijpay/demo/entity/PayPalBean.java

@@ -3,6 +3,7 @@ package com.ijpay.demo.entity;
 
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
+import org.noear.solon.annotation.PropertySource;
 
 /**
  * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
@@ -18,6 +19,7 @@ import org.noear.solon.annotation.Inject;
  * @author Javen
  */
 @Inject("${paypal}") //"classpath:/paypal.properties"，启动时进行加载
+@PropertySource("classpath:/paypal.properties")
 @Configuration
 public class PayPalBean {
 	private String clientId;

IJPay-Demo-Solon/src/main/java/com/ijpay/demo/entity/UnionPayBean.java

@@ -2,6 +2,7 @@ package com.ijpay.demo.entity;
 
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
+import org.noear.solon.annotation.PropertySource;
 
 /**
  * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
@@ -17,6 +18,7 @@ import org.noear.solon.annotation.Inject;
  * @author Javen
  */
 @Inject("${union}")
+@PropertySource("classpath:/unionpay.properties")
 @Configuration
 public class UnionPayBean {
 	private String machId;

IJPay-Demo-Solon/src/main/java/com/ijpay/demo/entity/WxPayBean.java

@@ -2,6 +2,7 @@ package com.ijpay.demo.entity;
 
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
+import org.noear.solon.annotation.PropertySource;
 
 /**
  * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
@@ -18,6 +19,7 @@ import org.noear.solon.annotation.Inject;
  */
 
 @Inject("${wxpay}")
+@PropertySource("classpath:/wxpay.properties")
 @Configuration
 public class WxPayBean {
 	private String appId;

IJPay-Demo-Solon/src/main/java/com/ijpay/demo/entity/WxPayV3Bean.java

@@ -2,6 +2,7 @@ package com.ijpay.demo.entity;
 
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
+import org.noear.solon.annotation.PropertySource;
 
 /**
  * <p>IJPay 让支付触手可及，封装了微信支付、支付宝支付、银联支付常用的支付方式以及各种常用的接口。</p>
@@ -17,6 +18,7 @@ import org.noear.solon.annotation.Inject;
  * @author Javen
  */
 @Inject("${v3}")
+@PropertySource("classpath:/wxpay_v3.properties")
 @Configuration
 public class WxPayV3Bean {
 	private String appId;