diff --git a/pom.xml b/pom.xml index c6b5a74..d71fe78 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.imyeyu.timiserverapi TimiServerAPI - 1.0.14 + 1.0.15 jar TimiServerAPI imyeyu.com API @@ -167,6 +167,16 @@ true + + e2ins_nexus + https://nexus.e2ins.com/repository/maven-public/ + + true + + + true + + @@ -225,6 +235,11 @@ org.flywaydb flyway-mysql + + com.e2ins.ms.notify + e2ins-msg-notify-service-sdk + 0.0.9 + org.springframework.boot spring-boot-starter-freemarker diff --git a/src/main/java/com/imyeyu/api/config/BeanConfig.java b/src/main/java/com/imyeyu/api/config/BeanConfig.java index 00a701e..c52e365 100644 --- a/src/main/java/com/imyeyu/api/config/BeanConfig.java +++ b/src/main/java/com/imyeyu/api/config/BeanConfig.java @@ -1,5 +1,6 @@ package com.imyeyu.api.config; +import com.e2ins.ms.notify.SmsNotifyService; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.MapperFeature; @@ -31,6 +32,12 @@ public class BeanConfig { .build(); } + @Bean + public SmsNotifyService smsNotifyService() { + // TODO + return new SmsNotifyService(null, null); + } + @Bean public Yaml yaml() { return new Yaml(); diff --git a/src/main/java/com/imyeyu/api/modules/gao/bean/GaoUserInviteCache.java b/src/main/java/com/imyeyu/api/modules/gao/bean/GaoUserInviteCache.java index 0505b40..c74d089 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/bean/GaoUserInviteCache.java +++ b/src/main/java/com/imyeyu/api/modules/gao/bean/GaoUserInviteCache.java @@ -12,7 +12,7 @@ public class GaoUserInviteCache { /// 发起邀请的用户 ID private String inviterUserId; - /// 门店 ID + /// 门店 ID,GLOBAL_MANAGER 可为空 private String storeId; /// 角色 ID diff --git a/src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventController.java b/src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventController.java index 72234c3..b825122 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventController.java +++ b/src/main/java/com/imyeyu/api/modules/gao/controller/GaoEventController.java @@ -62,7 +62,9 @@ public class GaoEventController { @RequireGaoPermission(GaoPermissionCode.EVENT_READ) @PostMapping("/detail") public GaoEvent detail(@RequestParam String id) { - return service.get(id); + GaoEvent event = service.get(id); + event.setRoleCodeList(service.listRoleCode(event.getId())); + return event; } @AOPLog diff --git a/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventServiceImplement.java b/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventServiceImplement.java index 76cfa58..2ee36c2 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoEventServiceImplement.java @@ -221,7 +221,7 @@ public class GaoEventServiceImplement extends AbstractEntityService redisUserToken; @@ -98,6 +102,24 @@ public class UserLoginServiceImplement implements UserLoginService, TimiJava { return result; } + + @Override + public LoginResponse loginBySms(CaptchaVerifyReq req) { + try { + NotifyDetail detail = smsNotifyService.captchaVerify(req); + // 无报错即成功 + User user = userService.getByPhoneNo(detail.getSendTo()); + if (!user.isValidPhone()) { + user.setPhoneNoVerifyAt(Time.now()); + userService.update(user); + } + return login(UUID.randomUUID().toString(), user.getId()); + } catch (IOException e) { + log.error("login by sms error", e); + throw new TimiException(TimiCode.ERROR, "验证短信失败"); + } + } + @Override public User getLoginUser(String token) { if (TimiJava.isEmpty(token)) {