diff --git a/changelog.md b/changelog.md index edc6bee1..5503ff72 100755 --- a/changelog.md +++ b/changelog.md @@ -2,7 +2,7 @@ ## 日常更新 -- 2025-08-17:admin后台可关联商户;fastmybatis升级到3.1.6。有升级SQL,见:[sop-20250817.sql](./upgrade/sop-20250817.sql) +- 2025-08-17:admin后台可关联商户;fastmybatis升级到3.1.7。有升级SQL,见:[sop-20250817.sql](./upgrade/sop-20250817.sql) - 2025-07-22: 修复当objClass被代理后,获取不到interface BUG - 2025-06-15:新增帮助文档管理。有升级SQL,见:[sop-20250615.sql](./upgrade/sop-20250615.sql) - 2025-06-11:java-sdk添加文件下载示例 diff --git a/pom.xml b/pom.xml index d6e78784..3c57eaeb 100755 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 1.2 2.0.1.Final 6.0.13.Final - 3.1.6 + 3.1.7 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvInfoMapper.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvInfoMapper.java index 71f8e51d..87fc8ef6 100755 --- a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvInfoMapper.java +++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvInfoMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; public interface IsvInfoMapper extends BaseMapper { default IsvInfo getByAppId(String appId) { - return this.get(IsvInfo::getAppId, appId); + return this.getByField(IsvInfo::getAppId, appId); } } diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvKeysMapper.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvKeysMapper.java index 7e416c3e..e1cff31a 100755 --- a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvKeysMapper.java +++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvKeysMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; public interface IsvKeysMapper extends BaseMapper { default IsvKeys getByIsvId(Long isvId) { - return this.get(IsvKeys::getIsvId, isvId); + return this.getByField(IsvKeys::getIsvId, isvId); } } diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvManagerImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvManagerImpl.java index 5cc1235f..98de78a7 100755 --- a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvManagerImpl.java +++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvManagerImpl.java @@ -56,7 +56,7 @@ public class LocalIsvManagerImpl implements IsvManager { protected IsvDTO search(String appId) { IsvInfo isvInfo = isvInfoMapper.getByAppId(appId); IsvDTO isvDTO = CopyUtil.copyBean(isvInfo, IsvDTO::new); - IsvMerchant isvMerchant = isvMerchantMapper.get(IsvMerchant::getAppId, appId); + IsvMerchant isvMerchant = isvMerchantMapper.getByField(IsvMerchant::getAppId, appId); if (isvMerchant != null) { isvDTO.setMerchantCode(isvMerchant.getMerchantCode()); } diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java index 31c8eeb6..a7c59cf6 100755 --- a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java @@ -50,7 +50,7 @@ public class SysConfigService extends BaseLambdaService environment.getProperty(key, defaultValue)); diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/website/WebsiteService.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/website/WebsiteService.java index 5b640463..6a31c119 100755 --- a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/website/WebsiteService.java +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/website/WebsiteService.java @@ -33,7 +33,7 @@ public class WebsiteService { private DocSettingService docSettingService; public List listDocApp() { - List docApps = docAppService.list(DocApp::getIsPublish, YesOrNo.YES); + List docApps = docAppService.listByField(DocApp::getIsPublish, YesOrNo.YES); return CopyUtil.copyList(docApps, DocAppDTO::new); }