Commit 1cdae0c3 authored by zhuxiang's avatar zhuxiang
Browse files

Merge remote-tracking branch 'origin/sxx' into sxx

parents 580a8793 f9424aaf
...@@ -67,7 +67,7 @@ public class InTheEarlyTask { ...@@ -67,7 +67,7 @@ public class InTheEarlyTask {
ScheduleEntity scheduleEntity = scheduleService.getUser(dates[0], dates[1]); ScheduleEntity scheduleEntity = scheduleService.getUser(dates[0], dates[1]);
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("name", scheduleEntity.getName()); map.put("name", scheduleEntity.getName());
SmsUtil.sendMsg(scheduleEntity.getPhone(), "SMS_490030330", map); SmsUtil.sendMsg(scheduleEntity.getPhone(), "SMS_491150329", map);
//保存短信发送历史记录 //保存短信发送历史记录
smsInformService.save(SmsInformEntity.builder() smsInformService.save(SmsInformEntity.builder()
.name(scheduleEntity.getName()) .name(scheduleEntity.getName())
......
...@@ -41,8 +41,8 @@ public class OpsTask { ...@@ -41,8 +41,8 @@ public class OpsTask {
private EmailRecordService emailRecordService; private EmailRecordService emailRecordService;
//每个月一号执行一次,本月要到期的证书 //每个月一号执行一次,本月要到期的证书
// @Scheduled(cron = "0 0 10 1 * ?") @Scheduled(cron = "0 0 10 1 * ?")
@Scheduled(cron = "0/10 * * * * ?") // @Scheduled(cron = "0/10 * * * * ?")
@Transactional @Transactional
public void slow() { public void slow() {
//查询有没有本月要到期的ssl证书 //查询有没有本月要到期的ssl证书
......
...@@ -19,9 +19,9 @@ public class SmsUtil { ...@@ -19,9 +19,9 @@ public class SmsUtil {
DefaultProfile profile = DefaultProfile.getProfile( DefaultProfile profile = DefaultProfile.getProfile(
"cn-hangzhou", "cn-hangzhou",
//accessKeyId //accessKeyId
"LTAI5tKxtLWiJ2M5ffb2aMQu", "LTAI5tCAKQWmKVuJZeHCt8gA",
//accessSecret //accessSecret
"N86GOBwrnsmmRkjJsxZTtXsfZOsNBv"); "c3fbBO2cXozBtENz9hjFThdvLamfq9");
IAcsClient client = new DefaultAcsClient(profile); IAcsClient client = new DefaultAcsClient(profile);
CommonRequest request = new CommonRequest(); CommonRequest request = new CommonRequest();
request.setMethod(MethodType.POST); request.setMethod(MethodType.POST);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment