From 9dd748e0352f31b6255be2860c177db0d20ac40e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:41:35 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
index 24dca07..5758af1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
@@ -9,7 +9,8 @@
* 涓芥按鍏紬鍙�
*/
public enum WxGZHEnum {
- ZYY("47231022633110211A2101", "3311000002", "MzMxMTAwMDAwMg==", "http://192.168.10.170:18001/frontend/medical/api"), JN("47255004333112711A1001", null, null, null);
+ ZYY("47231022633110211A2101", "3311000002", "MzMxMTAwMDAwMg==", "http://40.78.1.5:8101/frontend/medical/api"),
+ JN("47255004333112711A1001", null, null, null);
private String orgid;
@@ -25,19 +26,18 @@
}
public static List<String> getDescByCode(String orgid) {
+ List<String> list = new ArrayList<>();
WxGZHEnum[] organEnums = values();
for (int i = 0; i < organEnums.length; i++) {
WxGZHEnum organEnum = organEnums[i];
if (organEnum.getOrgid().equals(orgid)) {
- List<String> list = new ArrayList<>();
- if (StringUtils.isEmpty(organEnum.getOrgid())) list.add(organEnum.getOrgid());
- if (StringUtils.isEmpty(organEnum.getAppid())) list.add(organEnum.getAppid());
- if (StringUtils.isEmpty(organEnum.getAppSecret())) list.add(organEnum.getAppSecret());
- if (StringUtils.isEmpty(organEnum.getAddress())) list.add(organEnum.getAddress());
- return list;
+ if (StringUtils.isNotEmpty(organEnum.getOrgid())) list.add(organEnum.getOrgid());
+ if (StringUtils.isNotEmpty(organEnum.getAppid())) list.add(organEnum.getAppid());
+ if (StringUtils.isNotEmpty(organEnum.getAppSecret())) list.add(organEnum.getAppSecret());
+ if (StringUtils.isNotEmpty(organEnum.getAddress())) list.add(organEnum.getAddress());
}
}
- return null;
+ return list;
}
public String getOrgid() {
--
Gitblit v1.9.3