合并代码

Pu Zhibing

4 天以前 8399270e3f12301ddf143c87bec9ca1be7b54ff0

合并代码

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -29,7 +29,6 @@
import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import io.rong.models.response.TokenResult;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
@@ -563,8 +562,8 @@
        loginWarpper.setToken(token);
        loginWarpper.setAppid(UUIDUtil.getRandomCode());
        loginWarpper.setState(ToolUtil.isEmpty(driver.getIdCard()) ? 1 : 0);
        TokenResult token1 = RongCloudUtil.getToken(driver.getId().toString(), driver.getName(), driver.getHeadImgUrl());
        loginWarpper.setRongYunToken(token1.getToken());
//        TokenResult token1 = RongCloudUtil.getToken(driver.getId().toString(), driver.getName(), driver.getHeadImgUrl());
//        loginWarpper.setRongYunToken(token1.getToken());

        //创建高德猎鹰的终端数据
//        String tid = gdFalconUtil.createTerminal(phone);

 DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml

@@ -115,7 +115,7 @@

#支付回调地址
#正式环境
callbackPath: https://traffic.qytzt.cn/chuxing/driver
callbackPath: https://traffic.qytzt.cn/chuxing/driver-server

---
#交通部推送数据功能开关

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java

@@ -339,8 +339,12 @@
        if (count > 0) {
            return "error";
        }
        if(ToolUtil.isEmpty(tCompany.getIdentifier())){
            return "统一社会信用代码不能为空";
        }
        //调用中台接口创建企业
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
//        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
        String enterCode = "";
        Integer enterNew = null;
        Long empId = null;
@@ -497,7 +501,7 @@
        TCompany tCompany = tCompanyService.selectById(tCompanyId);
        //调用中台接口创建企业
        if(1 == tCompany.getEnterNew()){
            CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
            CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
            if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
                ShiroUser user1 = shiroExtUtil.getUser();
                User user = userService.selectById(user1.getId());
@@ -574,8 +578,11 @@
        if (count > 0) {
            return "error";
        }
        if(ToolUtil.isEmpty(tCompany.getIdentifier())){
            return "统一社会信用代码不能为空";
        }
        //调用中台接口创建企业
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
        String enterCode = "";
        Long empId = null;
        Integer empnew = null;

 MessagePushTravel/src/main/java/com/sinata/push/config/QYTConfig.java

New file
@@ -0,0 +1,33 @@
package com.sinata.push.config;

import com.sinata.push.util.echo.NettyServerController;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;

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() {
        NettyServerController.setQytConfig(this);
    }
}

 MessagePushTravel/src/main/resources/application-dev.yml

New file
@@ -0,0 +1,19 @@
server:
  port: 6000
spring:
  profiles:
    active: dev
  application:
    name: message #服务名称
  servlet:
    multipart:
      max-request-size: 100MB
      max-file-size: 100MB
  redis:
    host: 192.168.110.80
    port: 6379
    password: 123456

qyt:
  chuxing_url: http://192.168.110.85:5000
  daijia_url: http://192.168.110.106:3002

 MessagePushTravel/src/main/resources/application-produce.yml

New file
@@ -0,0 +1,23 @@
server:
  port: 6000
spring:
  profiles:
    active: prod
  application:
    name: message #服务名称
  servlet:
    multipart:
      max-request-size: 100MB
      max-file-size: 100MB
  redis:
    host: 10.31.1.219
    port: 6410
    password: Qnz_jt@20#25
    database: 0
    timeout: 1000
    cluster:
      nodes: 10.31.1.219:6410,10.31.1.30:6410,10.31.1.97:6411

qyt:
  chuxing_url: http://10.31.182.11:8010/chuxing
  daijia_url: http://10.31.182.11:8010/daijia

 MessagePushTravel/src/main/resources/application-test.yml

New file
@@ -0,0 +1,23 @@
server:
  port: 6000
spring:
  profiles:
    active: test
  application:
    name: message #服务名称
  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

qyt:
  chuxing_url: http://10.88.188.65:8010/chuxing
  daijia_url: http://10.88.188.65:8010/daijia

 UserQYTTravel/guns-admin/src/main/resources/application-produce.yml

@@ -109,7 +109,7 @@

#支付回调地址
#正式环境
callbackPath: https://traffic.qytzt.cn/chuxing/user
callbackPath: https://traffic.qytzt.cn/chuxing/user-server


---