From 0178e6cd1335ec3cb0445adf48954b4aba4ea903 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 八月 2025 11:49:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml | 3
UserQYTTravel/pom.xml | 12
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java | 23
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java | 2
UserQYTTravel/guns-admin/src/main/resources/application-dev.yml | 149 +++++++
DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml | 2
UserQYTTravel/guns-admin/src/main/resources/application-test.yml | 138 +++++++
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java | 53 +-
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 19
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java | 4
ManagementQYTTravel/guns-admin/src/main/resources/application-test.yml | 2
UserQYTTravel/guns-admin/src/main/resources/application.yml | 147 -------
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 10
/dev/null | 35 -
DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java | 94 ++--
UserQYTTravel/guns-admin/src/main/resources/logback.xml | 2
DriverQYTTravel/guns-admin/src/main/resources/application-test.yml | 30 +
DriverQYTTravel/guns-admin/src/main/resources/logback.xml | 2
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java | 103 ++--
UserQYTTravel/guns-admin/src/main/resources/application-produce.yml | 149 +++++++
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java | 63 +-
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java | 2
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java | 40 +-
23 files changed, 688 insertions(+), 396 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index ae9ba2f..57d2317 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -15,10 +15,10 @@
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
import java.math.BigDecimal;
import java.math.MathContext;
@@ -33,9 +33,6 @@
*/
@Component
public class PushUtil {
-
- @Autowired
- private RestTemplate internalRestTemplate;
@Autowired
private IOrderTaxiService orderTaxiService;
@@ -57,7 +54,11 @@
private Map<String, Timer> taskMap = new HashMap<>();//存储定时推送的定时器
- private final String socket_uri = "http://192.168.110.85:6000";
+ @Value("${qyt.socket_uri}")
+ private String socket_uri;
+
+
+
// qyt 改派重新推单
@@ -86,6 +87,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -125,6 +127,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -164,6 +167,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -203,6 +207,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -439,6 +444,7 @@
params.put("msg", msg.toJSONString());
params.put("id", jsonObject.getIntValue("id"));
params.put("type", jsonObject.getIntValue("type"));
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -473,6 +479,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -515,6 +522,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -555,6 +563,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
index cdd7986..25dea7d 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
@@ -5,6 +5,7 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
+import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +23,8 @@
@Slf4j
public class EmployeeUtil {
+ private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
+
/**
* 企业增加员工
@@ -30,11 +33,11 @@
*/
public static SaveStaffNode saveStaffNode(SaveStaffNodeRequest request){
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/saveStaffNode";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/saveStaffNode";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -45,8 +48,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【企业增加员工】请求地址:" + url);
log.info("【企业增加员工】请求参数:" + JSON.toJSONString(contentMap));
@@ -76,11 +79,11 @@
*/
public static Boolean editStaffNode(EditStaffNodeRequest request){
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/editStaffNode";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/editStaffNode";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -91,8 +94,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【企业修改员工信息】请求地址:" + url);
log.info("【企业修改员工信息】请求参数:" + JSON.toJSONString(contentMap));
@@ -121,11 +124,11 @@
*/
public static Boolean ecrmDeleteStafNode(DeleteStafNodeRequest request){
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/ecrmDeleteStafNode";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/ecrmDeleteStafNode";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
String content = "";//业务参数
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
@@ -137,8 +140,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【企业删除人员】请求地址:" + url);
log.info("【企业删除人员】请求参数:" + JSON.toJSONString(contentMap));
@@ -167,11 +170,11 @@
*/
public static StaffNodeInfo getStaffNode(GetStaffNodeRequest request){
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getStaffNode";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/getStaffNode";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -182,8 +185,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【根据员工ID获取人员信息】请求地址:" + url);
log.info("【根据员工ID获取人员信息】请求参数:" + JSON.toJSONString(contentMap));
@@ -218,11 +221,11 @@
request.setAccessMode("APP");
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/addAccountInfo";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/addAccountInfo";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -233,8 +236,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【创建账号-同步证联开户信息】请求地址:" + url);
log.info("【创建账号-同步证联开户信息】请求参数:" + JSON.toJSONString(contentMap));
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java
index 19540ad..047bb3f 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java
@@ -5,6 +5,7 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
+import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +24,8 @@
@Slf4j
public class EnterpriseUtil {
+ private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
+
/**
* 根据社会信用代码判断企业是否已存在
@@ -32,11 +35,11 @@
*/
public static CheckEnterExist checkEnterExistByEnterIdCardNo(String uscc) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/check_enter_exist_by_enterIdCardNo";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/check_enter_exist_by_enterIdCardNo";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> map = new HashMap<>();
@@ -47,8 +50,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", "{\"uscc\":\"" + uscc + "\"}");
log.info("【根据社会信用代码判断企业是否已存在】请求地址:" + url);
log.info("【根据社会信用代码判断企业是否已存在】请求参数:" + JSON.toJSONString(map));
@@ -78,11 +81,11 @@
*/
public static CheckEnterExist checkEnterNameExist(String enterName) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/checkEnterNameExist";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/checkEnterNameExist";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> map = new HashMap<>();
@@ -93,8 +96,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", "{\"enterName\":\"" + enterName + "\"}");
log.info("【根据企业名称判断企业是否已存在】请求地址:" + url);
log.info("【根据企业名称判断企业是否已存在】请求参数:" + JSON.toJSONString(map));
@@ -124,11 +127,11 @@
*/
public static EnterpriseInfo getEnterpriseDetail(String enter_code) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getEnterpriseDetail";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/getEnterpriseDetail";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> map = new HashMap<>();
@@ -139,8 +142,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", "{\"enter_code\":\"" + enter_code + "\"}");
log.info("【查询企业详情】请求地址:" + url);
log.info("【查询企业详情】请求参数:" + JSON.toJSONString(map));
@@ -171,11 +174,11 @@
*/
public static Boolean modifyEnterpriseInfo(ModifyEnterpriseInfoRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/modifyEnterpriseInfo";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/modifyEnterpriseInfo";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> map = new HashMap<>();
@@ -186,8 +189,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", new Gson().toJson(request));
log.info("【修改企业基本信息】请求地址:" + url);
log.info("【修改企业基本信息】请求参数:" + JSON.toJSONString(map));
@@ -211,11 +214,11 @@
*/
public static boolean delEnterprise(String enterNum, String operator) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/delCompany";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/delCompany";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> map = new HashMap<String, Object>();
@@ -226,8 +229,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", "{\"enterNum\":\"" + enterNum + "\",\"operator\":\"" + operator + "\"}");
log.info("【删除企业信息】请求地址:" + url);
@@ -262,11 +265,11 @@
*/
public static CreateEnterprise createEnterprise(CreateEnterpriseRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createEnterprise";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/createEnterprise";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> map = new HashMap<String, Object>();
@@ -277,8 +280,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
map.put(SystemParameterNames.getAppKey(), appKey);
map.put(SystemParameterNames.getMessage_id(), messageId);
- map.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- map.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ map.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ map.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
map.put("content", new Gson().toJson(request));
log.info("【创建企业】请求地址:" + url);
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
index 17d2ee9..03ca6f1 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -6,6 +6,7 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
+import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.UUIDUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import lombok.extern.slf4j.Slf4j;
@@ -21,6 +22,8 @@
*/
@Slf4j
public class OrderUtil {
+
+ private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
public static void main(String[] args) {
@@ -198,16 +201,16 @@
TradeRequest request = new TradeRequest<TradePayOff1Data>();
request.setSceneId("1911676727023968256");
- request.setAppId(QianYunTongProperties.appkey);
+ request.setAppId(qianYunTongConfig.getAppkey());
request.setConfigVersion(1);
request.setRequestId(UUIDUtil.getRandomCode());
request.setData(tradePayOff1Data);
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/tradePayOff";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/tradePayOff";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -218,8 +221,8 @@
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【拉起支付】请求地址:" + url);
log.info("【拉起支付】请求参数:" + JSON.toJSONString(contentMap));
@@ -246,11 +249,11 @@
request.setScene("TRAFFIC");
request.setPartnerId("522700");
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/createTravelItinerary";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/createTravelItinerary";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -261,8 +264,8 @@
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【创建行程单】请求地址:" + url);
log.info("【创建行程单】请求参数:" + JSON.toJSONString(contentMap));
@@ -287,11 +290,11 @@
request.setScene("TRAFFIC");
request.setPartnerId("522700");
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/modifyTravelItinerary";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/modifyTravelItinerary";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -302,8 +305,8 @@
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【修改行程单】请求地址:" + url);
log.info("【修改行程单】请求参数:" + JSON.toJSONString(contentMap));
@@ -330,11 +333,11 @@
request.setPartnerId("522700");
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getTravelItineraryList";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/getTravelItineraryList";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -345,8 +348,8 @@
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【行程单列表查询】请求地址:" + url);
log.info("【行程单列表查询】请求参数:" + JSON.toJSONString(contentMap));
@@ -403,17 +406,17 @@
TradeRequest request = new TradeRequest<TradeOrderCreateData>();
request.setSceneId("1945688132719169536");
- request.setAppId(QianYunTongProperties.appkey);
+ request.setAppId(qianYunTongConfig.getAppkey());
request.setConfigVersion(1);
request.setRequestId(UUIDUtil.getRandomCode());
request.setData(tradeOrderCreateData);
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/tradeOrderCreate";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/tradeOrderCreate";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -424,8 +427,8 @@
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【订单创建及拉起支付】请求地址:" + url);
log.info("【订单创建及拉起支付】请求参数:" + JSON.toJSONString(contentMap));
@@ -454,17 +457,17 @@
createOrderRequest.setChannelSource("GRJYCXWXXCX");
TradeRequest request = new TradeRequest<CreateOrderRequest>();
- request.setSceneId(QianYunTongProperties.sceneId);
- request.setAppId(QianYunTongProperties.appkey);
+ request.setSceneId("1948289607125864448");
+ request.setAppId(qianYunTongConfig.getAppkey());
request.setConfigVersion(1);
request.setRequestId(UUIDUtil.getRandomCode());
request.setData(createOrderRequest);
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/tradeOrderCreate";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/tradeOrderCreate";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -475,8 +478,8 @@
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【订单创建】请求地址:" + url);
log.info("【订单创建】请求参数:" + JSON.toJSONString(contentMap));
@@ -537,16 +540,16 @@
TradeRequest request = new TradeRequest<TradePayOffData>();
request.setSceneId("1774717104844095488");
- request.setAppId(QianYunTongProperties.appkey);
+ request.setAppId(qianYunTongConfig.getAppkey());
request.setConfigVersion(2);
request.setRequestId(UUIDUtil.getRandomCode());
request.setData(tradePayOffData);
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/tradePayOff";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/tradePayOff";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -557,8 +560,8 @@
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【（补偿单）拉起支付】请求地址:" + url);
log.info("【（补偿单）拉起支付】请求参数:" + JSON.toJSONString(contentMap));
@@ -591,11 +594,11 @@
request.setData(getPaymentInfoDataRequest);
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/paymentInfo";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/paymentInfo";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -606,8 +609,8 @@
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【查询支付单信息】请求地址:" + url);
log.info("【查询支付单信息】请求参数:" + JSON.toJSONString(contentMap));
@@ -643,11 +646,11 @@
request.setPayChannel(6);
request.setIsCompensate(1);
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/paymentOrder";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/paymentOrder";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -658,8 +661,8 @@
String messageId = UUIDUtil.getRandomCode();
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【（补偿单）支付成功通知】请求地址:" + url);
log.info("【（补偿单）支付成功通知】请求参数:" + JSON.toJSONString(contentMap));
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
index b01a52e..0bb352f 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -85,7 +85,7 @@
}
if("test".equals(activeProfile)){
this.setAppkey("10001104");
- this.setPrivateKeyPath("/root/server/app/key/private_key_test.pem");
+ this.setPrivateKeyPath("/etraffic/server/private_key_test.pem");
this.setUserName("xiaofei");
this.setStatus("1");
this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
deleted file mode 100644
index fde5644..0000000
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.stylefeng.guns.modular.system.util.qianyuntong;
-
-/**
- * 黔云通配置
- *
- * @author zhibing.pu
- * @Date 2025/6/6 15:03
- */
-public interface QianYunTongProperties {
- /************************************开发/测试start***********************************/
-
- /**
- * appkey
- */
- String appkey = "10001104";
- /**
- * 私钥地址
- */
-// String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
- String privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem";
- /**
- * 私钥地址
- */
-// String privateKeyPath = "/root/server/app/key/private_key_test.pem";
- /**
- * 消费者账号
- */
- String userName = "xiaofei";
- /**
- * 状态
- * 1：生产环境
- * 2：测试环境
- */
- String status = "1";
- /**
- * API地址
- */
- String apiUrl = "https://test-zhongtai.stqcloud.com:10070";
- /**
- * 桶名
- */
- String bucketName = "bucuTest0625";
- /**
- * 场景编号
- */
- String sceneId = "1948289607125864448";
-
- /************************************开发/测试end***********************************/
-
- /************************************生产start***********************************/
-
-// /**
-// * appkey
-// */
-// String appkey = "10001104";
-// /**
-// * 私钥地址
-// */
-//// String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key.pem";
-// /**
-// * 私钥地址
-// */
-// String privateKeyPath = "/root/server/app/key/private_key.pem";
-// /**
-// * 消费者账号
-// */
-// String userName = "xiwang";
-// /**
-// * 状态
-// * 1：生产环境
-// * 2：测试环境
-// */
-// String status = "1";
-// /**
-// * API地址
-// */
-// String apiUrl = "http://jjzhongtai.stqcloud.com:10010";
-// /**
-// * 桶名
-// */
-// String bucketName = "qyt20250702";
-
- /************************************生产end***********************************/
-
-
-
- /**
- * 小程序appId
- */
- String appId = "wxcc3c9058e2b294db";
- /**
- * HOS的基础路径(公共前缀)
- */
- String endPoint = "http://119.4.112.68:27741/v1";
- /**
- * 账户的ID
- */
- String account = "d8bef0a04db511f0b79d01a3e2b7587e";
- /**
- * 向UAAS服务请求到的access_key
- */
- String accessKey = "TYMFTFD5SIIT15DCCUD7";
- /**
- * 向UAAS服务请求到的secret_key
- */
- String secretKey = "AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z";
-}
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java
index 4759ee5..e9a0578 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/SMSUtil.java
@@ -5,6 +5,7 @@
import com.google.gson.Gson;
import com.open.common.util.OpenApiClient;
import com.open.common.util.SystemParameterNames;
+import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.SendSmsRequest;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +23,8 @@
@Slf4j
public class SMSUtil {
+ private static QianYunTongConfig qianYunTongConfig = SpringContextsUtil.getBean(QianYunTongConfig.class).getQianYunTongConfig();
+
/**
* 获取易信验证码
@@ -30,11 +33,11 @@
*/
public static String sendVerifyCode(String mobile) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/sendVerifyCode";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/sendVerifyCode";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -45,8 +48,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", "{\"mobile\":\"" + mobile + "\"}");
log.info("【获取易信验证码】请求地址:" + url);
log.info("【获取易信验证码】请求参数:" + JSON.toJSONString(contentMap));
@@ -76,11 +79,11 @@
*/
public static Boolean sendSms(SendSmsRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/sendSmsByTpl";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/sendSmsByTpl";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -91,8 +94,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【根据模板发送短信】请求地址:" + url);
log.info("【根据模板发送短信】请求参数:" + JSON.toJSONString(contentMap));
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
index db6bdbd..98623d2 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
@@ -32,11 +32,11 @@
*/
public static List<QYTUserInfo> getUserInfoByPhone(String mobile) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/2.0/queryUserinfoByMobilev2";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/2.0/queryUserinfoByMobilev2";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -47,8 +47,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", "{\"list\":[{\"mobile\":\"" + mobile + "\"}]}");
log.info("【根据手机号码获取人员信息】请求地址:" + url);
log.info("【根据手机号码获取人员信息】请求参数:" + JSON.toJSONString(contentMap));
@@ -84,11 +84,11 @@
*/
public static RegisterViaMobile registerViaMobile(RegisterViaMobileRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/m1_register_via_mobile";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/m1_register_via_mobile";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -99,8 +99,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【根据手机号注册用户】请求地址:" + url);
log.info("【根据手机号注册用户】请求参数:" + JSON.toJSONString(contentMap));
@@ -130,11 +130,11 @@
*/
public static Boolean modifyPwd(ModifyPwdRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/modifyPwd";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/modifyPwd";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -145,8 +145,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【易信用户修改密码】请求地址:" + url);
log.info("【易信用户修改密码】请求参数:" + JSON.toJSONString(contentMap));
@@ -176,11 +176,11 @@
*/
public static Boolean resetPwd(ResetPwdRequest request) {
//请求路径
- String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/resetPwd";
+ String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/resetPwd";
//私钥文件
- String skprivateKeyFile = QianYunTongProperties.privateKeyPath;
+ String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath();
//注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密
- String appKey = QianYunTongProperties.appkey;//appkey
+ String appKey = qianYunTongConfig.getAppkey();//appkey
Map<String, String> headers = new HashMap<>();
headers.put("Content-Type", "application/json");
Map<String, Object> contentMap = new HashMap<String, Object>();
@@ -191,8 +191,8 @@
String messageId = UUID.randomUUID().toString().replaceAll("-", "");
contentMap.put(SystemParameterNames.getAppKey(), appKey);
contentMap.put(SystemParameterNames.getMessage_id(), messageId);
- contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName);
- contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status);
+ contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName());
+ contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus());
contentMap.put("content", new Gson().toJson(request));
log.info("【易信重置密码】请求地址:" + url);
log.info("【易信重置密码】请求参数:" + JSON.toJSONString(contentMap));
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
index 8e8822b..63c1232 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
@@ -68,8 +68,8 @@
this.merchNo = "B00000871";
this.encrpNo = "1055490595";
this.signNo = "1066348524";
- this.cer = "C:\\Users\\39373\\Desktop\\UAT-demo-公用\\1055490595.cer";
- this.sm2 = "C:\\Users\\39373\\Desktop\\UAT-demo-公用\\871_111111.sm2";
+ this.cer = "/etraffic/server/1055490595.cer";
+ this.sm2 = "/etraffic/server/871_111111.sm2";
this.password = "111111";
}
if("prod".equals(activeProfile)){
diff --git a/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml b/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml
index 861d718..42118af 100644
--- a/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml
+++ b/DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -102,6 +102,8 @@
appKey-dispatch: 111 #极光推送应用唯一标识
masterSecret-dispatch: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
+qyt:
+ socket_uri: http://192.168.110.85:6000
---
diff --git a/DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml b/DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml
index 1e79014..38a93e3 100644
--- a/DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml
+++ b/DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml
@@ -80,6 +80,7 @@
appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
mchId: 111 #微信支付分配的商户号
key: 111 #key为商户平台设置的密钥key：
+ url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}
---
@@ -103,6 +104,8 @@
appKey-dispatch: 111 #极光推送应用唯一标识
masterSecret-dispatch: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
+qyt:
+ socket_uri:
---
diff --git a/DriverQYTTravel/guns-admin/src/main/resources/application-test.yml b/DriverQYTTravel/guns-admin/src/main/resources/application-test.yml
index 526159e..75e14de 100644
--- a/DriverQYTTravel/guns-admin/src/main/resources/application-test.yml
+++ b/DriverQYTTravel/guns-admin/src/main/resources/application-test.yml
@@ -29,13 +29,13 @@
max-request-size: 100MB
max-file-size: 100MB
redis:
- host: 172.21.35.151
- port: 6512
- password: SC_cache@20#25
+ host: 10.88.154.24
+ port: 7560
+ password: Idcs_B_2025rd141
database: 0
timeout: 1000
cluster:
- nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513
+ nodes: 10.88.154.24:7560,10.88.154.34:7560,10.88.154.59:7560,10.88.154.98:7560,10.88.154.100:7560,10.88.154.109:7560
mybatis-plus:
typeAliasesPackage: com.stylefeng.guns.modular
@@ -58,17 +58,22 @@
spring:
datasource:
- url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
- username: traffic_scusr
- password: QYT_sc@20#25
- db-name: traffic_scdb #用来搜集数据库的所有表
+ url: jdbc:mysql://10.86.17.201:5740/hn_ridingdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ username: hn_ridingdb
+ password: hn_ridingdb123456$#@!
+ db-name: hn_ridingdb #用来搜集数据库的所有表
filters: wall,mergeStat
---
spring:
data:
mongodb:
- uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track
+ host: 10.88.204.206
+ port: 27009
+ username: qn_riding_adm
+ password: QN_riding@Prom2025
+ database: qn_ridingdb
+
---
@@ -80,6 +85,7 @@
appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
mchId: 111 #微信支付分配的商户号
key: 111 #key为商户平台设置的密钥key：
+ url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}
---
@@ -103,12 +109,14 @@
appKey-dispatch: 111 #极光推送应用唯一标识
masterSecret-dispatch: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
-
+---
+qyt:
+ socket_uri: http://10.88.188.199:6000
---
#支付回调地址
#正式环境
-callbackPath: https://traffic.qytzt.cn/driver
+callbackPath: https://test-qncx.sitechcloud.com/chuxing/driver-server
---
#交通部推送数据功能开关
diff --git a/DriverQYTTravel/guns-admin/src/main/resources/logback.xml b/DriverQYTTravel/guns-admin/src/main/resources/logback.xml
index 57c8c5e..a9cd8d5 100644
--- a/DriverQYTTravel/guns-admin/src/main/resources/logback.xml
+++ b/DriverQYTTravel/guns-admin/src/main/resources/logback.xml
@@ -7,7 +7,7 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
- <property name="log.path" value="/data/app/logs/driver"/>
+ <property name="log.path" value="/etraffic/server/logs/driver"/>
<!--0. 日志格式和颜色渲染 -->
<!-- 彩色日志依赖的渲染类 -->
diff --git a/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
index ae5d1f0..fdc0840 100644
--- a/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
+++ b/DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -1,47 +1,47 @@
-package com.stylefeng.guns;
-
-import com.stylefeng.guns.modular.system.model.Driver;
-import com.stylefeng.guns.modular.system.service.IDriverService;
-import com.stylefeng.guns.modular.system.util.zhenglian.ZhengLianUtil;
-import com.stylefeng.guns.modular.system.util.zhenglian.model.TokenRequest;
-import com.stylefeng.guns.modular.system.util.zhenglian.model.TradeTerminalInfo;
-import com.stylefeng.guns.modular.system.util.zhenglian.model.ZLUserInfo;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class GunsApplicationTest {
-
- @Autowired
- private MongoTemplate mongoTemplate;
- @Autowired
- private IDriverService driverService;
-
-
- @Test
- public void test() {
-
- Driver driver = driverService.selectById(14);
- TokenRequest tokenRequest = new TokenRequest();
- tokenRequest.setAppUserId(driver.getEmpId().toString());
- tokenRequest.setUserName(driver.getName());
- tokenRequest.setCertNo(driver.getIdCard());
- tokenRequest.setPhone(driver.getPhone());
- TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
- tradeTerminalInfo.setIp("127.0.0.1");
- tradeTerminalInfo.setTerminal("1");
- tradeTerminalInfo.setMac("");
- ZLUserInfo userInfo = null;
- try {
- userInfo = ZhengLianUtil.getUserInfo("14", tradeTerminalInfo);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- System.err.println(userInfo);
- }
-}
+//package com.stylefeng.guns;
+//
+//import com.stylefeng.guns.modular.system.model.Driver;
+//import com.stylefeng.guns.modular.system.service.IDriverService;
+//import com.stylefeng.guns.modular.system.util.zhenglian.ZhengLianUtil;
+//import com.stylefeng.guns.modular.system.util.zhenglian.model.TokenRequest;
+//import com.stylefeng.guns.modular.system.util.zhenglian.model.TradeTerminalInfo;
+//import com.stylefeng.guns.modular.system.util.zhenglian.model.ZLUserInfo;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.data.mongodb.core.MongoTemplate;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//public class GunsApplicationTest {
+//
+// @Autowired
+// private MongoTemplate mongoTemplate;
+// @Autowired
+// private IDriverService driverService;
+//
+//
+// @Test
+// public void test() {
+//
+// Driver driver = driverService.selectById(14);
+// TokenRequest tokenRequest = new TokenRequest();
+// tokenRequest.setAppUserId(driver.getEmpId().toString());
+// tokenRequest.setUserName(driver.getName());
+// tokenRequest.setCertNo(driver.getIdCard());
+// tokenRequest.setPhone(driver.getPhone());
+// TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
+// tradeTerminalInfo.setIp("127.0.0.1");
+// tradeTerminalInfo.setTerminal("1");
+// tradeTerminalInfo.setMac("");
+// ZLUserInfo userInfo = null;
+// try {
+// userInfo = ZhengLianUtil.getUserInfo("14", tradeTerminalInfo);
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// System.err.println(userInfo);
+// }
+//}
diff --git a/DriverQYTTravel/guns-admin/src/test/sql/test.sql b/DriverQYTTravel/guns-admin/src/test/sql/test.sql
deleted file mode 100644
index 04b15ca..0000000
--- a/DriverQYTTravel/guns-admin/src/test/sql/test.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server : localhost
- Source Server Type : MySQL
- Source Server Version : 50719
- Source Host : localhost:3306
- Source Schema : guns
-
- Target Server Type : MySQL
- Target Server Version : 50719
- File Encoding : 65001
-
- Date: 10/07/2018 14:09:19
-*/
-
-DROP DATABASE IF EXISTS guns_test;
-CREATE DATABASE IF NOT EXISTS guns_test DEFAULT CHARSET utf8 COLLATE utf8_general_ci;
-
-use guns_test;
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for test
--- ----------------------------
-DROP TABLE IF EXISTS `test`;
-CREATE TABLE `test` (
- `aaa` int(11) NOT NULL AUTO_INCREMENT,
- `bbb` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`aaa`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
-SET FOREIGN_KEY_CHECKS = 1;
diff --git a/ManagementQYTTravel/guns-admin/src/main/resources/application-test.yml b/ManagementQYTTravel/guns-admin/src/main/resources/application-test.yml
index bfbac3b..254d48f 100644
--- a/ManagementQYTTravel/guns-admin/src/main/resources/application-test.yml
+++ b/ManagementQYTTravel/guns-admin/src/main/resources/application-test.yml
@@ -91,7 +91,7 @@
#支付回调地址
#正式环境
-callbackPath: https://test-qncx.sitechcloud.com
+callbackPath: https://test-qncx.sitechcloud.com/chuxing
#交通部推送数据功能开关
pushMinistryOfTransport: false
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index a947089..a356b3c 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -13,6 +13,7 @@
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
@@ -29,7 +30,9 @@
@Component
public class PushUtil {
- private final String socket_uri = "http://192.168.110.85:6000";
+ @Value("${qyt.socket_uri}")
+ private String socket_uri;
+
@Autowired
private IOrderTaxiService orderTaxiService;
@@ -81,6 +84,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -119,6 +123,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -312,6 +317,7 @@
params.put("msg", msg.toJSONString());
params.put("id", jsonObject.getIntValue("id"));
params.put("type", jsonObject.getIntValue("type"));
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -361,6 +367,7 @@
params.put("msg", msg.toJSONString());
params.put("id", id);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
@@ -401,6 +408,7 @@
params.put("msg", jsonObject.toJSONString());
params.put("id", uid);
params.put("type", type);
+ params.put("bussinessType", "dache");
post.form(params);
HttpResponse execute = post.execute();
if (200 != execute.getStatus()) {
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
index 9e33b27..8c44e45 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -160,7 +160,7 @@
public QianYunTongConfig getQianYunTongConfig() {
if("dev".equals(activeProfile)){
this.appkey = "10001104";
- this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem";
+ this.privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
this.userName = "xiaofei";
this.status = "1";
this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
diff --git a/UserQYTTravel/guns-admin/src/main/resources/application-dev.yml b/UserQYTTravel/guns-admin/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..57afa96
--- /dev/null
+++ b/UserQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -0,0 +1,149 @@
+server:
+ port: 8006
+
+guns:
+ swagger-open: true #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
+ picture-server-address: http://192.168.0.43/resources/ #图片服务器地址
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+
+spring:
+ application:
+ name: user-server
+ profiles:
+ active: dev
+ # active: prod
+ mvc:
+ static-path-pattern: /static/**
+ view:
+ prefix: /WEB-INF/view
+ devtools:
+ restart:
+ enabled: false
+ additional-paths: src/main/java
+ exclude: static/**,WEB-INF/view/**
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+ redis:
+ host: 192.168.110.80
+ port: 6379
+ password: 123456
+ database: 0
+ # redis:
+ # host: 172.21.35.151
+ # port: 6512
+ # password: SC_cache@20#25
+ # database: 0
+ # timeout: 1000
+ # cluster:
+ # nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513
+
+mybatis-plus:
+ typeAliasesPackage: com.stylefeng.guns.modular
+ configuration:
+ log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+
+
+
+eureka:
+ client:
+ service-url: #注册中心地址
+ defaultZone: http://sinata:sinata@192.168.110.85:8000/eureka #启用身份验证的方式连接
+ register-with-eureka: true #在注册中心进行注册
+ fetch-registry: true #从Eureka中获取注册信息。
+
+---
+
+
+#配置Swagger接口扫描范围
+swagger:
+ base-package: com.stylefeng.guns.modular
+
+spring:
+ datasource:
+ url: jdbc:mysql://192.168.110.80:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: 123456
+ db-name: qyttravel #用来搜集数据库的所有表
+ filters: wall,mergeStat
+
+
+ #spring:
+ # datasource:
+ # url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ # username: traffic_scusr
+ # password: QYT_sc@20#25
+ # db-name: traffic_scdb #用来搜集数据库的所有表
+ # filters: wall,mergeStat
+
+
+---
+spring:
+ data:
+ mongodb:
+ uri: mongodb://192.168.110.80:27017/traveling_track
+
+
+---
+
+
+
+wx:
+ grantType: authorization_code #填authorization_code
+ appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
+ appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
+ appletsAppid: wxcc3c9058e2b294db #小程序APPid
+ appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
+ mchId: 111 #微信支付分配的商户号
+ key: 111 #key为商户平台设置的密钥key：
+
+---
+
+alipay:
+ appid: 111 #应用程序唯一标识
+ appPrivateKey: 111 #开发者应用私钥
+ alipayPublicKey: ; #应用公钥
+ alipay_public_key: 111 #支付宝公钥
+
+---
+
+juhe: #聚合数据
+ appKey: 111 #
+
+qyt:
+ socket_uri: http://192.168.110.85:6000
+
+---
+
+#支付回调地址
+#正式环境
+callbackPath: https://traffic.qytzt.cn/user
+
+
+---
+
+#交通部推送数据功能开关
+pushMinistryOfTransport: false
+
+#邮件配置
+spring:
+ mail:
+ host: smtp.qq.com
+ port: 465
+ username: 1721849008@qq.com
+ password: nhnbmjfdywilcbdj # 这里是授权码，不是邮箱登录密码
+ properties:
+ mail:
+ smtp:
+ ssl:
+ enable: true # 启用 SSL 加密（根据端口是否为 465 决定，通常需要开启）
+ auth: true # 启用身份验证（必须为 true）
+# pdf生成位置
+trip:
+ sheet:
+ filePath: D:/qytPdf/
\ No newline at end of file
diff --git a/UserQYTTravel/guns-admin/src/main/resources/application-produce.yml b/UserQYTTravel/guns-admin/src/main/resources/application-produce.yml
new file mode 100644
index 0000000..a40add3
--- /dev/null
+++ b/UserQYTTravel/guns-admin/src/main/resources/application-produce.yml
@@ -0,0 +1,149 @@
+server:
+ port: 8006
+
+guns:
+ swagger-open: true #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
+ picture-server-address: http://192.168.0.43/resources/ #图片服务器地址
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+
+spring:
+ application:
+ name: user-server
+ profiles:
+ active: dev
+ # active: prod
+ mvc:
+ static-path-pattern: /static/**
+ view:
+ prefix: /WEB-INF/view
+ devtools:
+ restart:
+ enabled: false
+ additional-paths: src/main/java
+ exclude: static/**,WEB-INF/view/**
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+ redis:
+ host: 192.168.110.80
+ port: 6379
+ password: 123456
+ database: 0
+ # redis:
+ # host: 172.21.35.151
+ # port: 6512
+ # password: SC_cache@20#25
+ # database: 0
+ # timeout: 1000
+ # cluster:
+ # nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513
+
+mybatis-plus:
+ typeAliasesPackage: com.stylefeng.guns.modular
+ configuration:
+ log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+
+
+
+eureka:
+ client:
+ service-url: #注册中心地址
+ defaultZone: http://sinata:sinata@192.168.110.85:8000/eureka #启用身份验证的方式连接
+ register-with-eureka: true #在注册中心进行注册
+ fetch-registry: true #从Eureka中获取注册信息。
+
+---
+
+
+#配置Swagger接口扫描范围
+swagger:
+ base-package: com.stylefeng.guns.modular
+
+spring:
+ datasource:
+ url: jdbc:mysql://192.168.110.80:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: 123456
+ db-name: qyttravel #用来搜集数据库的所有表
+ filters: wall,mergeStat
+
+
+ #spring:
+ # datasource:
+ # url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ # username: traffic_scusr
+ # password: QYT_sc@20#25
+ # db-name: traffic_scdb #用来搜集数据库的所有表
+ # filters: wall,mergeStat
+
+
+---
+spring:
+ data:
+ mongodb:
+ uri: mongodb://192.168.110.80:27017/traveling_track
+ # uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track
+
+
+---
+
+
+
+wx:
+ grantType: authorization_code #填authorization_code
+ appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
+ appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
+ appletsAppid: wxcc3c9058e2b294db #小程序APPid
+ appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
+ mchId: 111 #微信支付分配的商户号
+ key: 111 #key为商户平台设置的密钥key：
+
+---
+
+alipay:
+ appid: 111 #应用程序唯一标识
+ appPrivateKey: 111 #开发者应用私钥
+ alipayPublicKey: ; #应用公钥
+ alipay_public_key: 111 #支付宝公钥
+
+---
+
+juhe: #聚合数据
+ appKey: 111 #
+
+qyt:
+ socket_uri: http://192.168.110.85:6000
+---
+
+#支付回调地址
+#正式环境
+callbackPath: https://traffic.qytzt.cn/user
+
+
+---
+
+#交通部推送数据功能开关
+pushMinistryOfTransport: false
+
+#邮件配置
+spring:
+ mail:
+ host: smtp.qq.com
+ port: 465
+ username: 1721849008@qq.com
+ password: nhnbmjfdywilcbdj # 这里是授权码，不是邮箱登录密码
+ properties:
+ mail:
+ smtp:
+ ssl:
+ enable: true # 启用 SSL 加密（根据端口是否为 465 决定，通常需要开启）
+ auth: true # 启用身份验证（必须为 true）
+# pdf生成位置
+trip:
+ sheet:
+ filePath: D:/qytPdf/
\ No newline at end of file
diff --git a/UserQYTTravel/guns-admin/src/main/resources/application-test.yml b/UserQYTTravel/guns-admin/src/main/resources/application-test.yml
new file mode 100644
index 0000000..cbedb51
--- /dev/null
+++ b/UserQYTTravel/guns-admin/src/main/resources/application-test.yml
@@ -0,0 +1,138 @@
+server:
+ port: 8006
+
+guns:
+ swagger-open: true #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
+ picture-server-address: http://192.168.0.43/resources/ #图片服务器地址
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+
+spring:
+ application:
+ name: user-server
+ profiles:
+ active: test
+ mvc:
+ static-path-pattern: /static/**
+ view:
+ prefix: /WEB-INF/view
+ devtools:
+ restart:
+ enabled: false
+ additional-paths: src/main/java
+ exclude: static/**,WEB-INF/view/**
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+ redis:
+ host: 10.88.154.24
+ port: 7560
+ password: Idcs_B_2025rd141
+ database: 0
+ timeout: 1000
+ cluster:
+ nodes: 10.88.154.24:7560,10.88.154.34:7560,10.88.154.59:7560,10.88.154.98:7560,10.88.154.100:7560,10.88.154.109:7560
+
+mybatis-plus:
+ typeAliasesPackage: com.stylefeng.guns.modular
+ configuration:
+ log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+
+
+
+eureka:
+ client:
+ service-url: #注册中心地址
+ defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
+ register-with-eureka: true #在注册中心进行注册
+ fetch-registry: true #从Eureka中获取注册信息。
+
+---
+
+
+#配置Swagger接口扫描范围
+swagger:
+ base-package: com.stylefeng.guns.modular
+
+spring:
+ datasource:
+ url: jdbc:mysql://10.86.17.201:5740/hn_ridingdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ username: hn_ridingdb
+ password: hn_ridingdb123456$#@!
+ db-name: hn_ridingdb #用来搜集数据库的所有表
+ filters: wall,mergeStat
+
+
+
+---
+spring:
+ data:
+ mongodb:
+ host: 10.88.204.206,10.88.204.207,10.88.204.208
+ port: 27009
+ username: qn_riding_adm
+ password: QN_riding@Prom2025
+ database: qn_ridingdb
+
+
+---
+
+
+
+wx:
+ grantType: authorization_code #填authorization_code
+ appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
+ appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
+ appletsAppid: wxcc3c9058e2b294db #小程序APPid
+ appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
+ mchId: 111 #微信支付分配的商户号
+ key: 111 #key为商户平台设置的密钥key：
+
+---
+
+alipay:
+ appid: 111 #应用程序唯一标识
+ appPrivateKey: 111 #开发者应用私钥
+ alipayPublicKey: ; #应用公钥
+ alipay_public_key: 111 #支付宝公钥
+
+---
+
+juhe: #聚合数据
+ appKey: 111 #
+
+qyt:
+ socket_uri: http://192.168.110.85:6000
+---
+
+#支付回调地址
+#正式环境
+callbackPath: https://test-qncx.sitechcloud.com/chuxing/user-server
+
+
+---
+
+#交通部推送数据功能开关
+pushMinistryOfTransport: false
+
+#邮件配置
+spring:
+ mail:
+ host: smtp.qq.com
+ port: 465
+ username: 1721849008@qq.com
+ password: nhnbmjfdywilcbdj # 这里是授权码，不是邮箱登录密码
+ properties:
+ mail:
+ smtp:
+ ssl:
+ enable: true # 启用 SSL 加密（根据端口是否为 465 决定，通常需要开启）
+ auth: true # 启用身份验证（必须为 true）
+# pdf生成位置
+trip:
+ sheet:
+ filePath: /etraffic/server/qytPdf/
\ No newline at end of file
diff --git a/UserQYTTravel/guns-admin/src/main/resources/application.yml b/UserQYTTravel/guns-admin/src/main/resources/application.yml
index d16acea..883c13d 100644
--- a/UserQYTTravel/guns-admin/src/main/resources/application.yml
+++ b/UserQYTTravel/guns-admin/src/main/resources/application.yml
@@ -1,148 +1,3 @@
-server:
- port: 8006
-
-guns:
- swagger-open: true #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
- picture-server-address: http://192.168.0.43/resources/ #图片服务器地址
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
-
spring:
- application:
- name: user-server
profiles:
- active: dev
- # active: prod
- mvc:
- static-path-pattern: /static/**
- view:
- prefix: /WEB-INF/view
- devtools:
- restart:
- enabled: false
- additional-paths: src/main/java
- exclude: static/**,WEB-INF/view/**
- servlet:
- multipart:
- max-request-size: 100MB
- max-file-size: 100MB
- redis:
- host: 192.168.110.80
- port: 6379
- password: 123456
- database: 0
- # redis:
- # host: 172.21.35.151
- # port: 6512
- # password: SC_cache@20#25
- # database: 0
- # timeout: 1000
- # cluster:
- # nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513
-
-mybatis-plus:
- typeAliasesPackage: com.stylefeng.guns.modular
- configuration:
- log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
-
-
-
-eureka:
- client:
- service-url: #注册中心地址
- defaultZone: http://sinata:sinata@192.168.110.85:8000/eureka #启用身份验证的方式连接
- register-with-eureka: true #在注册中心进行注册
- fetch-registry: true #从Eureka中获取注册信息。
-
----
-
-
-#配置Swagger接口扫描范围
-swagger:
- base-package: com.stylefeng.guns.modular
-
-spring:
- datasource:
- url: jdbc:mysql://192.168.110.80:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: 123456
- db-name: qyttravel #用来搜集数据库的所有表
- filters: wall,mergeStat
-
-
- #spring:
- # datasource:
- # url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
- # username: traffic_scusr
- # password: QYT_sc@20#25
- # db-name: traffic_scdb #用来搜集数据库的所有表
- # filters: wall,mergeStat
-
-
----
-spring:
- data:
- mongodb:
- uri: mongodb://192.168.110.80:27017/traveling_track
- # uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track
-
-
----
-
-
-
-wx:
- grantType: authorization_code #填authorization_code
- appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
- appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
- appletsAppid: wxcc3c9058e2b294db #小程序APPid
- appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
- mchId: 111 #微信支付分配的商户号
- key: 111 #key为商户平台设置的密钥key：
-
----
-
-alipay:
- appid: 111 #应用程序唯一标识
- appPrivateKey: 111 #开发者应用私钥
- alipayPublicKey: ; #应用公钥
- alipay_public_key: 111 #支付宝公钥
-
----
-
-juhe: #聚合数据
- appKey: 111 #
-
-
----
-
-#支付回调地址
-#正式环境
-callbackPath: https://traffic.qytzt.cn/user
-
-
----
-
-#交通部推送数据功能开关
-pushMinistryOfTransport: false
-
-#邮件配置
-spring:
- mail:
- host: smtp.qq.com
- port: 465
- username: 1721849008@qq.com
- password: nhnbmjfdywilcbdj # 这里是授权码，不是邮箱登录密码
- properties:
- mail:
- smtp:
- ssl:
- enable: true # 启用 SSL 加密（根据端口是否为 465 决定，通常需要开启）
- auth: true # 启用身份验证（必须为 true）
-# pdf生成位置
-trip:
- sheet:
- filePath: D:/qytPdf/
\ No newline at end of file
+ active: '@spring.active@'
\ No newline at end of file
diff --git a/UserQYTTravel/guns-admin/src/main/resources/logback.xml b/UserQYTTravel/guns-admin/src/main/resources/logback.xml
index ac5c343..64952fc 100644
--- a/UserQYTTravel/guns-admin/src/main/resources/logback.xml
+++ b/UserQYTTravel/guns-admin/src/main/resources/logback.xml
@@ -7,7 +7,7 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
- <property name="log.path" value="/data/app/logs/user"/>
+ <property name="log.path" value="/etraffic/server/logs/user"/>
<!--0. 日志格式和颜色渲染 -->
<!-- 彩色日志依赖的渲染类 -->
diff --git a/UserQYTTravel/pom.xml b/UserQYTTravel/pom.xml
index 121e0c3..64ce8c4 100644
--- a/UserQYTTravel/pom.xml
+++ b/UserQYTTravel/pom.xml
@@ -221,19 +221,13 @@
<profiles>
<profile>
- <id>local</id>
- <properties>
- <spring.active>local</spring.active>
- </properties>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
<id>dev</id>
<properties>
<spring.active>dev</spring.active>
</properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
</profile>
<profile>
<id>test</id>
--
Gitblit v1.7.1