From 14d190e2db4a666996a93b101e0b833310273b4f Mon Sep 17 00:00:00 2001 From: xiang Date: Sat, 6 Sep 2025 22:58:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=98=BF=E9=87=8C=E4=BA=91=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/xservice/aliyun/common/ClientUtils.java | 12 ++++++------ ...iyunProperties.java => AliyunAuthProperties.java} | 6 +++--- .../xservice/aliyun/config/AliyunConfigHolder.java | 4 ++-- .../aliyun/config/AliyunPropertiesConfig.java | 10 ++++++++++ .../xservice/aliyun/smscode/SmsCodeServiceImpl.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- 6 files changed, 23 insertions(+), 13 deletions(-) rename xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/{AliyunProperties.java => AliyunAuthProperties.java} (61%) create mode 100644 xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunPropertiesConfig.java diff --git a/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/common/ClientUtils.java b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/common/ClientUtils.java index 69ded96..ffa8ae8 100644 --- a/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/common/ClientUtils.java +++ b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/common/ClientUtils.java @@ -4,22 +4,22 @@ import com.aliyun.auth.credentials.Credential; import com.aliyun.auth.credentials.provider.StaticCredentialProvider; import com.aliyun.sdk.service.dysmsapi20170525.AsyncClient; import com.aliyun.teaopenapi.models.Config; -import com.xiang.xservice.basic.xservice.aliyun.config.AliyunProperties; +import com.xiang.xservice.basic.xservice.aliyun.config.AliyunAuthProperties; import darabonba.core.client.ClientOverrideConfiguration; import lombok.Setter; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.stereotype.Component; @Component -@EnableConfigurationProperties({AliyunProperties.class}) +@EnableConfigurationProperties({AliyunAuthProperties.class}) public class ClientUtils { @Setter - private static AliyunProperties aliyunProperties; + private static AliyunAuthProperties aliyunProperties; private static final String ENDPOINT = "dysmsapi.aliyuncs.com"; public static com.aliyun.dysmsapi20170525.Client initClients() throws Exception { - AliyunProperties properties = new AliyunProperties(); + AliyunAuthProperties properties = new AliyunAuthProperties(); Config config = new Config() // 配置 AccessKey ID，请确保代码运行环境配置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。 .setAccessKeyId(aliyunProperties.getAccessKeyId()) @@ -32,8 +32,8 @@ public class ClientUtils { public static AsyncClient initAsyncClient() { StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder() - .accessKeyId(System.getenv(aliyunProperties.getAccessKeyId())) - .accessKeySecret(System.getenv(aliyunProperties.getAccessKeySecret())) + .accessKeyId(aliyunProperties.getAccessKeyId()) + .accessKeySecret(aliyunProperties.getAccessKeySecret()) .build()); return AsyncClient.builder() .region("cn-hangzhou") // Region ID diff --git a/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunProperties.java b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunAuthProperties.java similarity index 61% rename from xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunProperties.java rename to xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunAuthProperties.java index b5cdc54..664840f 100644 --- a/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunProperties.java +++ b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunAuthProperties.java @@ -3,13 +3,13 @@ package com.xiang.xservice.basic.xservice.aliyun.config; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.boot.context.properties.ConfigurationProperties; @Data @AllArgsConstructor @NoArgsConstructor -@RefreshScope -public class AliyunProperties { +@ConfigurationProperties(prefix = "aliyun.auth") +public class AliyunAuthProperties { private String accessKeyId; private String accessKeySecret; diff --git a/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunConfigHolder.java b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunConfigHolder.java index 31a244a..7f1f4a3 100644 --- a/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunConfigHolder.java +++ b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunConfigHolder.java @@ -7,9 +7,9 @@ import javax.annotation.PostConstruct; @Component public class AliyunConfigHolder { - private final AliyunProperties aliyunProperties; + private final AliyunAuthProperties aliyunProperties; - public AliyunConfigHolder(AliyunProperties aliyunProperties) { + public AliyunConfigHolder(AliyunAuthProperties aliyunProperties) { this.aliyunProperties = aliyunProperties; } diff --git a/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunPropertiesConfig.java b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunPropertiesConfig.java new file mode 100644 index 0000000..993cc70 --- /dev/null +++ b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/config/AliyunPropertiesConfig.java @@ -0,0 +1,10 @@ +package com.xiang.xservice.basic.xservice.aliyun.config; + +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableConfigurationProperties(AliyunAuthProperties.class) +public class AliyunPropertiesConfig { + +} diff --git a/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/smscode/SmsCodeServiceImpl.java b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/smscode/SmsCodeServiceImpl.java index 3f43490..6cf87f0 100644 --- a/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/smscode/SmsCodeServiceImpl.java +++ b/xservice-message-starter/src/main/java/com/xiang/xservice/basic/xservice/aliyun/smscode/SmsCodeServiceImpl.java @@ -13,7 +13,7 @@ public class SmsCodeServiceImpl implements ISmsCodeService { Map param = Maps.newHashMap(); param.put("code", smsCode); try { - SmsCodeUtils.asyncSmsCode(phoneNumber, "大象网", "SMS_259435198", param, null); + SmsCodeUtils.asyncSmsCode(phoneNumber, "大象网", "SMS_464515480", param, null); return Boolean.TRUE; } catch (Exception e) { return Boolean.FALSE; diff --git a/xservice-message-starter/src/main/resources/META-INF/spring.factories b/xservice-message-starter/src/main/resources/META-INF/spring.factories index 4bfae8a..989f8cb 100644 --- a/xservice-message-starter/src/main/resources/META-INF/spring.factories +++ b/xservice-message-starter/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.xiang.xservice.basic.xservice.aliyun.config.AliyunProperties \ No newline at end of file +com.xiang.xservice.basic.xservice.aliyun.config.AliyunPropertiesConfig \ No newline at end of file