Merge remote-tracking branch 'origin/master'

xuhy

2023-04-10 52f9908cf1f565da1d0068329c7218038dade6eb

Merge remote-tracking branch 'origin/master'

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java

@@ -1,6 +1,8 @@
package com.supersavedriving.driver.modular.system.api;

import com.alibaba.fastjson.JSON;
import com.supersavedriving.driver.modular.system.model.Driver;
import com.supersavedriving.driver.modular.system.model.Order;
import com.supersavedriving.driver.modular.system.util.rongyun.RongYunUtil;
import com.supersavedriving.driver.modular.system.util.rongyun.model.CloudRecordingCallback;
import com.supersavedriving.driver.modular.system.warpper.*;
@@ -21,6 +23,9 @@
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
import java.util.Map;

@@ -440,9 +445,10 @@
     */
    @ResponseBody
    @PostMapping("/base/order/cloudRecordingCallback")
    public void cloudRecordingCallback(HttpServletRequest request){
    public void cloudRecordingCallback(HttpServletRequest request, HttpServletResponse response){
        CloudRecordingCallback cloudRecordingCallback = RongYunUtil.cloudRecordingCallback(request);
        System.err.println("-------------------云端录制状态回调！-------------------");
//        System.err.println("-------------------云端录制状态回调！-------------------");
//        System.err.println(JSON.toJSONString(cloudRecordingCallback));
        if(null == cloudRecordingCallback){
            System.err.println("云端录制状态回调解析出错！");
            return;
@@ -450,8 +456,20 @@
        Integer type = cloudRecordingCallback.getType();
        if(4 == type){//文件上传
            String fileUrl = cloudRecordingCallback.getOutput().getFileUrl();
            System.err.println("文件上传完毕：" + fileUrl);
            String roomId = cloudRecordingCallback.getRoomId();
            Order order = orderService.selectById(roomId);
            order.setRouteRecord(fileUrl);
            orderService.updateById(order);
        }
        PrintWriter out = null;
        try {
            out = response.getWriter();
        } catch (IOException e) {
            e.printStackTrace();
        }
        out.print("OK");
        out.flush();
        out.close();
    }



 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml

@@ -59,6 +59,7 @@
        <result column="oldState" property="oldState"/>
        <result column="status" property="status" />
        <result column="createTime" property="createTime" />
        <result column="routeRecord" property="routeRecord"/>
    </resultMap>



 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java

@@ -297,4 +297,9 @@
     */
    @TableField("createTime")
    private Date createTime;
    /**
     * 行程录音地址
     */
    @TableField("routeRecord")
    private String routeRecord;
}

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MD5AndKL.java

 driver/guns-admin/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>

    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/usr/local/server/app/logs"/>
    <property name="log.path" value="/usr/local/server/app/logs/driver"/>
    <!--<property name="log.path" value="d:/logs/driver"/>-->

    <!--0. 日志格式和颜色渲染 -->

 management/guns-admin/pom.xml

@@ -212,42 +212,6 @@
            <version>3.1</version>
        </dependency>

        <!--引入本地工行支付jar start-->
        <dependency>
            <groupId>com.icbc</groupId>
            <artifactId>icbc</artifactId>
            <version>v2</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/icbc-api-sdk-cop.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>com.icbc.api</groupId>
            <artifactId>icbc</artifactId>
            <version>v2</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/icbc-api-sdk-cop-io.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>cn.com.infosec</groupId>
            <artifactId>icbc</artifactId>
            <version>v2</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/icbc-ca.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>cn.com.infosecCrypto</groupId>
            <artifactId>icbc</artifactId>
            <version>v2</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/InfosecCrypto_Java1_02_JDK14+.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>proguard</groupId>
            <artifactId>icbc</artifactId>
            <version>v2</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/proguard.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpmime</artifactId>
@@ -291,16 +255,16 @@
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <!--打包后的项目名-->
                    <!--<warName>example</warName>-->
                    <webResources>
                        <resource>
                    <!--<webResources>-->
                        <!--<resource>-->
                            <!--把本地lib里面的jar复制到lib-->
                            <directory>${project.basedir}/lib</directory>
                            <targetPath>WEB-INF/lib/</targetPath>
                            <includes>
                                <include>**/*.jar</include>
                            </includes>
                        </resource>
                    </webResources>
                            <!--<directory>${project.basedir}/lib</directory>-->
                            <!--<targetPath>WEB-INF/lib/</targetPath>-->
                            <!--<includes>-->
                                <!--<include>**/*.jar</include>-->
                            <!--</includes>-->
                        <!--</resource>-->
                    <!--</webResources>-->
                </configuration>
            </plugin>
        </plugins>

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java

@@ -13,15 +13,12 @@
import com.stylefeng.guns.modular.system.dao.CarInsuranceMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.commons.lang.time.DateUtils;
import org.apache.poi.hdf.extractor.TC;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.ui.Model;
@@ -79,14 +76,8 @@
    @Autowired
    private ITServerCarmodelService itServerCarmodelService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Resource
    private CarInsuranceMapper carInsuranceMapper;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;

    /**
     * 跳转到车辆管理首页
@@ -281,24 +272,8 @@
    public ResultUtil saveCarInsurance(CarInsurance carInsurance){
        if(carInsurance.getId() == null){
            carInsuranceMapper.insert(carInsurance);
            new Thread(new Runnable() {
                @Override
                public void run() {
                    if(pushMinistryOfTransport){//上传数据
                        pushMinistryOfTransportUtil.baseInfoVehicleInsurance(carInsurance.getId(), 1);
                    }
                }
            }).start();
        }else{
            carInsuranceMapper.updateById(carInsurance);
            new Thread(new Runnable() {
                @Override
                public void run() {
                    if(pushMinistryOfTransport){//上传数据
                        pushMinistryOfTransportUtil.baseInfoVehicleInsurance(carInsurance.getId(), 2);
                    }
                }
            }).start();
        }

        return ResultUtil.success();
@@ -349,14 +324,6 @@
    @RequestMapping(value = "/delCarInsurance", method = RequestMethod.POST)
    public ResultUtil delCarInsurance(Integer id){
        carInsuranceMapper.deleteById(id);
        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                    pushMinistryOfTransportUtil.baseInfoVehicleInsurance(id, 3);
                }
            }
        }).start();
        return ResultUtil.success();
    }

@@ -448,16 +415,6 @@
            }
            tCarServiceService.insert(service);
        }

        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyStat();
                    pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
                }
            }
        }).start();
        return SUCCESS_TIP;
    }

@@ -477,16 +434,6 @@
//            obj.setCarId(null);
            tDriverService.updateById(obj);
        }

        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyStat();
                    pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
                }
            }
        }).start();
        return SUCCESS_TIP;
    }

@@ -544,14 +491,6 @@
        }

        tCarService.updateById(tCar);
        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){
                    pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
                }
            }
        }).start();
        return SUCCESS_TIP;
    }


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

@@ -8,14 +8,11 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITCompanyCityService;
import com.stylefeng.guns.modular.system.service.ITRegionService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -54,12 +51,6 @@

    @Autowired
    private ITCompanyCityService tCompanyCityService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;

    /**
     * 跳转到修改平台信息
@@ -428,21 +419,6 @@

        //添加经营区域
        addSocpe(subArr,tCompany.getId());

        TCompany tCompany1 = tCompanyService.selectById(tCompany.getId());
        if(tCompany1.getType() == 1){
            new Thread(new Runnable() {
                @Override
                public void run() {
                    if(pushMinistryOfTransport){//上传平台数据
                        pushMinistryOfTransportUtil.baseInfoCompanyPay();//上传网约车平台公司支付信息
                        pushMinistryOfTransportUtil.baseInfoCompany(tCompany.getId());
                        pushMinistryOfTransportUtil.baseInfoCompanyService();
                        pushMinistryOfTransportUtil.baseInfoCompanyPermit(tCompany.getId());
                    }
                }
            }).start();
        }
        return SUCCESS_TIP;
    }


 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverBackController.java

@@ -16,7 +16,6 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.apache.poi.ss.usermodel.Cell;

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java

@@ -7,11 +7,7 @@
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.ui.Model;
@@ -43,12 +39,6 @@

    @Autowired
    private ITVersionManagementService tVersionManagementService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;

    /**
     * 跳转到版本管理首页

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -12,7 +12,6 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Value;
@@ -20,7 +19,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.ui.Model;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;

import javax.annotation.Resource;
import java.io.BufferedReader;
@@ -53,14 +51,8 @@
    @Autowired
    private ITDriverService tDriverService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Resource
    private OrderCancelMapper orderCancelMapper;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;

    @Value("${filePath}")
    private String filePath;
@@ -200,16 +192,6 @@
        map.put("orderType", "1");
        String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
        System.out.println("专车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);

        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                    pushMinistryOfTransportUtil.orderCancel(tOrderPrivateCarId);
                }
            }
        }).start();

        return SUCCESS_TIP;
    }


 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java

@@ -8,12 +8,8 @@
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.TServerCarmodel;
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -21,7 +17,6 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.TSystemPrice;
import com.stylefeng.guns.modular.system.service.ITSystemPriceService;

@@ -46,15 +41,6 @@

    @Autowired
    private ITServerCarmodelService tServerCarmodelService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Autowired
    private IUserService userService;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;



@@ -176,14 +162,6 @@
        tSystemPrice.setType(1);
        tSystemPrice.setState(1);
        tSystemPriceService.insert(tSystemPrice);
        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport){//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
                }
            }
        }).start();
        return SUCCESS_TIP;
    }

@@ -207,14 +185,6 @@
            }
        }
        tSystemPriceService.updateById(tSystemPrice);
        new Thread(new Runnable() {
            @Override
            public void run() {
                if(pushMinistryOfTransport) {//上传数据
                    pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
                }
            }
        }).start();
        return SUCCESS_TIP;
    }


 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java

@@ -50,12 +50,6 @@
    @Autowired
    private IUserService userService;

    private Map<String, Long> loginTime = new HashMap<>();

    private Map<String, Integer> loginFailures = new HashMap<>();

    private List<String> ips = Arrays.asList("127.0.0.1","192.168.0.247");



    /**
@@ -121,82 +115,7 @@
     */
    @RequestMapping(value = "/login", method = RequestMethod.POST)
    public String loginVali(String username, String password, String remember, Model model, HttpServletRequest request) {
        String ip = request.getHeader("x-forwarded-for");
        if (ip != null && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) {
            // 多次反向代理后会有多个ip值，第一个ip才是真实ip
            if (ip.indexOf(",") != -1) {
                ip = ip.split(",")[0];
            }
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("Proxy-Client-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("WL-Proxy-Client-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("HTTP_CLIENT_IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("X-Real-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getRemoteAddr();
        }
        if(!ips.contains(ip)){
            model.addAttribute("tips", "请在特定的网络下使用系统");
            return "/login.html";
        }

        Integer f = loginFailures.get(username);
        f = f == null ? 0 : f;
        // 校验账号，密码是否正确，如果错误，对次数进行加1
        IShiro shiroFactory = ShiroFactroy.me();
        User user = userService.getByAccount(username);
        password = AESUtils.decrypt(password);
        if(null == user){
            f++;
            loginFailures.put(username, f);
        }else {
            // 校验密码
            ShiroUser shiroUser1 = shiroFactory.shiroUser(user);
            SimpleAuthenticationInfo info = shiroFactory.info(shiroUser1, user, username);
            String pass = ShiroKit.md5(password, user.getSalt());
            if(!info.getCredentials().equals(pass)){
                f++;
                loginFailures.put(username, f);
                if(f<5){
                    model.addAttribute("number", "3");
                }
                if(f==5){
                    model.addAttribute("number", "5");
                }
                return "/login.html";
            }
        }
        model.addAttribute("number", "3");
        /*if(f > 5 ){
            model.addAttribute("tips", "登录次数过多，请等30分钟再试！");
            if (KaptchaUtil.getKaptchaOnOff()) {
                String kaptcha = super.getPara("kaptcha").trim();
                String code = (String) super.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY);
                if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) {
                    throw new InvalidKaptchaException();
                }
            }
            return "/login.html";
        }*/
        //验证验证码是否正确
//        if (KaptchaUtil.getKaptchaOnOff()) {
//            String kaptcha = super.getPara("kaptcha").trim();
//            String code = (String) super.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY);
//            if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) {
//                throw new InvalidKaptchaException();
//            }
//        }
        Subject currentUser = ShiroKit.getSubject();
        UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());

@@ -207,9 +126,6 @@
//        }
        token.setRememberMe(false);//关闭记住我功能
        currentUser.login(token);

        // 登录成功，错误次数值改0
        loginFailures.put(username, 0);

        ShiroUser shiroUser = ShiroKit.getUser();
        super.getSession().setAttribute("shiroUser", shiroUser);

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtils.java

@@ -27,16 +27,16 @@
     * @param context
     * @return
     */
    public static String encrypt(String context) {
        try {
            byte[] decode = context.getBytes(CHARSET);
            byte[] bytes = createKeyAndIv(decode, Cipher.ENCRYPT_MODE);
            return Base64.getEncoder().encodeToString(bytes);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return null;
    }
//    public static String encrypt(String context) {
//        try {
//            byte[] decode = context.getBytes(CHARSET);
//            byte[] bytes = createKeyAndIv(decode, Cipher.ENCRYPT_MODE);
//            return Base64.getEncoder().encodeToString(bytes);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return null;
//    }

    /**
     * 解密
@@ -96,9 +96,9 @@
    public static void main(String[] args) {
        String context = "zhaors";
        System.out.println("元数据" + context);
        String encrypt = encrypt(context);
        System.out.println("加密之后：" + encrypt);
        String decrypt = decrypt(encrypt);
        System.out.println("解密之后：" + decrypt);
//        String encrypt = encrypt(context);
//        System.out.println("加密之后：" + encrypt);
//        String decrypt = decrypt(encrypt);
//        System.out.println("解密之后：" + decrypt);
    }
}

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java

File was deleted

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java

@@ -1,22 +1,10 @@
package com.stylefeng.guns.modular.system.util;

public class PushURL {
    public static String zull_user_url = "https://okyueche.com:443";
    public static String zull_user_url = "http://127.0.0.1:81";
    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 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 String zull_user_url = "http://127.0.0.1:80";
//    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 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";
}

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java

@@ -24,12 +24,6 @@
    private ITLocationService locationService;

    @Autowired
    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;

    @Value("${pushMinistryOfTransport}")
    private boolean pushMinistryOfTransport;

    @Autowired
    private ITDriverService driverService;


@@ -53,25 +47,6 @@
    public void taskDay(){
        try {
            locationService.updateFence();//更新线上电子围栏
        }catch (Exception e){
            e.printStackTrace();
        }
    }



    /**
     * 每月第一天的1点执行的任务
     */
    @Scheduled(cron = "0 0 1 1 * *")
    public void taskMonth(){
        try {
            if(pushMinistryOfTransport){
                List<TDriver> tDrivers = driverService.selectList(new EntityWrapper<TDriver>().eq("authState", 2).ne("flag", 3));
                for(TDriver driver : tDrivers){
                    pushMinistryOfTransportUtil.baseInfoDriverStat(driver.getId());
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }

 management/guns-admin/src/main/resources/application.yml

@@ -16,12 +16,6 @@
spring:
  profiles:
    active: local
#  datasource:
#    url: jdbc:mysql://192.168.0.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
#    username: root
#    password: 123456
#    db-name: super_save_driving #用来搜集数据库的所有表
#    filters: wall,mergeStat
  mvc:
    static-path-pattern: /static/**
    view:
@@ -52,8 +46,8 @@
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置
wx:
  conf:
    appId: wx3613e8d4c8624ea1
    secret: 25782eabe39e796a92d2fcb38947e7dc
    appId: wx8a9af3889395d0e1
    secret: 95a34f114973298cce4297a20bb59bc3

#eureka:
#  client:
@@ -65,22 +59,13 @@

---

#spring:
#  profiles: local
#  datasource:
#    url: jdbc:mysql://Rm-wz9rpe0t74ys3b1h8go.mysql.rds.aliyuncs.com:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: Root2020!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat


spring:
  profiles: local
  datasource:
    url: jdbc:mysql://192.168.110.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    url: jdbc:mysql://127.0.0.1:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    username: root
    password: 123456
    password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
#    password: 123456
    db-name: super_save_driving #用来搜集数据库的所有表
    filters: wall,mergeStat

@@ -110,9 +95,9 @@

---

filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
filePath: /usr/local/server/app/orderPostionFile/ #存储订单轨迹文件路径
#filePath: C:/orderPostionFile/  #存储订单轨迹文件路径


#交通部推送数据功能开关
pushMinistryOfTransport: true
pushMinistryOfTransport: false

 management/guns-admin/src/main/webapp/WEB-INF/view/login.html

@@ -55,7 +55,7 @@
<div style="display: flex;align-items: center;justify-content: center;height: 100%">


<!--<img src="${ctxPath}/static/img/index4.png" style="width: 300px;height: 400px;z-index: 1000">-->
<img src="${ctxPath}/static/img/login.png" style="width: 300px;height: 400px;z-index: 1000;border-radius: 10px;">
<div  style="position: relative;left: -20px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;">
    <div style="max-height: 100%">
        <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/>&nbsp;超省新代驾管理后台</h3>
@@ -145,9 +145,9 @@
        return decryptedStr.toString();
    }
    function login(){
        let password = $('#password').val();
        password = encrypt(password);
        $('#password').val(password);
        // let password = $('#password').val();
        // password = encrypt(password);
        // $('#password').val(password);
        $('#submit').submit();
    }


 management/guns-admin/src/main/webapp/static/favicon1.ico

 management/guns-admin/src/main/webapp/static/img/icon100.png

Binary files differ

 management/guns-admin/src/main/webapp/static/img/index4.png

Binary files differ

 management/guns-admin/src/main/webapp/static/img/login.png

 management/guns-admin/src/main/webapp/static/img/logo.png

 user/guns-admin/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>

    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/usr/local/server/app/logs"/>
    <property name="log.path" value="/usr/local/server/app/logs/user"/>
    <!--<property name="log.path" value="d:/logs/user"/>-->

    <!--0. 日志格式和颜色渲染 -->