Bug修复

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

@@ -71,7 +71,7 @@ public class TranslateController {
             if (vo.getCharCount() < 10000) {
                 cost = 2; // 不满1000字符的费用为1
             } else {
-                cost = (int) Math.ceil(vo.getCharCount() / 1000.0 )*2;
+                cost = (int) Math.ceil(vo.getCharCount() / 10000.0 )*2;
             }
             vo.setCredit(cost);
             result.setData(vo);

pdf-office-pdf-website/src/main/resources/generatorConfig.xml

@@ -39,18 +39,18 @@
 			<property name="enableSubPackages" value="true" />
 		</javaClientGenerator>
 <!--		<table tableName="oauth_client_details"/>-->
-		<table tableName="user">
-			<columnOverride column="platform_type"  javaType="java.lang.Integer"/>
-			<columnOverride column="account_type"  javaType="java.lang.Integer"/>
-			<columnOverride column="account_source" javaType="java.lang.Integer"/>
-			<columnOverride column="remark" javaType="java.lang.String" jdbcType="VARCHAR"/>
-		</table>
+<!--		<table tableName="user">-->
+<!--			<columnOverride column="platform_type"  javaType="java.lang.Integer"/>-->
+<!--			<columnOverride column="account_type"  javaType="java.lang.Integer"/>-->
+<!--			<columnOverride column="account_source" javaType="java.lang.Integer"/>-->
+<!--			<columnOverride column="remark" javaType="java.lang.String" jdbcType="VARCHAR"/>-->
+<!--		</table>-->
 <!--		<table tableName="user_subscription_info">-->
 <!--			<columnOverride column="platform" javaType="java.lang.Integer"/>-->
 <!--			<columnOverride column="status" javaType="java.lang.Integer"/>-->
 <!--			<columnOverride column="pay_type" javaType="java.lang.Integer"/>-->
 <!--		</table>-->
-
+		<table tableName="order_gift"/>
 <!--		<table tableName="vpp_company">-->
 <!--		</table>-->
 <!--		<table tableName="login_device"/>-->

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

@@ -659,7 +659,7 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public boolean getVerifyCode(EmailCodeTypeEnum action, VerifyTypeEnum type, String receiver, String appId) {
         boolean flag = false;
-        if (redisUtils.hexists(CommonConstant.VERIFY_CODE_TIME_OUT + action.value() + CommonConstant.STRING_SIGN_COLON + appId, receiver)) {
+        if (redisUtils.hexists(CommonConstant.VERIFY_CODE_TIME_OUT + action.value() + CommonConstant.STRING_SIGN_COLON + appId, receiver.toLowerCase())) {
             throw new BackendRuntimeException(ExceptionEnum.VERIFY_CODE_SEND_TOO_QUICKLY);
         }
         String code = CommonUtils.generateVerifyCode();
@@ -683,9 +683,9 @@ public class AuthServiceImpl implements AuthService {
         }
         //存入缓存
         if (flag) {
-            redisUtils.hset(CommonConstant.EMAIL_VERIFY_CODE_KEY + action.value() + CommonConstant.STRING_SIGN_COLON + appId, receiver, code, AuthConstant.VERIFY_CODE_KEY_EXPIRE_TIME);
+            redisUtils.hset(CommonConstant.EMAIL_VERIFY_CODE_KEY + action.value() + CommonConstant.STRING_SIGN_COLON + appId, receiver.toLowerCase(), code, AuthConstant.VERIFY_CODE_KEY_EXPIRE_TIME);
             //再次发送计时
-            redisUtils.hset(CommonConstant.VERIFY_CODE_TIME_OUT + action.value() + CommonConstant.STRING_SIGN_COLON + appId , receiver, "1", AuthConstant.VERIFY_CODE_KEY_RESEND_TIME);
+            redisUtils.hset(CommonConstant.VERIFY_CODE_TIME_OUT + action.value() + CommonConstant.STRING_SIGN_COLON + appId , receiver.toLowerCase(), "1", AuthConstant.VERIFY_CODE_KEY_RESEND_TIME);
         }
         return flag;
     }
@@ -811,10 +811,10 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public void checkEmailCodeValid(EmailCodeTypeEnum type, String account, String code, String appId) {
         //获取用户存在redis中的登录邮箱验证码
-        String captchaCode = redisUtils.hget(CommonConstant.EMAIL_VERIFY_CODE_KEY + type.value() + CommonConstant.STRING_SIGN_COLON + appId, account);
+        String captchaCode = redisUtils.hget(CommonConstant.EMAIL_VERIFY_CODE_KEY + type.value() + CommonConstant.STRING_SIGN_COLON + appId, account.toLowerCase());
         if(StringUtils.isNotEmpty(code) && code.equals(captchaCode)){
             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.toLowerCase());
             }
             //验证通过删除
         }else{
@@ -832,7 +832,7 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public void isEmailCodeValid(EmailCodeTypeEnum type, String account, String code, String appId) {
         //获取用户存在redis中的登录邮箱验证码
-        String captchaCode = redisUtils.hget(CommonConstant.EMAIL_VERIFY_CODE_KEY + type.value() + CommonConstant.STRING_SIGN_COLON + appId, account);
+        String captchaCode = redisUtils.hget(CommonConstant.EMAIL_VERIFY_CODE_KEY + type.value() + CommonConstant.STRING_SIGN_COLON + appId, account.toUpperCase());
         if(StringUtils.isNotEmpty(code) && !code.equals(captchaCode)){
             throw new BackendRuntimeException(ExceptionEnum.EMAIL_VERIFY_CODE_KEY_ERROR);
         }