Browse Source

Bug修复

tangxiangan 4 months ago
parent
commit
c11d2ceab1

+ 2 - 1
pdf-office-pdf-website/src/main/java/cn/kdan/cloud/pdf/office/website/controller/TranslateController.java

@@ -74,7 +74,8 @@ public class TranslateController {
                 cost = (int) Math.ceil(vo.getCharCount() / 1000.0 )*2;
             }
             vo.setCredit(cost);
-            return vo;
+            result.setData(vo);
+            return result;
         } catch (Exception e) {
             TranslateResult<String> result = new TranslateResult<String>();
             result.setCode("500");

+ 2 - 3
pdf-office-sso/src/main/java/cn/kdan/cloud/pdf/office/sso/service/impl/AuthServiceImpl.java

@@ -813,11 +813,10 @@ public class AuthServiceImpl implements AuthService {
         //获取用户存在redis中的登录邮箱验证码
         String captchaCode = redisUtils.hget(CommonConstant.EMAIL_VERIFY_CODE_KEY + type.value() + CommonConstant.STRING_SIGN_COLON + appId, account);
         if(StringUtils.isNotEmpty(code) && code.equals(captchaCode)){
-            if(type.value().equals("member_login")){
-                return;
+            if(!type.value().equals("member_login")){
+                redisUtils.hdel(CommonConstant.EMAIL_VERIFY_CODE_KEY + type.value() + CommonConstant.STRING_SIGN_COLON + appId, account);
             }
             //验证通过删除
-            redisUtils.hdel(CommonConstant.EMAIL_VERIFY_CODE_KEY + type.value() + CommonConstant.STRING_SIGN_COLON + appId, account);
         }else{
             throw new BackendRuntimeException(ExceptionEnum.EMAIL_VERIFY_CODE_KEY_ERROR);
         }