diff --git a/.workbuddy/memory/2026-06-21.md b/.workbuddy/memory/2026-06-21.md new file mode 100644 index 0000000..65ad73b --- /dev/null +++ b/.workbuddy/memory/2026-06-21.md @@ -0,0 +1,27 @@ +# 2026-06-21 工作日志 + +## WxLoginController 配置读取顺序调整 + +### 修改内容 +修改了 `WxLoginController.java` 中的 `getMpWxSetting` 方法,调整小程序配置读取顺序: + +**修改前:** +- 优先:`db_websopy.app_config`(category=wechat) +- 兜底:`sys_setting.mp-weixin` + +**修改后:** +- 优先:`sys_setting.mp-weixin` +- 兜底:`db_websopy.app_config`(category=wechat) + +### 修改原因 +业务需求变更,需要优先从系统设置(sys_setting)读取小程序配置,数据库配置(app_config)作为兜底方案。 + +### 影响范围 +影响所有调用 `getMpWxSetting` 方法的地方: +- `getOpenIdByCode` - 获取 openid +- `getAccessToken` - 获取 access_token +- `loginByOpenId` - openid 无感登录 +- `getWxOpenId` / `getWxOpenIdOnly` - 获取微信 openId + +### 文件位置 +`/Users/gxwebsoft/JAVA/com.gxwebsoft.core/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java` diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java index 9f5332a..a8cd040 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java @@ -437,7 +437,7 @@ public class WxLoginController extends BaseController { } /** - * 优先读取 db_websopy.app_config(category=wechat),不存在或异常时回退到 sys_setting (mp-weixin) + * 优先读取 sys_setting (mp-weixin),不存在或异常时回退到 db_websopy.app_config(category=wechat) * * @param tenantId 租户ID(传 null 时使用当前请求租户) * @return JSONObject 配置内容(含 appId / appSecret 等字段) @@ -445,15 +445,16 @@ public class WxLoginController extends BaseController { private JSONObject getMpWxSetting(Integer tenantId) { Integer tid = tenantId != null ? tenantId : getTenantId(); try { - JSONObject wechat = appConfigService.getByCategory("wechat", tid); - if (wechat != null && !wechat.isEmpty()) { - return wechat; + // 优先:sys_setting.mp-weixin + JSONObject setting = settingService.getBySettingKey("mp-weixin"); + if (setting != null && !setting.isEmpty()) { + return setting; } } catch (Exception e) { - System.err.println("[WxLoginController] 读取 app_config 失败,回退 sys_setting: " + e.getMessage()); + System.err.println("[WxLoginController] 读取 sys_setting 失败,回退 app_config: " + e.getMessage()); } - // 兜底:原 sys_setting.mp-weixin - return settingService.getBySettingKey("mp-weixin"); + // 兜底:db_websopy.app_config(category=wechat) + return appConfigService.getByCategory("wechat", tid); } /**