Commit 758bd515e1455ced3c1d6c0ed04e2c22fce6be55
1 parent
b0dbf454
sping->spring
Showing
6 changed files
with
32 additions
and
18 deletions
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/permission/SysMenuServiceTest.java
| ... | ... | @@ -12,7 +12,7 @@ import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysMenuM |
| 12 | 12 | import cn.iocoder.yudao.adminserver.modules.system.enums.permission.MenuTypeEnum; |
| 13 | 13 | import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysMenuProducer; |
| 14 | 14 | import cn.iocoder.yudao.adminserver.modules.system.service.permission.impl.SysMenuServiceImpl; |
| 15 | -import cn.iocoder.yudao.framework.common.util.sping.SpringAopUtils; | |
| 15 | +import cn.iocoder.yudao.framework.common.util.spring.SpringAopUtils; | |
| 16 | 16 | import cn.iocoder.yudao.framework.test.core.util.RandomUtils; |
| 17 | 17 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; |
| 18 | 18 | import com.google.common.collect.Multimap; | ... | ... |
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/permission/SysRoleServiceTest.java
| ... | ... | @@ -13,7 +13,7 @@ import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysRoleM |
| 13 | 13 | import cn.iocoder.yudao.adminserver.modules.system.enums.permission.SysRoleTypeEnum; |
| 14 | 14 | import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysRoleProducer; |
| 15 | 15 | import cn.iocoder.yudao.adminserver.modules.system.service.permission.impl.SysRoleServiceImpl; |
| 16 | -import cn.iocoder.yudao.framework.common.util.sping.SpringAopUtils; | |
| 16 | +import cn.iocoder.yudao.framework.common.util.spring.SpringAopUtils; | |
| 17 | 17 | import org.junit.jupiter.api.Test; |
| 18 | 18 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 19 | 19 | import org.springframework.context.annotation.Import; | ... | ... |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/sping/SpringAopUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/spring/SpringAopUtils.java
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/sping/SpringExpressionUtils.java renamed to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/spring/SpringExpressionUtils.java
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java
| ... | ... | @@ -9,7 +9,7 @@ import static com.yunpian.sdk.constant.Code.*; |
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * 云片的 SmsCodeMapping 实现类 |
| 12 | - * | |
| 12 | + * <p> | |
| 13 | 13 | * 参见 https://www.yunpian.com/official/document/sms/zh_CN/returnvalue_common 文档 |
| 14 | 14 | * |
| 15 | 15 | * @author 芋道源码 |
| ... | ... | @@ -20,24 +20,38 @@ public class YunpianSmsCodeMapping implements SmsCodeMapping { |
| 20 | 20 | public ErrorCode apply(String apiCode) { |
| 21 | 21 | int code = Integer.parseInt(apiCode); |
| 22 | 22 | switch (code) { |
| 23 | - case OK: return SUCCESS; | |
| 24 | - case ARGUMENT_MISSING: return SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR; | |
| 25 | - case BAD_ARGUMENT_FORMAT: return SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_PARAM_ERROR; | |
| 23 | + case OK: | |
| 24 | + return SUCCESS; | |
| 25 | + case ARGUMENT_MISSING: | |
| 26 | + return SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR; | |
| 27 | + case BAD_ARGUMENT_FORMAT: | |
| 28 | + return SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_PARAM_ERROR; | |
| 26 | 29 | case TPL_NOT_FOUND: |
| 27 | - case TPL_NOT_VALID: return SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_INVALID; | |
| 28 | - case MONEY_NOT_ENOUGH: return SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_MONEY_NOT_ENOUGH; | |
| 29 | - case BLACK_WORD: return SmsFrameworkErrorCodeConstants.SMS_SEND_CONTENT_INVALID; | |
| 30 | + case TPL_NOT_VALID: | |
| 31 | + return SmsFrameworkErrorCodeConstants.SMS_TEMPLATE_INVALID; | |
| 32 | + case MONEY_NOT_ENOUGH: | |
| 33 | + return SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_MONEY_NOT_ENOUGH; | |
| 34 | + case BLACK_WORD: | |
| 35 | + return SmsFrameworkErrorCodeConstants.SMS_SEND_CONTENT_INVALID; | |
| 30 | 36 | case DUP_IN_SHORT_TIME: |
| 31 | 37 | case TOO_MANY_TIME_IN_5: |
| 32 | 38 | case DAY_LIMIT_PER_MOBILE: |
| 33 | - case HOUR_LIMIT_PER_MOBILE: return SmsFrameworkErrorCodeConstants.SMS_SEND_BUSINESS_LIMIT_CONTROL; | |
| 34 | - case BLACK_PHONE_FILTER: return SmsFrameworkErrorCodeConstants.SMS_MOBILE_BLACK; | |
| 39 | + case HOUR_LIMIT_PER_MOBILE: | |
| 40 | + return SmsFrameworkErrorCodeConstants.SMS_SEND_BUSINESS_LIMIT_CONTROL; | |
| 41 | + case BLACK_PHONE_FILTER: | |
| 42 | + return SmsFrameworkErrorCodeConstants.SMS_MOBILE_BLACK; | |
| 35 | 43 | case SIGN_NOT_MATCH: |
| 36 | 44 | case BAD_SIGN_FORMAT: |
| 37 | - case SIGN_NOT_VALID: return SmsFrameworkErrorCodeConstants.SMS_SIGN_INVALID; | |
| 38 | - case BAD_API_KEY: return SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_INVALID; | |
| 39 | - case API_NOT_ALLOWED: return SmsFrameworkErrorCodeConstants.SMS_PERMISSION_DENY; | |
| 40 | - case IP_NOT_ALLOWED: return SmsFrameworkErrorCodeConstants.SMS_IP_DENY; | |
| 45 | + case SIGN_NOT_VALID: | |
| 46 | + return SmsFrameworkErrorCodeConstants.SMS_SIGN_INVALID; | |
| 47 | + case BAD_API_KEY: | |
| 48 | + return SmsFrameworkErrorCodeConstants.SMS_ACCOUNT_INVALID; | |
| 49 | + case API_NOT_ALLOWED: | |
| 50 | + return SmsFrameworkErrorCodeConstants.SMS_PERMISSION_DENY; | |
| 51 | + case IP_NOT_ALLOWED: | |
| 52 | + return SmsFrameworkErrorCodeConstants.SMS_IP_DENY; | |
| 53 | + default: | |
| 54 | + break; | |
| 41 | 55 | } |
| 42 | 56 | return SmsFrameworkErrorCodeConstants.SMS_UNKNOWN; |
| 43 | 57 | } | ... | ... |
yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/aop/BizTraceAspect.java
| ... | ... | @@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.tracer.core.aop; |
| 3 | 3 | import cn.hutool.core.map.MapUtil; |
| 4 | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | 5 | import cn.iocoder.yudao.framework.tracer.core.annotation.BizTrace; |
| 6 | -import cn.iocoder.yudao.framework.common.util.sping.SpringExpressionUtils; | |
| 6 | +import cn.iocoder.yudao.framework.common.util.spring.SpringExpressionUtils; | |
| 7 | 7 | import cn.iocoder.yudao.framework.tracer.core.util.TracerFrameworkUtils; |
| 8 | 8 | import io.opentracing.Span; |
| 9 | 9 | import io.opentracing.Tracer; | ... | ... |