Browse Source

fix 能正常启动

Administrator 1 year ago
parent
commit
cf39df2a68

+ 4 - 6
ruoyi-admin/pom.xml

@@ -20,7 +20,6 @@
         <dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <artifactId>commons-codec</artifactId>
-            <version>1.9</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <groupId>commons-logging</groupId>
@@ -30,18 +29,17 @@
         <dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <artifactId>httpclient</artifactId>
-            <version>4.3.2</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
             <artifactId>httpcore</artifactId>
-            <version>4.3.2</version>
+            <version>4.4.15</version>
         </dependency>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>org.slf4j</groupId>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.7</version>
-        </dependency>
+            <version>2.0.5</version>
+        </dependency>-->
         <!--顺丰的核心包(本地打包)-->
         <!--顺丰的核心包(本地打包)-->
         <dependency>
         <dependency>
             <groupId>com.sf.csim.express</groupId>
             <groupId>com.sf.csim.express</groupId>

+ 1 - 0
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,5 +1,6 @@
 package com.ruoyi;
 package com.ruoyi;
 
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;

+ 48 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/alipay/AlipayTradeWapPay.java

@@ -0,0 +1,48 @@
+package com.ruoyi.web.controller.alipay;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.AlipayConfig;
+import com.alipay.api.response.AlipayTradeWapPayResponse;
+import com.alipay.api.domain.AlipayTradeWapPayModel;
+import com.alipay.api.request.AlipayTradeWapPayRequest;
+
+public class AlipayTradeWapPay {
+
+    public  void AlipayApi() throws AlipayApiException {
+        String privateKey = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCdEgdHzKCYUjMUW9eNkVU6I6JWstTRCw5w6typSld7LKF0mCCnz0GFrxx4p+28rQzp8V9ONH/UH81qFSrQQIZPMdJQITNqJNidC7ypMcarruZhvmwa/9O1U/teKbelMuBtWoke0deAl6YmNXcc5t1EU2mYbwF3ITYBylxRpQ5Mea6ScERP0kxfyTGkQ8K1TdrvXHvr0HePbl2TDBCN88B/QwTx0wIL1cdBSriewftiZ+PITctYlXtPqtKe/WEWl4vk+pfLYDH/q6XkR4zrxXkHhyV0JHZSeO2FNsMdcv3zImbaWAHdbiQj5gaWywXaMdnOaYyFKSSKStbYnWue6HHLAgMBAAECggEAPqYeOUkpFRhUP16Sj2jUcagc7C/QKsEaNXe4I93/HqYij/rNq6FDJSs/U/DHJmZvrDAWL39JLTayHAntVbsm1xesJ0HW3BNuQtWXnnS4JWpRgdMOE4bOzph8voYtNbshQPzHjH9uUWAraToSFHkQ8FvE1oQQNZANlpE8WWRYW6/bftFEkVi+VeJUH8xEhFUkwuMZ5w7ERnMCjqnzdtBYLFA3pAJQkyv0XLEj5Bs/IetF4Q4+IopeI/H7+vFwRmDnZvNDdgWOyFnWsuvW1rhJjhYF/B56MWZwP/KfbZdI3YjMdYpveULzesk4wlG5xuzmFsS3AKw2nm/Rq/HtQmIRgQKBgQDoJnPwii3nmiO/FA35pkVNvGWSBtHheRnwhUvwqd1p68/sxNPe5LiBP8zwr1hTtUT+zy5TZQLF3HIlzARIH6NVEh5YTFK3OkJu18w64IrAEKCMfO3U2lYaDIDHrPqkMMFYKKyNJA6cUkCG5g3QXNuFXqUPUjOJjAFTrRqGyVE3mwKBgQCtNPpz8nux/y+X6ggRDdeI2bpr+BrMQKT1DF/an9k8twP1i0S+RBkCEoRlSJ6gELE24dA6ZuU9tnE0FO14eM2cUviqHU3pkyUj9rcpHxlYBokCyr8q5EnTruYsAzoydcc99CiHD3QC2LDdFb5iGh+OGn+Gql5S2T6A5nO4zNKJkQKBgQDKvgJVGSg78way8n2+AHLYD+eYnzIeutdnkdIfbQn8XkApZEAwkgl8f06pCEmYWV/XNPMdS8MfL4XU8pbusgq/2eH8dTNr54prKTWoWb9zO1IrP1Opp8C4YSD6wVvnltjT+DmxzcKgzMijxzhbNy1UDbMTbVOrFUV3YV8gRaMTbwKBgBUfOMua7mqua+diqskpnvcZVhqEjwAJghRABhBrHdrBlsIC0cdCFqqiB3Myf+WVI4dF0lbM5Xe5H+TyCGOAl9JQa/KS0EWDpCvWkk95c2XApkSo5NceL8KYuYj0e8xbgIiVlbuirssKEcdkN2tPNDnoEVUiwY3o4C5n7ATFNYeBAoGBAKrFwAfpj70UC1jRmYJ/FL7h5M+CPIkweT+biD5YGC0T9ijrgKUm2LV1rCQyo70nGDP7/wK15XiuOk69oZCF/bdjNTpNpYA1j1sC1oHuq746zh/4protfOdb+mk6rVWwYF++swttQ5pcmu2W/l+ufd8edbkzMl/a2zi0kvVrnx2x";
+        String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAogc/9hKx6FAM6btKymkkFh932UfOPal4DgxXGstpFUG5Ehc+dMqm6e0CoMfNjZ4IBTRttE/OaBP/mW+YI53Tb+ND2rb22BqG+5JMp1WBJ4Tdz6DTKsbTRfN0Hrv1HiBglpgaJZs6Oymt1b43jnpL1bWsUULBnI+PWamlIottHK2IHC3/d5jN/9gz6TP6VkPnmokiBr0Hfcmv7jMjWsVsOf1wh5Jk/I7VSc+H314EO83Z1Cd+jS7lXLhHz105ORKUQf0dZD0VBa9Nl1aOMGZThrpcA9S6B3KfE8f66fIFLkhG/7IM7zSSsR0G8aLxiORCN9vpf38qwxBrWuugJtJqqwIDAQAB";
+        AlipayConfig alipayConfig = new AlipayConfig();
+        alipayConfig.setServerUrl("https://openapi-sandbox.dl.alipaydev.com/gateway.do");
+        alipayConfig.setAppId("9021000134610854");
+
+        alipayConfig.setPrivateKey(privateKey);
+        alipayConfig.setFormat("json");
+        alipayConfig.setAlipayPublicKey(alipayPublicKey);
+        alipayConfig.setCharset("UTF-8");
+        alipayConfig.setSignType("RSA2");
+        AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig);
+        AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest();
+        AlipayTradeWapPayModel model = new AlipayTradeWapPayModel();
+        model.setOutTradeNo("70501111111S001111119");
+        model.setTotalAmount("9.00");
+        model.setSubject("大乐透");
+        model.setProductCode("QUICK_WAP_WAY");
+        model.setSellerId("2088102147948060");
+        request.setBizModel(model);
+        AlipayTradeWapPayResponse response = alipayClient.pageExecute(request, "POST");
+        // 如果需要返回GET请求,请使用
+        // AlipayTradeWapPayResponse response = alipayClient.pageExecute(request, "GET");
+        String pageRedirectionData = response.getBody();
+        System.out.println(pageRedirectionData);
+        if (response.isSuccess()) {
+            System.out.println("调用成功");
+        } else {
+            System.out.println("调用失败");
+            // sdk版本是"4.38.0.ALL"及以上,可以参考下面的示例获取诊断链接
+            // String diagnosisUrl = DiagnosisUtils.getDiagnosisUrl(response);
+            // System.out.println(diagnosisUrl);
+        }
+    }
+}

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -36,7 +36,7 @@ public class CaptchaController
 
 
     @Autowired
     @Autowired
     private RedisCache redisCache;
     private RedisCache redisCache;
-    
+
     @Autowired
     @Autowired
     private ISysConfigService configService;
     private ISysConfigService configService;
     /**
     /**

+ 9 - 2
ruoyi-system/pom.xml

@@ -20,12 +20,12 @@
         <dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
             <artifactId>core</artifactId>
-            <version>3.1.0</version>
+            <version>3.5.1</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>
             <artifactId>javase</artifactId>
-            <version>3.1.0</version>
+            <version>3.5.1</version>
         </dependency>
         </dependency>
         <!--微信支付-->
         <!--微信支付-->
         <dependency>
         <dependency>
@@ -39,6 +39,13 @@
             <artifactId>alipay-sdk-java</artifactId>
             <artifactId>alipay-sdk-java</artifactId>
             <version>4.38.192.ALL</version>
             <version>4.38.192.ALL</version>
         </dependency>
         </dependency>
+
+        <!--自定义配置处理-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- 通用工具-->
         <!-- 通用工具-->
         <dependency>
         <dependency>
             <groupId>com.ruoyi</groupId>
             <groupId>com.ruoyi</groupId>

+ 3 - 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/wx/WxPayV3Bean.java

@@ -6,8 +6,9 @@ import org.springframework.stereotype.Component;
 /**
 /**
  * 微信支付获取配置信息
  * 微信支付获取配置信息
  * @Author: tjf
  * @Author: tjf
- * @Date: 2024/1/17 14:01
- */
+ * @Date: 2024/1/17 14:01*/
+
+
 @Component
 @Component
 @ConfigurationProperties(prefix = "wx")
 @ConfigurationProperties(prefix = "wx")
 public class WxPayV3Bean {
 public class WxPayV3Bean {

+ 3 - 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxPayServiceImpl.java

@@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
 
 
 
 
 
 
-import com.fhs.core.exception.ResultException;
+
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.domain.wx.WxPayOrderReqVo;
 import com.ruoyi.system.domain.wx.WxPayOrderReqVo;
@@ -20,6 +20,7 @@ import com.wechat.pay.java.service.payments.jsapi.model.Amount;
 import com.wechat.pay.java.service.payments.jsapi.model.Payer;
 import com.wechat.pay.java.service.payments.jsapi.model.Payer;
 import com.wechat.pay.java.service.payments.jsapi.model.PrepayRequest;
 import com.wechat.pay.java.service.payments.jsapi.model.PrepayRequest;
 import com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse;
 import com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse;
+import org.springframework.stereotype.Service;
 import utils.WxPayUtil;
 import utils.WxPayUtil;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
@@ -30,8 +31,6 @@ import java.io.InputStreamReader;
 import java.util.UUID;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.Stream;
-
-import static com.ruoyi.common.constant.Constants.LOGIN_FAIL;
 import static com.wechat.pay.java.core.http.Constant.*;
 import static com.wechat.pay.java.core.http.Constant.*;
 
 
 /**
 /**
@@ -39,6 +38,7 @@ import static com.wechat.pay.java.core.http.Constant.*;
  * @Date: 2024/1/17 14:16
  * @Date: 2024/1/17 14:16
  * @Describe:
  * @Describe:
  */
  */
+@Service
 public class WxPayServiceImpl implements IWxPayService {
 public class WxPayServiceImpl implements IWxPayService {
 
 
     @Resource
     @Resource