diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java index 7c1859c..7bc7aed 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthPermissionController.java @@ -64,7 +64,7 @@ public class SchisandraAuthPermissionController { } } /** - * @description:查询权限信息 + * @description: 查询权限信息 * @param: [schisandraAuthPermissionDTO] * @return: com.schisandra.auth.common.entity.Result * @author zlg diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java index de547d8..db7f73a 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java @@ -1,31 +1,51 @@ package com.schisandra.auth.application.controller; + +import com.schisandra.auth.common.entity.Result; +import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.common.utils.SmsCodeUtils; import lombok.extern.slf4j.Slf4j; -import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; - import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * @Classname SchisandraSmsController - * @BelongsProject: schisandra-cloud-storage - * @BelongsPackage: com.schisandra.auth.application.controller - * @Author: landaiqing - * @CreateTime: 2024-05-08 01:41 - * @Description: TODO - * @Version: 1.0 - */ +import javax.annotation.Resource; + +import static java.util.concurrent.TimeUnit.SECONDS; + @RestController @RequestMapping("/sms/") @Slf4j public class SchisandraSmsController { + @Resource + private RedisUtil redisUtil; + + private final String authPhonePrefix="auth.phone"; +/** + * @description: 发送短信验证码 + * @param: [phone] + * @return: com.schisandra.auth.common.entity.Result + * @author zlg + * @date: 2024/5/8 22:53 + */ + @GetMapping("/sendByTemplate") + public Result sendByTemplate(String phone) { + String prefix = redisUtil.buildKey(authPhonePrefix, phone); + String code = SmsCodeUtils.generateValidateCode(4).toString(); + if (!redisUtil.exist(prefix)){ + SmsResponse smsResponse=SmsFactory.getBySupplier("alibaba").sendMessage(phone,code); + if (smsResponse.isSuccess()){ + redisUtil.setNx(prefix, code, 60L,SECONDS); + return Result.ok(); + }else { + return Result.fail(); + } + }else { + return Result.fail("发送频繁，请稍后重试"); + } - @GetMapping("send") - public SmsResponse send(String phone){ - SmsBlend smsBlend =SmsFactory.getSmsBlend(); - return smsBlend.sendMessage(phone, "1234"); } + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SmsController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SmsController.java deleted file mode 100644 index 9bea211..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SmsController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.schisandra.auth.application.controller; - - -import com.schisandra.auth.common.entity.Result; -import com.schisandra.auth.common.redis.RedisUtil; -import com.schisandra.auth.common.utils.SmsCodeUtils; -import lombok.extern.slf4j.Slf4j; -import org.dromara.sms4j.api.entity.SmsResponse; -import org.dromara.sms4j.core.factory.SmsFactory; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -import static java.util.concurrent.TimeUnit.SECONDS; - -@RestController -@RequestMapping("/sms/") -@Slf4j -public class SmsController { - @Resource - private RedisUtil redisUtil; - - private final String authPhonePrefix="auth.phone"; -/** - * @description: 发送短信验证码 - * @param: [phone] - * @return: com.schisandra.auth.common.entity.Result - * @author zlg - * @date: 2024/5/8 22:53 - */ - @GetMapping("/sendByTemplate") - public Result sendByTemplate(String phone) { - String prefix = redisUtil.buildKey(authPhonePrefix, phone); - String code = SmsCodeUtils.generateValidateCode(4).toString(); - if (!redisUtil.exist(prefix)){ - SmsResponse smsResponse=SmsFactory.getBySupplier("alibaba").sendMessage(phone,code); - if (smsResponse.isSuccess()){ - redisUtil.setNx(prefix, code, 60L,SECONDS); - return Result.ok(); - }else { - return Result.fail(); - } - }else { - return Result.fail("发送频繁，请稍后重试"); - } - - } - -} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java index 7091ab2..a58509e 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java @@ -8,6 +8,6 @@ public interface SchisandraAuthPermissionDomainService { Object update(SchisandraAuthPermissionBO schisandraAuthPermissionBO); Object delete(SchisandraAuthPermissionBO schisandraAuthPermissionBO); Object insert(SchisandraAuthPermissionBO schisandraAuthPermissionBO); - SchisandraAuthPermission select(SchisandraAuthPermissionBO schisandraAuthPermissionBO); + SchisandraAuthPermissionBO select(SchisandraAuthPermissionBO schisandraAuthPermissionBO); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java index 374997f..276339f 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java @@ -27,7 +27,7 @@ public interface SchisandraAuthUserDomainService { * @author msz * @return com.schisandra.auth.infra.basic.entity.SchisandraAuthUser */ - SchisandraAuthUser queryById(SchisandraAuthUserBO schisandraAuthUserBO); + SchisandraAuthUserBO queryById(SchisandraAuthUserBO schisandraAuthUserBO); /** * @description 添加用户信息 * @param schisandraAuthUserBO diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java index 4c4a107..05df5fe 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java @@ -62,11 +62,12 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth * @date: 2024/4/17 17:07 */ @Override - public SchisandraAuthPermission select(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { + public SchisandraAuthPermissionBO select(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO); SchisandraAuthPermission schisandraAuthPermission1 =schisandraAuthPermissionService.queryById(schisandraAuthPermission.getId()); - return schisandraAuthPermission1; + SchisandraAuthPermissionBO schisandraAuthPermissionBO1 = SchisandraAuthPermissionBOConverter.INSTANCE.convertEntityToBO(schisandraAuthPermission1); + return schisandraAuthPermissionBO1; } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java index 2a5418b..4fa075a 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java @@ -38,9 +38,10 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo * @date 2024/4/3 22:10 */ @Override - public SchisandraAuthUser queryById(SchisandraAuthUserBO schisandraAuthUserBO) { + public SchisandraAuthUserBO queryById(SchisandraAuthUserBO schisandraAuthUserBO) { SchisandraAuthUser schisandraAuthUser = schisandraAuthUserService.queryById(schisandraAuthUserBO.getId()); - return schisandraAuthUser; + SchisandraAuthUserBO schisandraAuthUserBO1 = SchisandraAuthUserBOConverter.INSTANCE.convertEntityToBO(schisandraAuthUser); + return schisandraAuthUserBO1; } /** * @description 添加用户信息 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml index fe8dc08..e0b1bbc 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml @@ -67,8 +67,9 @@ sa-token: # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik） token-style: random-32 # 是否输出操作日志 - is-log: true + is-log: false token-prefix: schisandra + is-print: false sms: # 标注从yml读取配置 @@ -79,4 +80,9 @@ sms: isPrint: false HttpLog: true +# mybatis-plus日志 +mybatis-plus: + global-config: + banner: false + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/banner.txt b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/banner.txt index 390516c..a8184f3 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/banner.txt +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -${AnsiColor.GREEN} + ,---, ,--.' | ,--, ,---, diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/log4j2-spring.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/log4j2-spring.xml index 2acdb03..04b62c0 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/log4j2-spring.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/log4j2-spring.xml @@ -7,10 +7,10 @@ - + - +