diff --git a/cash-api/account-server/src/main/java/com/czg/controller/FeignController.java b/cash-api/account-server/src/main/java/com/czg/controller/FeignController.java deleted file mode 100644 index 22486e94..00000000 --- a/cash-api/account-server/src/main/java/com/czg/controller/FeignController.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.czg.controller; - -import com.alibaba.fastjson2.JSONObject; -import com.czg.system.dto.SysParamsDTO; -import com.czg.system.service.SysParamsService; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author GYJoker - */ -@RestController -@RequestMapping("/feign") -public class FeignController { - -// @DubboReference - private SysParamsService sysParamsService; - - @RequestMapping("/test") - public String test() { - SysParamsDTO test = sysParamsService.getParamsByCode2("test"); - return JSONObject.toJSONString(test); - } - -} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/system/service/SysParamsService.java b/cash-common/cash-common-service/src/main/java/com/czg/system/service/SysParamsService.java index a5b0dfff..f398340d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/system/service/SysParamsService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/system/service/SysParamsService.java @@ -42,7 +42,7 @@ public interface SysParamsService extends IService { * @return 参数 */ CzgResult getParamsByCode(String code); - SysParamsDTO getParamsByCode2(String code); + SysParams getSysParam(String code); /** * 根据参数类型获取参数 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java index f5354efc..c0f0a13e 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java @@ -1,7 +1,6 @@ package com.czg.service.account.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.czg.account.dto.auth.LoginTokenDTO; @@ -14,8 +13,7 @@ import com.czg.enums.UserAuthSourceEnum; import com.czg.exception.CzgException; import com.czg.sa.StpKit; import com.czg.account.service.UserInfoService; -import com.czg.utils.AlipayUtil; -import com.czg.utils.WechatAuthUtil; +import com.czg.service.account.util.AlipayUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/utils/AlipayUtil.java b/cash-service/account-service/src/main/java/com/czg/service/account/util/AlipayUtil.java similarity index 95% rename from cash-common/cash-common-tools/src/main/java/com/czg/utils/AlipayUtil.java rename to cash-service/account-service/src/main/java/com/czg/service/account/util/AlipayUtil.java index af9beae6..08fed27b 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/utils/AlipayUtil.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/util/AlipayUtil.java @@ -1,15 +1,11 @@ -package com.czg.utils; +package com.czg.service.account.util; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; import com.alipay.api.AlipayClient; import com.alipay.api.AlipayConfig; import com.alipay.api.DefaultAlipayClient; -import com.alipay.api.internal.util.AlipayEncrypt; import com.alipay.api.request.AlipaySystemOauthTokenRequest; import com.alipay.api.response.AlipaySystemOauthTokenResponse; -import com.czg.exception.CzgException; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/utils/WechatAuthUtil.java b/cash-service/account-service/src/main/java/com/czg/service/account/util/WechatAuthUtil.java similarity index 98% rename from cash-common/cash-common-tools/src/main/java/com/czg/utils/WechatAuthUtil.java rename to cash-service/account-service/src/main/java/com/czg/service/account/util/WechatAuthUtil.java index 12cc4063..408227c0 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/utils/WechatAuthUtil.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/util/WechatAuthUtil.java @@ -1,4 +1,4 @@ -package com.czg.utils; +package com.czg.service.account.util; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; diff --git a/cash-service/system-service/src/main/java/com/czg/service/system/mapper/SysParamsMapper.java b/cash-service/system-service/src/main/java/com/czg/service/system/mapper/SysParamsMapper.java index 308ded64..be81fe54 100644 --- a/cash-service/system-service/src/main/java/com/czg/service/system/mapper/SysParamsMapper.java +++ b/cash-service/system-service/src/main/java/com/czg/service/system/mapper/SysParamsMapper.java @@ -2,6 +2,9 @@ package com.czg.service.system.mapper; import com.czg.system.entity.SysParams; import com.mybatisflex.core.BaseMapper; +import org.apache.ibatis.annotations.Select; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; /** * 映射层。 @@ -9,6 +12,11 @@ import com.mybatisflex.core.BaseMapper; * @author mac * @since 2025-02-07 */ +@CacheConfig(cacheNames = "params") public interface SysParamsMapper extends BaseMapper { + @Cacheable(key = "#code") + @Select("select * from sys_params where param_code = #{code}") + SysParams getSysParam(String code); + } diff --git a/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java b/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java index ade63f29..5d951158 100644 --- a/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java +++ b/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java @@ -12,20 +12,19 @@ import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; import java.util.ArrayList; import java.util.List; /** - * 服务层实现。 + * 服务层实现。 * * @author mac * @since 2025-02-07 */ @DubboService @CacheConfig(cacheNames = "params") -public class SysParamsServiceImpl extends ServiceImpl implements SysParamsService { +public class SysParamsServiceImpl extends ServiceImpl implements SysParamsService { @Override public CzgResult insertParams(SysParamsDTO paramsDTO) { @@ -42,7 +41,7 @@ public class SysParamsServiceImpl extends ServiceImpl getParamsByCode(String code) { - SysParams sysParams = getOne(new QueryWrapper().eq(SysParams::getParamCode, code)); - + SysParams sysParams = getMapper().getSysParam(code); if (sysParams == null) { return CzgResult.failure("参数不存在"); } @@ -104,14 +101,8 @@ public class SysParamsServiceImpl extends ServiceImpl