From f388738abe887990516f3ab1b7e97f828613a437 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 23 九月 2024 10:18:40 +0800
Subject: [PATCH] 2024-09-23 朱宝民 优化获取图片验证码接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/captcha/CaptchaCtrl.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 95abb7a..a2449e2 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,5 +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;
@@ -34,7 +37,18 @@
      */
     @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");
+        if(wxDataSourceName != null && wxDataSourceName.trim().length() > 0){
+            log.info("寰俊寮�鍙戯紝璁剧疆鏁版嵁婧愬悕绉颁负:" + wxDataSourceName);
+            //鎶婄粍缁囧崟浣嶆爣绛句綔涓烘暟鎹簮鍚嶇О
+            DataSourceContext.set(wxDataSourceName);
+        } else {
+            log.info("鐢ㄦ埛鏈�夋嫨鏁版嵁婧�");
+        }
+
         // 鐢熸垚楠岃瘉鐮佸疄浣�
         CaptchaDomain captchaDomain = captchaSV.createGoogleCaptcha(type);
         if (null != captchaDomain) {
@@ -66,7 +80,7 @@
             captchaDomain.setText(null);
             captchaDomain.setCode(null);
             // 杩斿洖鍓嶇淇℃伅
-            return captchaDomain;
+            return BaseResponseUtils.buildSuccess(captchaDomain);
         } else {
             return null;
         }

--
Gitblit v1.8.0