diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectConfigAssembler.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectConfigAssembler.java index 8fe1106e2..041ce2240 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectConfigAssembler.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/direct/AlipayDirectConfigAssembler.java @@ -42,7 +42,7 @@ public class AlipayDirectConfigAssembler { AlipayDirectApp app = resolveApp(mchNo, channelMchNo, capability); AlipayDirectAppKeyConfig keyConfig = alipayDirectAppKeyConfigService.findByAlipayDirectAppId(app.getId()); - AlipaySdkCredential credential = new AlipaySdkCredential(); + var credential = new AlipaySdkCredential(); credential.setAliAppId(app.getAliAppId()); credential.setPrivateKey(keyConfig.getPrivateKey()); credential.setAlipayPublicKey(keyConfig.getAlipayPublicKey()); diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/isv/AlipayIsvConfigAssembler.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/isv/AlipayIsvConfigAssembler.java index b8d872464..9c4445341 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/isv/AlipayIsvConfigAssembler.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/isv/AlipayIsvConfigAssembler.java @@ -47,7 +47,7 @@ public class AlipayIsvConfigAssembler { // 服务商应用密钥/证书配置 AlipayIsvAppKeyConfig keyConfig = alipayIsvAppKeyConfigService.findByAlipayIsvAppId(isvMerchant.getIsvAppId()); - AlipaySdkCredential credential = new AlipaySdkCredential(); + var credential = new AlipaySdkCredential(); credential.setAliAppId(isvApp.getAliAppId()); credential.setPrivateKey(keyConfig.getPrivateKey()); credential.setAlipayPublicKey(keyConfig.getAlipayPublicKey()); diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/refund/AlipayRefundSyncService.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/refund/AlipayRefundSyncService.java index d87f0c7a0..54f4ffe44 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/refund/AlipayRefundSyncService.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/service/payment/refund/AlipayRefundSyncService.java @@ -39,7 +39,7 @@ public class AlipayRefundSyncService { /// @return 同步结果(含映射后的退款状态) public RefundResultBo sync(PayRefundOrder refundOrder, AlipaySdkCredential credential) { // 构建请求 - AlipayRefundSyncReq req = new AlipayRefundSyncReq(); + var req = new AlipayRefundSyncReq(); req.setOutTradeNo(refundOrder.getOrderNo()); req.setTradeNo(refundOrder.getOutOrderNo()); req.setOutRequestNo(refundOrder.getRefundNo()); diff --git a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectChannelMerchantService.java b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectChannelMerchantService.java index f48400a1f..83959b247 100644 --- a/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-douyin/src/main/java/cn/daxpay/open/channel/douyin/service/direct/DouyinDirectChannelMerchantService.java @@ -49,7 +49,7 @@ public class DouyinDirectChannelMerchantService { channelMerchant.setEnable(true); channelMerchantManager.save(channelMerchant); // 写直连绑定表(dyMchId 作为业务字段) - DouyinDirectChannelMerchant entity = new DouyinDirectChannelMerchant(); + var entity = new DouyinDirectChannelMerchant(); entity.setMchNo(param.getMchNo()); entity.setChannelMchNo(channelMchNo); entity.setProduct(param.getProduct()); diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectChannelMerchantService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectChannelMerchantService.java index dcb01e206..aa24acaaf 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/direct/WechatDirectChannelMerchantService.java @@ -49,7 +49,7 @@ public class WechatDirectChannelMerchantService { channelMerchant.setEnable(true); channelMerchantManager.save(channelMerchant); // 写直连绑定表(wxMchId 作为业务字段, 不参与关联) - WechatDirectChannelMerchant entity = new WechatDirectChannelMerchant(); + var entity = new WechatDirectChannelMerchant(); entity.setMchNo(param.getMchNo()); entity.setChannelMchNo(channelMchNo); entity.setProduct(param.getProduct()); diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvChannelMerchantService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvChannelMerchantService.java index d5c4a2e56..c3ac2b089 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvChannelMerchantService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/isv/WechatIsvChannelMerchantService.java @@ -50,7 +50,7 @@ public class WechatIsvChannelMerchantService { channelMerchant.setEnable(true); channelMerchantManager.save(channelMerchant); // 写服务商绑定表 - WechatIsvChannelMerchant entity = new WechatIsvChannelMerchant(); + var entity = new WechatIsvChannelMerchant(); entity.setMchNo(param.getMchNo()); entity.setChannelMchNo(channelMchNo); entity.setProduct(param.getProduct()); diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/refund/WechatRefundSyncService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/refund/WechatRefundSyncService.java index f76d41f3b..07a63c1c2 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/refund/WechatRefundSyncService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/refund/WechatRefundSyncService.java @@ -43,7 +43,7 @@ public class WechatRefundSyncService { /// @return 同步结果(含映射后的退款状态) public RefundResultBo sync(PayRefundOrder refundOrder, WechatSdkCredential credential) { // 构建请求 - WechatRefundSyncReq req = new WechatRefundSyncReq(); + var req = new WechatRefundSyncReq(); req.setOutRefundNo(refundOrder.getRefundNo()); req.setCredential(credential); diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/handler/MchTenantInterceptorConfiguration.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/handler/MchTenantInterceptorConfiguration.java index 840153090..edc70153c 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/handler/MchTenantInterceptorConfiguration.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/common/handler/MchTenantInterceptorConfiguration.java @@ -17,7 +17,7 @@ public class MchTenantInterceptorConfiguration { /// 租户拦截器 @Bean public MpInterceptor MchTenantInterceptor() { - TenantLineInnerInterceptor tenantInterceptor = new TenantLineInnerInterceptor(); + var tenantInterceptor = new TenantLineInnerInterceptor(); tenantInterceptor.setTenantLineHandler(customTenantHandler); return new MpInterceptor(tenantInterceptor, -999); } diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java index dc7d4d41a..6889702b8 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/NormalPayService.java @@ -64,7 +64,7 @@ public class NormalPayService { payRouteFacade.resolve(payParam); var payStrategy = PaymentStrategyFactory.createByProduct(payParam.getProduct(), AbsNormalPayStrategy.class); // 支付前处理: 校验与通道配置组装(只依赖请求参数), 失败直接抛出不持久化(订单尚未创建) - PayStrategyContext context = new PayStrategyContext().setPayParam(payParam); + var context = new PayStrategyContext().setPayParam(payParam); payStrategy.doBeforePay(context); // 查询已有订单并校验，结果填充到 context payAssistService.findAndCheckOrder(payParam.getBizOrderNo(), context); diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java index 6f3168786..0b9c2fbab 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PayCloseService.java @@ -84,7 +84,7 @@ public class PayCloseService { } else { // 处理中: 调用通道关闭/撤销策略 closeType = useCancel ? CloseTypeEnum.CANCEL : CloseTypeEnum.CLOSE; - PayStrategyContext context = new PayStrategyContext() + var context = new PayStrategyContext() .setContainer(normalOrder) .setTrade(trade); AbsPayCloseStrategy strategy = PaymentStrategyFactory.createByProduct( diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java index 20d16bfdb..89f4bfe73 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/core/trade/service/PaySyncService.java @@ -92,7 +92,7 @@ public class PaySyncService { try { NormalPayOrder normalOrder = payNormalOrderManager.findById(trade.getContainerId()) .orElse(null); - PayStrategyContext context = new PayStrategyContext() + var context = new PayStrategyContext() .setContainer(normalOrder) .setTrade(trade); var syncStrategy = PaymentStrategyFactory.createByProduct( @@ -190,7 +190,7 @@ public class PaySyncService { private void closeRemote(PayTrade trade, NormalPayOrder normalOrder) { AbsPayCloseStrategy strategy = PaymentStrategyFactory.createByProduct( trade.getProduct(), AbsPayCloseStrategy.class); - PayStrategyContext context = new PayStrategyContext() + var context = new PayStrategyContext() .setContainer(normalOrder) .setTrade(trade); strategy.doBeforeClose(context); diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/service/DeviceVendorConfigAdminService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/service/DeviceVendorConfigAdminService.java index 1794947f7..9c3cb0eba 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/service/DeviceVendorConfigAdminService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/device/vendor/service/DeviceVendorConfigAdminService.java @@ -34,7 +34,7 @@ public class DeviceVendorConfigAdminService { param.getDeviceType(), param.getVendorCode(), param.getConfigName(), null)) { throw new OperationFailException(CommonCode.FAIL_CODE, "error.device.vendor.configNameExists"); } - DeviceVendorConfig entity = new DeviceVendorConfig() + var entity = new DeviceVendorConfig() .setDeviceType(param.getDeviceType()) .setVendorCode(param.getVendorCode()) .setConfigName(param.getConfigName()) diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductCapabilityService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductCapabilityService.java index 1a8429060..c90392dfd 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductCapabilityService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductCapabilityService.java @@ -135,7 +135,7 @@ public class PayProductCapabilityService { /// 关联行转为能力展示项 private PayProductCapabilityResult toItem(PayProductCapability rel, PayCapability cap) { - PayProductCapabilityResult item = new PayProductCapabilityResult() + var item = new PayProductCapabilityResult() .setCode(cap.getCode()) .setSortNo(rel.getSortNo()); PayCapabilityEnum capabilityEnum = PayCapabilityEnum.findByCode(cap.getCode()); diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java index c6fda065c..6ef56747f 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/product/service/PayProductConfigService.java @@ -73,7 +73,7 @@ public class PayProductConfigService { /// PayProduct + 库表 + 策略合并为配置结果 private PayProductConfigResult toConfigResult(PayProduct payProduct, Map configMap) { - PayProductConfigResult result = new PayProductConfigResult() + var result = new PayProductConfigResult() .setProduct(payProduct.getCode()) .setName(I18nUtil.getEnumName(ProductEnum.findByCode(payProduct.getCode()))) .setChannel(payProduct.getChannel()) diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/provider/service/PayProviderProductService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/provider/service/PayProviderProductService.java index 5560bd356..a97d33e2e 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/provider/service/PayProviderProductService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/provider/service/PayProviderProductService.java @@ -36,7 +36,7 @@ public class PayProviderProductService { } Map> capabilityCodesByProduct = payProductCapabilityService.loadCapabilityCodesByProduct(); for (PayProductResult product : payProductService.listAll()) { - PayProviderProductResult productItem = new PayProviderProductResult() + var productItem = new PayProviderProductResult() .setLabel(product.getName()) .setValue(product.getCode()) .setChannel(product.getChannel()) diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/provider/service/PayProviderService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/provider/service/PayProviderService.java index c9aba33f9..2a16ed096 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/provider/service/PayProviderService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/masterdata/constants/provider/service/PayProviderService.java @@ -82,7 +82,7 @@ public class PayProviderService { int brandOrdinal = 0; for (PayProviderEnum brandEnum : PayProviderEnum.values()) { PayProvider dbBrand = providerMap.get(brandEnum.getCode()); - PayProviderGroupResult group = new PayProviderGroupResult() + var group = new PayProviderGroupResult() .setProvider(brandEnum.getCode()) .setProviderLabel(I18nUtil.getEnumName(brandEnum)) .setIcon(dbBrand != null ? dbBrand.getIcon() : null) diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java index cf7735c97..d9002ff44 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/basic/PayRouteBasicConfigService.java @@ -83,7 +83,7 @@ public class PayRouteBasicConfigService { throw new BizInfoException(CommonErrorCode.VALIDATE_PARAMETERS_ERROR, "pay.route.error.productStrategyMissing"); } - PayRouteBasicConfig config = new PayRouteBasicConfig(); + var config = new PayRouteBasicConfig(); config.setStrategyId(strategy.getId()); config.setProvider(item.getProvider()); config.setChannelMchNo(item.getChannelMchNo()); diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java index 260bc9f80..9bd8ca333 100644 --- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java +++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/merchant/service/route/scene/PayRouteSceneConfigService.java @@ -100,7 +100,7 @@ public class PayRouteSceneConfigService { // 校验支付能力在候选集合内 payRouteStrategyCapabilitySupport.validateSceneCapability( providerCode, item.getMethod(), item.getChannelMchNo(), item.getCapability()); - PayRouteSceneConfig config = new PayRouteSceneConfig(); + var config = new PayRouteSceneConfig(); config.setStrategyId(strategy.getId()); config.setMethod(item.getMethod()); config.setChannelMchNo(item.getChannelMchNo()); diff --git a/daxpay-platform/daxpay-platform-capability/capability-cache/src/main/java/cn/daxpay/open/platform/capability/cache/notify/publisher/CacheInvalidationPublisher.java b/daxpay-platform/daxpay-platform-capability/capability-cache/src/main/java/cn/daxpay/open/platform/capability/cache/notify/publisher/CacheInvalidationPublisher.java index cc18f395b..08e09fc66 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-cache/src/main/java/cn/daxpay/open/platform/capability/cache/notify/publisher/CacheInvalidationPublisher.java +++ b/daxpay-platform/daxpay-platform-capability/capability-cache/src/main/java/cn/daxpay/open/platform/capability/cache/notify/publisher/CacheInvalidationPublisher.java @@ -30,7 +30,7 @@ public class CacheInvalidationPublisher { /// @param cacheName 缓存名称 /// @param key 缓存键 public void publishEvict(String cacheName, Object key) { - CacheInvalidationMessage message = new CacheInvalidationMessage(); + var message = new CacheInvalidationMessage(); message.setCacheName(cacheName); message.setKey(String.valueOf(key)); message.setType(CacheInvalidationType.EVICT.name()); @@ -49,7 +49,7 @@ public class CacheInvalidationPublisher { /// /// @param cacheName 缓存名称 public void publishClear(String cacheName) { - CacheInvalidationMessage message = new CacheInvalidationMessage(); + var message = new CacheInvalidationMessage(); message.setCacheName(cacheName); message.setType(CacheInvalidationType.CLEAR.name()); diff --git a/daxpay-platform/daxpay-platform-capability/capability-file/src/main/java/cn/daxpay/open/platform/capability/file/controller/PlatformFileController.java b/daxpay-platform/daxpay-platform-capability/capability-file/src/main/java/cn/daxpay/open/platform/capability/file/controller/PlatformFileController.java index 3759a0c54..35378ca5c 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-file/src/main/java/cn/daxpay/open/platform/capability/file/controller/PlatformFileController.java +++ b/daxpay-platform/daxpay-platform-capability/capability-file/src/main/java/cn/daxpay/open/platform/capability/file/controller/PlatformFileController.java @@ -46,7 +46,7 @@ public class PlatformFileController { @NotNull(message = "{validation.field.fileId.notNull}") @RequestParam Long fileId, @NotNull(message = "{validation.field.objectKey.notBlank}") @RequestParam String objectKey, @RequestParam(required = false) String etag) { - FileUploadConfirmParam param = new FileUploadConfirmParam(); + var param = new FileUploadConfirmParam(); param.setFileId(fileId); param.setObjectKey(objectKey); param.setEtag(etag); diff --git a/daxpay-platform/daxpay-platform-capability/capability-file/src/main/java/cn/daxpay/open/platform/capability/file/service/PlatformFileService.java b/daxpay-platform/daxpay-platform-capability/capability-file/src/main/java/cn/daxpay/open/platform/capability/file/service/PlatformFileService.java index f397a68a5..e016f1e6b 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-file/src/main/java/cn/daxpay/open/platform/capability/file/service/PlatformFileService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-file/src/main/java/cn/daxpay/open/platform/capability/file/service/PlatformFileService.java @@ -76,7 +76,7 @@ public class PlatformFileService { OffsetDateTime expireTime = s3FileStorageService.calculateUploadExpireTime(); - PlatformFileRecord platformFileRecord = new PlatformFileRecord() + var platformFileRecord = new PlatformFileRecord() .setPath(path) .setSize(param.getFileSize()) .setFilename(filename) @@ -89,7 +89,7 @@ public class PlatformFileService { platformFileRecordManager.save(platformFileRecord); - FileUploadPresignResult result = new FileUploadPresignResult(); + var result = new FileUploadPresignResult(); result.setFileId(platformFileRecord.getId()); result.setObjectKey(objectKey); result.setFilename(filename); @@ -264,7 +264,7 @@ public class PlatformFileService { s3FileStorageService.upload(data, objectKey, contentType); - PlatformFileRecord platformFileRecord = new PlatformFileRecord() + var platformFileRecord = new PlatformFileRecord() .setPath(path) .setSize((long) data.length) .setFilename(filename) diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatMaAuthService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatMaAuthService.java index 746fad05f..441e495a3 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatMaAuthService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatMaAuthService.java @@ -38,7 +38,7 @@ public class WechatMaAuthService { /// 获取微信小程序API的Service public WxMaService getWxMaService(String appId, String appSecret) { WxMaService wxMaService = new WxMaServiceImpl(); - WxMaDefaultConfigImpl wxMaConfig = new WxMaDefaultConfigImpl(); + var wxMaConfig = new WxMaDefaultConfigImpl(); wxMaConfig.setAppid(appId); wxMaConfig.setSecret(appSecret); try { diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatMpAuthService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatMpAuthService.java index fd6823167..1bc490aec 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatMpAuthService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatMpAuthService.java @@ -82,7 +82,7 @@ public class WechatMpAuthService { WxOAuth2UserInfo userInfo = wxMpService.getOAuth2Service().getUserInfo(accessToken, null); // 转换结果 - WechatUserInfoResult result = new WechatUserInfoResult(); + var result = new WechatUserInfoResult(); result.setOpenId(userInfo.getOpenid()); result.setNickname(userInfo.getNickname()); result.setHeadImgUrl(userInfo.getHeadImgUrl()); @@ -106,7 +106,7 @@ public class WechatMpAuthService { /// 获取微信公众号API的Service public WxMpService getWxMpService(String appId, String appSecret) { WxMpService wxMpService = new WxMpServiceImpl(); - WxMpDefaultConfigImpl wxMpConfig = new WxMpDefaultConfigImpl(); + var wxMpConfig = new WxMpDefaultConfigImpl(); wxMpConfig.setAppId(appId); wxMpConfig.setSecret(appSecret); try { diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatUserService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatUserService.java index b1e7a01a1..63f0e08d1 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatUserService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatUserService.java @@ -49,7 +49,7 @@ public class WechatUserService { } // 转换结果 - WechatUserInfoResult result = new WechatUserInfoResult(); + var result = new WechatUserInfoResult(); result.setOpenId(wxMpUser.getOpenId()); result.setNickname(wxMpUser.getNickname()); result.setHeadImgUrl(wxMpUser.getHeadImgUrl()); @@ -104,7 +104,7 @@ public class WechatUserService { } // 转换结果 - WechatPhoneResult result = new WechatPhoneResult(); + var result = new WechatPhoneResult(); result.setPhoneNumber(phoneInfo.getPhoneNumber()); result.setPurePhoneNumber(phoneInfo.getPurePhoneNumber()); result.setCountryCode(phoneInfo.getCountryCode()); @@ -126,7 +126,7 @@ public class WechatUserService { /// 创建微信公众号Service private WxMpService createWxMpService(String appId, String appSecret) { WxMpService wxMpService = new WxMpServiceImpl(); - WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl(); + var config = new WxMpDefaultConfigImpl(); config.setAppId(appId); config.setSecret(appSecret); wxMpService.setWxMpConfigStorage(config); @@ -136,7 +136,7 @@ public class WechatUserService { /// 创建微信小程序Service private WxMaService createWxMaService(String appId, String appSecret) { WxMaService wxMaService = new WxMaServiceImpl(); - WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl(); + var config = new WxMaDefaultConfigImpl(); config.setAppid(appId); config.setSecret(appSecret); wxMaService.setWxMaConfig(config); diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMaMessageService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMaMessageService.java index 69b6bc636..70290ac79 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMaMessageService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMaMessageService.java @@ -46,7 +46,7 @@ public class WechatMaMessageService { WechatMessageRecord record = createMessageRecord(param); recordService.saveRecord(record); - MessageSendResult result = new MessageSendResult() + var result = new MessageSendResult() .setRecordId(record.getId()) .setSuccess(false); @@ -157,7 +157,7 @@ public class WechatMaMessageService { /// 创建消息记录 private WechatMessageRecord createMessageRecord(UniformMessageParam param) { - WechatMessageRecord record = new WechatMessageRecord(); + var record = new WechatMessageRecord(); record.setMessageType("uniform"); record.setOpenId(param.getOpenId()); record.setTemplateId(param.getTemplateId()); @@ -174,7 +174,7 @@ public class WechatMaMessageService { /// 注意：weixin-java-miniapp 4.8.1.B版本的统一服务消息API较为复杂 /// 这里采用简化实现，实际使用时可能需要根据具体需求调整 private WxMaUniformMessage buildUniformMessage(UniformMessageParam param) { - WxMaUniformMessage uniformMessage = new WxMaUniformMessage(); + var uniformMessage = new WxMaUniformMessage(); uniformMessage.setToUser(param.getOpenId()); // 设置为使用小程序模板消息 @@ -190,7 +190,7 @@ public class WechatMaMessageService { /// 创建微信小程序Service private WxMaService createWxMaService(String wxAppId, String appSecret, String accessToken) { WxMaService wxMaService = new WxMaServiceImpl(); - WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl(); + var config = new WxMaDefaultConfigImpl(); config.setAppid(wxAppId); config.setSecret(appSecret); config.setToken(accessToken); diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMessageRecordService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMessageRecordService.java index ed1302f02..786ae3e14 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMessageRecordService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMessageRecordService.java @@ -55,7 +55,7 @@ public class WechatMessageRecordService { /// @param errorMsg 错误信息 public void updateStatus(Long recordId, String status, String msgId, String errorMsg) { try { - WechatMessageRecord record = new WechatMessageRecord(); + var record = new WechatMessageRecord(); record.setId(recordId); record.setStatus(status); record.setMsgId(msgId); @@ -172,7 +172,7 @@ public class WechatMessageRecordService { /// 构建模板消息参数 @SuppressWarnings("unchecked") private TemplateMessageParam buildTemplateMessageParam(WechatMessageRecord record) { - TemplateMessageParam param = new TemplateMessageParam(); + var param = new TemplateMessageParam(); param.setWxAppId(record.getWxAppId()); // AppSecret需要从外部传入，这里暂时为空，实际使用时需要调用方提供 param.setOpenId(record.getOpenId()); @@ -192,7 +192,7 @@ public class WechatMessageRecordService { /// 构建统一服务消息参数 @SuppressWarnings("unchecked") private UniformMessageParam buildUniformMessageParam(WechatMessageRecord record) { - UniformMessageParam param = new UniformMessageParam(); + var param = new UniformMessageParam(); param.setWxAppId(record.getWxAppId()); // AppSecret需要从外部传入，这里暂时为空，实际使用时需要调用方提供 param.setOpenId(record.getOpenId()); diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMpMessageService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMpMessageService.java index ee5803b5e..629ce532a 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMpMessageService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMpMessageService.java @@ -47,7 +47,7 @@ public class WechatMpMessageService { WechatMessageRecord record = createMessageRecord(param); recordService.saveRecord(record); - MessageSendResult result = new MessageSendResult() + var result = new MessageSendResult() .setRecordId(record.getId()) .setSuccess(false); @@ -156,7 +156,7 @@ public class WechatMpMessageService { /// 创建消息记录 private WechatMessageRecord createMessageRecord(TemplateMessageParam param) { - WechatMessageRecord record = new WechatMessageRecord(); + var record = new WechatMessageRecord(); record.setMessageType("template"); record.setOpenId(param.getOpenId()); record.setTemplateId(param.getTemplateId()); @@ -192,7 +192,7 @@ public class WechatMpMessageService { /// 创建微信公众号Service private WxMpService createWxMpService(String wxAppId, String appSecret, String accessToken) { WxMpService wxMpService = new WxMpServiceImpl(); - WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl(); + var config = new WxMpDefaultConfigImpl(); config.setAppId(wxAppId); config.setSecret(appSecret); config.setAccessToken(accessToken); diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/token/service/WechatTokenService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/token/service/WechatTokenService.java index ed9d0c166..693fc761b 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/token/service/WechatTokenService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/token/service/WechatTokenService.java @@ -137,7 +137,7 @@ public class WechatTokenService { /// 创建微信公众号Service private WxMpService createWxMpService(String wxAppId, String appSecret) { WxMpService wxMpService = new WxMpServiceImpl(); - WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl(); + var config = new WxMpDefaultConfigImpl(); config.setAppId(wxAppId); config.setSecret(appSecret); wxMpService.setWxMpConfigStorage(config); diff --git a/daxpay-platform/daxpay-platform-common/common-artemis/src/main/java/cn/daxpay/open/platform/common/artemis/ArtemisCommonAutoConfiguration.java b/daxpay-platform/daxpay-platform-common/common-artemis/src/main/java/cn/daxpay/open/platform/common/artemis/ArtemisCommonAutoConfiguration.java index 2be8566e4..ae64fd934 100644 --- a/daxpay-platform/daxpay-platform-common/common-artemis/src/main/java/cn/daxpay/open/platform/common/artemis/ArtemisCommonAutoConfiguration.java +++ b/daxpay-platform/daxpay-platform-common/common-artemis/src/main/java/cn/daxpay/open/platform/common/artemis/ArtemisCommonAutoConfiguration.java @@ -72,7 +72,7 @@ public class ArtemisCommonAutoConfiguration { @ConditionalOnMissingBean(name = ArtemisBeanNames.TOPIC_LISTENER_FACTORY) public JmsListenerContainerFactory topicListenerFactory(ConnectionFactory connectionFactory, ObservationRegistry observationRegistry) { - DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); + var factory = new DefaultJmsListenerContainerFactory(); factory.setConnectionFactory(connectionFactory); // Topic 模式（pub-sub），对应 broker 端 multicast 路由类型 factory.setPubSubDomain(true); diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/java/cn/daxpay/open/platform/common/i18n/config/I18nAutoConfiguration.java b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/java/cn/daxpay/open/platform/common/i18n/config/I18nAutoConfiguration.java index b4beb3e0c..f6ff22256 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/java/cn/daxpay/open/platform/common/i18n/config/I18nAutoConfiguration.java +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/java/cn/daxpay/open/platform/common/i18n/config/I18nAutoConfiguration.java @@ -19,7 +19,7 @@ public class I18nAutoConfiguration { @Bean public MessageSource messageSource(ResourcePatternResolver resourceResolver) { - JsonMessageSource source = new JsonMessageSource(resourceResolver); + var source = new JsonMessageSource(resourceResolver); source.setDefaultLocale(Locale.CHINA); // 初始化 I18nUtil I18nUtil.setMessageSource(source); diff --git a/daxpay-platform/daxpay-platform-common/common-mybatis-plus/src/main/java/cn/daxpay/open/platform/common/mybatisplus/configuration/MpConfiguration.java b/daxpay-platform/daxpay-platform-common/common-mybatis-plus/src/main/java/cn/daxpay/open/platform/common/mybatisplus/configuration/MpConfiguration.java index 8123338e0..54a4d21de 100644 --- a/daxpay-platform/daxpay-platform-common/common-mybatis-plus/src/main/java/cn/daxpay/open/platform/common/mybatisplus/configuration/MpConfiguration.java +++ b/daxpay-platform/daxpay-platform-common/common-mybatis-plus/src/main/java/cn/daxpay/open/platform/common/mybatisplus/configuration/MpConfiguration.java @@ -34,7 +34,7 @@ public class MpConfiguration { /// 总结: 对sql进行单次改造的优先放入,不对sql进行改造的最后放入 @Bean public MybatisPlusInterceptor mybatisPlusInterceptor(List interceptors) { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + var interceptor = new MybatisPlusInterceptor(); interceptors.stream() .sorted(Comparator.comparing(MpInterceptor::getSortNo)) .map(MpInterceptor::getInnerInterceptor) diff --git a/daxpay-platform/daxpay-platform-common/common-mybatis-plus/src/main/java/cn/daxpay/open/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java b/daxpay-platform/daxpay-platform-common/common-mybatis-plus/src/main/java/cn/daxpay/open/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java index 88800d43d..f428c9fd5 100644 --- a/daxpay-platform/daxpay-platform-common/common-mybatis-plus/src/main/java/cn/daxpay/open/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java +++ b/daxpay-platform/daxpay-platform-common/common-mybatis-plus/src/main/java/cn/daxpay/open/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java @@ -13,7 +13,7 @@ public class MpInterceptorConfiguration { /// 分页(无参构造：由 MyBatis-Plus 从 DataSource 的 JDBC URL 自动推断数据库方言，换库零改动) @Bean public MpInterceptor paginationInnerInterceptor() { - PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + var paginationInnerInterceptor = new PaginationInnerInterceptor(); paginationInnerInterceptor.setOptimizeJoin(false); return new MpInterceptor(paginationInnerInterceptor, 1); } diff --git a/daxpay-platform/daxpay-platform-common/common-redis/src/main/java/cn/daxpay/open/platform/common/redis/configuration/RedisAutoConfiguration.java b/daxpay-platform/daxpay-platform-common/common-redis/src/main/java/cn/daxpay/open/platform/common/redis/configuration/RedisAutoConfiguration.java index 283078126..77e62407d 100644 --- a/daxpay-platform/daxpay-platform-common/common-redis/src/main/java/cn/daxpay/open/platform/common/redis/configuration/RedisAutoConfiguration.java +++ b/daxpay-platform/daxpay-platform-common/common-redis/src/main/java/cn/daxpay/open/platform/common/redis/configuration/RedisAutoConfiguration.java @@ -28,7 +28,7 @@ public class RedisAutoConfiguration { /// 字符串类型Redis模板，适用于简单字符串值 @Bean public StringRedisTemplate stringRedisTemplate(LettuceConnectionFactory connectionFactory) { - StringRedisTemplate template = new StringRedisTemplate(); + var template = new StringRedisTemplate(); template.setConnectionFactory(connectionFactory); return template; } diff --git a/daxpay-platform/daxpay-platform-common/common-spring/src/main/java/cn/daxpay/open/platform/common/spring/configuration/SpringCorsConfiguration.java b/daxpay-platform/daxpay-platform-common/common-spring/src/main/java/cn/daxpay/open/platform/common/spring/configuration/SpringCorsConfiguration.java index fc193f8a2..deda9d3c8 100644 --- a/daxpay-platform/daxpay-platform-common/common-spring/src/main/java/cn/daxpay/open/platform/common/spring/configuration/SpringCorsConfiguration.java +++ b/daxpay-platform/daxpay-platform-common/common-spring/src/main/java/cn/daxpay/open/platform/common/spring/configuration/SpringCorsConfiguration.java @@ -31,7 +31,7 @@ public class SpringCorsConfiguration { @ConditionalOnProperty(prefix = "daxpay.platform.common.spring.cors", value = "enable", havingValue = "true") public FilterRegistrationBean corsWebFilter() { PlatformCommonProperties.Spring.Cors cors = platformCommonProperties.getSpring().getCors(); - CorsConfiguration config = new CorsConfiguration(); + var config = new CorsConfiguration(); // 允许跨域发送身份凭证 config.setAllowCredentials(cors.isAllowCredentials()); // 预检请求有效期 @@ -44,7 +44,7 @@ public class SpringCorsConfiguration { addConfigValues(cors.getAllowedOriginPatterns(), config::addAllowedOriginPattern); config.addExposedHeader(HttpHeaders.SET_COOKIE); - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + var source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", config); FilterRegistrationBean bean = new FilterRegistrationBean<>(new CorsFilter(source)); bean.setOrder(Ordered.HIGHEST_PRECEDENCE); diff --git a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/util/RsaSignUtil.java b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/util/RsaSignUtil.java index 8b9f7b8d3..147347528 100644 --- a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/util/RsaSignUtil.java +++ b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/util/RsaSignUtil.java @@ -29,7 +29,7 @@ public class RsaSignUtil { byte[] decoded = Base64.getDecoder().decode(privateKeyPEM); try { - PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(decoded); + var keySpec = new PKCS8EncodedKeySpec(decoded); KeyFactory kf = KeyFactory.getInstance("RSA"); return kf.generatePrivate(keySpec); } catch (Exception e) { @@ -46,7 +46,7 @@ public class RsaSignUtil { .replaceAll("\\s", ""); byte[] decoded = Base64.getDecoder().decode(publicKeyPEM); - X509EncodedKeySpec keySpec = new X509EncodedKeySpec(decoded); + var keySpec = new X509EncodedKeySpec(decoded); try { KeyFactory kf = KeyFactory.getInstance("RSA"); return kf.generatePublic(keySpec); diff --git a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/dao/user/UserPasswordHistoryManager.java b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/dao/user/UserPasswordHistoryManager.java index 59a57891a..9305497b8 100644 --- a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/dao/user/UserPasswordHistoryManager.java +++ b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/dao/user/UserPasswordHistoryManager.java @@ -22,7 +22,7 @@ public class UserPasswordHistoryManager { /// 添加密码历史记录 public void addHistory(Long userId, String passwordHash) { - UserPasswordHistory history = new UserPasswordHistory() + var history = new UserPasswordHistory() .setUserId(userId) .setPassword(passwordHash); history.setCreateTime(OffsetDateTime.now(ZoneOffset.UTC)); diff --git a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/dao/user/UserPasswordSecurityManager.java b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/dao/user/UserPasswordSecurityManager.java index ba753ea51..a5bdff18b 100644 --- a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/dao/user/UserPasswordSecurityManager.java +++ b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/dao/user/UserPasswordSecurityManager.java @@ -25,7 +25,7 @@ public class UserPasswordSecurityManager extends BaseManager { - UserPasswordSecurity security = new UserPasswordSecurity(); + var security = new UserPasswordSecurity(); security.setId(userId); security.setPasswordErrorCount(0); security.setInitialPassword(true); @@ -101,7 +101,7 @@ public class UserPasswordSecurityManager extends BaseManager definitionMap = this.collectDefinitions(); this.validateDefinitions(definitionMap); - PermCodeScanResult result = new PermCodeScanResult(); + var result = new PermCodeScanResult(); Map existedMap = permCodeManager.findAll().stream() .collect(Collectors.toMap(PermCodeData::getCode, item -> item, (a, b) -> a)); @@ -175,7 +175,7 @@ public class PermCodeScanService { Method method = handlerMethod.getMethod(); String location = beanType.getName() + "#" + method.getName(); - PermCodeDefinition definition = new PermCodeDefinition() + var definition = new PermCodeDefinition() .setCode(code) .setNameCn(nameCn) .setNameEn(nameEn) diff --git a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/service/twofactor/UserTwoFactorService.java b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/service/twofactor/UserTwoFactorService.java index 5482a6eb1..938a5368b 100644 --- a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/service/twofactor/UserTwoFactorService.java +++ b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/service/twofactor/UserTwoFactorService.java @@ -51,7 +51,7 @@ public class UserTwoFactorService { public TwoFactorStatusResult getStatus() { Long userId = SecurityUtil.getUserId(); PlatformTwoFactorAuthConfig config = getConfig(); - TwoFactorStatusResult result = new TwoFactorStatusResult() + var result = new TwoFactorStatusResult() .setPlatformEnabled(Boolean.TRUE.equals(config.getEnabled())); Optional bound = userTwoFactorManager.findByUserId(userId); if (bound.isPresent()) { diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/provider/OssConfigProviderImpl.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/provider/OssConfigProviderImpl.java index b35218947..a56cb71fe 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/provider/OssConfigProviderImpl.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/provider/OssConfigProviderImpl.java @@ -31,7 +31,7 @@ public class OssConfigProviderImpl implements OssConfigProvider { /// 将平台OSS配置转换为文件存储配置 private FileStorageConfig convertToFileStorageConfig(PlatformOssConfig config) { - FileStorageConfig storageConfig = new FileStorageConfig(); + var storageConfig = new FileStorageConfig(); storageConfig.setEndpoint(config.getEndpoint()) .setRegion(config.getRegion()) .setPublicBucket(config.getPublicBucket()) diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/protocol/UserProtocolItemService.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/protocol/UserProtocolItemService.java index 3cc830f2a..97649070f 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/protocol/UserProtocolItemService.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/protocol/UserProtocolItemService.java @@ -61,7 +61,7 @@ public class UserProtocolItemService { /// 根据协议ID查询协议项列表 public PageResult page(PageParam pageParam, Long protocolId){ - UserProtocolItemQuery query = new UserProtocolItemQuery(); + var query = new UserProtocolItemQuery(); query.setProtocolId(protocolId); return MpUtil.toPageResult(userProtocolItemManager.page(pageParam, query)); }