From c8e2fab9ae930401aabdd6c2d461aa6b8828829f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 六月 2023 14:56:31 +0800
Subject: [PATCH] 更新支付功能
---
driver/guns-admin/src/main/resources/redis.properties | 20 +++---
driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java | 110 ++++++++++++++++++------------------
driver/guns-admin/src/main/resources/application.yml | 12 ++--
3 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/driver/guns-admin/src/main/resources/application.yml b/driver/guns-admin/src/main/resources/application.yml
index 0c5d6a9..f409d2c 100644
--- a/driver/guns-admin/src/main/resources/application.yml
+++ b/driver/guns-admin/src/main/resources/application.yml
@@ -13,8 +13,8 @@
application:
name: driver-server
profiles:
- active: dev
-# active: produce
+# active: dev
+ active: produce
mvc:
static-path-pattern: /static/**
view:
@@ -55,8 +55,8 @@
datasource:
url: jdbc:mysql://127.0.0.1:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
-# password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
- password: 123456
+ password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
+# password: 123456
db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -120,8 +120,8 @@
spring:
data:
mongodb:
-# uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
- uri: mongodb://127.0.0.1:27017/admin
+ uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
+# uri: mongodb://127.0.0.1:27017/admin
---
diff --git a/driver/guns-admin/src/main/resources/redis.properties b/driver/guns-admin/src/main/resources/redis.properties
index 524fa7c..90747df 100644
--- a/driver/guns-admin/src/main/resources/redis.properties
+++ b/driver/guns-admin/src/main/resources/redis.properties
@@ -2,19 +2,19 @@
# Redis���ݿ�������Ĭ��Ϊ0��
spring.redis.database=0
-# Redis��������ַ
-#spring.redis.host=127.0.0.1
-## Redis���������Ӷ˿�
-#spring.redis.port=16379
-## Redis�������������루Ĭ��Ϊ�գ�
-#spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
-
-## Redis��������ַ
+ Redis��������ַ
spring.redis.host=127.0.0.1
# Redis���������Ӷ˿�
-spring.redis.port=6379
+spring.redis.port=16379
# Redis�������������루Ĭ��Ϊ�գ�
-spring.redis.password=123456
+spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
+
+### Redis��������ַ
+#spring.redis.host=127.0.0.1
+## Redis���������Ӷ˿�
+#spring.redis.port=6379
+## Redis�������������루Ĭ��Ϊ�գ�
+#spring.redis.password=123456
# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
spring.redis.jedis.pool.max-active=1024
diff --git a/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java b/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java
index 5cd2811..884bbf1 100644
--- a/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java
+++ b/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java
@@ -1,56 +1,56 @@
-package com.supersavedriving.driver;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.supersavedriving.driver.modular.system.model.DriverBank;
-import com.supersavedriving.driver.modular.system.model.WeatherCity;
-import com.supersavedriving.driver.modular.system.service.*;
-import com.supersavedriving.driver.modular.system.util.ResultUtil;
-import com.supersavedriving.driver.modular.system.util.juhe.WeatherCityInfo;
-import com.supersavedriving.driver.modular.system.util.juhe.WeatherUtil;
-import com.supersavedriving.driver.modular.system.warpper.PerformanceSummaryWarpper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class GunsApplicationTest {
-
- @Autowired
- private IOrderService orderService;
-
- @Autowired
- private IDriverService driverService;
-
- @Autowired
- private IDriverBankService driverBankService;
-
-
- @Test
- public void test() throws Exception {
-// ResultUtil resultUtil = driverService.microenterprise(1, "蒲芝兵", "510823198911154858"
-// , "15828353127", "https://10pz685243.zicp.fun/supersavedriving/base/driver/microenterpriseCallback");
+//package com.supersavedriving.driver;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.baomidou.mybatisplus.mapper.EntityWrapper;
+//import com.supersavedriving.driver.modular.system.model.DriverBank;
+//import com.supersavedriving.driver.modular.system.model.WeatherCity;
+//import com.supersavedriving.driver.modular.system.service.*;
+//import com.supersavedriving.driver.modular.system.util.ResultUtil;
+//import com.supersavedriving.driver.modular.system.util.juhe.WeatherCityInfo;
+//import com.supersavedriving.driver.modular.system.util.juhe.WeatherUtil;
+//import com.supersavedriving.driver.modular.system.warpper.PerformanceSummaryWarpper;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.BeanUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//public class GunsApplicationTest {
+//
+// @Autowired
+// private IOrderService orderService;
+//
+// @Autowired
+// private IDriverService driverService;
+//
+// @Autowired
+// private IDriverBankService driverBankService;
+//
+//
+// @Test
+// public void test() throws Exception {
+//// ResultUtil resultUtil = driverService.microenterprise(1, "蒲芝兵", "510823198911154858"
+//// , "15828353127", "https://10pz685243.zicp.fun/supersavedriving/base/driver/microenterpriseCallback");
+//// System.err.println(JSON.toJSONString(resultUtil));
+//
+//
+//// DriverBank driverId = driverBankService.selectOne(new EntityWrapper<DriverBank>().eq("driverId", 1));
+//// System.err.println(JSON.toJSONString(driverId));
+//
+//
+//// ResultUtil resultUtil = driverBankService.addDriverBank(1, "蒲芝兵", "15828353127"
+//// , "510823198911154858", "6212264402094114687");
+//// System.err.println(JSON.toJSONString(resultUtil));
+//
+//
+//// ResultUtil resultUtil1 = driverBankService.delDriverBank(1, 1);
+//// System.err.println(JSON.toJSONString(resultUtil1));
+//
+// ResultUtil resultUtil = driverService.balanceRecharge(1, 1D);
// System.err.println(JSON.toJSONString(resultUtil));
-
-
-// DriverBank driverId = driverBankService.selectOne(new EntityWrapper<DriverBank>().eq("driverId", 1));
-// System.err.println(JSON.toJSONString(driverId));
-
-
-// ResultUtil resultUtil = driverBankService.addDriverBank(1, "蒲芝兵", "15828353127"
-// , "510823198911154858", "6212264402094114687");
-// System.err.println(JSON.toJSONString(resultUtil));
-
-
-// ResultUtil resultUtil1 = driverBankService.delDriverBank(1, 1);
-// System.err.println(JSON.toJSONString(resultUtil1));
-
- ResultUtil resultUtil = driverService.balanceRecharge(1, 1D);
- System.err.println(JSON.toJSONString(resultUtil));
- }
-}
+// }
+//}
--
Gitblit v1.7.1