From 4c7dbf169a8faf84257a5119bd251b537f7e8eea Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 13 Jun 2025 23:01:14 +0800
Subject: [PATCH] 1

---
 src/main/resources/application.properties             |    2 +-
 src/main/resources/application.yml                    |   10 +++++-----
 src/main/java/com/nq/service/impl/PayServiceImpl.java |   10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index 7b1c67a..07e278a 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -96,11 +96,11 @@
             return ServerResponse.createByErrorCodeMsg(401,googleTranslateUtil.translate("请登录",lang ));
         }
 
-        if(type == 1){//支付1
-            return getPaymentOne(tradeAmount, reqUrl,user,request);
-        }else if(type == 2){//支付2
-            return getPaymentTwo(tradeAmount, uipReqRul, user,request);
-        }
+//        if(type == 1){//支付1
+//            return getPaymentOne(tradeAmount, reqUrl,user,request);
+//        }else if(type == 2){//支付2
+//            return getPaymentTwo(tradeAmount, uipReqRul, user,request);
+//        }
         return ServerResponse.createByErrorMsg("获取支付方式失败",request);
     }
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a4abc90..3119969 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 ftp.server.http.prefix=https://img.durocaspitall.com/
 
 redis1.ip=localhost
-redis1.port=6379
+redis1.port=6380
 redis1.pwd=
 redis1.timeout=10000
 redis.max.total=50
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fd47f7d..d013587 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -102,11 +102,11 @@
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 127.0.0.1
     # 端口,默认为6379
-    port: 6379
+    port: 6380
     # 数据库索引
-    database: 0
+    database: 5
     # 密码
     password:
     # 连接超时时间
@@ -124,10 +124,10 @@
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://127.0.0.1:6306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #    url: jdbc:mysql://127.0.0.1:3306/cgstock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
-    password: 123456
+    password: Err;2[eoGFUriwdgr
     druid:
       # 初始连接数
       initialSize: 5

--
Gitblit v1.9.3