修改配置

Pu Zhibing

7 天以前 258b6a8932bf026b773d9e33a82aa9d4cd745511

修改配置

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -249,8 +249,8 @@
                    templateCode = "a8af3c2972db4c9e91add990dff22f65";//司机注册失败
                    break;
            }
            HuaWeiSMSUtil.sendSms("", driver.getPhone(), "8822061324669", templateCode);
//            String s = aLiSendSms.sendSms(driver.getPhone(), templateCode, "{}");
//            HuaWeiSMSUtil.sendSms("", driver.getPhone(), "8822061324669", templateCode);
            String s = aLiSendSms.sendSms(driver.getPhone(), "SMS_485340165", "{}");
            return ResultUtil.success();
        }catch (Exception e){
            e.printStackTrace();

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -403,8 +403,8 @@
        orderLogistics.setPickUpCode(random);
        this.updateById(orderLogistics);
        //发送短信
        HuaWeiSMSUtil.sendSms("[\"" + random + "\"]", orderLogistics.getRecipientPhone(), "8822072510762", "3f8a36fe5265433783655dcb6fb51465");
//        aLiSendSms.sendSms(orderLogistics.getRecipientPhone(), "SMS_206737941", "{\"code\":\"" + random + "\"}");
//        HuaWeiSMSUtil.sendSms("[\"" + random + "\"]", orderLogistics.getRecipientPhone(), "8822072510762", "3f8a36fe5265433783655dcb6fb51465");
        aLiSendSms.sendSms(orderLogistics.getRecipientPhone(), "SMS_317840272", "{\"code\":\"" + random + "\"}");
    }

    @Override

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

@@ -171,13 +171,13 @@
                templateCode = "c230a6b92504473c97c17741e1cc0b9d";//修改密码
                break;
        }
        HuaWeiSMSUtil.sendSms("[\"" + authCode + "\"]", phone, "8822061324669", templateCode);
//        String sData = aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + authCode + "\"}");
//        JSONObject jsonObject = JSON.parseObject(sData);
//        String message = jsonObject.getString("Message");
//        if(!"OK".equals(message)){
//            return ResultUtil.error("");
//        }
//        HuaWeiSMSUtil.sendSms("[\"" + authCode + "\"]", phone, "8822061324669", templateCode);
        String sData = aLiSendSms.sendSms(phone, "SMS_317840272", "{\"code\":\"" + authCode + "\"}");
        JSONObject jsonObject = JSON.parseObject(sData);
        String message = jsonObject.getString("Message");
        if(!"OK".equals(message)){
            return ResultUtil.error("");
        }
        System.out.println(sms);
        return ResultUtil.success();
    }

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -788,12 +788,12 @@
            Driver driver = driverService.selectById(orderTaxi.getDriverId());
            driver.setState(3);//修改司机为服务中
            drivers.add(driver);
            taskUtil.driverIds.add(driver.getId());//添加需要推送提醒的司机
//            taskUtil.driverIds.add(driver.getId());//添加需要推送提醒的司机

            Integer muoth = Long.valueOf((orderTaxi.getTravelTime().getTime() - System.currentTimeMillis()) / (1000 * 60)).intValue();
            //发送短信提醒
            HuaWeiSMSUtil.sendSms("[\"" + orderTaxi.getStartAddress() + "\",\"" + orderTaxi.getEndAddress() + "\",\"" + muoth + "\"]", driver.getPhone(), "8822072510762", "d1585000f09b40b784c9e22c8c34a24a");
//            aLiSendSms.sendSms(driver.getPhone(), "SMS_207522070", "{\"data\":\"" + orderTaxi.getStartAddress() + "\",\"data1\":\"" + orderTaxi.getEndAddress() + "\",\"data2\":\"" + muoth + "\"}");
//            HuaWeiSMSUtil.sendSms("[\"" + orderTaxi.getStartAddress() + "\",\"" + orderTaxi.getEndAddress() + "\",\"" + muoth + "\"]", driver.getPhone(), "8822072510762", "d1585000f09b40b784c9e22c8c34a24a");
            aLiSendSms.sendSms(driver.getPhone(), "SMS_485290170", "{\"data\":\"" + orderTaxi.getStartAddress() + "\",\"data1\":\"" + orderTaxi.getEndAddress() + "\",\"data2\":\"" + muoth + "\"}");
        }
        //专车
        List<OrderPrivateCar> list1 = orderPrivateCarService.queryMaturity();
@@ -801,12 +801,12 @@
            Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
            driver.setState(3);//修改司机为服务中
            drivers.add(driver);
            taskUtil.driverIds.add(driver.getId());//添加需要推送提醒的司机
//            taskUtil.driverIds.add(driver.getId());//添加需要推送提醒的司机

            Integer muoth = Long.valueOf((orderPrivateCar.getTravelTime().getTime() - System.currentTimeMillis()) / (1000 * 60)).intValue();
            //发送短信提醒
            HuaWeiSMSUtil.sendSms("[\"" + orderPrivateCar.getStartAddress() + "\",\"" + orderPrivateCar.getEndAddress() + "\",\"" + muoth + "\"]", driver.getPhone(), "8822072510762", "d1585000f09b40b784c9e22c8c34a24a");
//            aLiSendSms.sendSms(driver.getPhone(), "SMS_207522070", "{\"data\":\"" + orderPrivateCar.getStartAddress() + "\",\"data1\":\"" + orderPrivateCar.getEndAddress() + "\",\"data2\":\"" + muoth + "\"}");
//            HuaWeiSMSUtil.sendSms("[\"" + orderPrivateCar.getStartAddress() + "\",\"" + orderPrivateCar.getEndAddress() + "\",\"" + muoth + "\"]", driver.getPhone(), "8822072510762", "d1585000f09b40b784c9e22c8c34a24a");
            aLiSendSms.sendSms(driver.getPhone(), "SMS_485290170", "{\"data\":\"" + orderPrivateCar.getStartAddress() + "\",\"data1\":\"" + orderPrivateCar.getEndAddress() + "\",\"data2\":\"" + muoth + "\"}");
        }
        //跨城
        List<OrderCrossCity> orderCrossCities = orderCrossCityService.queryMaturity();
@@ -814,23 +814,23 @@
            Driver driver = driverService.selectById(orderCrossCity.getDriverId());
            driver.setState(3);//修改司机为服务中
            drivers.add(driver);
            taskUtil.driverIds.add(driver.getId());//添加需要推送提醒的司机
//            taskUtil.driverIds.add(driver.getId());//添加需要推送提醒的司机

            Integer muoth = Long.valueOf((orderCrossCity.getTravelTime().getTime() - System.currentTimeMillis()) / (1000 * 60)).intValue();
            //发送短信提醒
            HuaWeiSMSUtil.sendSms("[\"" + orderCrossCity.getStartAddress() + "\",\"" + orderCrossCity.getEndAddress() + "\",\"" + muoth + "\"]", driver.getPhone(), "8822072510762", "d1585000f09b40b784c9e22c8c34a24a");
//            aLiSendSms.sendSms(driver.getPhone(), "SMS_207522070", "{\"data\":\"" + orderCrossCity.getStartAddress() + "\",\"data1\":\"" + orderCrossCity.getEndAddress() + "\",\"data2\":\"" + muoth + "\"}");
//            HuaWeiSMSUtil.sendSms("[\"" + orderCrossCity.getStartAddress() + "\",\"" + orderCrossCity.getEndAddress() + "\",\"" + muoth + "\"]", driver.getPhone(), "8822072510762", "d1585000f09b40b784c9e22c8c34a24a");
            aLiSendSms.sendSms(driver.getPhone(), "SMS_485290170", "{\"data\":\"" + orderCrossCity.getStartAddress() + "\",\"data1\":\"" + orderCrossCity.getEndAddress() + "\",\"data2\":\"" + muoth + "\"}");
        }
        //小件物流
        List<OrderLogistics> orderLogistics = orderLogisticsService.queryMaturity();
        for(OrderLogistics orderLogistics1 : orderLogistics){
            Driver driver = driverService.selectById(orderLogistics1.getDriverId());
            taskUtil.driverIds.add(driver.getId());//添加需要推送提醒的司机
//            taskUtil.driverIds.add(driver.getId());//添加需要推送提醒的司机

            Integer muoth = Long.valueOf((orderLogistics1.getTravelTime().getTime() - System.currentTimeMillis()) / (1000 * 60)).intValue();
            //发送短信提醒
            HuaWeiSMSUtil.sendSms("[\"" + orderLogistics1.getStartAddress() + "\",\"" + orderLogistics1.getEndAddress() + "\",\"" + muoth + "\"]", driver.getPhone(), "8822072510762", "d1585000f09b40b784c9e22c8c34a24a");
//            aLiSendSms.sendSms(driver.getPhone(), "SMS_207522070", "{\"data\":\"" + orderLogistics1.getStartAddress() + "\",\"data1\":\"" + orderLogistics1.getEndAddress() + "\",\"data2\":\"" + muoth + "\"}");
//            HuaWeiSMSUtil.sendSms("[\"" + orderLogistics1.getStartAddress() + "\",\"" + orderLogistics1.getEndAddress() + "\",\"" + muoth + "\"]", driver.getPhone(), "8822072510762", "d1585000f09b40b784c9e22c8c34a24a");
            aLiSendSms.sendSms(driver.getPhone(), "SMS_485290170", "{\"data\":\"" + orderLogistics1.getStartAddress() + "\",\"data1\":\"" + orderLogistics1.getEndAddress() + "\",\"data2\":\"" + muoth + "\"}");
        }
        if(drivers.size() > 0){
            driverService.updateBatchById(drivers);//批量修改状态为服务中

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java

@@ -21,8 +21,8 @@
    // 设置鉴权参数，初始化客户端
    private DefaultProfile profile = DefaultProfile.getProfile(
            "cn-hangzhou",// 地域ID
            "LTAI4G9Zez9H4B36vakPXGy4",// 您的AccessKey ID
            "BOVPUeZndKVbrPOq6Ef5j6oiydB3XZ");// 您的AccessKey Secret
            "LTAI5tGCqU3g9NkFSnYPBFcU",// 您的AccessKey ID
            "YgMJaG3GhsMGBIw2LjKi9ZofmRdEkX");// 您的AccessKey Secret
    private IAcsClient client = new DefaultAcsClient(profile);

    private static void log_print(String functionName, Object result) {
@@ -70,7 +70,7 @@
        // 接收短信的手机号码
        request.putQueryParameter("PhoneNumbers", phone);
        // 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。
        request.putQueryParameter("SignName", "OK出行");
        request.putQueryParameter("SignName", "快客运输");
        // 短信模板ID
        request.putQueryParameter("TemplateCode", templateCode);
        // 短信模板变量对应的实际值，JSON格式。

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java

@@ -23,7 +23,7 @@
@Component
public class GDFalconUtil implements ApplicationRunner {

    private String key = "c473445a931ee8c42eef8b63fc3602c5";
    private String key = "c3e2c90e17d69f793f839aa736d5e8d9";

    @Autowired
    private RestTemplate restTemplate;

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

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

    private String key = "c473445a931ee8c42eef8b63fc3602c5";
    private String key = "c3e2c90e17d69f793f839aa736d5e8d9";

    private JSONArray jsonArray = new JSONArray();


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

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

    private String key = "c473445a931ee8c42eef8b63fc3602c5";
    private String key = "c3e2c90e17d69f793f839aa736d5e8d9";

    @Autowired
    private RestTemplate restTemplate;

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

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

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

@@ -57,10 +57,10 @@
    @Scheduled(fixedRate = 1000 * 60 * 5)
    public void taskFiveMinute(){
        try {
            for (Integer id: driverIds){
                jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
            }
            this.driverIds.clear();
//            for (Integer id: driverIds){
//                jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
//            }
//            this.driverIds.clear();
        } catch (Exception e) {
            e.printStackTrace();
        }

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

@@ -82,34 +82,34 @@

wx:
  grantType: authorization_code #填authorization_code
  appid: wx1b6102c5f391ed90 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 04fc328367d9741b70d379bb7a6d7a9b #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appid: wx754d93f1f804c911 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 75c80ed99f22427399896e84bcb0d7c6 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: #小程序APPid
  appletsAppSecret: #
  mchId: 1582056471 #微信支付分配的商户号
  key: cxM9KcSD8adbmrmFcCvZuaEvZYFUKiad #key为商户平台设置的密钥key：
  mchId: 1644620019 #微信支付分配的商户号
  key: 5f8d3a1b6c7e9f2a4b0d8c3e7f9a2b62 #key为商户平台设置的密钥key：

---

alipay:
  appid: 2021003139618168  #应用程序唯一标识
  appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCirPHwhWeh9FNW7FcpR5H5DOGRr0gm9Z8BMNNQtEOdY/n/iHlngTDcg2Osps6DlRVJNlpki8sG1Skir4y1TYvUgqd4sEEfdQXBYOooJo4xfsDiyU6cXCPVFh0KuEcFBGybVtnslGTFPquIXQw/7Maujf10ibWZPK1zdWju+5EpM7ZJLKaZvVP53HMVIeGezSLm/l5lDGb6SRHc4z4KziSYFKzeFJdU8co6qLoGUKub43aszr3siumWbpZuRybuEZu1nhsJDEfiKJaS3HJ21fow+tqVoqBFHnk5SDc/r5Nhp4L+BY1pLJJVYKQZrEjKSnEM29XJRvp/OSKirXlqHy+9AgMBAAECggEBAJBw/XXyDh2IgsNIoO/fQ6aeoF8qAufM6f01rDwZg3vpvJ3/QMT9ujPiWguAJRhCtJ7IKyTh10je1mKc+1Q0Ybc0t5z66ygSUSTud5tk+JbMFFqKIknFqm9W7jyJeU3kKscXK/LbpEpbJhWzgN/1zkhJfUYPzHYeoWhGVQD10GOCvvuNhm2y6xgWYg5XxgzkTOMd3l9SUXQDjzJJwUAzJudLtrxVtQ/Af1PvU2NElHzYmdp/BZQaWH2wayVQ+GRFxWmWjkxH0YUGr1peUcDwO+DLwJPvQX6hioPRk4pntfXyyCtvlKD99ISliqzM5wA6J/MP94NrxjpTcz1ApCFD6qUCgYEA77K0VcAu9M7Hpjj6h+rRCjlkGo8n7Jy0nuDZCgGthxo5DYgWDvb2a9/Uk7XsECJEwQ1TGn3SID5FoE2sa3yRxmQg8smgsSZ4wkaogSouvCqUtfX+NtmUP+CiLek81o6r3LbyiWaUpl7iaZ7lj76c4JYSfctRKlTp4AVBGhTu8vsCgYEArb06423nUn1NW2lxS+4o3V1ngg73Ttm9zlz5cIWbvzXY68zPC3pEWSqGnokgZ+0xmEU380rk6u/0PIoXKLd19m4oyI8k2457qkDWJzq4xjo08+lV8sMzSedYFEZB9NwPVf1FysttkB7MnAT9uUzaXtbA2bwSDuhg7gNgtUlsqqcCgYBamT4mRzy4VUwLHPA83VljtuuKSl+5xEVU5AHFEXtIXHYCElTcFSZxAao0podyVbGNEn89vR7mBwOEIrev7OagiQoXGnS9YKA2NkTMhWgiwSlyWWdbzgOF3V8PYWAYbNay1wd3Pamj9Ks5ZtC380ESdkbI+0dTa8L2ZKYFuLHUbwKBgAjqU/JFuoAWI/kT4Rd3Yitx1pTq9a/bJo1HYhlvEb3vInF/MgSxwn4c24mZGcubdVcN/kAC0Nppc8wDfgq911TM9FTOW6LUne3vo82hisfJRtxZVeq+L4yUTYXE0S+idzr/Yyxz4exqWC+NZgOzOOVy+bRynS6cqBSuobDL0sKzAoGAL7Jzb1fbtgtY99wjS22YFKD9EOwmSzT5EetOF4ecoDmvSEHkPV4REzlabyNZEevKcPMCKSYL0nP17zjJsNOzLxiGi1CeXr8UrwetD1za8fwit6w4h+o+43MmWQCiC6MxQb+Gb92g0dCgJbpV8xl+Llu1mZnWSvbcQJI7/mgJlcw= #开发者应用私钥
  appid: 111  #应用程序唯一标识
  appPrivateKey: 111 #开发者应用私钥
  alipayPublicKey: 11 #应用公钥
  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoqzx8IVnofRTVuxXKUeR+Qzhka9IJvWfATDTULRDnWP5/4h5Z4Ew3INjrKbOg5UVSTZaZIvLBtUpIq+MtU2L1IKneLBBH3UFwWDqKCaOMX7A4slOnFwj1RYdCrhHBQRsm1bZ7JRkxT6riF0MP+zGro39dIm1mTytc3Vo7vuRKTO2SSymmb1T+dxzFSHhns0i5v5eZQxm+kkR3OM+Cs4kmBSs3hSXVPHKOqi6BlCrm+N2rM697Irplm6Wbkcm7hGbtZ4bCQxH4iiWktxydtX6MPralaKgRR55OUg3P6+TYaeC/gWNaSySVWCkGaxIykpxDNvVyUb6fzkioq15ah8vvQIDAQAB #支付宝公钥
  alipay_public_key: 111 #支付宝公钥

---

juhe: #聚合数据
  appKey: 255c69586c889d2228cd9c75eb5d47be #
  appKey: c4b903ff5624f661d0af962ef8b3f424 #


---

jiguang:
  appKey-driver: 93204c35ded9ba377a14af19 #极光推送应用唯一标识
  masterSecret-driver: e4f6f435faefad29db6ba9b2 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
  appKey-dispatch: cc212ee6dcecb26625917f40 #极光推送应用唯一标识
  masterSecret-dispatch: 0d163a25a20647665c28639e #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
  appKey-driver: 111 #极光推送应用唯一标识
  masterSecret-driver: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
  appKey-dispatch: 111 #极光推送应用唯一标识
  masterSecret-dispatch: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的


---

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

File was deleted

 ManagementOKTravel/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;
@@ -21,14 +19,11 @@
import com.stylefeng.guns.modular.system.model.TVersionManagement;
import com.stylefeng.guns.modular.system.service.ITVersionManagementService;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;

import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

/**
 * 版本管理控制器
@@ -140,10 +135,8 @@
            e.printStackTrace();
        }*/
        try {
            MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
            MultipartFile file = (MultipartFile) myfile;

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

 ManagementOKTravel/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;
@@ -105,6 +105,7 @@
            try {
                //文件上传，具体根据实际替换
                pictureName = ObsUploadUtil.obsUpload(request, picture);
//                pictureName = OssUploadUtil.ossUpload(request, picture);
 
                String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
                if (callback == null) {

 ManagementOKTravel/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;
@@ -67,7 +67,7 @@
            MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
            if (file.getSize() != 0) {
                ossUpload = ObsUploadUtil.obsUpload(request, file);
//                ossUpload = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), file);
//                ossUpload = OssUploadUtil.ossUpload(request, file);
                m.put("imgUrl", ossUpload);
            }
        } catch (Exception e) {
@@ -88,7 +88,7 @@
                return null;
            }
            String pictureName = ObsUploadUtil.obsUpload(request, file);
//            String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
//            String pictureName = OssUploadUtil.ossUpload(request, file);
            return pictureName;
        } catch (IOException e1) {
            return null;
@@ -137,6 +137,7 @@
            }

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

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

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

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

    private String key = "e17d799b2506d05faf7f88320a266803";
    private String key = "c3e2c90e17d69f793f839aa736d5e8d9";

    private JSONArray jsonArray = new JSONArray();


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

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

    private String key = "e17d799b2506d05faf7f88320a266803";
    private String key = "c3e2c90e17d69f793f839aa736d5e8d9";

    @Autowired
    private RestTemplate restTemplate;

 ManagementOKTravel/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=" + "e17d799b2506d05faf7f88320a266803";
            String url = "http://restapi.amap.com/v3/geocode/geo?address=" + address + "&output=JSON&key=" + "c3e2c90e17d69f793f839aa736d5e8d9";
            // 请求高德接口
            String result = sendHttpGet(url);
            JSONObject resultJOSN = JSONObject.parseObject(result);

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

File was renamed from ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/core/util/ObsUploadUtil.java
@@ -1,4 +1,4 @@
package com.stylefeng.guns.core.util;
package com.stylefeng.guns.modular.system.util;

import com.obs.services.ObsClient;
import com.obs.services.model.ObjectMetadata;
@@ -12,10 +12,10 @@
public class ObsUploadUtil {
    //OBS图片访问域名
    public static String endPoint = "obs.cn-north-9.myhuaweicloud.com";
    public static String accessKeyId = "OELF1ZVCZ5BGRYE5IGPX";
    public static String accessKeySecret = "D3ZQCQda8tlSPTO9OPWTPJ51kLQFDu7hI6NX4u96";
    public static String bucketName = "kuaiyuncx";
    public static String oss_domain = "https://kuaiyuncx.obs.cn-north-9.myhuaweicloud.com/";
    public static String accessKeyId = "HPUAG2CQG1EIMFMARJCR";
    public static String accessKeySecret = "56JY6d9zUbMXIgauEt9mFTD3ArP0gaPk33Ap1myW";
    public static String bucketName = "kuaiyunchuxing";
    public static String oss_domain = "https://kuaiyunchuxing.obs.cn-north-9.myhuaweicloud.com/";


    // 创建ObsClient实例

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

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

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

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WoUtil.java

File was deleted

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

@@ -82,20 +82,20 @@

wx:
  grantType: authorization_code #填authorization_code
  appid: wx4cb0b79a93717805 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 9857366ba1933e612077f3f774af4a1d #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appid: wx754d93f1f804c911 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 75c80ed99f22427399896e84bcb0d7c6 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wx2a1f355f789f1002 #小程序APPid
  appletsAppSecret: 0bd5c17a95bd8256d26f3f567cb40f02 #
  mchId: 1582056471 #微信支付分配的商户号
  key: cxM9KcSD8adbmrmFcCvZuaEvZYFUKiad #key为商户平台设置的密钥key：
  appletsAppSecret: 3da5b15a7bfcd888aab74348eb325f33 #
  mchId: 1644620019 #微信支付分配的商户号
  key: 5f8d3a1b6c7e9f2a4b0d8c3e7f9a2b62 #key为商户平台设置的密钥key：

---

alipay:
  appid: 2021001146641234  #应用程序唯一标识
  appPrivateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCsokqONGWM2hjADQzr0q1UAu8jJzbD8zqLnVy4+BRKyryOEF+whfol3fmbBbSrXALgf5X3fuIRogAz2N6s3oKck+jQBw7dTncQoNv97DHgeaJcYtxtzl3GIFriB0KAPaGwDQqTipdCgfbIcUxHa2NjZAzAO0588eyARBwseevsOjp0rHITf5ApJUYSzTkiGQ4Rd9zbE43grBmskm1bgIQyBM6fFUTC6nUOXC6sPDHhuAFaIZ98VVsFG1nbzv783lLWKPe/PU5Ia02bxSY9JYLhT/cmBqI9wdcsGAa9M331IZM+Zib+ePB+2oW+rW7WasBaQGbqNHsfr2moXjPbZJoLAgMBAAECggEBAI/rTJR5AiAGwpN5Tchb/rwHJi38Rx/c6nXyXpal2uTvV3poFB4p0302LR0cCJ7DOnLGatPGJ9njYJ/YsOsVJXY7qN+kwrOk8oYeVMi/3GTzgnPax0GTxYGi/6Fnw/z9ZIpMlQCjja6YgpBgQ+NWl6kIg8jOqIRpe20DWymJCzIHhtGjr197jN238UilVtPJaf/43v7CZcvqO6RWscAxpF1cSlBB7L9P3eBYMO4hmPjHEGVRIglvO4XawddOT3SDluf/Nz50vaQGre6AslVImDIMXC1XVgOfviOOCB8CBNydmvdrylhgM+8znkrAg6Np52u8UY1v/8+tNOSnGQyZVeECgYEA87Q6jtKwbIsIlEzy8QcANeo75X31UYs2eFd4icLpAqLgeUzWFYoonkws06cVwZAMjjUkLFjXE7gm8utMSFVOjP35xcOxAVcGzHaZAhBBO+G3W+9UeOIIcbp0O3xWTgVhzkXK6gSx74G0f/38AAf19ik9VrFRj1yvXgAdC/mSND0CgYEAtVgYXr/i7eV/VuOaX4dB3NnfJBDP3zFhbZxPhP2T56vjsWFofNPT02vi2AUVAz81XkhZdVaUIKFb5eiLYNIXmbVev3Dpcu4JRuOLKROYQIBQqcmBjBjhlw7PsJQM+wPPejQeaB6YCM6h5sxWbZt4WzYJPgUc9bJVZRrrYicxw+cCgYEA28VzbWso+KmlEgAWsi+rC/PxEfM2MNRHSd0v8aQY92yk3B7jjUcrfB2b6z7pisX53KClv2xagQj37ucswqpTjShYf/ULAfdWRTrKnybDfVn/PeQlnGHSVaVcvmxRdEi8PAWKiOG1CRVCDo6gG/MR52ynSS/dKljeOPoHN85X/80CgYAqoFuSIg7IltKY7QVDgTq1HC18f8stDqF1L3Hts+GJankqH9h8xxoar1hyKLeovLnhwKXuk/xbszIz17azeo77nYt4+qSVVGiv1hrG/Akk2ESdtHUUJmEYre2Z9yMZ+epSMmAXX2GjaFbcNpn2R75BynDfuDn3cwTpsCs2NjpXbwKBgQCnK1z91dr1pntk+wMIqaQ1wX8bE/vEbv0TAP9UBwcsKGBQcTo0zrwdM0V8K4CQPXra6KV5EHwq+9IkYB9KMzhineoWhZ/irqhFN7yt7IMy9hXIjAuzDarw1H6gq8kFMdsxH2dcd06sH2HnPz9VjVqiXOFTGFuVXy1f26McHSlxnA== #开发者应用私钥
  appid: 111  #应用程序唯一标识
  appPrivateKey: 111 #开发者应用私钥
  alipayPublicKey: 11 #应用公钥
  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArKJKjjRljNoYwA0M69KtVALvIyc2w/M6i51cuPgUSsq8jhBfsIX6Jd35mwW0q1wC4H+V937iEaIAM9jerN6CnJPo0AcO3U53EKDb/ewx4HmiXGLcbc5dxiBa4gdCgD2hsA0Kk4qXQoH2yHFMR2tjY2QMwDtOfPHsgEQcLHnr7Do6dKxyE3+QKSVGEs05IhkOEXfc2xON4KwZrJJtW4CEMgTOnxVEwup1DlwurDwx4bgBWiGffFVbBRtZ287+/N5S1ij3vz1OSGtNm8UmPSWC4U/3JgaiPcHXLBgGvTN99SGTPmYm/njwftqFvq1u1mrAWkBm6jR7H69pqF4z22SaCwIDAQAB #支付宝公钥
  alipay_public_key: 111 #支付宝公钥

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

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

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

    <!--地图-->
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=5760dee49160a809b3bcfedcee9032f6"></script>
    <!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IRKL4FLGKZUFr6T3gFk3t9X6kKarKu1K"></script>-->

    <!-- 全局css -->

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

@@ -256,6 +256,11 @@
        </div>
    </div>
</div>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode:'15524b84c82c145a6ec41d33a2f51260',
    }
</script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1"></script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool"></script>
<script type="text/javascript" src='https://a.amap.com/jsapi_demos/static/citys.js'></script>

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

@@ -125,7 +125,7 @@
    </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=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5760dee49160a809b3bcfedcee9032f6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
@}

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

@@ -46,7 +46,7 @@
    </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=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5760dee49160a809b3bcfedcee9032f6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
@}

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

@@ -109,7 +109,7 @@
    </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=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5760dee49160a809b3bcfedcee9032f6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
@}

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

@@ -46,7 +46,7 @@
    </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=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5760dee49160a809b3bcfedcee9032f6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
@}

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

@@ -102,7 +102,7 @@
    </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=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5760dee49160a809b3bcfedcee9032f6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}

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

@@ -46,7 +46,7 @@
    </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=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=5760dee49160a809b3bcfedcee9032f6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}

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

@@ -164,6 +164,11 @@

    </div>
</div>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode:'15524b84c82c145a6ec41d33a2f51260',
    }
</script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&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>

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

@@ -187,6 +187,11 @@

    </div>
</div>
<script type="text/javascript">
    window._AMapSecurityConfig = {
        securityJsCode:'15524b84c82c145a6ec41d33a2f51260',
    }
</script>
<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&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>

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java

@@ -7,10 +7,7 @@
import com.stylefeng.guns.modular.system.service.ISmsrecordService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.service.IVerifiedService;
import com.stylefeng.guns.modular.system.util.ObsUploadUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.WeChatUtil;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.LoginWarpper;
import com.stylefeng.guns.modular.system.warpper.UserInfoWarpper;
import com.stylefeng.guns.modular.system.warpper.VerifiedWarpper;
@@ -717,6 +714,7 @@
                return ResultUtil.error("请上传图片文件（jpg/jpeg/png）");
            }
            String s = ObsUploadUtil.obsUpload(request, file);
//            String s = OssUploadUtil.ossUpload(request, file);
            return ResultUtil.success(s);
        }catch (Exception e){
            e.printStackTrace();

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -151,14 +151,14 @@
                templateCode = "c230a6b92504473c97c17741e1cc0b9d";//修改密码
                break;
        }
        HuaWeiSMSUtil.sendSms("[\"" + authCode + "\"]", phone, "8822061324669", templateCode);
//        String sData = aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + authCode + "\"}");
////        JSONObject jsonObject = JSON.parseObject(sData);
////        String message = jsonObject.getString("Message");
////        if(!"OK".equals(message)){
////            System.err.println(message);
////            return ResultUtil.error(message);
////        }
//        HuaWeiSMSUtil.sendSms("[\"" + authCode + "\"]", phone, "8822061324669", templateCode);
        String sData = aLiSendSms.sendSms(phone, "SMS_317840272", "{\"code\":\"" + authCode + "\"}");
//        JSONObject jsonObject = JSON.parseObject(sData);
//        String message = jsonObject.getString("Message");
//        if(!"OK".equals(message)){
//            System.err.println(message);
//            return ResultUtil.error(message);
//        }
        System.out.println(sms);
        return ResultUtil.success();
    }

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java

@@ -21,8 +21,8 @@
    // 设置鉴权参数，初始化客户端
    private DefaultProfile profile = DefaultProfile.getProfile(
            "cn-hangzhou",// 地域ID
            "LTAI4G9Zez9H4B36vakPXGy4",// 您的AccessKey ID
            "BOVPUeZndKVbrPOq6Ef5j6oiydB3XZ");// 您的AccessKey Secret
            "LTAI5tGCqU3g9NkFSnYPBFcU",// 您的AccessKey ID
            "YgMJaG3GhsMGBIw2LjKi9ZofmRdEkX");// 您的AccessKey Secret
    private IAcsClient client = new DefaultAcsClient(profile);

    private static void log_print(String functionName, Object result) {
@@ -70,7 +70,7 @@
        // 接收短信的手机号码
        request.putQueryParameter("PhoneNumbers", phone);
        // 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。
        request.putQueryParameter("SignName", "OK出行");
        request.putQueryParameter("SignName", "快客运输");
        // 短信模板ID
        request.putQueryParameter("TemplateCode", templateCode);
        // 短信模板变量对应的实际值，JSON格式。

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java

@@ -21,7 +21,7 @@
@Component
public class GDFalconUtil implements ApplicationRunner {

    private String key = "c473445a931ee8c42eef8b63fc3602c5";
    private String key = "c3e2c90e17d69f793f839aa736d5e8d9";

    @Autowired
    private RestTemplate restTemplate;

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

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

    private String key = "c473445a931ee8c42eef8b63fc3602c5";
    private String key = "c3e2c90e17d69f793f839aa736d5e8d9";

    private JSONArray jsonArray = new JSONArray();


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

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

    private String key = "c473445a931ee8c42eef8b63fc3602c5";
    private String key = "c3e2c90e17d69f793f839aa736d5e8d9";

    @Autowired
    private RestTemplate restTemplate;

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

@@ -12,10 +12,10 @@
public class ObsUploadUtil {
    //OBS图片访问域名
    public static String endPoint = "obs.cn-north-9.myhuaweicloud.com";
    public static String accessKeyId = "OELF1ZVCZ5BGRYE5IGPX";
    public static String accessKeySecret = "D3ZQCQda8tlSPTO9OPWTPJ51kLQFDu7hI6NX4u96";
    public static String bucketName = "kuaiyuncx";
    public static String oss_domain = "https://kuaiyuncx.obs.cn-north-9.myhuaweicloud.com/";
    public static String accessKeyId = "HPUAG2CQG1EIMFMARJCR";
    public static String accessKeySecret = "56JY6d9zUbMXIgauEt9mFTD3ArP0gaPk33Ap1myW";
    public static String bucketName = "kuaiyunchuxing";
    public static String oss_domain = "https://kuaiyunchuxing.obs.cn-north-9.myhuaweicloud.com/";


    // 创建ObsClient实例

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

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

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

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

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

@@ -87,25 +87,25 @@

wx:
  grantType: authorization_code #填authorization_code
  appid: wx4cb0b79a93717805 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 9857366ba1933e612077f3f774af4a1d #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wx2a1f355f789f1002 #小程序APPid
  appletsAppSecret: 477ad21cd57a98f12896a0c79aaefd9c #
  mchId: 1582056471 #微信支付分配的商户号
  key: cxM9KcSD8adbmrmFcCvZuaEvZYFUKiad #key为商户平台设置的密钥key：
  appletsAppSecret: 3da5b15a7bfcd888aab74348eb325f33 #
  mchId: 1644620019 #微信支付分配的商户号
  key: 5f8d3a1b6c7e9f2a4b0d8c3e7f9a2b62 #key为商户平台设置的密钥key：

---

alipay:
  appid: 2021001146641234  #应用程序唯一标识
  appPrivateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCsokqONGWM2hjADQzr0q1UAu8jJzbD8zqLnVy4+BRKyryOEF+whfol3fmbBbSrXALgf5X3fuIRogAz2N6s3oKck+jQBw7dTncQoNv97DHgeaJcYtxtzl3GIFriB0KAPaGwDQqTipdCgfbIcUxHa2NjZAzAO0588eyARBwseevsOjp0rHITf5ApJUYSzTkiGQ4Rd9zbE43grBmskm1bgIQyBM6fFUTC6nUOXC6sPDHhuAFaIZ98VVsFG1nbzv783lLWKPe/PU5Ia02bxSY9JYLhT/cmBqI9wdcsGAa9M331IZM+Zib+ePB+2oW+rW7WasBaQGbqNHsfr2moXjPbZJoLAgMBAAECggEBAI/rTJR5AiAGwpN5Tchb/rwHJi38Rx/c6nXyXpal2uTvV3poFB4p0302LR0cCJ7DOnLGatPGJ9njYJ/YsOsVJXY7qN+kwrOk8oYeVMi/3GTzgnPax0GTxYGi/6Fnw/z9ZIpMlQCjja6YgpBgQ+NWl6kIg8jOqIRpe20DWymJCzIHhtGjr197jN238UilVtPJaf/43v7CZcvqO6RWscAxpF1cSlBB7L9P3eBYMO4hmPjHEGVRIglvO4XawddOT3SDluf/Nz50vaQGre6AslVImDIMXC1XVgOfviOOCB8CBNydmvdrylhgM+8znkrAg6Np52u8UY1v/8+tNOSnGQyZVeECgYEA87Q6jtKwbIsIlEzy8QcANeo75X31UYs2eFd4icLpAqLgeUzWFYoonkws06cVwZAMjjUkLFjXE7gm8utMSFVOjP35xcOxAVcGzHaZAhBBO+G3W+9UeOIIcbp0O3xWTgVhzkXK6gSx74G0f/38AAf19ik9VrFRj1yvXgAdC/mSND0CgYEAtVgYXr/i7eV/VuOaX4dB3NnfJBDP3zFhbZxPhP2T56vjsWFofNPT02vi2AUVAz81XkhZdVaUIKFb5eiLYNIXmbVev3Dpcu4JRuOLKROYQIBQqcmBjBjhlw7PsJQM+wPPejQeaB6YCM6h5sxWbZt4WzYJPgUc9bJVZRrrYicxw+cCgYEA28VzbWso+KmlEgAWsi+rC/PxEfM2MNRHSd0v8aQY92yk3B7jjUcrfB2b6z7pisX53KClv2xagQj37ucswqpTjShYf/ULAfdWRTrKnybDfVn/PeQlnGHSVaVcvmxRdEi8PAWKiOG1CRVCDo6gG/MR52ynSS/dKljeOPoHN85X/80CgYAqoFuSIg7IltKY7QVDgTq1HC18f8stDqF1L3Hts+GJankqH9h8xxoar1hyKLeovLnhwKXuk/xbszIz17azeo77nYt4+qSVVGiv1hrG/Akk2ESdtHUUJmEYre2Z9yMZ+epSMmAXX2GjaFbcNpn2R75BynDfuDn3cwTpsCs2NjpXbwKBgQCnK1z91dr1pntk+wMIqaQ1wX8bE/vEbv0TAP9UBwcsKGBQcTo0zrwdM0V8K4CQPXra6KV5EHwq+9IkYB9KMzhineoWhZ/irqhFN7yt7IMy9hXIjAuzDarw1H6gq8kFMdsxH2dcd06sH2HnPz9VjVqiXOFTGFuVXy1f26McHSlxnA== #开发者应用私钥
  appid: 111  #应用程序唯一标识
  appPrivateKey: 111 #开发者应用私钥
  alipayPublicKey: 11 #应用公钥
  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA36VhhGiOBwCZ5eRmCYSCgG9Rp42Nf8ku4WvD7F9whq/YVTBmvt1/lOXVyuoeT3JWF4UHy0b04k18o4X4ZOwxdgpdSxb1Ov8AIP8EDQS6yafvISTeX43/i8DB+PyXHKNTrIoetsR1Kvw9zKUKbwCLacnUQSl/40j4MN6h6IOC+lfV6ka80f3O+bDXuh5z3l7CgnIPuxvKC7RlC9LaQIitYVs0duovCROVZlU9Ryec9SwZx9lk36bsXgrcOzte2SrwgvYA6/pDEdA52C2Wd4Ym46G17AW4gLuExZG3sK/x0dzgVvPIHAIcooguJdJM8W8lQbmWqCTcV9WtS3AldKV55wIDAQAB #支付宝公钥
  alipay_public_key: 111 #支付宝公钥

---

juhe: #聚合数据
  appKey: 255c69586c889d2228cd9c75eb5d47be #
  appKey: c4b903ff5624f661d0af962ef8b3f424 #


---