Merge branch 'feature/admin' into preview

feature/community-center
Diyu0904 2025-04-30 16:50:05 +08:00
commit ab059c7dde
4 changed files with 11 additions and 3 deletions

View File

@ -10,6 +10,7 @@ import com.rabbitmq.client.Channel;
import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -30,6 +31,9 @@ import java.util.concurrent.TimeUnit;
@Component @Component
public class CodeConsumer { public class CodeConsumer {
@Value("${mcwl.templateCode}")
private String templateCode;
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@ -54,7 +58,7 @@ public class CodeConsumer {
// 构建 sendDataMap // 构建 sendDataMap
Map<String, String> sendDataMap = new HashMap<>(); Map<String, String> sendDataMap = new HashMap<>();
sendDataMap.put("code", phoneLoginBody.getCode()); sendDataMap.put("code", phoneLoginBody.getCode());
String s1 = TelSmsUtils.sendSms(phoneLoginBody.getPhone(), "SMS_478520014", sendDataMap); String s1 = TelSmsUtils.sendSms(phoneLoginBody.getPhone(), templateCode, sendDataMap);
//手动确认 //手动确认

View File

@ -174,3 +174,5 @@ mcwl:
user: user:
avatar: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/7/53/3f5cc1d7-b062-4a22-9f7e-d442bc6dcf42.png avatar: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/7/53/3f5cc1d7-b062-4a22-9f7e-d442bc6dcf42.png
backgroundImg: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/8/2/c8387681-8138-4a29-a1c9-4a143da34c5a.png backgroundImg: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/8/2/c8387681-8138-4a29-a1c9-4a143da34c5a.png
#发送短信模板
templateCode: SMS_485410248

View File

@ -172,3 +172,5 @@ mcwl:
user: user:
avatar: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/7/53/3f5cc1d7-b062-4a22-9f7e-d442bc6dcf42.png avatar: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/7/53/3f5cc1d7-b062-4a22-9f7e-d442bc6dcf42.png
backgroundImg: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/8/2/c8387681-8138-4a29-a1c9-4a143da34c5a.png backgroundImg: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/8/2/c8387681-8138-4a29-a1c9-4a143da34c5a.png
#发送短信模板
templateCode: SMS_485360194

View File

@ -18,8 +18,8 @@ public class TelSmsUtils {
/** /**
* AccessKeyaccessKeySecretAPI访 * AccessKeyaccessKeySecretAPI访
*/ */
private static String accessKeyId = "LTAI5tSHZZ8wHJRP8X4r9TXT"; private static String accessKeyId = "LTAI5tJY7ZgftP6g2Vv66Hgy";
private static String accessKeySecret = "F82IVNx0IGJ3AnP6gSIfcyql1HCXIH"; private static String accessKeySecret = "Hx3sbJa8GJzRCFjArqEgk2965Gayrf";
/** /**
* 访 * 访