diff --git a/README.md b/README.md index baf3ae75..064e2439 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Aida 1.2 -Version of aida 1.2 -123 \ No newline at end of file +Version of aida 1.3 +修改预先登录接口、逻辑 \ No newline at end of file diff --git a/src/main/java/com/ai/da/model/dto/AccountPreLoginDTO.java b/src/main/java/com/ai/da/model/dto/AccountPreLoginDTO.java index acb07219..fd35fbbc 100644 --- a/src/main/java/com/ai/da/model/dto/AccountPreLoginDTO.java +++ b/src/main/java/com/ai/da/model/dto/AccountPreLoginDTO.java @@ -14,7 +14,19 @@ public class AccountPreLoginDTO { @ApiModelProperty("用户名") private String userName; + /*新增字段*/ + @NotBlank(message = "Please input email !") + @ApiModelProperty("邮箱") + private String email; + @NotBlank(message = "password cannot be empty!") @ApiModelProperty("密码") private String password; + + @NotBlank(message = "operationType cannot be empty") + @ApiModelProperty("操作类型 LOGIN 注册 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱") + private String operationType; + + @ApiModelProperty("异常ip") + private String ip; } diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 813630c4..75465bb1 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -73,6 +73,37 @@ public class AccountServiceImpl extends ServiceImpl impl }else{ Assert.isTrue(account.getUserPassword().equals(accountDTO.getPassword()),"Password error !"); } + /*发送邮件*/ + OperationTypeEnum operationTypeEnum = OperationTypeEnum.of(accountDTO.getOperationType()); + Assert.notNull(operationTypeEnum, "Unknown operation type!"); + String randomVerifyCode = RandomsUtil.generateVerifyCode(100000L, 999999L); + LocalCacheUtils.setVerifyCodeCache( + accountDTO.getOperationType() + "_" + accountDTO.getEmail(), randomVerifyCode); + Boolean result = Boolean.FALSE; + switch (operationTypeEnum) { + case LOGIN: + Assert.notNull(accountDTO, "Email not registered!"); + result = SendEmailUtil.send(accountDTO.getEmail(), null, + SendEmailUtil.LOGIN_TEMPLATE_ID, randomVerifyCode); + break; + case FORGET_PWD: + Assert.notNull(accountDTO, "Email not registered!"); + result = SendEmailUtil.send(accountDTO.getEmail(), null, + SendEmailUtil.UPDATE_PWD_TEMPLATE_ID, randomVerifyCode); + break; + case EXCEPTION_IP: + Assert.notNull(accountDTO, "Email not registered!"); + result = SendEmailUtil.send(accountDTO.getEmail(), accountDTO.getIp(), + SendEmailUtil.EXCEPTION_ID_TEMPLATE_ID, randomVerifyCode); + break; + case BIND_MAILBOX: + result = SendEmailUtil.send(accountDTO.getEmail(), null, + SendEmailUtil.BIND_MAILBOX_TEMPLATE_ID, randomVerifyCode); + break; + default: + Assert.notNull(operationTypeEnum, "Unknown operation type!"); + } + Assert.isTrue(result, "Failed to send mail"); return new AccountPreLoginVO(account.getId()); } diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index c8d4565a..b1405e44 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -1,10 +1,10 @@ -server.port=5566 +server.port=5567 #datasource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://18.162.111.141:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=QWa998345 +spring.datasource.url=jdbc:mysql://192.168.77.128:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.username=zcr +spring.datasource.password=root #security spring.security.jwtSecret=JWTSECRET diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9119889c..e708600c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,4 +2,4 @@ #spring.profiles.active=test #application-prodļ() -spring.profiles.active=prod \ No newline at end of file +spring.profiles.active=test \ No newline at end of file diff --git a/target/classes/application-test.properties b/target/classes/application-test.properties index c8d4565a..b1405e44 100644 --- a/target/classes/application-test.properties +++ b/target/classes/application-test.properties @@ -1,10 +1,10 @@ -server.port=5566 +server.port=5567 #datasource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://18.162.111.141:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=QWa998345 +spring.datasource.url=jdbc:mysql://192.168.77.128:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.username=zcr +spring.datasource.password=root #security spring.security.jwtSecret=JWTSECRET diff --git a/target/classes/application.properties b/target/classes/application.properties index a7972f34..6fc6bbea 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -2,4 +2,4 @@ #spring.profiles.active=test #����application-prod�ļ�(��������) -spring.profiles.active=prod \ No newline at end of file +spring.profiles.active=test \ No newline at end of file diff --git a/target/classes/com/ai/da/common/config/FileProperties.class b/target/classes/com/ai/da/common/config/FileProperties.class index 317f52be..eea431dc 100644 Binary files a/target/classes/com/ai/da/common/config/FileProperties.class and b/target/classes/com/ai/da/common/config/FileProperties.class differ diff --git a/target/classes/com/ai/da/common/enums/CollectionLevel1TypeEnum.class b/target/classes/com/ai/da/common/enums/CollectionLevel1TypeEnum.class index c496b08a..0b4e3a3b 100644 Binary files a/target/classes/com/ai/da/common/enums/CollectionLevel1TypeEnum.class and b/target/classes/com/ai/da/common/enums/CollectionLevel1TypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/CollectionLevel2TypeEnum.class b/target/classes/com/ai/da/common/enums/CollectionLevel2TypeEnum.class index dc909d95..2a4c4bab 100644 Binary files a/target/classes/com/ai/da/common/enums/CollectionLevel2TypeEnum.class and b/target/classes/com/ai/da/common/enums/CollectionLevel2TypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/CurrentDesignPictureTypeEnum.class b/target/classes/com/ai/da/common/enums/CurrentDesignPictureTypeEnum.class index 512188fe..6c7a4f46 100644 Binary files a/target/classes/com/ai/da/common/enums/CurrentDesignPictureTypeEnum.class and b/target/classes/com/ai/da/common/enums/CurrentDesignPictureTypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/CurrentDesignPrintPictureTypeEnum.class b/target/classes/com/ai/da/common/enums/CurrentDesignPrintPictureTypeEnum.class index a6010a49..ec5caafc 100644 Binary files a/target/classes/com/ai/da/common/enums/CurrentDesignPrintPictureTypeEnum.class and b/target/classes/com/ai/da/common/enums/CurrentDesignPrintPictureTypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/DesignTypeEnum.class b/target/classes/com/ai/da/common/enums/DesignTypeEnum.class index ebfb0265..a0ddb87d 100644 Binary files a/target/classes/com/ai/da/common/enums/DesignTypeEnum.class and b/target/classes/com/ai/da/common/enums/DesignTypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/LibraryLevel1TypeEnum.class b/target/classes/com/ai/da/common/enums/LibraryLevel1TypeEnum.class index 58829077..7cbbc716 100644 Binary files a/target/classes/com/ai/da/common/enums/LibraryLevel1TypeEnum.class and b/target/classes/com/ai/da/common/enums/LibraryLevel1TypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/LibraryTopTypeEnum.class b/target/classes/com/ai/da/common/enums/LibraryTopTypeEnum.class index bdbd9ea1..1284c11c 100644 Binary files a/target/classes/com/ai/da/common/enums/LibraryTopTypeEnum.class and b/target/classes/com/ai/da/common/enums/LibraryTopTypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/LoginTypeEnum.class b/target/classes/com/ai/da/common/enums/LoginTypeEnum.class index 11586613..fc305a09 100644 Binary files a/target/classes/com/ai/da/common/enums/LoginTypeEnum.class and b/target/classes/com/ai/da/common/enums/LoginTypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/OperationTypeEnum.class b/target/classes/com/ai/da/common/enums/OperationTypeEnum.class index 21059527..1004abe4 100644 Binary files a/target/classes/com/ai/da/common/enums/OperationTypeEnum.class and b/target/classes/com/ai/da/common/enums/OperationTypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/PythonToJavaApiOperationTypeEnum.class b/target/classes/com/ai/da/common/enums/PythonToJavaApiOperationTypeEnum.class index 2b53f5eb..5613ce8f 100644 Binary files a/target/classes/com/ai/da/common/enums/PythonToJavaApiOperationTypeEnum.class and b/target/classes/com/ai/da/common/enums/PythonToJavaApiOperationTypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/SingleOverallEnum.class b/target/classes/com/ai/da/common/enums/SingleOverallEnum.class index 02a4b4fc..0bb23b90 100644 Binary files a/target/classes/com/ai/da/common/enums/SingleOverallEnum.class and b/target/classes/com/ai/da/common/enums/SingleOverallEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/SwitchCategoryEnum.class b/target/classes/com/ai/da/common/enums/SwitchCategoryEnum.class index 8e965e5f..4551ff59 100644 Binary files a/target/classes/com/ai/da/common/enums/SwitchCategoryEnum.class and b/target/classes/com/ai/da/common/enums/SwitchCategoryEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/SysFileLevel1TypeEnum.class b/target/classes/com/ai/da/common/enums/SysFileLevel1TypeEnum.class index 9eab78ee..d8fb228f 100644 Binary files a/target/classes/com/ai/da/common/enums/SysFileLevel1TypeEnum.class and b/target/classes/com/ai/da/common/enums/SysFileLevel1TypeEnum.class differ diff --git a/target/classes/com/ai/da/common/enums/SysFileLevel2TypeEnum.class b/target/classes/com/ai/da/common/enums/SysFileLevel2TypeEnum.class index c2915279..32b9ca5a 100644 Binary files a/target/classes/com/ai/da/common/enums/SysFileLevel2TypeEnum.class and b/target/classes/com/ai/da/common/enums/SysFileLevel2TypeEnum.class differ diff --git a/target/classes/com/ai/da/common/security/filter/AuthenticationFilter.class b/target/classes/com/ai/da/common/security/filter/AuthenticationFilter.class index d7f3264f..cbaf17ac 100644 Binary files a/target/classes/com/ai/da/common/security/filter/AuthenticationFilter.class and b/target/classes/com/ai/da/common/security/filter/AuthenticationFilter.class differ diff --git a/target/classes/com/ai/da/common/security/filter/UserAuthenticationProcessingFilter.class b/target/classes/com/ai/da/common/security/filter/UserAuthenticationProcessingFilter.class index 29a7edc9..ff5eb9e4 100644 Binary files a/target/classes/com/ai/da/common/security/filter/UserAuthenticationProcessingFilter.class and b/target/classes/com/ai/da/common/security/filter/UserAuthenticationProcessingFilter.class differ diff --git a/target/classes/com/ai/da/common/utils/FileUtil.class b/target/classes/com/ai/da/common/utils/FileUtil.class index d9291017..ccab5815 100644 Binary files a/target/classes/com/ai/da/common/utils/FileUtil.class and b/target/classes/com/ai/da/common/utils/FileUtil.class differ diff --git a/target/classes/com/ai/da/common/utils/JSONResponseUtils.class b/target/classes/com/ai/da/common/utils/JSONResponseUtils.class index e7f5747b..b072ea73 100644 Binary files a/target/classes/com/ai/da/common/utils/JSONResponseUtils.class and b/target/classes/com/ai/da/common/utils/JSONResponseUtils.class differ diff --git a/target/classes/com/ai/da/common/utils/MultiReadHttpServletRequest.class b/target/classes/com/ai/da/common/utils/MultiReadHttpServletRequest.class index 231534c8..4fbae118 100644 Binary files a/target/classes/com/ai/da/common/utils/MultiReadHttpServletRequest.class and b/target/classes/com/ai/da/common/utils/MultiReadHttpServletRequest.class differ diff --git a/target/classes/com/ai/da/common/utils/RsaDecryptUtils.class b/target/classes/com/ai/da/common/utils/RsaDecryptUtils.class index 1d9274cd..38c404bb 100644 Binary files a/target/classes/com/ai/da/common/utils/RsaDecryptUtils.class and b/target/classes/com/ai/da/common/utils/RsaDecryptUtils.class differ diff --git a/target/classes/com/ai/da/controller/LibraryController.class b/target/classes/com/ai/da/controller/LibraryController.class index 4fdacf79..7ffafadb 100644 Binary files a/target/classes/com/ai/da/controller/LibraryController.class and b/target/classes/com/ai/da/controller/LibraryController.class differ diff --git a/target/classes/com/ai/da/controller/PythonController.class b/target/classes/com/ai/da/controller/PythonController.class index c908d072..da03c859 100644 Binary files a/target/classes/com/ai/da/controller/PythonController.class and b/target/classes/com/ai/da/controller/PythonController.class differ diff --git a/target/classes/com/ai/da/controller/SavedCollectionController.class b/target/classes/com/ai/da/controller/SavedCollectionController.class index a63ff48a..22821e28 100644 Binary files a/target/classes/com/ai/da/controller/SavedCollectionController.class and b/target/classes/com/ai/da/controller/SavedCollectionController.class differ diff --git a/target/classes/com/ai/da/mapper/entity/TCollectionElementRelation.class b/target/classes/com/ai/da/mapper/entity/TCollectionElementRelation.class index c1da7c79..8ec7ace9 100644 Binary files a/target/classes/com/ai/da/mapper/entity/TCollectionElementRelation.class and b/target/classes/com/ai/da/mapper/entity/TCollectionElementRelation.class differ diff --git a/target/classes/com/ai/da/model/dto/AccountPreLoginDTO.class b/target/classes/com/ai/da/model/dto/AccountPreLoginDTO.class index 3bbce5ee..97be4b41 100644 Binary files a/target/classes/com/ai/da/model/dto/AccountPreLoginDTO.class and b/target/classes/com/ai/da/model/dto/AccountPreLoginDTO.class differ diff --git a/target/classes/com/ai/da/python/PythonService.class b/target/classes/com/ai/da/python/PythonService.class index 64bb2c06..8f51a4a2 100644 Binary files a/target/classes/com/ai/da/python/PythonService.class and b/target/classes/com/ai/da/python/PythonService.class differ diff --git a/target/classes/com/ai/da/service/impl/AccountServiceImpl$1.class b/target/classes/com/ai/da/service/impl/AccountServiceImpl$1.class index ee31be9b..c587d452 100644 Binary files a/target/classes/com/ai/da/service/impl/AccountServiceImpl$1.class and b/target/classes/com/ai/da/service/impl/AccountServiceImpl$1.class differ diff --git a/target/classes/com/ai/da/service/impl/AccountServiceImpl.class b/target/classes/com/ai/da/service/impl/AccountServiceImpl.class index 16873b0b..7c3ec704 100644 Binary files a/target/classes/com/ai/da/service/impl/AccountServiceImpl.class and b/target/classes/com/ai/da/service/impl/AccountServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/CollectionElementServiceImpl.class b/target/classes/com/ai/da/service/impl/CollectionElementServiceImpl.class index 174aa8ca..0948dc0f 100644 Binary files a/target/classes/com/ai/da/service/impl/CollectionElementServiceImpl.class and b/target/classes/com/ai/da/service/impl/CollectionElementServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/CollectionServiceImpl.class b/target/classes/com/ai/da/service/impl/CollectionServiceImpl.class index 1a64b005..c142a386 100644 Binary files a/target/classes/com/ai/da/service/impl/CollectionServiceImpl.class and b/target/classes/com/ai/da/service/impl/CollectionServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/DesignItemServiceImpl.class b/target/classes/com/ai/da/service/impl/DesignItemServiceImpl.class index 58d32673..c3acf027 100644 Binary files a/target/classes/com/ai/da/service/impl/DesignItemServiceImpl.class and b/target/classes/com/ai/da/service/impl/DesignItemServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/DesignServiceImpl.class b/target/classes/com/ai/da/service/impl/DesignServiceImpl.class index 623018c7..060db578 100644 Binary files a/target/classes/com/ai/da/service/impl/DesignServiceImpl.class and b/target/classes/com/ai/da/service/impl/DesignServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/LibraryModelPointServiceImpl.class b/target/classes/com/ai/da/service/impl/LibraryModelPointServiceImpl.class index 97091974..be95f23e 100644 Binary files a/target/classes/com/ai/da/service/impl/LibraryModelPointServiceImpl.class and b/target/classes/com/ai/da/service/impl/LibraryModelPointServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/LibraryServiceImpl.class b/target/classes/com/ai/da/service/impl/LibraryServiceImpl.class index 07d791ef..f9e9ab41 100644 Binary files a/target/classes/com/ai/da/service/impl/LibraryServiceImpl.class and b/target/classes/com/ai/da/service/impl/LibraryServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/PanToneServiceImpl.class b/target/classes/com/ai/da/service/impl/PanToneServiceImpl.class index a2d9c02b..fb9ff56d 100644 Binary files a/target/classes/com/ai/da/service/impl/PanToneServiceImpl.class and b/target/classes/com/ai/da/service/impl/PanToneServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/SysFileServiceImpl.class b/target/classes/com/ai/da/service/impl/SysFileServiceImpl.class index 333b94d6..de350c02 100644 Binary files a/target/classes/com/ai/da/service/impl/SysFileServiceImpl.class and b/target/classes/com/ai/da/service/impl/SysFileServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.class b/target/classes/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.class index 6fad7ad0..683668f8 100644 Binary files a/target/classes/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.class and b/target/classes/com/ai/da/service/impl/TCollectionElementRelationServiceImpl.class differ diff --git a/target/classes/com/ai/da/service/impl/UserLikeServiceImpl.class b/target/classes/com/ai/da/service/impl/UserLikeServiceImpl.class index 6ac22352..5f071f93 100644 Binary files a/target/classes/com/ai/da/service/impl/UserLikeServiceImpl.class and b/target/classes/com/ai/da/service/impl/UserLikeServiceImpl.class differ