From 427d87e5572d72d0e3aaa4364e4f53569222e321 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 三月 2025 21:40:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
index 1015dd7..e11e3f3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java
@@ -1,6 +1,8 @@
package com.dy.pipIrrApp.captcha;
import com.dy.common.multiDataSource.DataSourceContext;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrApp.captcha.dto.CaptchaDomain;
import com.dy.pipIrrGlobal.pojoBa.BaCaptcha;
import jakarta.servlet.ServletOutputStream;
@@ -35,7 +37,7 @@
*/
@GetMapping("/get")
@ResponseBody
- public CaptchaDomain getCaptcha(HttpServletRequest request, @RequestParam(value = "type", required = false, defaultValue = "char") String type) {
+ public BaseResponse<CaptchaDomain> getCaptcha(HttpServletRequest request, @RequestParam(value = "type", required = false, defaultValue = "char") String type) {
// 閰嶇疆鏁版嵁婧�
HttpServletRequest httpRequest = (HttpServletRequest) request;
String wxDataSourceName = httpRequest.getHeader("tag");
@@ -72,13 +74,13 @@
baCaptcha.setCode(captchaDomain.getCode());
baCaptcha.setExpiration(calendar.getTimeInMillis());
Long rec = captchaSV.addCaptcha(baCaptcha);
- System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode());
+ //System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode());
// 鏃犵敤淇℃伅璁剧┖
captchaDomain.setText(null);
captchaDomain.setCode(null);
// 杩斿洖鍓嶇淇℃伅
- return captchaDomain;
+ return BaseResponseUtils.buildSuccess(captchaDomain);
} else {
return null;
}
@@ -116,7 +118,7 @@
baCaptcha.setCode(captchaDomain.getCode());
baCaptcha.setExpiration(calendar.getTimeInMillis());
Long rec = captchaSV.addCaptcha(baCaptcha);
- System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode());
+ //System.out.println("token: " + captchaDomain.getToken() + "; code: " + captchaDomain.getCode());
// 浠ユ枃浠舵祦鐨勫舰寮忥紝杈撳嚭楠岃瘉鐮佸浘鐗�
ServletOutputStream out = null;
--
Gitblit v1.8.0