7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-11-13 09:46:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

admin后台可关联商户;fastmybatis升级到3.1.7

Browse Source
This commit is contained in:
六如
2025-08-18 13:38:44 +08:00
parent 0588006cd1
commit fd4ff7c98d
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.md
View File

@@ -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-07-22: 修复当objClass被代理后，获取不到interface BUG
- 2025-06-15：新增帮助文档管理。有升级SQL，见：[sop-20250615.sql](./upgrade/sop-20250615.sql) - 2025-06-15：新增帮助文档管理。有升级SQL，见：[sop-20250615.sql](./upgrade/sop-20250615.sql)
- 2025-06-11：java-sdk添加文件下载示例 - 2025-06-11：java-sdk添加文件下载示例

2
pom.xml
View File

@@ -50,7 +50,7 @@
<commons-logging.version>1.2</commons-logging.version> <commons-logging.version>1.2</commons-logging.version>
<validation-api.version>2.0.1.Final</validation-api.version> <validation-api.version>2.0.1.Final</validation-api.version>
<hibernate-validator.version>6.0.13.Final</hibernate-validator.version> <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
<fastmybatis.version>3.1.6</fastmybatis.version> <fastmybatis.version>3.1.7</fastmybatis.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>

2
sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvInfoMapper.java
View File

@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
public interface IsvInfoMapper extends BaseMapper<IsvInfo> { public interface IsvInfoMapper extends BaseMapper<IsvInfo> {
default IsvInfo getByAppId(String appId) { default IsvInfo getByAppId(String appId) {
return this.get(IsvInfo::getAppId, appId); return this.getByField(IsvInfo::getAppId, appId);
} }
} }

2
sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvKeysMapper.java
View File

@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
public interface IsvKeysMapper extends BaseMapper<IsvKeys> { public interface IsvKeysMapper extends BaseMapper<IsvKeys> {
default IsvKeys getByIsvId(Long isvId) { default IsvKeys getByIsvId(Long isvId) {
return this.get(IsvKeys::getIsvId, isvId); return this.getByField(IsvKeys::getIsvId, isvId);
} }
} }

2
sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvManagerImpl.java
View File

@@ -56,7 +56,7 @@ public class LocalIsvManagerImpl implements IsvManager {
protected IsvDTO search(String appId) { protected IsvDTO search(String appId) {
IsvInfo isvInfo = isvInfoMapper.getByAppId(appId); IsvInfo isvInfo = isvInfoMapper.getByAppId(appId);
IsvDTO isvDTO = CopyUtil.copyBean(isvInfo, IsvDTO::new); IsvDTO isvDTO = CopyUtil.copyBean(isvInfo, IsvDTO::new);
IsvMerchant isvMerchant = isvMerchantMapper.get(IsvMerchant::getAppId, appId); IsvMerchant isvMerchant = isvMerchantMapper.getByField(IsvMerchant::getAppId, appId);
if (isvMerchant != null) { if (isvMerchant != null) {
isvDTO.setMerchantCode(isvMerchant.getMerchantCode()); isvDTO.setMerchantCode(isvMerchant.getMerchantCode());
} }

2
sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java
View File

@@ -50,7 +50,7 @@ public class SysConfigService extends BaseLambdaService<SysConfig, SysConfigMapp
*/ */
public String getConfigValue(String key, String defaultValue) { public String getConfigValue(String key, String defaultValue) {
Objects.requireNonNull(key, "need key"); Objects.requireNonNull(key, "need key");
SysConfig systemConfig = get(SysConfig::getConfigKey, key); SysConfig systemConfig = getByField(SysConfig::getConfigKey, key);
return Optional.ofNullable(systemConfig) return Optional.ofNullable(systemConfig)
.map(SysConfig::getConfigValue) .map(SysConfig::getConfigValue)
.orElseGet(() -> environment.getProperty(key, defaultValue)); .orElseGet(() -> environment.getProperty(key, defaultValue));

2
sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/website/WebsiteService.java
View File

@@ -33,7 +33,7 @@ public class WebsiteService {
private DocSettingService docSettingService; private DocSettingService docSettingService;
public List<DocAppDTO> listDocApp() { public List<DocAppDTO> listDocApp() {
List<DocApp> docApps = docAppService.list(DocApp::getIsPublish, YesOrNo.YES); List<DocApp> docApps = docAppService.listByField(DocApp::getIsPublish, YesOrNo.YES);
return CopyUtil.copyList(docApps, DocAppDTO::new); return CopyUtil.copyList(docApps, DocAppDTO::new);
} }