Pu Zhibing
5 天以前 e25d138ac2e1a2b271b27bbc1973f0b5898b1d82
修改bug
8个文件已修改
1个文件已添加
93 ■■■■ 已修改文件
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/QYTConfig.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/CreateEnterpriseRequest.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/resources/application-prod.yml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/resources/application-test.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/QYTConfig.java
New file
@@ -0,0 +1,32 @@
package com.stylefeng.guns.config;
import com.stylefeng.guns.modular.system.util.PushURL;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import javax.annotation.PostConstruct;
/**
 * @author zhibing.pu
 * @Date 2025/8/12 13:58
 */
@Data
@Configuration
@ConfigurationProperties(prefix = "qyt")
public class QYTConfig {
    /**
     * 出行网关接口地址
     */
    private String chuxingUrl;
    /**
     * 代驾网关接口地址
     */
    private String daijiaUrl;
    @PostConstruct
    public void init() {
        PushURL.setQytConfig(this);
    }
}
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -356,6 +356,7 @@
            CreateEnterpriseRequest request = new CreateEnterpriseRequest();
            request.setName(tCompany.getName());
            request.setNickName(tCompany.getName());
            request.setUscc(tCompany.getIdentifier());
            request.setIndustry_code("123456");
            request.setMobile(account);
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
@@ -595,6 +596,7 @@
            CreateEnterpriseRequest request = new CreateEnterpriseRequest();
            request.setName(tCompany.getName());
            request.setNickName(tCompany.getName());
            request.setUscc(tCompany.getIdentifier());
            request.setIndustry_code("123456");
            request.setMobile(account);
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -1,16 +1,23 @@
package com.stylefeng.guns.modular.system.util;
import com.stylefeng.guns.config.QYTConfig;
public class PushURL {
//    public static String zull_user_url = "http://192.168.110.85";
//    public static String zull_user_url = "https://test-qncx.sitechcloud.com/chuxing";
    public static String zull_user_url = "https://traffic.qytzt.cn/chuxing";
    public static String order_push_url = zull_user_url + "/driver/base/order/pushOrderState";
    public static String driver_auth_url = zull_user_url + "/driver/base/driver/sendsms";
    public static String withdraw_auth_url = zull_user_url + "/driver/base/withdrawal/withdrawalAudit";
    public static String cancel_order_url = zull_user_url + "/user/base/order/sendOrderState";
    public static String freeze_user_url = zull_user_url + "/user/base/user/freeze";
    public static String send_sms_code = zull_user_url + "/user/base/queryCaptcha";
    public static String push_order = zull_user_url + "/user/base/taxi/pushOrder";
    public static QYTConfig qytConfig;
    public static String zull_user_url = qytConfig.getChuxingUrl();
    public static String order_push_url = zull_user_url + "/driver-server/base/order/pushOrderState";
    public static String driver_auth_url = zull_user_url + "/driver-server/base/driver/sendsms";
    public static String withdraw_auth_url = zull_user_url + "/driver-server/base/withdrawal/withdrawalAudit";
    public static String cancel_order_url = zull_user_url + "/user-server/base/order/sendOrderState";
    public static String freeze_user_url = zull_user_url + "/user-server/base/user/freeze";
    public static String send_sms_code = zull_user_url + "/user-server/base/queryCaptcha";
    public static String push_order = zull_user_url + "/user-server/base/taxi/pushOrder";
    public static String ministry_of_transport_data = "http://120.77.11.218:8868/ministryOfTransport";
    public static String ministry_of_transport_ftp = "http://120.77.11.218:8868/ftp";
    public static void setQytConfig(QYTConfig qytConfig) {
        PushURL.qytConfig = qytConfig;
    }
}
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
@@ -220,14 +220,14 @@
        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));
        log.info("【企业增加员工】请求地址:{}", url);
        log.info("【企业增加员工】请求参数:{}", JSON.toJSONString(contentMap));
        String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap);
        log.info("【企业增加员工】请求结果:" + result);
        log.info("【企业增加员工】请求结果:{}", result);
        JSONObject jsonObject = JSON.parseObject(result);
        String retCode = jsonObject.getString("retCode");
        if (!"0".equals(retCode)) {
            log.error("【企业增加员工】请求失败:" + result);
            log.error("【企业增加员工】请求失败:{}", result);
            String retMsg = jsonObject.getString("retMsg");
            retMsg = retMsg.substring(retMsg.indexOf("{"));
            jsonObject = JSON.parseObject(retMsg);
@@ -236,7 +236,7 @@
        JSONObject object = jsonObject.getJSONObject("object");
        String status = object.getString("status");
        if (!"0".equals(status)) {
            log.error("【企业增加员工】失败:" + object.toJSONString());
            log.error("【企业增加员工】失败:{}", object.toJSONString());
            return ResultUtil.error("【企业增加员工】失败:" + object.getString("desc"));
        }
        SaveStaffNode saveStaffNode = object.getObject("data", SaveStaffNode.class);
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -180,7 +180,7 @@
            this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
            this.setBucketName("bucuTest0625");
            this.setAppId("wxcc3c9058e2b294db");
            this.setEndPoint("http://119.4.112.68:27741/v1");
            this.setEndPoint("http://10.30.52.45:27741/v1");
            this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
            this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
            this.setSecretKey("AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z");
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/CreateEnterpriseRequest.java
@@ -17,6 +17,10 @@
     */
    private String nickName;
    /**
     * 统一社会信用代码
     */
    private String uscc;
    /**
     * 行业编码
     */
    private String industry_code;
ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -81,6 +81,11 @@
---
qyt:
  chuxing_url: http://127.0.0.1:8010
  daijia_url: http://127.0.0.1:8010
#支付回调地址
#正式环境
callbackPath: http://127.0.0.1
ManagementQYTTravel/guns-admin/src/main/resources/application-prod.yml
@@ -87,6 +87,11 @@
---
qyt:
  chuxing_url: http://10.31.182.11:8010/chuxing
  daijia_url: http://10.31.182.11:8010/daijia
#支付回调地址
#正式环境
callbackPath: https://traffic.qytzt.cn/chuxing
ManagementQYTTravel/guns-admin/src/main/resources/application-test.yml
@@ -1,5 +1,5 @@
server:
  port: 8010
  port: 8080
guns:
  swagger-open: true              #是否开启swagger (true/false)
@@ -89,6 +89,10 @@
---
qyt:
  chuxing_url: http://10.88.188.65:8010/chuxing
  daijia_url: http://10.88.188.65:8010/daijia
#支付回调地址
#正式环境
callbackPath: https://test-qncx.sitechcloud.com/chuxing