修改第三方账号

Pu Zhibing

2024-12-17 5112e974a7ac589e47bc9015c195d0e5331b91a4

修改第三方账号

 EurekaAHTravel/pom.xml

@@ -9,8 +9,8 @@
        <relativePath/> <!-- lookup parent from repository -->
    </parent>
    <groupId>com.sinata</groupId>
    <artifactId>demo</artifactId>
    <version>0.0.1-SNAPSHOT</version>
    <artifactId>eureka</artifactId>
    <version>0.0.1</version>
    <name>eureka</name>
    <description>Eureka project for Spring Boot</description>


 ManagementAHTravel/guns-admin/pom.xml

@@ -216,6 +216,12 @@
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </dependency>
        <!--华为云的obs-->
        <dependency>
            <groupId>com.huaweicloud</groupId>
            <artifactId>esdk-obs-java</artifactId>
            <version>3.19.5</version>
        </dependency>
    </dependencies>



 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/OssUploadUtil.java

File was deleted

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java

@@ -17,6 +17,7 @@
import com.stylefeng.guns.modular.system.service.ITActivityGeneralizationService;
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import com.stylefeng.guns.modular.system.util.GaoDeMapUtil;
import com.stylefeng.guns.modular.system.util.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
import com.stylefeng.guns.modular.system.util.UUIDUtil;
import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
@@ -194,7 +195,7 @@
        MyQrCodeUtil.createCodeToFile("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
        BufferedImage qrCodeImage = QRCodeUtil.createImage("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
        MultipartFile qrCodeFile = convert(qrCodeImage, new Date().getTime()+ UUIDUtil.getRandomCode(3)+".PNG");
        String picture = OssUploadUtil.ossUpload1(qrCodeFile);
        String picture = ObsUploadUtil.obsUpload(qrCodeFile);
        System.err.println("二维码："+ picture);
        tActivityGeneralization.setQrCode(picture);
        activityGeneralizationService.updateById(tActivityGeneralization);

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

@@ -6,10 +6,8 @@
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.ObsUploadUtil;
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.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import org.springframework.beans.factory.annotation.Value;
@@ -143,7 +141,7 @@
            MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
            MultipartFile file = (MultipartFile) myfile;

            String pictureName = OssUploadUtil.ossUpload(request, file);
            String pictureName = ObsUploadUtil.obsUpload(file);
            m.put("imgUrl", pictureName);
        }catch (Exception e){
            e.printStackTrace();

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

@@ -98,6 +98,8 @@
            }else {
                model.addAttribute("recordState",2);
            }
        }else{
            model.addAttribute("recordState",1);
        }
        return PREFIX + "tOrderPrivateCar_orderDetail.html";
    }

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java

@@ -3,7 +3,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.stylefeng.guns.core.util.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil ;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -104,7 +104,7 @@
            String pictureName = "";
            try {
                //文件上传，具体根据实际替换
                pictureName = OssUploadUtil.ossUpload(request, picture);
                pictureName = ObsUploadUtil.obsUpload(picture);
 
                String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
                if (callback == null) {

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java

@@ -4,7 +4,7 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.util.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.OssUploadUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +66,7 @@
            MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
            MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
            if (file.getSize() != 0) {
                ossUpload = OssUploadUtil.ossUpload(request, file);
                ossUpload = ObsUploadUtil.obsUpload(file);
                m.put("imgUrl", ossUpload);
            }
        } catch (Exception e) {
@@ -86,7 +86,7 @@
            if(!s.equals("jpg") && !s.equals("png") && !s.equals("jpeg")){
                return null;
            }
            String pictureName = OssUploadUtil.ossUpload(request, file);
            String pictureName = ObsUploadUtil.obsUpload(file);
            return pictureName;
        } catch (IOException e1) {
            return null;
@@ -134,7 +134,7 @@
                return null;
            }

            pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);
            pictureName = ObsUploadUtil.obsUpload(picture);

            String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
            if (callback == null) {

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java

@@ -34,7 +34,7 @@
    @Autowired
    private IGDInterfaceService gdInterfaceService;

    private String key = "8fc6a7da12d64696e9727605d81f72de";
    private String key = "b186a87ff13d88eb08fac9997519af5e";

    private JSONArray jsonArray = new JSONArray();


 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java

@@ -20,7 +20,7 @@
@Component
public class GDMapGeocodingUtil {

    private String key = "8fc6a7da12d64696e9727605d81f72de";
    private String key = "b186a87ff13d88eb08fac9997519af5e";

    @Autowired
    private RestTemplate restTemplate;

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GaoDeMapUtil.java

@@ -35,7 +35,7 @@

        try {
            // 拼接请求高德的url
            String url = "http://restapi.amap.com/v3/geocode/geo?address=" + address + "&output=JSON&key=" + "8fc6a7da12d64696e9727605d81f72de";
            String url = "http://restapi.amap.com/v3/geocode/geo?address=" + address + "&output=JSON&key=" + "b186a87ff13d88eb08fac9997519af5e";
            // 请求高德接口
            String result = sendHttpGet(url);
            JSONObject resultJOSN = JSONObject.parseObject(result);

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HuaWeiSMSUtil.java

@@ -38,14 +38,14 @@
    public static void sendSms(String code,String phone,String sender,String templateId) throws Exception{
        //必填,请参考"开发准备"获取如下数据,替换为实际值
        String url = "https://rtcsms.cn-north-1.myhuaweicloud.com:10743/sms/batchSendSms/v1"; //APP接入地址+接口访问URI
        String appKey = "qnay92s7V0K7719H10m7X4yo3fl3"; //APP_Key
        String appSecret = "6nSHQzZ3o18JeW6UtS448BbblOa0"; //APP_Secret
        String appKey = "111"; //APP_Key
        String appSecret = "111"; //APP_Secret
//        String sender = "10690400999303617"; //国内短信签名通道号或国际/港澳台短信通道号
//        String templateId = "d8f8f781b6e04c848f8148f4d6604bcd"; //模板ID

        //条件必填,国内短信关注,当templateId指定的模板类型为通用模板时生效且必填,必须是已审核通过的,与模板类型一致的签名名称
        //国际/港澳台短信不用关注该参数
        String signature = "超级过客"; //签名名称
        String signature = "111"; //签名名称

        //必填,全局号码格式(包含国家码),示例:+8615123456789,多个号码之间用英文逗号分隔
        String receiver = "+86"+phone; //短信接收人号码

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ObsUploadUtil.java

New file
@@ -0,0 +1,74 @@
package com.stylefeng.guns.modular.system.util;

import com.obs.services.ObsClient;
import com.obs.services.model.ObjectMetadata;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;

public class ObsUploadUtil {
    //OBS图片访问域名
    public static String endPoint = "obs.cn-north-4.myhuaweicloud.com";
    public static String accessKeyId = "9L2JQW43N6QSKCSHXOHH";
    public static String accessKeySecret = "svg1NDBIwAYuiOee4gQB9rw1c87ug2mv7jYkH8o5";
    public static String bucketName = "anhenew";
    public static String oss_domain = "https://anhenew.obs.cn-north-4.myhuaweicloud.com/";


    // 创建ObsClient实例
    public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);

    public static String obsUpload(MultipartFile file) throws IOException{
        String fileName = "";
        if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
            InputStream content = file.getInputStream();//获得指定文件的输入流
            ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
            meta.setContentLength(file.getSize());  // 必须设置ContentLength
            String originalFilename = file.getOriginalFilename();
            fileName =  UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
            obsClient.putObject(bucketName,"admin/"+fileName,content,meta);// 上传Object.
            if(fileName != null && !"".equals(fileName)){
                System.out.println(fileName);
                fileName = oss_domain+"admin/"+fileName;
            }
        }
        return fileName;
    }

    /**
     * 删除某个Object
     *
     * @param bucketUrl
     * @return
     */
    public static boolean deleteObject(String bucketUrl) {
        try {
            bucketUrl=bucketUrl.replace(oss_domain+"web","");
            // 删除Object.
            obsClient.deleteObject(bucketName, bucketUrl);
        } catch (Exception e) {
            e.printStackTrace();
            return false;
        } finally {
            //ossClient.shutdown();
        }
        return true;
    }
	
//     public static void createBucket(String bucketName)
//     {
//         //初始化 OSSClient
////          ossClient = new OssClient(endPoint, accessKeyId, accessKeySecret);
//
//         // 新建一个Bucket
//         Bucket bucket = ossClient.createBucket(bucketName);
//         System.out.println(bucket.getName());
//         System.out.println(bucket.getCreationDate());
//     }
//	 
//     public static void main(String[] args) {
//         OssUploadUtil.createBucket("ssfdfsd");
//    }
}

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java

@@ -12,9 +12,9 @@
public class OssUploadUtil {
    //OSS图片访问域名
    public static String oss_domain = "http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/";
    public static String accessKeyId = "LTAI5tR4whv88Y5CUucCJEu6";
    public static String accessKeySecret = "2fObO6LE6U2OzrUfXw9YBlQWHohFvg";
    public static String bucketName="bao-weiqing";
    public static String accessKeyId = "111";
    public static String accessKeySecret = "111";
    public static String bucketName="111";
    public static String endpoint = "oss-cn-hangzhou.aliyuncs.com";
    
    public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
@@ -57,7 +57,6 @@


    public static String ossUpload1(MultipartFile file) throws IOException{
        //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
        String fileName = "";
        if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
            InputStream content = file.getInputStream();//获得指定文件的输入流

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java

@@ -69,12 +69,12 @@

    @Value("${callbackPath}")
    private String callbackPath;//支付回调网关地址

    private String app_cert_path = "/usr/local/server/cer/zhifubao/user/app_cert_path.crt";//应用公钥证书路径

    private String alipay_cert_path = "/usr/local/server/cer/zhifubao/user/alipay_cert_path.crt";//支付宝公钥证书文件路径

    private String alipay_root_cert_path = "/usr/local/server/cer/zhifubao/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
    
    private String app_cert_path = "/root/server/app/cert/ali/appCertPublicKey_2021003115600201.crt";//应用公钥证书路径
    
    private String alipay_cert_path = "/root/server/app/cert/ali/alipayCertPublicKey_RSA2.crt";//支付宝公钥证书文件路径
    
    private String alipay_root_cert_path = "/root/server/app/cert/ali/alipayRootCert.crt";//支付宝CA根证书文件路径

    @Autowired
    private HttpClientUtil httpClientUtil;
@@ -86,83 +86,83 @@
     * 支付宝支付
     */
    public ResultUtil alipay(String body, String subject, String passbackParams, String outTradeNo, String amount, String notifyUrl){
//        //构造client
//        CertAlipayRequest certAlipayRequest = new CertAlipayRequest ();
//        //设置网关地址
//        certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");
//        //设置应用Id
//        certAlipayRequest.setAppId(aliAppid);
//        //设置应用私钥
//        certAlipayRequest.setPrivateKey(appPrivateKey);
//        //设置请求格式，固定值json
//        certAlipayRequest.setFormat("json");
//        //设置字符集
//        certAlipayRequest.setCharset("UTF-8");
//        //设置签名类型
//        certAlipayRequest.setSignType("RSA2");
//        //设置应用公钥证书路径
//        certAlipayRequest.setCertPath(app_cert_path);
//        //设置支付宝公钥证书路径
//        certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path);
//        //设置支付宝根证书路径
//        certAlipayRequest.setRootCertPath(alipay_root_cert_path);
//        //构造client
//        AlipayClient alipayClient = null;
//        try {
//            alipayClient = new DefaultAlipayClient(certAlipayRequest);
//        } catch (AlipayApiException e) {
//            e.printStackTrace();
//        }
//        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
//        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest ();
//        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
//        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel ();
//        model.setBody(body);
//        model.setSubject (subject);
//        model.setOutTradeNo (outTradeNo);
//        model.setTimeoutExpress ("30m" );
//        model.setTotalAmount (amount);
//        model.setProductCode ( "QUICK_MSECURITY_PAY" );
//        model.setPassbackParams(passbackParams);//自定义参数
//        request.setBizModel ( model );
//        request.setNotifyUrl (callbackPath + notifyUrl);
//        try  {
//            //这里和普通的接口调用不同，使用的是sdkExecute
//            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
//            Map<String, String> map = new HashMap<>();
//            map.put("orderString", response.getBody());
//            System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
//            return ResultUtil.success(map);
//        }  catch (AlipayApiException e ) {
//            e.printStackTrace();
//        }


        //实例化客户端
        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
        model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品，请将商品描述字符串累加传给body。
        model.setSubject(subject);//商品的标题/交易标题/订单标题/订单关键字等。
        model.setOutTradeNo(outTradeNo);//商户网站唯一订单号
        model.setTimeoutExpress("30m");
        model.setTotalAmount(amount);//付款金额
        model.setProductCode("QUICK_MSECURITY_PAY");
        model.setPassbackParams(passbackParams);//自定义参数
        request.setBizModel(model);
        request.setNotifyUrl(callbackPath + notifyUrl);
        //构造client
        CertAlipayRequest certAlipayRequest = new CertAlipayRequest ();
        //设置网关地址
        certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");
        //设置应用Id
        certAlipayRequest.setAppId(aliAppid);
        //设置应用私钥
        certAlipayRequest.setPrivateKey(appPrivateKey);
        //设置请求格式，固定值json
        certAlipayRequest.setFormat("json");
        //设置字符集
        certAlipayRequest.setCharset("UTF-8");
        //设置签名类型
        certAlipayRequest.setSignType("RSA2");
        //设置应用公钥证书路径
        certAlipayRequest.setCertPath(app_cert_path);
        //设置支付宝公钥证书路径
        certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path);
        //设置支付宝根证书路径
        certAlipayRequest.setRootCertPath(alipay_root_cert_path);
        //构造client
        AlipayClient alipayClient = null;
        try {
            alipayClient = new DefaultAlipayClient(certAlipayRequest);
        } catch (AlipayApiException e) {
            e.printStackTrace();
        }
        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest ();
        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel ();
        model.setBody(body);
        model.setSubject (subject);
        model.setOutTradeNo (outTradeNo);
        model.setTimeoutExpress ("30m" );
        model.setTotalAmount (amount);
        model.setProductCode ( "QUICK_MSECURITY_PAY" );
        model.setPassbackParams(passbackParams);//自定义参数
        request.setBizModel ( model );
        request.setNotifyUrl (callbackPath + notifyUrl);
        try  {
            //这里和普通的接口调用不同，使用的是sdkExecute
            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
            Map<String, String> map = new HashMap<>();
            map.put("orderString", response.getBody());
            System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
            return ResultUtil.success(map);
        } catch (AlipayApiException e) {
        }  catch (AlipayApiException e ) {
            e.printStackTrace();
        }


//        //实例化客户端
//        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
//        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
//        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
//        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
//        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
//        model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品，请将商品描述字符串累加传给body。
//        model.setSubject(subject);//商品的标题/交易标题/订单标题/订单关键字等。
//        model.setOutTradeNo(outTradeNo);//商户网站唯一订单号
//        model.setTimeoutExpress("30m");
//        model.setTotalAmount(amount);//付款金额
//        model.setProductCode("QUICK_MSECURITY_PAY");
//        model.setPassbackParams(passbackParams);//自定义参数
//        request.setBizModel(model);
//        request.setNotifyUrl(callbackPath + notifyUrl);
//        try {
//            //这里和普通的接口调用不同，使用的是sdkExecute
//            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
//            Map<String, String> map = new HashMap<>();
//            map.put("orderString", response.getBody());
//            System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
//            return ResultUtil.success(map);
//        } catch (AlipayApiException e) {
//            e.printStackTrace();
//        }
        return null;
    }

@@ -599,7 +599,7 @@
        Map<String, String> map1 = null;
        String body1 = null;
        try {
            String certPath = "/usr/local/server/cert/weixin/apiclient_cert.p12";
            String certPath = "/root/server/app/cert/weixin/apiclient_cert.p12";
            body1 = httpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
        } catch (Exception e) {
            e.printStackTrace();
@@ -829,7 +829,7 @@
        xmlString.append("</xml>");

        Map<String, String> map1 = null;
        String certPath = "/usr/local/server/cert/weixin/apiclient_cert.p12";//证书地址
        String certPath = "/root/server/app/cert/weixin/apiclient_cert.p12";//证书地址
        String body1 = httpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
        //将结果xml解析成map
        body1 = body1.replaceAll("<!\\[CDATA\\[","");
@@ -906,7 +906,7 @@
        xmlString.append("</xml>");

        Map<String, String> map1 = null;
        String certPath = "/usr/local/server/cert/weixin/apiclient_cert.p12";//证书地址
        String certPath = "/root/server/app/cert/weixin/apiclient_cert.p12";//证书地址
        String body1 = httpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
        //将结果xml解析成map
        body1 = body1.replaceAll("<!\\[CDATA\\[","");

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

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

public class PushURL {
    public static String zull_user_url = "https://fuban.net";
    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";

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RongCloudUtil.java

@@ -22,8 +22,8 @@
 * 融云
 */
public class RongCloudUtil {
    private static String appKey = "25wehl3u20ddw";
    private static String appSecret = "gG3IjHADkAK";
    private static String appKey = "111";
    private static String appSecret = "111";
           
    private static RongCloud rongCloud = RongCloud.getInstance(appKey, appSecret);
    /**

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

@@ -15,7 +15,7 @@

spring:
  profiles:
    active: local
    active: dev
  mvc:
    static-path-pattern: /static/**
    view:
@@ -39,18 +39,6 @@
    configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则（camel case）映射
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置

logging:
  level.root: error
  level.com.stylefeng: debug
  path: logs/
  file: guns.log

#eureka:
#  client:
#    service-url: #注册中心地址
#      defaultZone: http://sinata:sinata@139.9.249.67:8000/eureka #启用身份验证的方式连接
#    register-with-eureka: true #在注册中心进行注册
#    fetch-registry: true #从Eureka中获取注册信息。


---
@@ -63,13 +51,6 @@
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat

#spring:
#  datasource:
#    url: jdbc:mysql://1.95.6.206:3306/nttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#    username: root
#    password: Xiwang2024!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat


#多数据源情况的配置
@@ -88,29 +69,26 @@

wx:
  grantType: authorization_code #填authorization_code
  appid: wx8a8b041a12743151 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 9e49b99856528f934b51e5e280c7c803 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wxeea48ae5e05197d4 #小程序APPid
  appletsAppSecret: 229f9ca7bb94076a7f8069b10aa18358 #
  mchId: 1514387581 #微信支付分配的商户号
  key: mIyYnFMPd2j1ki1vzUMWhKr4Ve04Mse7 #key为商户平台设置的密钥key：
  appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wx1e3ffc473b238a2a #小程序APPid
  appletsAppSecret: 6346afbc7afc56a008ef888ed5b74500 #
  mchId: 1618978168 #微信支付分配的商户号
  key: BTisLYCrwstKZRTBZef5pe51SCA7Kxe1 #key为商户平台设置的密钥key：

---

alipay:
  appid: 2021003183602081  #应用程序唯一标识
  appPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCh2Oi+GQ1MolFx3+urEOPlYOFpUJhZlVHC2hooRsarMvI/XTnA/yR84QwkgqbZVSKLNyNuJ2MOcyuGGnNThlcgi6hq1sZCEOvxZrraLi85Zu295HPAcZdVNwWyOLSwiEQsS759fayDvVj0aVVIg88sy6NptpXgYtEpWj1NJkxrmb39fZeebPFnerDNDLeim5r6tnMcICTx41Cvkv23uXOeG79WY3F8e4DwsId/lc2VO8c0hQ2e3c2XXEYONSNSnnlLKtQT/gOu34ttKAeEc4SVeIKCsAG4XV4JxnnaJ7Muhvfpawf8jbOv+lYKd+JWUmbj6v0JXnD+uUBhWsojbWv7AgMBAAECggEBAJDmtYG0xi5tSMPOOZ2/knoD4ew7JxtVT41HXZHfw/D0vOQ0IAgFpnJTvl5VxvHfgfzoEcWGZ+5A+J+owMXwCcNupgt5XKk7ozJOyk2aeddHquSPS37pdBbsGyJ0GHnQllCeQ97wjGqqNKEmSR+SOwMdEqILwWXSsvb1/to6xsKxxlxSrTfCAGImmdbJ3latr5PWOcLwxxRArEuDb8j68pvbuwtGVueJu8q/hcoZ9ne8935wy/85HO91gl5CbJuqk/6YN39w/sazcHHsMo01j1TQlCSIV315nM1kNt4dmWcLWPFvG7TcOZNPSDA1BXTxEry6wimBBh0tETJY1mjxOckCgYEA24xF+/r7xdbenlB/uhw21i+gNLPEeJb2Ng6V6CwhX96g7QPdiymaSJn6sEeJTc0MPm0KCohtPdM+qDXCGq+5hLo0pI52ZCNYEUAZIuJrZLeZoK3b7RUAZjD3A2/LiTvMtZaomyovH9wLgDsn26oqUSLxw901FyL+9pxpBWg0z08CgYEAvLgcmTlLFJasoCOOIgTrxtvt0nqejKu691lEInQhg5KrjFSwljBSZ2043BgVA2Xl6oWopbXVUyOz/RvOdzdw8Jl6M430/FNu1rJRwRcMH31lYG66NTRZoRV9vN42qVYyXCGoaYPFHpmZnDdCs+/Pwu+V+VGQmnyfMlIWfRrKTZUCgYA4iaYYHukpaI0Jvfc2iT+B5t/d0pF88HtVLmpiUMMDekR85OrvhHYrziNls/Zi57QIe3IDhmCDdFwFW1qyHqCq0nzuB5XrccKjJpuShTZcyH8yhrNFGYxxxJhH9Uk3/QNZnAOtea6LCNKZYiKAihC9tj8GTnf2jleUUHEnKE+5NwKBgDD3oMwNNrMP6ZjfwOiI2FjQBiSAFpWvlaLKscgy0+Nc8lBGRU+jGC6oA4Hwabto/EBfEAR3avPYpsI9LdR3OUHkwPWRlwjF6VOiD16HyWh+VAiyknRtsff/KJISIqLLr+OCBD3kqAgpmNcU66Tey8zr98Eqbdf4ECKxdA5gHjAFAoGBAJISdjODKJgNDVKRzk5+EGoZ9buFyOuMxmTA0MbTScFidvVMt8jGc27b+AWcs54ZQcgGeNtl3c//K6vdrEBUTnR5tlLnlnFKzgOxlwI+i9eSOlWgz8T3+Ra3L5TIZ11kBO1I0/tB+ERLokZcgnNTERHapxr0Xu86zKjz548e/oqo #开发者应用私钥
  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAodjovhkNTKJRcd/rqxDj5WDhaVCYWZVRwtoaKEbGqzLyP105wP8kfOEMJIKm2VUiizcjbidjDnMrhhpzU4ZXIIuoatbGQhDr8Wa62i4vOWbtveRzwHGXVTcFsji0sIhELEu+fX2sg71Y9GlVSIPPLMujabaV4GLRKVo9TSZMa5m9/X2XnmzxZ3qwzQy3opua+rZzHCAk8eNQr5L9t7lznhu/VmNxfHuA8LCHf5XNlTvHNIUNnt3Nl1xGDjUjUp55SyrUE/4Drt+LbSgHhHOElXiCgrABuF1eCcZ52iezLob36WsH/I2zr/pWCnfiVlJm4+r9CV5w/rlAYVrKI21r+wIDAQAB #应用公钥
  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsi4M2NzIx0UQVa7pSXZnAqzNWgGaFmfjOrkwtlxnCdnqcl/9TnXNc86N+EBnBa7xKeb6hrGn/ZE+Ex6imZMp5V41+lJZ6Ynqk3zAvaPLgiq2DU4PHRBTaJZlcoBONemHgggGq2NqQRUUNfty9ZHZejDJic1WOX+BypEZgph1yZ6z4CcxeXXCHYlWViKvwGFRZtuvcypP3Uv7juIA460C1y/+etDxaUC4LPIxQJeCI9rPCTQb54rkJd0Htbvv525tVovhJxXvF9J/XE2LzYier7T8tQJ/TYGvVvZoMmyWWIO3SBuWwjp1nSh9tfbfXTRIUJjWVFTMS04WR6oG9tDS+QIDAQAB #支付宝公钥
  appid: 111  #应用程序唯一标识
  appPrivateKey: 111 #开发者应用私钥
  alipayPublicKey: 111 #应用公钥
  alipay_public_key: 111 #支付宝公钥

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


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

#支付回调地址
#正式环境
callbackPath: https://fuban.net
callbackPath: http://1.95.8.79:81/driver

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

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

@@ -1,132 +1,230 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>

    <!--定义日志存放的位置-->
    <springProperty scope="context" name="gunsLogPath" source="log.path" defaultValue="guns-logs"/>

    <!-- ****************************************************************************************** -->
    <!-- ****************************** 本地开发只在控制台打印日志 ******************************** -->
    <!-- ****************************************************************************************** -->
    <springProfile name="local">

        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
            <!--encoder 默认配置为PatternLayoutEncoder-->
            <encoder>
                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %logger Line:%-3L - %msg%n</pattern>
                <charset>utf-8</charset>
            </encoder>
        </appender>

        <!-- 日志记录器，日期滚动记录 -->
        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
            <!-- 正在记录的日志文件的路径及文件名 -->
            <file>${gunsLogPath}/log_error.log</file>
            <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
                <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
                而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
                <fileNamePattern>${gunsLogPath}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
                <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
                命名日志文件，例如log-error-2013-12-21.0.log -->
                <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                    <maxFileSize>2MB</maxFileSize>
                </timeBasedFileNamingAndTriggeringPolicy>
            </rollingPolicy>
            <!-- 追加方式记录日志 -->
            <append>true</append>
            <!-- 日志文件的格式 -->
            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
                <charset>utf-8</charset>
            </encoder>
            <!-- 日志文件记录级别配置。
                日志级别：ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF
                onMatch="ACCEPT" 表示匹配该级别及以上
                onMatch="DENY" 表示不匹配该级别及以上
                onMatch="NEUTRAL" 表示该级别及以上的，由下一个filter处理，如果当前是最后一个，则表示匹配该级别及以上
                onMismatch="ACCEPT" 表示匹配该级别以下
                onMismatch="NEUTRAL" 表示该级别及以下的，由下一个filter处理，如果当前是最后一个，则不匹配该级别以下的
                onMismatch="DENY" 表示不匹配该级别以下的
             -->
            <filter class="ch.qos.logback.classic.filter.LevelFilter">
                <level>ERROR</level>
                <onMatch>ACCEPT</onMatch>
                <onMismatch>DENY</onMismatch>
            </filter>
        </appender>

        <root level="INFO">
            <appender-ref ref="STDOUT"/>
            <appender-ref ref="FILE"/>
<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，比如: 如果设置为WARN，则低于WARN的信息都不会输出 -->
<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
<configuration  scan="true" scanPeriod="10 seconds">
    <contextName>logback</contextName>
    
    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/root/server/app/logs/admin"/>
    
    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->
    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
    <!-- 彩色日志格式 -->
    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
    
    <!--1. 输出到控制台-->
    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <level>debug</level>
        </filter>
        <encoder>
            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
            <!-- 设置字符集 -->
            <charset>UTF-8</charset>
        </encoder>
    </appender>
    
    <!--2. 输出到文档-->
    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <!-- 正在记录的日志文档的路径及文档名 -->
        <file>${log.path}/debug.log</file>
        <!--日志文档输出格式-->
        <encoder>
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
            <charset>UTF-8</charset> <!-- 设置字符集 -->
        </encoder>
        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志归档 -->
            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <!--日志文档保留天数-->
            <maxHistory>180</maxHistory>
        </rollingPolicy>
        <!-- 此日志文档只记录debug级别的 -->
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>debug</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
    
    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <!-- 正在记录的日志文档的路径及文档名 -->
        <file>${log.path}/info.log</file>
        <!--日志文档输出格式-->
        <encoder>
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
            <charset>UTF-8</charset>
        </encoder>
        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 每天日志归档路径以及格式 -->
            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <!--日志文档保留天数-->
            <maxHistory>180</maxHistory>
        </rollingPolicy>
        <!-- 此日志文档只记录info级别的 -->
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>info</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
    
    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <!-- 正在记录的日志文档的路径及文档名 -->
        <file>${log.path}/warn.log</file>
        <!--日志文档输出格式-->
        <encoder>
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
        </encoder>
        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <!--日志文档保留天数-->
            <maxHistory>180</maxHistory>
        </rollingPolicy>
        <!-- 此日志文档只记录warn级别的 -->
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>warn</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
    
    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <!-- 正在记录的日志文档的路径及文档名 -->
        <file>${log.path}/error.log</file>
        <!--日志文档输出格式-->
        <encoder>
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
        </encoder>
        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <!--日志文档保留天数-->
            <maxHistory>180</maxHistory>
        </rollingPolicy>
        <!-- 此日志文档只记录ERROR级别的 -->
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>ERROR</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
    
    <!-- 2.5 所有 除了DEBUG级别的其它高于DEBUG的 日志，记录到一个文件  -->
    <appender name="ALL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <!-- 正在记录的日志文档的路径及文档名 -->
        <file>${log.path}/all.log</file>
        <!--日志文档输出格式-->
        <encoder>
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
        </encoder>
        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${log.path}/all-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>100MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
            <!--日志文档保留天数-->
            <maxHistory>180</maxHistory>
        </rollingPolicy>
        <!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>DEBUG</level>
            <onMatch>DENY</onMatch>
            <onMismatch>ACCEPT</onMismatch>
        </filter>
    </appender>
    
    <!--
        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
        以及指定<appender>。<logger>仅有一个name属性，
        一个可选的level和一个可选的addtivity属性。
        name:用来指定受此logger约束的某一个包或者具体的某一个类。
        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
              还有一个特殊值INHERITED或者同义词NULL，代表强制执行上级的级别。
              如果未设置此属性，那么当前logger将会继承上级的级别。
        addtivity:是否向上级logger传递打印信息。默认是true。
        <logger name="org.springframework.web" level="info"/>
        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
    -->
    
    <!--
        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
        不能设置为INHERITED或者同义词NULL。默认是DEBUG
        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
    -->
    
    <!-- 4  最终的策略：
                 基本策略(root级) + 根据profile在启动时, logger标签中定制化package日志级别(优先级高于上面的root级)-->
    <springProfile name="dev">
        <root level="info">
            <appender-ref ref="CONSOLE" />
            <appender-ref ref="DEBUG_FILE" />
            <appender-ref ref="INFO_FILE" />
            <appender-ref ref="WARN_FILE" />
            <appender-ref ref="ERROR_FILE" />
            <appender-ref ref="ALL_FILE" />
        </root>
        <logger name="com.baomidou.mybatisplus" level="info"/>
        <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
        <logger name="business-log" level="warn"/>
    </springProfile>
    
    <springProfile name="fat">
        <root level="info">
            <appender-ref ref="CONSOLE" />
            <appender-ref ref="DEBUG_FILE" />
            <appender-ref ref="INFO_FILE" />
            <appender-ref ref="WARN_FILE" />
            <appender-ref ref="ERROR_FILE" />
            <appender-ref ref="ALL_FILE" />
        </root>
        <logger name="com.baomidou.mybatisplus" level="debug"/>
        <logger name="com.stylefeng.guns.modular.system.dao" level="error"/>
        <logger name="business-log" level="warn"/>
    </springProfile>
    
    <springProfile name="produce">
        <root level="info">
            <!-- 生产环境最好不配置console写文件 -->
            <appender-ref ref="DEBUG_FILE" />
            <appender-ref ref="INFO_FILE" />
            <appender-ref ref="WARN_FILE" />
            <appender-ref ref="ERROR_FILE" />
            <appender-ref ref="ALL_FILE" />
        </root>
        <logger name="com.baomidou.mybatisplus" level="error"/>
        <logger name="com.stylefeng.guns.modular.system.dao" level="debug"/>
        <logger name="business-log" level="warn"/>
    </springProfile>

    <!-- ****************************************************************************************** -->
    <!-- ********************** 放到服务器上不管在什么环境都只在文件记录日志 ********************** -->
    <!-- ****************************************************************************************** -->
    <springProfile name="!local">

        <!-- 日志记录器，日期滚动记录 -->
        <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
            <!-- 正在记录的日志文件的路径及文件名 -->
            <file>${gunsLogPath}/log_error.log</file>
            <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
                <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
                而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
                <fileNamePattern>${gunsLogPath}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
                <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
                命名日志文件，例如log-error-2013-12-21.0.log -->
                <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                    <maxFileSize>2MB</maxFileSize>
                </timeBasedFileNamingAndTriggeringPolicy>
            </rollingPolicy>
            <!-- 追加方式记录日志 -->
            <append>true</append>
            <!-- 日志文件的格式 -->
            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
                <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
                <charset>utf-8</charset>
            </encoder>
            <!-- 此日志文件只记录error级别的 -->
            <filter class="ch.qos.logback.classic.filter.LevelFilter">
                <level>error</level>
                <onMatch>ACCEPT</onMatch>
                <onMismatch>DENY</onMismatch>
            </filter>
        </appender>

        <!-- 日志记录器，日期滚动记录 -->
        <appender name="FILE_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
            <!-- 正在记录的日志文件的路径及文件名 -->
            <file>${gunsLogPath}/log_total.log</file>
            <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
                <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
                而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
                <fileNamePattern>${gunsLogPath}/total/log-total-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
                <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
                命名日志文件，例如log-error-2013-12-21.0.log -->
                <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                    <maxFileSize>2MB</maxFileSize>
                </timeBasedFileNamingAndTriggeringPolicy>
            </rollingPolicy>
            <!-- 追加方式记录日志 -->
            <append>true</append>
            <!-- 日志文件的格式 -->
            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
                <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
                <charset>utf-8</charset>
            </encoder>
        </appender>

        <root level="INFO">
            <appender-ref ref="FILE_ERROR"/>
            <appender-ref ref="FILE_ALL"/>
        </root>

    </springProfile>

</configuration>


</configuration>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html

@@ -6,7 +6,12 @@
    <meta name="renderer" content="webkit"/><!-- 让360浏览器默认选择webkit内核 -->

    <!--地图-->
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=fc16f6c803d14c7ba0770c642f118af9"></script>
    <script type="text/javascript">
        window._AMapSecurityConfig = {
            securityJsCode: "419dbfdd6e8561375320e421de245aa5",
        };
    </script>
    <!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IRKL4FLGKZUFr6T3gFk3t9X6kKarKu1K"></script>-->

    <!-- 全局css -->

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html

@@ -256,9 +256,14 @@
        </div>
    </div>
</div>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.MouseTool"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=fc16f6c803d14c7ba0770c642f118af9"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=fc16f6c803d14c7ba0770c642f118af9&plugin=AMap.MouseTool"></script>
<script type="text/javascript" src='https://a.amap.com/jsapi_demos/static/citys.js'></script>
<script src="${ctxPath}/static/home.js"></script>
<script src="${ctxPath}/static/js/jquery.sparkline 2.1.2.js"></script>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode: "419dbfdd6e8561375320e421de245aa5",
    };
</script>
@}

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

@@ -6,7 +6,7 @@

    <title>安合出行 - 登录</title>

    <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
    <link rel="shortcut icon" href="${ctxPath}/static/favicon.ico">
    <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
    <link href="${ctxPath}/static/css/font-awesome.css?v=4.4.0" rel="stylesheet">
    <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
@@ -55,10 +55,10 @@
<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/213212.png" style="width: 300px;height: 400px;z-index: 1000;border-radius: 8px;">
<div  style="position: relative;left: -30px; 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>
        <h3 style="color: black;text-align: center;"><!--<img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/>&nbsp;-->安合出行管理后台</h3>
        <br/>
        <h4 style="color: red;">${tips!}</h4>
        <form class="m-t" role="form" action="${ctxPath}/login" method="post">

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/generalization/sysCouponRecord.html

@@ -17,9 +17,9 @@
                                <option value="">全部</option>
                                <option value="0">通用券</option>
                                <option value="1">专车券</option>
                                <option value="2">出租券</option>
<!--                                <option value="2">出租券</option>-->
                                <option value="3">跨城出行券</option>
                                <option value="7">接送机出行券</option>
<!--                                <option value="7">接送机出行券</option>-->
                            </#SelectCon>
                            </div>
                            <div class="col-sm-3">

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html

@@ -21,7 +21,7 @@
                        <option value="1">专车券</option>
                        <!--<option value="2">出租车券</option>-->
                        <option value="3">跨城券</option>
                        <option value="7">接送机券</option>
<!--                        <option value="7">接送机券</option>-->
                        <option value="0">通用券</option>
                    </#select>
                    <#input id="money" name="金额" underline="true" placeholder="最多4位数字"/>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html

@@ -68,7 +68,6 @@
                                    <input type="checkbox" name="serverBox" id="serverBox5" value="5">
                                    <label for="serverBox5"> 小件物流-跨城 </label>
                                </div>
                                -->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox6" value="6">
                                    <label for="serverBox6"> 包车 </label>
@@ -77,6 +76,7 @@
                                    <input type="checkbox" name="serverBox" id="serverBox7" value="7" onclick="TCarInfoDlg.jsjServerClick()">
                                    <label for="serverBox7"> 接送机 </label>
                                </div>
                                -->
                            </div>
                        </fieldset>
                    </div>
@@ -102,6 +102,7 @@
                            </select>
                        </div>
                    </div>
                    <!--
                    <div class="form-group" style="display: none;" id="jsjModelDiv">
                        <label class="col-sm-3 control-label">接送机车型：</label>
                        <div class="col-sm-9">
@@ -113,7 +114,7 @@
                            </select>
                        </div>
                    </div>

                    -->
                    <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
                        <option value="">选择车辆品牌</option>
                        @for(obj in brandList){

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html

@@ -70,7 +70,6 @@
                                    <input type="checkbox" name="serverBox" id="serverBox5" value="5" ${2 == five ? 'checked=checked' : ''}>
                                    <label for="serverBox5"> 小件物流-跨城 </label>
                                </div>
                                -->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox6" value="6" ${2 == six ? 'checked=checked' : ''}>
                                    <label for="serverBox6"> 包车 </label>
@@ -79,6 +78,7 @@
                                    <input type="checkbox" name="serverBox" id="serverBox7" value="7" ${2 == seven ? 'checked=checked' : ''} onclick="TCarInfoDlg.jsjServerClick()">
                                    <label for="serverBox7"> 接送机 </label>
                                </div>
                                -->
                            </div>
                        </fieldset>
                    </div>
@@ -104,6 +104,7 @@
                            </select>
                        </div>
                    </div>
                    <!--
                    <div class="form-group" id="jsjModelDiv">
                        <label class="col-sm-3 control-label">接送机车型：</label>
                        <div class="col-sm-9">
@@ -115,6 +116,7 @@
                            </select>
                        </div>
                    </div>
                    -->
                    <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
                        <option value="">选择车辆品牌</option>
                        @for(obj in brandList){

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html

@@ -216,7 +216,7 @@
                                        </div>
                                    </fieldset>
                                </div>
                                -->
                                
                                <div class="checkbox checkbox-danger">
                                    <input name="checkbox" id="checkbox6" type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox6()">
                                    <label for="checkbox6">
@@ -264,7 +264,7 @@
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                                </div>-->
                            </fieldset>
                        </div>
                    </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html

@@ -184,7 +184,7 @@
                                        </div>
                                    </fieldset>
                                </div>
                                -->
                                
                                <div class="checkbox checkbox-danger">
                                    <input name="checkbox" id="checkbox6" type="checkbox" value="6" onclick="TCompanyInfoDlg.checkbox6()">
                                    <label for="checkbox6">
@@ -223,7 +223,7 @@
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                                </div>-->
                            </fieldset>
                        </div>
                    </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html

@@ -165,7 +165,7 @@
                                        </div>
                                    </fieldset>
                                </div>
                                -->
                                
                                <div class="checkbox checkbox-danger">
                                    <input name="checkbox" id="checkbox6" type="checkbox" value="6" onclick="FranchiseeInfoDlg.checkbox6()">
                                    <label for="checkbox6">
@@ -205,7 +205,7 @@
                                        </div>
                                    </fieldset>
                                </div>

                                -->
                            </fieldset>
                        </div>
                    </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html

@@ -257,7 +257,7 @@
                                        </div>
                                    </fieldset>
                                </div>
                                -->
                                
                                <div class="checkbox checkbox-danger">
                                    <input name="checkbox" id="checkbox6" disabled type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} >
                                    <label for="checkbox6">
@@ -303,7 +303,7 @@
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                                </div>-->
                            </fieldset>
                        </div>
                    </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html

@@ -189,7 +189,7 @@
                                    </div>
                                </fieldset>
                            </div>
                            -->
                            
                            <div class="checkbox checkbox-danger">
                                <input name="checkbox" id="checkbox6" type="checkbox" disabled value="6" ${1 == item.isCharter ? 'checked=checked' : ''} >
                                <label for="checkbox6">
@@ -236,7 +236,7 @@
                                        </div>
                                    </div>
                                </fieldset>
                            </div>
                            </div>-->
                        </fieldset>
                    </div>
                </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html

@@ -216,7 +216,7 @@
                                        </div>
                                    </fieldset>
                                </div>
                                -->
                                
                                <div class="checkbox checkbox-danger">
                                    <input name="checkbox" id="checkbox6" type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox6()">
                                    <label for="checkbox6">
@@ -262,7 +262,7 @@
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                                </div>-->
                            </fieldset>
                        </div>
                    </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html

@@ -197,7 +197,7 @@
                                        </div>
                                    </fieldset>
                                </div>
                                -->
                                
                                <div class="checkbox checkbox-danger">
                                    <input name="checkbox" id="checkbox6" type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox6()">
                                    <label for="checkbox6">
@@ -244,7 +244,7 @@
                                            </div>
                                        </div>
                                    </fieldset>
                                </div>
                                </div>-->
                            </fieldset>
                        </div>
                    </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html

@@ -90,14 +90,14 @@
                                    <!--<input type="checkbox" name="serverBox" id="serverBox5" value="5">-->
                                    <!--<label for="serverBox5"> 小件物流-跨城 </label>-->
                                <!--</div>-->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox6" value="6">
                                    <label for="serverBox6"> 包车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox7" value="7">
                                    <label for="serverBox7"> 接送机 </label>
                                </div>
<!--                                <div class="checkbox checkbox-success  checkbox-inline">-->
<!--                                    <input type="checkbox" name="serverBox" id="serverBox6" value="6">-->
<!--                                    <label for="serverBox6"> 包车 </label>-->
<!--                                </div>-->
<!--                                <div class="checkbox checkbox-success  checkbox-inline">-->
<!--                                    <input type="checkbox" name="serverBox" id="serverBox7" value="7">-->
<!--                                    <label for="serverBox7"> 接送机 </label>-->
<!--                                </div>-->
                            </div>
                        </fieldset>
                    </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html

@@ -93,14 +93,14 @@
                                    <!--<input type="checkbox" name="serverBox" id="serverBox5" value="5" ${2 == five ? 'checked=checked' : ''}>-->
                                    <!--<label for="serverBox5"> 小件物流-跨城 </label>-->
                                <!--</div>-->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox6" value="6" ${2 == six ? 'checked=checked' : ''}>
                                    <label for="serverBox6"> 包车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox7" value="7" ${2 == seven ? 'checked=checked' : ''}>
                                    <label for="serverBox7"> 接送机 </label>
                                </div>
<!--                                <div class="checkbox checkbox-success  checkbox-inline">-->
<!--                                    <input type="checkbox" name="serverBox" id="serverBox6" value="6" ${2 == six ? 'checked=checked' : ''}>-->
<!--                                    <label for="serverBox6"> 包车 </label>-->
<!--                                </div>-->
<!--                                <div class="checkbox checkbox-success  checkbox-inline">-->
<!--                                    <input type="checkbox" name="serverBox" id="serverBox7" value="7" ${2 == seven ? 'checked=checked' : ''}>-->
<!--                                    <label for="serverBox7"> 接送机 </label>-->
<!--                                </div>-->
                            </div>
                        </fieldset>
                    </div>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html

@@ -31,8 +31,8 @@
                                <option value="3">跨城</option>
                                <!--<option value="4">跨城小件物流</option>-->
                                <!--<option value="5">同城小件物流</option>-->
                                <option value="6">包车</option>
                                <option value="7">接送机</option>
<!--                                <option value="6">包车</option>-->
<!--                                <option value="7">接送机</option>-->
                            </select>
                        </div>
                        <div class="col-sm-3" >
@@ -124,10 +124,10 @@
</div>
<script>
    window._AMapSecurityConfig = {
        securityJsCode:'58f0e656d02373943498c93ccb11b02f',
        securityJsCode:'419dbfdd6e8561375320e421de245aa5',
    };
</script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=fc16f6c803d14c7ba0770c642f118af9&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html

@@ -38,8 +38,8 @@
                                <option value="3">跨城</option>
                                <!--<option value="4">跨城小件物流</option>-->
                                <!--<option value="5">同城小件物流</option>-->
                                <option value="6">包车</option>
                                <option value="7">接送机</option>
<!--                                <option value="6">包车</option>-->
<!--                                <option value="7">接送机</option>-->
                            </select>
                        </div>
                        <div class="col-sm-3" >
@@ -155,10 +155,10 @@
</div>
<script>
    window._AMapSecurityConfig = {
        securityJsCode:'58f0e656d02373943498c93ccb11b02f',
        securityJsCode:'419dbfdd6e8561375320e421de245aa5',
    };
</script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=fc16f6c803d14c7ba0770c642f118af9&plugin=AMap.Autocomplete,AMap.PlaceSearch"></script>
<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
@}

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html

@@ -145,10 +145,15 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=fc16f6c803d14c7ba0770c642f118af9"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
<script>
    window._AMapSecurityConfig = {
        securityJsCode:'419dbfdd6e8561375320e421de245aa5',
    };
</script>
<script>
    var audioElements = document.querySelectorAll('audio');

    var recordState = $("#recordState").val();

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html

@@ -45,8 +45,13 @@

    </div>
</div>
<script>
    window._AMapSecurityConfig = {
        securityJsCode:'419dbfdd6e8561375320e421de245aa5',
    };
</script>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=fc16f6c803d14c7ba0770c642f118af9"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
@}

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html

@@ -35,7 +35,7 @@
                                    <option value="3">跨城</option>
                                    <!--<option value="4">跨城小件物流</option>-->
                                    <!--<option value="5">同城小件物流</option>-->
                                    <option value="6">包车</option>
<!--                                    <option value="6">包车</option>-->
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html

@@ -128,8 +128,13 @@
        </div>
    </div>
</div>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode: "419dbfdd6e8561375320e421de245aa5",
    };
</script>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=fc16f6c803d14c7ba0770c642f118af9"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
<script>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html

@@ -46,7 +46,12 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=fc16f6c803d14c7ba0770c642f118af9"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode: "419dbfdd6e8561375320e421de245aa5",
    };
</script>
@}

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html

@@ -101,8 +101,13 @@

    </div>
</div>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode: "419dbfdd6e8561375320e421de245aa5",
    };
</script>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=fc16f6c803d14c7ba0770c642f118af9"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html

@@ -45,8 +45,13 @@

    </div>
</div>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode: "419dbfdd6e8561375320e421de245aa5",
    };
</script>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=fc16f6c803d14c7ba0770c642f118af9"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_add.html

@@ -71,7 +71,7 @@
                            <#input id="oldState" name="状态(改派前订单状态)" underline="true"/>
                            <#input id="telX" name="移动小号" underline="true"/>
                            <#input id="bindId" name="移动小号绑定关系id" underline="true"/>
                            <#input id="serverCarModelId" name="接送机车型ID  关联t_server_carmodel表" underline="true"/>
<!--                            <#input id="serverCarModelId" name="接送机车型ID  关联t_server_carmodel表" underline="true"/>-->
                </div>
            </div>


 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_orderDetail.html

@@ -127,8 +127,13 @@
        </div>
    </div>
</div>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode: "419dbfdd6e8561375320e421de245aa5",
    };
</script>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=fc16f6c803d14c7ba0770c642f118af9"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTransfer/tOrderTransfer_info.js"></script>
<script>

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTransfer/tOrderTransfer_trajectory.html

@@ -45,8 +45,13 @@

    </div>
</div>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode: "419dbfdd6e8561375320e421de245aa5",
    };
</script>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5731f035751d2d75ab2de79dbe92dcfe"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=fc16f6c803d14c7ba0770c642f118af9"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTransfer/tOrderTransfer_info.js"></script>
@}

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html

@@ -164,7 +164,12 @@

    </div>
</div>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode: "419dbfdd6e8561375320e421de245aa5",
    };
</script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=fc16f6c803d14c7ba0770c642f118af9&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
@}

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html

@@ -187,7 +187,12 @@

    </div>
</div>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=5731f035751d2d75ab2de79dbe92dcfe&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode: "419dbfdd6e8561375320e421de245aa5",
    };
</script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=fc16f6c803d14c7ba0770c642f118af9&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
@}

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html

@@ -173,6 +173,7 @@
                            <br/>
                        </div>
                    </div>
                    <!--
                    <div class="form-group">
                        <label class="col-sm-2 control-label">接送机推单：</label>
                        <div class="col-sm-10">
@@ -246,6 +247,7 @@
                            <br/>
                        </div>
                    </div>
                    -->
                    <div class="form-group">
                        <label class="col-sm-2 control-label">取消设置：</label>
                        <div class="col-sm-10">
@@ -264,6 +266,7 @@
                                               @}
                                               name="ptCancel2" id="ptCancel2" class="form-control newWidth" />&nbsp;元取消费用；
                            <br/>
                            <!--
                            <br/>
                            接送机订单取消规则：接送机订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                             @if(isNotEmpty(ptCancel2)){
@@ -280,6 +283,7 @@
                                               @}
                                               name="ptCancel4" id="ptCancel4" class="form-control newWidth" />&nbsp;元取消费用；
                            <br/>
                            -->
                        </div>
                    </div>
                    <div class="form-group">
@@ -300,6 +304,7 @@
                                               @}
                                               name="yyCancel2" id="yyCancel2" class="form-control newWidth" />&nbsp;元取消费用；
                            <br/>
                            <!--
                            <br/>
                            接送机订单取消规则：接送机订单在司机接单&nbsp;<input type="text" oninput="checkIsInt(this)"
                                                             @if(isNotEmpty(yyCancel2)){
@@ -316,6 +321,7 @@
                                               @}
                                               name="yyCancel4" id="yyCancel4" class="form-control newWidth" />&nbsp;元取消费用；
                            <br/>
                            -->
                        </div>
                    </div>
                    <div class="form-group">
@@ -338,6 +344,7 @@
                                              @}
                                              name="phone2" id="phone2" class="form-control newWidth" />&nbsp;
                            <br/>
                            <!--
                            <br/>
                            包车调度电话：&nbsp;<input type="text"
                                              @if(isNotEmpty(phone3)){
@@ -347,6 +354,7 @@
                                              @}
                                              name="phone3" id="phone3" class="form-control newWidth" />&nbsp;
                            <br/>
                            -->
                        </div>
                        <div class="col-sm-3">
                            <#avatar id="userQrCode" name="用户端客服二维码" avatarImg="${reformist.userQrCode!}"/>
@@ -456,39 +464,39 @@
        var zc8 = $("#zc8").val().trim();
        var zc9 = $("#zc9").val().trim();

        var jsj1 = $("#jsj1").val().trim();
        var jsj2 = $("#jsj2").val().trim();
        var jsj3 = $("#jsj3").val().trim();
        var jsj4 = $("#jsj4").val().trim();
        var jsj5 = $("#jsj5").val().trim();
        var jsj6 = $("#jsj6").val().trim();
        var jsj7 = $("#jsj7").val().trim();
        var jsj8 = $("#jsj8").val().trim();
        var jsj9 = $("#jsj9").val().trim();
        // var jsj1 = $("#jsj1").val().trim();
        // var jsj2 = $("#jsj2").val().trim();
        // var jsj3 = $("#jsj3").val().trim();
        // var jsj4 = $("#jsj4").val().trim();
        // var jsj5 = $("#jsj5").val().trim();
        // var jsj6 = $("#jsj6").val().trim();
        // var jsj7 = $("#jsj7").val().trim();
        // var jsj8 = $("#jsj8").val().trim();
        // var jsj9 = $("#jsj9").val().trim();

        var ptCancel1 = $("#ptCancel1").val().trim();
        var ptCancel2 = $("#ptCancel2").val().trim();
        var ptCancel3 = $("#ptCancel3").val().trim();
        var ptCancel4 = $("#ptCancel4").val().trim();
        // var ptCancel3 = $("#ptCancel3").val().trim();
        // var ptCancel4 = $("#ptCancel4").val().trim();
        // var ptCancel5 = $("#ptCancel5").val().trim();
        // var ptCancel6 = $("#ptCancel6").val().trim();

        var yyCancel1 = $("#yyCancel1").val().trim();
        var yyCancel2 = $("#yyCancel2").val().trim();
        var yyCancel3 = $("#yyCancel3").val().trim();
        var yyCancel4 = $("#yyCancel4").val().trim();
        // var yyCancel3 = $("#yyCancel3").val().trim();
        // var yyCancel4 = $("#yyCancel4").val().trim();

        var phone1 = $("#phone1").val().trim();
        var phone2 = $("#phone2").val().trim();
        var phone3 = $("#phone3").val().trim();
        // var phone3 = $("#phone3").val().trim();
        var userQrCode = $("#userQrCode").val().trim();
        var driverQrCode = $("#driverQrCode").val().trim();

        if ("" == one || "" == two || "" == three
            || "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
            || "" == jsj1 || "" == jsj2 || "" == jsj3 || "" == jsj4 || "" == jsj5 || "" == jsj6 || "" == jsj7 || "" == jsj8 || "" == jsj9
            || "" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 /*|| "" == ptCancel5 || "" == ptCancel6*/
            || "" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4
            /*|| "" == jsj1 || "" == jsj2 || "" == jsj3 || "" == jsj4 || "" == jsj5 || "" == jsj6 || "" == jsj7 || "" == jsj8 || "" == jsj9*/
            || "" == ptCancel1 || "" == ptCancel2 /*|| "" == ptCancel3 || "" == ptCancel4 || "" == ptCancel5 || "" == ptCancel6*/
            || "" == yyCancel1 || "" == yyCancel2 /*|| "" == yyCancel3 || "" == yyCancel4*/
            || "" == phone1 || "" == phone2 ) {
            Feng.info("输入框不能为空!");
            return;
@@ -506,12 +514,12 @@
            || !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6)
            || !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9)

            || !regDouble.test(jsj1) || !regInt.test(jsj2) || !regDouble.test(jsj3)
            || !regDouble.test(jsj4) || !regInt.test(jsj5) || !regDouble.test(jsj6)
            || !regDouble.test(jsj7) || !regInt.test(jsj8) || !regDouble.test(jsj9)
            // || !regDouble.test(jsj1) || !regInt.test(jsj2) || !regDouble.test(jsj3)
            // || !regDouble.test(jsj4) || !regInt.test(jsj5) || !regDouble.test(jsj6)
            // || !regDouble.test(jsj7) || !regInt.test(jsj8) || !regDouble.test(jsj9)

            || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2)  || !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) /*|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
            || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) || !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)) {
            || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2)  /*|| !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) || !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
            || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) /*|| !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)*/) {
            Feng.info("格式不正确!");
            return ;
        }
@@ -546,31 +554,31 @@
        ajax.set("zc8", zc8);
        ajax.set("zc9", zc9);

        ajax.set("jsj1", jsj1);
        ajax.set("jsj2", jsj2);
        ajax.set("jsj3", jsj3);
        ajax.set("jsj4", jsj4);
        ajax.set("jsj5", jsj5);
        ajax.set("jsj6", jsj6);
        ajax.set("jsj7", jsj7);
        ajax.set("jsj8", jsj8);
        ajax.set("jsj9", jsj9);
        ajax.set("jsj1", 0);
        ajax.set("jsj2", 0);
        ajax.set("jsj3", 0);
        ajax.set("jsj4", 0);
        ajax.set("jsj5", 0);
        ajax.set("jsj6", 0);
        ajax.set("jsj7", 0);
        ajax.set("jsj8", 0);
        ajax.set("jsj9", 0);

        ajax.set("ptCancel1", ptCancel1);
        ajax.set("ptCancel2", ptCancel2);
        ajax.set("ptCancel3", ptCancel3);
        ajax.set("ptCancel4", ptCancel4);
        ajax.set("ptCancel3", 0);
        ajax.set("ptCancel4", 0);
        ajax.set("ptCancel5", 0);
        ajax.set("ptCancel6", 0);

        ajax.set("yyCancel1", yyCancel1);
        ajax.set("yyCancel2", yyCancel2);
        ajax.set("yyCancel3", yyCancel3);
        ajax.set("yyCancel4", yyCancel4);
        ajax.set("yyCancel3", 0);
        ajax.set("yyCancel4", 0);

        ajax.set("phone1", phone1);
        ajax.set("phone2", phone2);
        ajax.set("phone3", phone3);
        ajax.set("phone3", 0);
        ajax.set("userQrCode", userQrCode);
        ajax.set("driverQrCode", driverQrCode);
        ajax.start();

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html

@@ -189,10 +189,10 @@
                                    <br/>

                                    <br/>
                                    接送机活动打折：
                                    &nbsp;&nbsp;&nbsp;
                                    &nbsp;<input type="text"  name="zc1" id="content5Num2" class="form-control newWidth" />&nbsp;折
                                    <br/>
<!--                                    接送机活动打折：-->
<!--                                    &nbsp;&nbsp;&nbsp;-->
<!--                                    &nbsp;<input type="text"  name="zc1" id="content5Num2" class="form-control newWidth" />&nbsp;折-->
<!--                                    <br/>-->
                                    <!--
                                   <br/>
                                   小件物流活动打折：

 ManagementAHTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html

@@ -335,17 +335,17 @@
                                                 name="zc1" id="content5Num1" class="form-control newWidth" />&nbsp;
                                    <br/>

                                    <br/>
                                    接送机活动打折：
                                    &nbsp;&nbsp;&nbsp;
                                    &nbsp;<input type="text"
                                                 @if(isNotEmpty(item4)){
                                                 value="${item4.taxi}"
                                                 @}else{
                                                 value=""
                                                 @}
                                                 name="zc1" id="content5Num2" class="form-control newWidth" />&nbsp;
                                    <br/>
<!--                                    <br/>-->
<!--                                    接送机活动打折：-->
<!--                                    &nbsp;&nbsp;&nbsp;-->
<!--                                    &nbsp;<input type="text"-->
<!--                                                 @if(isNotEmpty(item4)){-->
<!--                                                 value="${item4.taxi}"-->
<!--                                                 @}else{-->
<!--                                                 value=""-->
<!--                                                 @}-->
<!--                                                 name="zc1" id="content5Num2" class="form-control newWidth" />&nbsp;-->
<!--                                    <br/>-->
                                    <!--
                            <br/>
                            小件物流活动打折：

 ManagementAHTravel/guns-admin/src/main/webapp/static/bitbug_favicon.ico

Binary files differ

 ManagementAHTravel/guns-admin/src/main/webapp/static/favicon.ico

 ManagementAHTravel/guns-admin/src/main/webapp/static/home.js

@@ -412,23 +412,23 @@
            kc += '</div>';
            o += kc;

            var cz = '<div class="list-group"><a href="#" class="list-group-item active">出租车未接订单</a>'
            for(var i in chuzu){
                cz += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + chuzu[i].start + '</p><p class="list-group-item-text">终点：' + chuzu[i].end + '</p>' +
                    '<p class="list-group-item-text">下单时间：' + chuzu[i].travelTime + '</p><p class="list-group-item-text">车型：' + chuzu[i].carModel + '</p>' +
                    '<p class="list-group-item-text">人数：' + chuzu[i].num + '</p></a>';
            }
            cz += '</div>';
            o += cz;
            // var cz = '<div class="list-group"><a href="#" class="list-group-item active">出租车未接订单</a>'
            // for(var i in chuzu){
            //     cz += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + chuzu[i].start + '</p><p class="list-group-item-text">终点：' + chuzu[i].end + '</p>' +
            //         '<p class="list-group-item-text">下单时间：' + chuzu[i].travelTime + '</p><p class="list-group-item-text">车型：' + chuzu[i].carModel + '</p>' +
            //         '<p class="list-group-item-text">人数：' + chuzu[i].num + '</p></a>';
            // }
            // cz += '</div>';
            // o += cz;

            var cx = '<div class="list-group"><a href="#" class="list-group-item active">城乡出行未接订单</a>'
            for(var i in kuahceng){
                cx += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + kuahceng[i].start + '</p><p class="list-group-item-text">终点：' + kuahceng[i].end + '</p>' +
                    '<p class="list-group-item-text">下单时间：' + kuahceng[i].travelTime + '</p><p class="list-group-item-text">车型：' + kuahceng[i].carModel + '</p>' +
                    '<p class="list-group-item-text">人数：' + kuahceng[i].num + '</p></a>';
            }
            cx += '</div>';
            o += cx;
            // var cx = '<div class="list-group"><a href="#" class="list-group-item active">城乡出行未接订单</a>'
            // for(var i in kuahceng){
            //     cx += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + kuahceng[i].start + '</p><p class="list-group-item-text">终点：' + kuahceng[i].end + '</p>' +
            //         '<p class="list-group-item-text">下单时间：' + kuahceng[i].travelTime + '</p><p class="list-group-item-text">车型：' + kuahceng[i].carModel + '</p>' +
            //         '<p class="list-group-item-text">人数：' + kuahceng[i].num + '</p></a>';
            // }
            // cx += '</div>';
            // o += cx;

            $('#order').html(o);
        }

 ManagementAHTravel/guns-admin/src/main/webapp/static/img/20210511-092352.JPG

Binary files differ

 ManagementAHTravel/guns-admin/src/main/webapp/static/img/213212.png

 ManagementAHTravel/guns-admin/src/main/webapp/static/img/index.png

Binary files differ

 ManagementAHTravel/guns-admin/src/main/webapp/static/img/index2.png

Binary files differ

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

 ManagementAHTravel/guns-admin/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js

@@ -119,9 +119,9 @@
                {title: '专车券领取总数', field: 'zcNum', visible: true, align: 'center', valign: 'middle'},
                {title: '专车券使用总数', field: 'zcUseNum', visible: true, align: 'center', valign: 'middle'},
                {title: '专车券使用总金额', field: 'zcUseMoney', visible: true, align: 'center', valign: 'middle'},
                {title: '出租车券领取总数', field: 'czcNum', visible: true, align: 'center', valign: 'middle'},
                {title: '出租车使用总数', field: 'czcUseNum', visible: true, align: 'center', valign: 'middle'},
                {title: '出租车使用总金额', field: 'czcUseMoney', visible: true, align: 'center', valign: 'middle'},
                // {title: '出租车券领取总数', field: 'czcNum', visible: true, align: 'center', valign: 'middle'},
                // {title: '出租车使用总数', field: 'czcUseNum', visible: true, align: 'center', valign: 'middle'},
                // {title: '出租车使用总金额', field: 'czcUseMoney', visible: true, align: 'center', valign: 'middle'},
                {title: '跨城券领取总数', field: 'kcNum', visible: true, align: 'center', valign: 'middle'},
                {title: '跨城券使用总数', field: 'kcUseNum', visible: true, align: 'center', valign: 'middle'},
                {title: '跨城券使用总金额', field: 'kcUseMoney', visible: true, align: 'center', valign: 'middle'},

 ZuulAHTravel/pom.xml

@@ -10,7 +10,7 @@
    </parent>
    <groupId>com.sinata</groupId>
    <artifactId>zuul</artifactId>
    <version>0.0.1-SNAPSHOT</version>
    <version>0.0.1</version>
    <name>zuul</name>
    <description>Zuul project for Spring Boot</description>


 ZuulAHTravel/src/main/java/com/sinata/zuul/util/applets/WebSocketHandler.java

@@ -23,7 +23,7 @@
    //用于websocket握手的处理类
    private WebSocketServerHandshaker handshaker;

    private static final String WEB_SOCKET_URL = "wss://localhost:9090/websocket";
    private static final String WEB_SOCKET_URL = "ws://localhost:9090/websocket";




 ZuulAHTravel/src/main/resources/redis.properties

@@ -2,13 +2,11 @@
# RedisÊý¾Ý¿âË÷Òý£¨Ä¬ÈÏΪ0£©
spring.redis.database=0
# Redis·þÎñÆ÷µØÖ·
spring.redis.host=1.95.6.206
spring.redis.host=127.0.0.1
# Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
spring.redis.port=6379
#spring.redis.port=6379
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
#spring.redis.password=WeiLaiChuXing@2024!
spring.redis.password=Xiwang2024!
spring.redis.password=123456
# Á¬½Ó³Ø×î´óÁ¬½ÓÊý£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£©
spring.redis.jedis.pool.max-active=1024
# Á¬½Ó³Ø×î´ó×èÈûµÈ´ýʱ¼ä£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£©