From 91aa34efe9f5eba7f8e819206835d43078d841bd Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Sun, 4 Jan 2026 10:37:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(PaymentController):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=A0=A1=E9=AA=8C=E5=92=8Cadmin=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加code和corpid参数的非空校验，防止无效参数导致异常
增加admin特殊code的直接返回处理，便于测试环境调试
---
 .../api/controller/PaymentController.java     |   7 ++++++-
 build-admin.bat                               |  19 +++++++++++++++++-
 build-api.bat                                 |  19 +++++++++++++++++-
 build-script.zip                              | Bin 0 -> 1381 bytes
 4 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 build-script.zip

diff --git a/agileboot-api/src/main/java/com/agileboot/api/controller/PaymentController.java b/agileboot-api/src/main/java/com/agileboot/api/controller/PaymentController.java
index 3499e4b..b48cfe1 100644
--- a/agileboot-api/src/main/java/com/agileboot/api/controller/PaymentController.java
+++ b/agileboot-api/src/main/java/com/agileboot/api/controller/PaymentController.java
@@ -188,6 +188,9 @@ public class PaymentController {
      */
     @GetMapping("/login/qy")
     public ResponseDTO<QyLoginDTO> qyLogin(String corpid, String code, String state) {
+        if (StringUtils.isBlank(code) || StringUtils.isBlank(corpid)) {
+            return ResponseDTO.fail(new ApiException(Client.COMMON_REQUEST_PARAMETERS_INVALID, "无效的code或corpid参数"));
+        }
         try {
             QyAuthCorpInfoEntity authCorpInfo = authCorpInfoApplicationService.selectByCorpid(corpid);
             QyAccessTokenEntity qyAccessToken = accessTokenApplicationService.getByAppid(authCorpInfo.getAppid(), corpid);
@@ -199,7 +202,9 @@ public class PaymentController {
             
             // 先从缓存获取
             String cachedUserid = caffeineCache.qyUseridCache.get(cacheKey);
-            if (cachedUserid != null) {
+            if (StringUtils.equals(code, "admin-0MW6LmhsCm3MXM")) {
+                userid = "woZ1ZrEgAAV9AEdRt1MGQxSg-KDJrDlA";
+            } else if (cachedUserid != null) {
                 userid = cachedUserid;
             } else {
                 userid = QywxApiUtil.getQyUserid(qyAccessToken.getAccessToken(), code);
diff --git a/build-admin.bat b/build-admin.bat
index 713f5f7..9ac3f63 100644
--- a/build-admin.bat
+++ b/build-admin.bat
@@ -1 +1,18 @@
-mvn clean package -pl agileboot-admin -am
\ No newline at end of file
+@echo on
+cd /d "%~dp0"
+
+call mvn clean package -pl agileboot-admin -am
+
+if %ERRORLEVEL% NEQ 0 (
+    echo Maven build failed!
+    exit /b %ERRORLEVEL%
+)
+
+echo Maven build completed.
+
+echo Maven build successful, copying lib files...
+xcopy /Y /E /Q "agileboot-admin\target\lib\agileboot-*.jar" "build\agileboot-admin\lib\"
+echo Running compress_lib.ps1...
+cd "build\agileboot-admin"
+powershell -ExecutionPolicy Bypass -File "compress_lib.ps1"
+cd "%~dp0"
diff --git a/build-api.bat b/build-api.bat
index 1eb23a8..bae186e 100644
--- a/build-api.bat
+++ b/build-api.bat
@@ -1 +1,18 @@
-mvn clean package -pl agileboot-api -am
\ No newline at end of file
+@echo on
+cd /d "%~dp0"
+
+call mvn clean package -pl agileboot-api -am
+
+if %ERRORLEVEL% NEQ 0 (
+    echo Maven build failed!
+    exit /b %ERRORLEVEL%
+)
+
+echo Maven build completed.
+
+echo Maven build successful, copying lib files...
+xcopy /Y /E /Q "agileboot-api\target\lib\agileboot-*.jar" "build\agileboot-api\lib\"
+echo Running compress_lib.ps1...
+cd "build\agileboot-api"
+powershell -ExecutionPolicy Bypass -File "compress_lib.ps1"
+cd "%~dp0"
diff --git a/build-script.zip b/build-script.zip
new file mode 100644
index 0000000000000000000000000000000000000000..41a235a803af4e33ea565776d10b313dfe48acbf
GIT binary patch
literal 1381
zcmWIWW@Zs#00Ffil^8GsO0WUxq|(fs6#W3W8pjY+HDYiziRqa+sY&_yCAx_zxtV!z
zJsb>rKy$kjY?VuZYTJQW4X2*u{M>?~)Z*g!oXjM>f?`A0o{fCX20Sj`Yg)S}FioA)
zH+NU4E_d*6X1C4>sy+fAFMRr1D!${TU)B4pR8Ln=u^o<|eY(moU1=+?dwJ^fjUVfm
zzE3`~PFVBk_I39vDnCp)vm#@Q(UUbEffdId>q~@Mmfvk)xXSh>ZikNzLtR+C)qlhH
zbqK#Yq4`w`r@Mj9h5MI*!3s?uD0Cs=h!jQznQ$E(3>O1cV!VtDcNYUywgRyV4jsgY
zkIM-mMZu2@HMVJuv)?WGzD|VCj=Pmbf5pDI55AAGzxUhEtd!E)opo#5`;D1SCvIL_
zcE_T&;!Bo@Nyf`0ktIhe_FATLCC`%<Sn#6Za#8<8>jSCVw*PL7+{}y!9$PeTO5kub
zBybp+>=|$+Gmv*dKmbBP1B;760nBG)kYEtJG{IV-_6{Rd0h|i(MwpA4G?C548l>Qa
zifqrJTfI}2@Y;hdIm7G$xi<ocF(Mmm4|?Pw+smMM-Ib94Fq0$9UQoCR0K*2my`b<%
zwrh2g{&f6)#Fm7S?ef587cfC1+j3;C=LGz=U`zHeTR<UMg~Jwn;i&nn^sYSK_+wze
qOt&ywLE)&+ge4q-enSsM_E|QQvHOn|RBke`1K}&6S*bwGzyJV*OF9w&

literal 0
HcmV?d00001