Commit 13afc3d57af8c3008759500cdcac5a5cfb3a9454
1 parent
0ef05fba
feat: springdoc
Showing
3 changed files
with
5 additions
and
7 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
| @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.system.controller.admin.captcha; | @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.system.controller.admin.captcha; | ||
| 3 | import cn.hutool.core.util.StrUtil; | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | import cn.hutool.extra.servlet.ServletUtil; | 4 | import cn.hutool.extra.servlet.ServletUtil; |
| 5 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | 5 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 6 | -import com.anji.captcha.model.common.ResponseModel; | ||
| 7 | -import com.anji.captcha.model.vo.CaptchaVO; | ||
| 8 | -import com.anji.captcha.service.CaptchaService; | 6 | +import com.xingyuv.captcha.model.common.ResponseModel; |
| 7 | +import com.xingyuv.captcha.model.vo.CaptchaVO; | ||
| 8 | +import com.xingyuv.captcha.service.CaptchaService; | ||
| 9 | import io.swagger.v3.oas.annotations.Operation; | 9 | import io.swagger.v3.oas.annotations.Operation; |
| 10 | import io.swagger.v3.oas.annotations.tags.Tag; | 10 | import io.swagger.v3.oas.annotations.tags.Tag; |
| 11 | import org.springframework.web.bind.annotation.PostMapping; | 11 | import org.springframework.web.bind.annotation.PostMapping; |
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
| @@ -5,8 +5,6 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | @@ -5,8 +5,6 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | ||
| 5 | import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | 5 | import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; |
| 6 | import cn.iocoder.yudao.framework.test.core.util.AssertUtils; | 6 | import cn.iocoder.yudao.framework.test.core.util.AssertUtils; |
| 7 | import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; | 7 | import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; |
| 8 | -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthLoginReqVO; | ||
| 9 | -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthLoginRespVO; | ||
| 10 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; | 8 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; |
| 11 | import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; | 9 | import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; |
| 12 | import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; | 10 | import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; |
| @@ -16,7 +14,7 @@ import cn.iocoder.yudao.module.system.service.member.MemberService; | @@ -16,7 +14,7 @@ import cn.iocoder.yudao.module.system.service.member.MemberService; | ||
| 16 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; | 14 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; |
| 17 | import cn.iocoder.yudao.module.system.service.social.SocialUserService; | 15 | import cn.iocoder.yudao.module.system.service.social.SocialUserService; |
| 18 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; | 16 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
| 19 | -import com.anji.captcha.service.CaptchaService; | 17 | +import com.xingyuv.captcha.service.CaptchaService; |
| 20 | import org.junit.jupiter.api.Test; | 18 | import org.junit.jupiter.api.Test; |
| 21 | import org.springframework.boot.test.mock.mockito.MockBean; | 19 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 22 | import org.springframework.context.annotation.Import; | 20 | import org.springframework.context.annotation.Import; |
| @@ -25,7 +23,6 @@ import javax.annotation.Resource; | @@ -25,7 +23,6 @@ import javax.annotation.Resource; | ||
| 25 | import javax.validation.Validator; | 23 | import javax.validation.Validator; |
| 26 | 24 | ||
| 27 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; | 25 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 28 | -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | ||
| 29 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; | 26 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; |
| 30 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString; | 27 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString; |
| 31 | import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; | 28 | import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; |