diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java index 1ad4b31e..37392683 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteCustomerApplyLogService.java @@ -41,7 +41,7 @@ public interface RemoteCustomerApplyLogService * @return 结果 */ @GetMapping("/log/customerApply") - public R customerApply(@PathVariable("customerID") Long customerID,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + public R customerApply(@RequestParam("customerID") Long customerID,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 新增用户 diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index b3d1cbda..c83ed94f 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java index c659d279..4b6579ce 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/RedisConstant.java @@ -33,5 +33,10 @@ public class RedisConstant { /** * H5申请幂等校验 */ - public final static String H5_APPLY_CHECK = CacheConstants.PROJET+"H5:apply:check"; + public final static String H5_APPLY_CHECK = CacheConstants.PROJET+"H5:apply:check:"; + + /** + * 撞库幂等校验 + */ + public final static String HIT_CHECK_CACHE = CacheConstants.PROJET+"hit:check:cache:"; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java index b01e92ce..609f43e0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SecureUtils.java @@ -334,7 +334,7 @@ public class SecureUtils { " \"orderStatus\":\"2\"\n" + "}"; - System.out.println(AesEncode(s3,"LwLjtU1Bt8dcxxjY")); + System.out.println(AesEncode(s1,"g5N8XTYaOEwEmBgg")); } /** * 解密 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index dd3075f9..d08317f9 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 @@ -30,12 +30,12 @@ spring: eager: true transport: # 控制台地址 - dashboard: 124.222.144.55:8718 + dashboard: 47.109.135.151:8718 # nacos配置持久化 datasource: ds1: nacos: - server-addr: 124.222.144.55:8848 + server-addr: 47.109.135.151:8848 dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java index e53a726e..31edb903 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/controller/PublicHalfController.java @@ -42,7 +42,7 @@ public class PublicHalfController{ * 通用半流程撞库 */ @GetMapping("/checkOrder") - public AjaxResult checkOrder(@RequestParam("phoneMD5")String phoneMd5,@RequestParam("channelSign")String channelSign) + public AjaxResult checkOrder(String phoneMd5,String channelSign) { return sysPublicHalfService.checkOrder(phoneMd5,channelSign); diff --git a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java index 6ec1bd7e..58d245e0 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java +++ b/ruoyi-modules/ruoyi-btc/src/main/java/com/ruoyi/btc/service/impl/SysPublicHalfServiceImpl.java @@ -8,6 +8,7 @@ import com.ruoyi.btc.domain.ComPublicHalfDto; import com.ruoyi.btc.domain.CustomerInfoDto; import com.ruoyi.btc.service.ISysPublicHalfService; import com.ruoyi.common.core.constant.CacheConstants; +import com.ruoyi.common.core.constant.RedisConstant; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.GetSumDto; import com.ruoyi.common.core.domain.R; @@ -24,9 +25,11 @@ import com.ruoyi.system.api.RemoteCustomerApplyLogService; import com.ruoyi.system.api.RemoteCustomerService; import com.ruoyi.system.api.RemoteMerchantService; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -36,6 +39,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor +@Slf4j public class SysPublicHalfServiceImpl implements ISysPublicHalfService { private final RemoteCustomerService remoteCustomerService; @@ -51,7 +55,6 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService @Override public AjaxResult check(ComPublicHalfDto comPublicHalfDto) { //校验 IP地址是否正常 渠道标识是否存在 数据是否为空 - if (StringUtils.isEmpty(comPublicHalfDto.getChannelSignature())){ return AjaxResult.error("渠道标识不能未空"); } @@ -62,12 +65,20 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService if (StringUtils.isEmpty(comPublicHalfDto.getData())){ return AjaxResult.error("加密数据不能为空"); } + //解密为customerInfoDto String s = SecureUtils.AesUtil.AesDecode(comPublicHalfDto.getData(), comPublicHalfDto.getChannelSignature()); if (s==null){ return AjaxResult.error("解密异常"); } CustomerInfoDto customerInfoDto = JSONObject.parseObject(s, CustomerInfoDto.class); + //撞库幂等性校验 暂时不加 +// Boolean aBoolean = redisService.hasKey(RedisConstant.HIT_CHECK_CACHE+customerInfoDto.getPhoneMd5()+":"+comPublicHalfDto.getChannelSignature()); +// if (aBoolean){ +// return AjaxResult.error("手机号："+customerInfoDto.getPhoneMd5()+"请勿重复撞库"); +// } +// redisService.setCacheObject(RedisConstant.HIT_CHECK_CACHE+customerInfoDto.getPhoneMd5(),1,60*3l, TimeUnit.SECONDS); + log.info("渠道：{}，撞库手机号：{}",channel.getChannelName(),customerInfoDto.getPhoneMd5()); //校验数据必传参数是否未传 String checkData = checkData(customerInfoDto); if (checkData!=null){ @@ -84,6 +95,7 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService customer.setStatus(2); customer.setPhoneMd5(customerInfoDto.getPhoneMd5()); R customerInfoByPhoneMd5 = remoteCustomerService.getCustomerInfoByPhoneMd5(customerInfoDto.getPhoneMd5(), SecurityConstants.INNER); + log.info("渠道：{}，是否查询到用户：{}",channel.getChannelName(),customerInfoByPhoneMd5.getCode()); if (customerInfoByPhoneMd5.getCode()==200){ remoteCustomerService.updateByPhoneMd5(customer,SecurityConstants.INNER); }else { @@ -211,6 +223,7 @@ public class SysPublicHalfServiceImpl implements ISysPublicHalfService return AjaxResult.error("解密异常"); } CustomerInfoDto customerInfoDto = JSONObject.parseObject(s, CustomerInfoDto.class); + log.info("渠道：{}，进件手机号：{}",channel.getChannelName(),customerInfoDto.getPhone()); //校验数据必传参数是否未传 String checkData = checkData(customerInfoDto); //转化字段未数据库中资质字段 更新 用户实名状态 一并保存用户申请记录 已申请 diff --git a/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml index 93c2745e..ab6bb0f6 100644 --- a/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-btc/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 15a8f393..fc025647 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index e7776f1a..82f5eac8 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index 99a0a25b..955c5fe1 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java index 4b152964..3b90ee9d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerApplyLogController.java @@ -66,7 +66,7 @@ public class CustomerApplyLogController extends BaseController * @return 结果 */ @GetMapping("/customerApply") - public R customerApply(@PathVariable("customerID") Long customerID,@RequestHeader(SecurityConstants.FROM_SOURCE) String source){ + public R customerApply(@RequestParam("customerID") Long customerID,@RequestHeader(SecurityConstants.FROM_SOURCE) String source){ return customerApplyLogService.getCustomerApply(customerID); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java index 58133de9..ebb6b15e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CustomerApplyLogServiceImpl.java @@ -134,7 +134,7 @@ public class CustomerApplyLogServiceImpl extends ServiceImpl() .isNotNull(CustomerApplyLog::getMerchantId) - .eq(CustomerApplyLog::getOrderStatus, 0) + .eq(CustomerApplyLog::getOrderStatus, 20) .ge(CustomerApplyLog::getCreateTime, LocalDateTimeUtils.getDateFromLocalDateTime(LocalDateTimeUtils.getTodayStartTime())) .le(CustomerApplyLog::getCreateTime, LocalDateTimeUtils.getDateFromLocalDateTime(LocalDateTimeUtils.getTodayEndTime()))); return R.ok(aLong>0); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java index 9efc4cb7..396e70bb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java @@ -19,6 +19,8 @@ import com.ruoyi.system.mapper.MerchantMapper; import com.ruoyi.system.service.ICustomerApplyLogService; import com.ruoyi.system.service.IMerchantService; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -32,12 +34,13 @@ import java.util.stream.Collectors; /** * 商户Service业务层处理 - * + * * @author ruoyi * @date 2024-09-15 */ @Service @RequiredArgsConstructor +@Slf4j public class MerchantServiceImpl extends ServiceImpl implements IService,IMerchantService { private final MerchantMapper merchantMapper; @@ -48,7 +51,7 @@ public class MerchantServiceImpl extends ServiceImpl i /** * 查询商户 - * + * * @param id 商户主键 * @return 商户 */ @@ -60,7 +63,7 @@ public class MerchantServiceImpl extends ServiceImpl i /** * 查询商户列表 - * + * * @param merchant 商户 * @return 商户 */ @@ -72,7 +75,7 @@ public class MerchantServiceImpl extends ServiceImpl i /** * 新增商户 - * + * * @param merchant 商户 * @return 结果 */ @@ -85,7 +88,7 @@ public class MerchantServiceImpl extends ServiceImpl i /** * 修改商户 - * + * * @param merchant 商户 * @return 结果 */ @@ -98,7 +101,7 @@ public class MerchantServiceImpl extends ServiceImpl i /** * 批量删除商户 - * + * * @param ids 需要删除的商户主键 * @return 结果 */ @@ -110,7 +113,7 @@ public class MerchantServiceImpl extends ServiceImpl i /** * 删除商户信息 - * + * * @param id 商户主键 * @return 结果 */ @@ -144,6 +147,7 @@ public class MerchantServiceImpl extends ServiceImpl i if (customerId==null){ return AjaxResult.error("用户不存在或未登录"); } + log.info("H5打开页面：{}",customerId); Customer customer = customerMapper.selectById(customerId); List merchants = matchMerchant(customer); List merchantListDtos = new ArrayList<>(); @@ -167,6 +171,7 @@ public class MerchantServiceImpl extends ServiceImpl i if (aBoolean){ return AjaxResult.error("请勿重复点击"); } + log.info("H5申请用户：{}",customerId); Customer customer = customerMapper.selectById(customerId); Merchant merchant = merchantMapper.selectById(merchantId); redisService.setCacheObject(RedisConstant.H5_APPLY_CHECK+customerId,1,10l, TimeUnit.SECONDS); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index f9f159f2..17605768 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a config: # 配置中心地址 - server-addr: 124.222.144.55:8848 - namespace: 9a5181d5-598c-4b27-9644-ef14e7fd250c + server-addr: 47.109.135.151:8848 + namespace: b8ad3fd2-18ea-4cdf-a82c-4ce483392b1a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 6f4f8acf..41be8c9c 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 124.222.144.55:8848 + server-addr: 47.109.135.151:8848 config: # 配置中心地址 - server-addr: 124.222.144.55:8848 + server-addr: 47.109.135.151:8848 # 配置文件格式 file-extension: yml # 共享配置