修改

src/main/java/com/edgec/browserbackend/account/controller/AccountController.java

@@ -247,6 +247,9 @@ public class AccountController {
         return resultDto;
     }
 
+    /**
+     * 账户充值
+     */
     @RequestMapping(path = "/0xwxpayputorder/{amount}", method = RequestMethod.GET)
     public UserPaymentDto wechatPayCallback(Principal principal, @PathVariable int amount) {
         return paymentService.wxPutPayOrder(principal.getName(), amount);

src/main/java/com/edgec/browserbackend/account/domain/UserPayment.java

@@ -2,12 +2,16 @@ package com.edgec.browserbackend.account.domain;
 
 import com.edgec.browserbackend.account.service.SmsUtils;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@Getter
+@Setter
 @Document(collection = "userpayment")
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class UserPayment {
@@ -15,7 +19,7 @@ public class UserPayment {
     @Id
     private String id;
 
-    private String tradeNo = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date())+SmsUtils.createRandom(true, 4);
+    private String tradeNo = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + SmsUtils.createRandom(true, 4);
 
     private String username;
 
@@ -28,69 +32,4 @@ public class UserPayment {
     private PaymentMethod paymentMethod;
 
     private String transId;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getTradeNo() {
-        return tradeNo;
-    }
-
-    public void setTradeNo(String tradeNo) {
-        this.tradeNo = tradeNo;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
-
-    public boolean isSucceed() {
-        return succeed;
-    }
-
-    public void setSucceed(boolean succeed) {
-        this.succeed = succeed;
-    }
-
-    public Date getPaymentDate() {
-        return paymentDate;
-    }
-
-    public void setPaymentDate(Date paymentDate) {
-        this.paymentDate = paymentDate;
-    }
-
-    public PaymentMethod getPaymentMethod() {
-        return paymentMethod;
-    }
-
-    public void setPaymentMethod(PaymentMethod paymentMethod) {
-        this.paymentMethod = paymentMethod;
-    }
-
-    public String getTransId() {
-        return transId;
-    }
-
-    public void setTransId(String transId) {
-        this.transId = transId;
-    }
-
 }

src/main/java/com/edgec/browserbackend/account/domain/UserPrePaidBilling.java

@@ -62,4 +62,8 @@ public class UserPrePaidBilling {
 
     private List<DeductionRecord> deductionRecords = new ArrayList<>();
 
+    public void addDeductionRecord(DeductionRecord record) {
+        this.deductionRecords.add(record);
+    }
+
 }

src/main/java/com/edgec/browserbackend/account/service/impl/EmailServiceImpl.java

@@ -37,18 +37,20 @@ public class EmailServiceImpl implements EmailService {
         context.setVariable("code", code);
         context.setVariable("time", ZonedDateTime.ofInstant(Instant.now(), ZoneId.systemDefault()).format(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")));
         String emailContent = templateEngine.process("reset", context);
-        sendHtmlMail(email,"Cloudam云端软件 | 密码重置",emailContent);
+        sendHtmlMail(email, "Cloudam云端软件 | 密码重置", emailContent);
     }
 
+    @Override
     public void sendEmailVerification(String username, String email, String code) {
         Context context = new Context();
         context.setVariable("id", username);
         context.setVariable("code", code);
         context.setVariable("time", ZonedDateTime.ofInstant(Instant.now(), ZoneId.systemDefault()).format(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")));
         String emailContent = templateEngine.process("verification", context);
-        sendHtmlMail(email,"Cloudam云端软件 | 注册邮箱验证",emailContent);
+        sendHtmlMail(email, "Cloudam云端软件 | 注册邮箱验证", emailContent);
     }
 
+    @Override
     public void sendHtmlMail(String to, String subject, String content) {
         MimeMessage message = mailSender.createMimeMessage();
         try {

src/main/java/com/edgec/browserbackend/account/service/impl/PaymentServiceImpl.java

@@ -26,6 +26,7 @@ import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import com.edgec.browserbackend.wxpay.*;
 import com.google.gson.Gson;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -412,44 +413,32 @@ public class PaymentServiceImpl implements PaymentService {
 
     @Override
     public UserPaymentDto wxPutPayOrder(String username, int amount) {
-
         Account byName = accountService.findByName(username);
-        if (byName == null)
-            throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + username);
-        if (byName.getPermission() < 4)
+        if (byName.getPermission() < 4) {
             throw new ClientRequestException(AccountErrorCode.NOPERMISSION, "account does not have permission: " + username);
-
-        boolean isVpsClient = true;
-
-        UserPayment internalOrder = new UserPayment();
-        internalOrder.setAmount(amount);
-        internalOrder.setPaymentMethod(PaymentMethod.WECHAT);
-        internalOrder.setSucceed(false);
-        internalOrder.setUsername(username);
+        }
 
         try {
 
+            // 创建并封装 UserPayment 信息
+            UserPayment internalOrder = getUserPayment(username, amount);
+
+            // 回调的url
             String notifyUrl = AccountController.WECHAT_PAY_CALLBACK_URL + internalOrder.getTradeNo();
 
+            // 获取微信支付的配置信息
+            boolean isVpsClient = true;
             WXPayConfig ourWxPayConfig = isVpsClient ? new FGLWxConfig() : new CloudamWxConfig();
-            WXPay wxPay = new WXPay(ourWxPayConfig);
 
-            Map<String, String> data = new HashMap<>();
-            data.put("appid", ourWxPayConfig.getAppID());
-            data.put("mch_id", ourWxPayConfig.getMchID());         //商户号
-            data.put("body", ourWxPayConfig.getBody());
-            data.put("trade_type", "NATIVE");                         //NATIVE 扫码支付
-            data.put("notify_url", notifyUrl);                     //回调地址
-            data.put("spbill_create_ip", "127.0.0.1");             //终端ip
-            data.put("total_fee", "" + amount * 100);       //订单总金额
-            data.put("fee_type", "CNY");                           //默认人民币
-            data.put("out_trade_no", internalOrder.getTradeNo());   //交易号
-            data.put("nonce_str", internalOrder.getTradeNo());   // 随机字符串小于32位
-            String s = WXPayUtil.generateSignature(data, ourWxPayConfig.getKey());  //签名
-            data.put("sign", s);
+            // 封装请求 微信支付 的数据
+            Map<String, String> data = encapsulateDataMap(amount, internalOrder, notifyUrl, ourWxPayConfig);
 
+            // 调用微信支付接口，并返回支付结果
+            WXPay wxPay = new WXPay(ourWxPayConfig);
             Map<String, String> respData = wxPay.unifiedOrder(data);
+
             if (respData.get("return_code").equals("SUCCESS") && respData.get("result_code").equals("SUCCESS")) {
+                // 若微信支付成功，则将支付信息保存到
                 userPaymentRepository.save(internalOrder);
                 UserPaymentDto result = new UserPaymentDto();
                 result.setTradeNo(internalOrder.getTradeNo());
@@ -843,4 +832,32 @@ public class PaymentServiceImpl implements PaymentService {
         return result;
     }
 
+    @NotNull
+    private UserPayment getUserPayment(String username, int amount) {
+        UserPayment internalOrder = new UserPayment();
+        internalOrder.setAmount(amount);
+        internalOrder.setPaymentMethod(PaymentMethod.WECHAT);
+        internalOrder.setSucceed(false);
+        internalOrder.setUsername(username);
+        return internalOrder;
+    }
+
+    @NotNull
+    private Map<String, String> encapsulateDataMap(int amount, UserPayment internalOrder, String notifyUrl, WXPayConfig ourWxPayConfig) throws Exception {
+        Map<String, String> data = new HashMap<>();
+        data.put("appid", ourWxPayConfig.getAppID());
+        data.put("mch_id", ourWxPayConfig.getMchID());         //商户号
+        data.put("body", ourWxPayConfig.getBody());
+        data.put("trade_type", "NATIVE");                         //NATIVE 扫码支付
+        data.put("notify_url", notifyUrl);                     //回调地址
+        data.put("spbill_create_ip", "127.0.0.1");             //终端ip
+        data.put("total_fee", "" + amount * 100);       //订单总金额
+        data.put("fee_type", "CNY");                           //默认人民币
+        data.put("out_trade_no", internalOrder.getTradeNo());   //交易号
+        data.put("nonce_str", internalOrder.getTradeNo());   // 随机字符串小于32位
+        String s = WXPayUtil.generateSignature(data, ourWxPayConfig.getKey());  //签名
+        data.put("sign", s);
+        return data;
+    }
+
 }

src/main/java/com/edgec/browserbackend/account/service/impl/UserLackMoneyServiceImpl.java

@@ -30,9 +30,13 @@ public class UserLackMoneyServiceImpl implements UserLackMoneyService {
         //用户名，欠费金额，账单Id，账单总数
         String username = billings.get(0).getUsername();
         float totalUnpaid = billings.stream().filter(x -> x.getStatus() == BillStatus.UNPAID)
-                                    .map(x -> x.getTotal() - (x.getDeductionRecords() != null ? (x.getDeductionRecords().stream().collect(Collectors.summingDouble(
-                                            DeductionRecord::getDeductionAmount
-                                    )).longValue()) : (0))).collect(Collectors.summingDouble(Float::floatValue)).floatValue();
+                                    .map(
+                                            x -> x.getTotal() - (
+                                                    x.getDeductionRecords() != null ? (x.getDeductionRecords().stream().collect(Collectors.summingDouble(DeductionRecord::getDeductionAmount)).longValue()) : (0)
+                                            )
+                                    )
+                                    .collect(Collectors.summingDouble(Float::floatValue))
+                                    .floatValue();
         List<String> ids = billings.stream().filter(x -> x.getStatus() == BillStatus.UNPAID).map(UserPrePaidBilling::getId).collect(Collectors.toList());
         int billsAmount = (int) billings.stream().filter(x -> x.getStatus() == BillStatus.UNPAID).count();
 

src/main/java/com/edgec/browserbackend/browser/dto/IpBuyResultDto.java

@@ -4,14 +4,44 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class IpBuyResultDto {
-    private String errorCode="";
+    private String errorCode = "";
 
-    private String requestid ="";
+    private String requestid = "";
 
     private int balance = 0;
 
     private List<IPData> iplist = new ArrayList<>();
 
+    public static class IPData {
+        private String ip;
+        private String validTill;
+
+        public IPData(String ip, String validTill) {
+            this.ip = ip;
+            this.validTill = validTill;
+        }
+
+        public IPData() {
+
+        }
+
+        public String getIp() {
+            return ip;
+        }
+
+        public void setIp(String ip) {
+            this.ip = ip;
+        }
+
+        public String getValidTill() {
+            return validTill;
+        }
+
+        public void setValidTill(String validTill) {
+            this.validTill = validTill;
+        }
+    }
+
     public String getErrorCode() {
         return errorCode;
     }
@@ -43,34 +73,4 @@ public class IpBuyResultDto {
     public void setIplist(List<IPData> iplist) {
         this.iplist = iplist;
     }
-
-    public static class IPData {
-        private String ip;
-        private String validTill;
-
-        public IPData(String ip, String validTill) {
-            this.ip = ip;
-            this.validTill = validTill;
-        }
-
-        public IPData() {
-
-        }
-
-        public String getIp() {
-            return ip;
-        }
-
-        public void setIp(String ip) {
-            this.ip = ip;
-        }
-
-        public String getValidTill() {
-            return validTill;
-        }
-
-        public void setValidTill(String validTill) {
-            this.validTill = validTill;
-        }
-    }
 }

src/main/java/com/edgec/browserbackend/browser/dto/RenewIpResultDto.java

@@ -4,36 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class RenewIpResultDto {
-    private String errorCode="";
+    private String errorCode = "";
 
     private int balance = 0;
 
     private List<IpBuyResultDto.IPData> iplist = new ArrayList<>();
 
-    public String getErrorCode() {
-        return errorCode;
-    }
-
-    public void setErrorCode(String errorCode) {
-        this.errorCode = errorCode;
-    }
-
-    public int getBalance() {
-        return balance;
-    }
-
-    public void setBalance(int balance) {
-        this.balance = balance;
-    }
-
-    public List<IpBuyResultDto.IPData> getIplist() {
-        return iplist;
-    }
-
-    public void setIplist(List<IpBuyResultDto.IPData> iplist) {
-        this.iplist = iplist;
-    }
-
     public static class IPData {
         private String ip;
         private String validTill;
@@ -44,7 +20,6 @@ public class RenewIpResultDto {
         }
 
         public IPData() {
-
         }
 
         public String getIp() {
@@ -64,4 +39,28 @@ public class RenewIpResultDto {
         }
     }
 
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public int getBalance() {
+        return balance;
+    }
+
+    public void setBalance(int balance) {
+        this.balance = balance;
+    }
+
+    public List<IpBuyResultDto.IPData> getIplist() {
+        return iplist;
+    }
+
+    public void setIplist(List<IpBuyResultDto.IPData> iplist) {
+        this.iplist = iplist;
+    }
+
 }
\ No newline at end of file

src/main/java/com/edgec/browserbackend/browser/task/PaymentTask.java

@@ -33,24 +33,28 @@ public class PaymentTask {
         Date date_5min = new Date(now - 5 * 60 * 1000);
         Date date_10min = new Date(now - 10 * 60 * 1000);
         List<UserPayment> unfinishedPayments = userPaymentRepository.findAllByPaymentDateBetweenAndSucceed(
-                ZonedDateTime.ofInstant(date_10min.toInstant(), ZoneId.systemDefault())
-                , ZonedDateTime.ofInstant(date_5min.toInstant(), ZoneId.systemDefault()), false);
-
-        if (unfinishedPayments != null && unfinishedPayments.size() > 0) {
-
-            unfinishedPayments.stream().forEach(payment -> {
-                PaymentMethod paymentMethod = payment.getPaymentMethod();
-
-                try {
-                    if (PaymentMethod.WECHAT.equals(paymentMethod)) {
-                        paymentService.wxCheckOrderStatus(payment.getTradeNo());
-                    } else if (PaymentMethod.ALIPAY.equals(paymentMethod)) {
-                        paymentService.aliCheckOrderStatus(payment.getTradeNo());
+                ZonedDateTime.ofInstant(date_10min.toInstant(), ZoneId.systemDefault()),
+                ZonedDateTime.ofInstant(date_5min.toInstant(), ZoneId.systemDefault()),
+                false);
+
+        if (unfinishedPayments != null && !unfinishedPayments.isEmpty()) {
+            unfinishedPayments.forEach(
+                    payment -> {
+                        PaymentMethod paymentMethod = payment.getPaymentMethod();
+
+                        try {
+                            if (PaymentMethod.WECHAT.equals(paymentMethod)) {
+                                paymentService.wxCheckOrderStatus(payment.getTradeNo());
+                            }
+
+                            if (PaymentMethod.ALIPAY.equals(paymentMethod)) {
+                                paymentService.aliCheckOrderStatus(payment.getTradeNo());
+                            }
+                        } catch (Exception e) {
+                            log.error("checkPayments", e);
+                        }
                     }
-                } catch (Exception e) {
-                    log.error("checkPayments", e);
-                }
-            });
+            );
         }
     }
-}
+}
\ No newline at end of file

src/main/java/com/edgec/browserbackend/common/utils/Trans.java

@@ -56,8 +56,8 @@ public class Trans {
      * @param args
      */
     public static void main(String[] args) {
-        String url = "http://free.ipwhois.io/json/";
-        Trans trans = new Trans("112.74.47.217", 20001, "fangguanlianbrowser", "5D753F36QKqIaA1");
+        String url = "https://china-merchant.wish.com/login";
+        Trans trans = new Trans("8.210.96.188", "WC5w4M5jkdz1aA1");
         String rs = trans.get(url);
         System.out.println(rs);
     }

src/main/java/com/edgec/browserbackend/wxpay/FGLWxConfig.java

@@ -18,10 +18,12 @@ public class FGLWxConfig extends WXPayConfig {
         return "acdkgjef237ckgSriEICRe2408sdjEDC";
     }
 
+    @Override
     public int getHttpConnectTimeoutMs() {
         return 8000;
     }
 
+    @Override
     public int getHttpReadTimeoutMs() {
         return 10000;
     }
@@ -35,10 +37,12 @@ public class FGLWxConfig extends WXPayConfig {
     public IWXPayDomain getWXPayDomain() {
         IWXPayDomain iwxPayDomain = new IWXPayDomain() {
 
+            @Override
             public void report(String domain, long elapsedTimeMillis, Exception ex) {
 
             }
 
+            @Override
             public DomainInfo getDomain(WXPayConfig config) {
                 return new IWXPayDomain.DomainInfo(WXPayConstants.DOMAIN_API, true);
             }