更新

PaymentClient/src/main/java/com/zhongshu/payment/client/service/WalletFeignService.java

@@ -1,6 +1,6 @@
 package com.zhongshu.payment.client.service;
 
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.client.model.WalletModel;
 import com.zhongshu.payment.client.model.param.AmountUpdateParam;
 import com.zhongshu.payment.client.types.WalletType;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/RechargeController.java

@@ -3,7 +3,7 @@ package com.zhongshu.payment.server.core.controller;
 import com.zhongshu.payment.client.model.param.OrderParam;
 import com.zhongshu.payment.client.model.param.QueryWalletParam;
 import com.zhongshu.payment.client.model.param.RechargeParam;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.server.core.service.RechargeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/test/TestController.java

@@ -1,6 +1,6 @@
 package com.zhongshu.payment.server.core.controller.test;
 
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import io.swagger.v3.oas.annotations.Operation;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/wxPaymentV3/WechatPayV3Controller.java

@@ -2,7 +2,7 @@ package com.zhongshu.payment.server.core.controller.wxPaymentV3;
 
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
 import com.zhongshu.payment.server.core.dataConfig.WxV3PayConfig;
 import com.zhongshu.payment.server.core.service.wxPaymentV3.WxPaymentService;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/RechargeService.java

@@ -17,7 +17,7 @@ import com.zhongshu.payment.client.model.PrePayModel;
 import com.zhongshu.payment.client.model.RechargeRecordModel;
 import com.zhongshu.payment.client.model.param.OrderParam;
 import com.zhongshu.payment.client.model.param.RechargeParam;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.client.types.*;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import com.zhongshu.payment.server.core.dao.WalletDao;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/TradeManageService.java

@@ -4,7 +4,7 @@ import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.payment.client.model.RechargeRecordModel;
 import com.zhongshu.payment.client.model.WalletModel;
 import com.zhongshu.payment.client.model.param.RecordSearchParam;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;
 import com.zhongshu.payment.server.core.domain.wallet.Wallet;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/TransferService.java

@@ -13,7 +13,7 @@ import com.zhongshu.payment.client.model.TransferModel;
 import com.zhongshu.payment.client.model.param.AmountUpdateParam;
 import com.zhongshu.payment.client.model.param.ExamineParam;
 import com.zhongshu.payment.client.model.param.RechargeParam;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.client.types.DataState;
 import com.zhongshu.payment.client.types.RechargeState;
 import com.zhongshu.payment.client.types.TradeType;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/impl/WalletFeignServiceImpl.java

@@ -2,9 +2,8 @@ package com.zhongshu.payment.server.core.service.impl;
 
 import com.zhongshu.payment.client.model.WalletModel;
 import com.zhongshu.payment.client.model.param.AmountUpdateParam;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.client.service.WalletFeignService;
-import com.zhongshu.payment.client.types.DataState;
 import com.zhongshu.payment.client.types.TradeType;
 import com.zhongshu.payment.client.types.WalletState;
 import com.zhongshu.payment.client.types.WalletType;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/pay/SuperPayService.java

@@ -3,7 +3,7 @@ package com.zhongshu.payment.server.core.service.pay;
 import com.wechat.pay.java.service.payments.jsapi.model.PrepayRequest;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.zhongshu.payment.client.model.PrePayModel;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 
 /**
  * @author TRX

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/pay/impl/WeChatPayService.java

@@ -11,7 +11,7 @@ import com.wechat.pay.java.service.payments.jsapi.model.PrepayRequest;
 import com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.zhongshu.payment.client.model.PrePayModel;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.server.core.service.pay.SuperPayService;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/wallet/WalletService.java

@@ -2,7 +2,7 @@ package com.zhongshu.payment.server.core.service.wallet;
 
 import ch.qos.logback.core.util.StringUtil;
 import com.github.microservice.auth.security.helper.AuthHelper;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.OrganizationFeignService;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/wxPaymentV3/WxPayNotifyService.java

@@ -12,7 +12,7 @@ import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.service.MqttFeignService;
 import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
 import com.zhongshu.payment.client.model.param.AmountUpdateParam;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.client.types.RechargeState;
 import com.zhongshu.payment.server.core.dao.RechargeRecordDao;
 import com.zhongshu.payment.server.core.domain.wallet.RechargeRecord;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/wxPaymentV3/WxPaymentService.java

@@ -11,7 +11,7 @@ import com.wechat.pay.java.service.payments.jsapi.model.*;
 import com.wechat.pay.java.service.payments.model.Transaction;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
 import com.zhongshu.card.client.model.wechat.MiniAppUserInfoVo;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.client.model.PrePayModel;
 import com.zhongshu.payment.server.core.service.base.SuperService;
 import com.zhongshu.payment.server.core.utils.wx.WechatCUtil;

PaymentServer/src/main/java/com/zhongshu/payment/server/core/utils/wx/WechatCUtil.java

@@ -7,12 +7,12 @@ import com.github.microservice.core.util.net.apache.HttpClientUtil;
 import com.github.microservice.core.util.net.apache.HttpModel;
 import com.github.microservice.core.util.net.apache.MethodType;
 import com.github.microservice.core.util.net.apache.ResponseModel;
-import com.github.microservice.models.ret.ResultState;
+import com.github.microservice.net.ResultState;
 import com.zhongshu.card.client.model.wechat.AccessTokenVo;
 import com.zhongshu.card.client.model.wechat.GenerateSchemeVo;
 import com.zhongshu.card.client.model.wechat.MiniAppUserInfoVo;
 import com.zhongshu.card.client.model.wechat.WechatPhoneNumber;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.payment.server.core.service.base.RedisService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;