From 58162242562d3cdafc55e1a6619aa86acb96efb7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 九月 2023 09:21:42 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 26 ++++
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java | 28 ++++
DriverIGOTravel/guns-admin/src/main/resources/application.yml | 8
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java | 8 +
DriverIGOTravel/pom.xml | 1
DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml | 129 +++++++++++++++++++++
DriverIGOTravel/guns-admin/pom.xml | 2
DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml | 127 +++++++++++++++++++++
8 files changed, 321 insertions(+), 8 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/pom.xml b/DriverIGOTravel/guns-admin/pom.xml
index 13384e2..29d890a 100644
--- a/DriverIGOTravel/guns-admin/pom.xml
+++ b/DriverIGOTravel/guns-admin/pom.xml
@@ -9,7 +9,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>guns-admin</artifactId>
+ <artifactId>driver</artifactId>
<name>guns-admin</name>
<description>guns 的spring boot版本</description>
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
index de9a844..65116b3 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
@@ -21,7 +21,9 @@
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.client.RestTemplate;
+import javax.annotation.PostConstruct;
import java.nio.charset.StandardCharsets;
+import java.util.TimeZone;
/**
* SpringBoot方式启动类
@@ -43,6 +45,12 @@
}
+ @PostConstruct
+ void started() {
+ TimeZone.setDefault(TimeZone.getTimeZone("GMT+0"));
+ }
+
+
@Bean //SpringCloud内部服务质检使用服务名调用
@LoadBalanced
public RestTemplate internalRestTemplate() {
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index a5fac8d..09b6696 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -143,6 +143,9 @@
private String salt = "SA;d5#";
+ @Autowired
+ private SMSUtil smsUtil;
+
@Override
public Integer getAppOpenInfo(Integer type) {
@@ -162,6 +165,21 @@
*/
@Override
public ResultUtil queryCaptcha(String phone, Integer type, Integer language) throws Exception {
+ if(type == 3){
+ Driver driver1 = driverMapper.queryByPhone(phone);
+ if(null != driver1){
+ if(driver1.getAuthState() == 1){
+ return ResultUtil.error(language == 1 ? "该司机正在审核中" : language == 2 ? "The driver is currently under review" : "The driver is currently under review");
+ }
+ if(driver1.getAuthState() == 2){
+ return ResultUtil.error(language == 1 ? "该司机已存在" : language == 2 ? "The driver already exists" : "Les Driver already exists");
+ }
+ if(driver1.getAuthState() == 3){
+ return ResultUtil.error(language == 1 ? "该司机账号已被冻结" : language == 2 ? "The driver's account has been frozen" : "Le compte du conducteur a été froid");
+ }
+ }
+ }
+
Random random = new Random();
StringBuffer sb = new StringBuffer();
for(int i = 0; i < 4; i++){
@@ -183,7 +201,7 @@
sms = "Votre code de vérification est: " + authCode + ". Ce code est valide pendant 5 minutes. Ne le divulguez pas aux autres!";
break;
}
- SMSUtil.sendTwilioMessage("+" + phone, sms);
+ smsUtil.sendCellulantMessage(phone, sms);
System.out.println(sms);
return ResultUtil.success();
}
@@ -426,7 +444,9 @@
driver1 = driverMapper.queryByPhone(phone);
if(null != driver1){
- return ResultUtil.error(language == 1 ? "账号已存在" : language == 2 ? "Account already exists" : "Le compte existe déjà");
+ LoginWarpper loginWarpper = new LoginWarpper();
+ loginWarpper.setId(driver1.getId());
+ return ResultUtil.success(loginWarpper);
}
Driver driver = new Driver();
driver.setAccount(phone);
@@ -2319,6 +2339,7 @@
* @param id
*/
private void singlePointLogin(Integer id){
+ pushUtil.pushOffline(id, 2);
//开始验证当前账号是否在别处登录
String value = redisUtil.getValue("DRIVER_" + id);
if(ToolUtil.isNotEmpty(value)){//将另外设备上的强迫下线（如果是车载端不需要下线）
@@ -2329,6 +2350,7 @@
redisUtil.remove("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
redisUtil.remove("DRIVER_" + id);//清除存储的token
}
+
}
@Override
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java
index ef7a8ff..d827a69 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java
@@ -1,9 +1,13 @@
package com.stylefeng.guns.modular.system.util;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.twilio.Twilio;
import com.twilio.rest.api.v2010.account.Message;
import com.twilio.type.PhoneNumber;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
import javax.net.ssl.*;
import java.io.*;
@@ -16,6 +20,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
+@Component
public class SMSUtil {
//无需修改,用于格式化鉴权头域,给"X-WSSE"参数赋值
@@ -266,4 +271,27 @@
return false;
}
}
+
+
+
+ @Autowired
+ private HttpClientUtil httpClientUtil;
+
+
+ public boolean sendCellulantMessage(String toPhone, String msg){
+ String url = "https://sms.nalosolutions.com/smsbackend/Nal_resl/send-message/";
+ Map<String, Object> params = new HashMap<>();
+ params.put("key", "ru#0flkf3993qh!!rg!@y4)nhwi08c#tg_vasek!ja)kvfnfjyoljoz(@nai(jkf");
+ params.put("msisdn", toPhone);
+ params.put("message", msg);
+ params.put("sender_id", "I-GO");
+ String s = httpClientUtil.pushHttpRequset("POST", url, params, null, "json");
+ JSONObject jsonObject = JSON.parseObject(s);
+ Integer status = jsonObject.getInteger("status");
+ if(1701 == status){
+ return true;
+ }else{
+ return false;
+ }
+ }
}
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml b/DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..b5cb567
--- /dev/null
+++ b/DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml
@@ -0,0 +1,127 @@
+server:
+ port: 8007
+
+guns:
+ swagger-open: true #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ # file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+
+spring:
+ application:
+ name: driver-server
+ mvc:
+ static-path-pattern: /static/**
+ view:
+ prefix: /WEB-INF/view
+ devtools:
+ restart:
+ enabled: false
+ additional-paths: src/main/java
+ exclude: static/**,WEB-INF/view/**
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+
+mybatis-plus:
+ typeAliasesPackage: com.stylefeng.guns.modular
+ configuration:
+ log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+
+
+eureka:
+ client:
+ service-url: #注册中心地址
+ defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
+ register-with-eureka: true #在注册中心进行注册
+ fetch-registry: true #从Eureka中获取注册信息。
+
+---
+spring:
+ datasource:
+ url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: 123456
+ db-name: guns #用来搜集数据库的所有表
+ filters: wall,mergeStat
+
+
+#多数据源情况的配置
+guns:
+ muti-datasource:
+ open: false
+ url: jdbc:mysql://127.0.0.1:3306/guns_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: root
+ dataSourceNames:
+ - dataSourceGuns
+ - dataSourceBiz
+
+
+
+wx:
+ grantType: authorization_code #填authorization_code
+ appid: wx97c33c052b2222f7 #应用唯一标识，在微信开放平台提交应用审核通过后获得
+ appSecret: 3cb8f3db9cd20b8ec276fe2e28979aaf #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
+ appletsAppid: #小程序APPid
+ appletsAppSecret: #
+ mchId: 1551741761 #微信支付分配的商户号
+ key: JnhREmZwHNKyFUQPEhijp1gdaCUzKg8P #key为商户平台设置的密钥key：
+
+---
+
+alipay:
+ appid: 2019080866147541 #应用程序唯一标识
+ appPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC+YuDPSRwDgk317Wp0xrMHfVr2gL/us4ue7REAP3vBT5qNGtl3EB3OycocTH2m3Y1rUhzrkkOWqG93iYb2Au11l8Q9jwv/lzyn6uQ/iiBwy5acet/5PxeKHeFytyjVrMFPNKEa1pOF5M7T5aMYTavR8xISTMiZ1ZerCOom9uPS8LT2aDP7GRUdsnJN9u6c1yIixQOpkI8FB62bSpQJvo7BP7CSm1+fa1upXoVWYWsnaDsa23TojaBR/T7ISf3Jpj6/ZSJtXoFa+CupKF6ghq85Mh3b17bClMuQ9oz7+OZq3neRfy4DEZhpo3NOX4oRH9x3xDnaTE7ZhiJTZJZUlsKFAgMBAAECggEBAKjxvWS0D7PdcakGIS23FS9UQd/0qFz93qwM2sVJkFwec5s7dDZ/irPxxPQPvIDSoafWmetBQ9Dxbti4pZaxSl7LakzmH1OTtTOc8SahP+BYCTKapx3aqtzZXzIY7peOUYwju8LBHu/19sN6R5xNcGdCN4sdr/Uy4P/ZTU9+TvTjMo5IUbomiGSt169eypy2yFXr1Ydtq0lS70ZnwCcnVlvjAI/AYRT2qOYVrBGlWs8qsoEMjRL1Cocq4lhXu1f9pw+z2FDw86Kj/nNL7oX3YS42ebGzB56CEYDnydcjZ8KMDnqGrwYjBLpulWL53x6q4d8Ht8l7yTMC/vnM46QgNAECgYEA95I8lUNWa2aTi7kyHQ9FYsdARcISnEFXypHKNiNgVmOYD5AxxIOvpz09B1tRJV2+ouiL81WnqhnRzc4pUwLeMiqJCgzAZjQsMvMAy6QMlCqintGahOhcS36L6PKU0fND/vMGWU+TPOpWkaB22zUeUI8nyJpzApscvdbhsDrhrcUCgYEAxN47kpe/jYLVUOjMzcT+GfJUJYwO4kUzSpUwQfGInPZzDM9YgUoT//BjsCF6QIVNZITKK6HbCdVmuFzPbQ/0g1cYqoBOW5SQxO4aCxkv23fSUXzhXTs29+XK7QIYh5iZ67pAg6YVxaF66MA06mgaQ/josH3LhEbzW81d84fczcECgYBJYxUIXgypC6AjJAPB73vu+weHZi8kGI6QosThZX0yPpWdz22hRjP0jEeh/aTBQde37N1HhZWM69hwfHNtgwUgs9EppHwID+EmPTh4JSoBZd4M3C9ExKhPTLTmmboZvlXipmG0ac1ImmKNCpcRBd71nGn7oiUDmb1cXO1L0ziAzQKBgBo6LR+Tfd6Bbp/P0/EZ7GxSf2ldJmJ4q6OlCn/OiM+4eY1cVkMrNkzjnrRJUXslBzF8C18SuhauSngHTU8PUBjrUorsewPyX/MMcYXG/jwz014tz+xWxjTydT1sCQ6PgvoHny6qwr3IjJJTgPk1k0I49+8DY0ilFyjEzF50XDNBAoGBAPBKfcwVzCnlch+BAeI3ovuGrnpdbTA01wvuyfE+IdTISY7KuI5JrbRx9SpkC+IPN/n9nHA6Ru0BmnM9QP4daN9P0VXKWKidXzgoKTt48U2/QNHwY/srciXRI6EdsRSY14KqMIFi0S5iRRzi8MztKYy2fDElTbwN8eHENmPxTy94 #开发者应用私钥
+ alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvmLgz0kcA4JN9e1qdMazB31a9oC/7rOLnu0RAD97wU+ajRrZdxAdzsnKHEx9pt2Na1Ic65JDlqhvd4mG9gLtdZfEPY8L/5c8p+rkP4ogcMuWnHrf+T8Xih3hcrco1azBTzShGtaTheTO0+WjGE2r0fMSEkzImdWXqwjqJvbj0vC09mgz+xkVHbJyTfbunNciIsUDqZCPBQetm0qUCb6OwT+wkptfn2tbqV6FVmFrJ2g7Gtt06I2gUf0+yEn9yaY+v2UibV6BWvgrqSheoIavOTId29e2wpTLkPaM+/jmat53kX8uAxGYaaNzTl+KER/cd8Q52kxO2YYiU2SWVJbChQIDAQAB #应用公钥
+ alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXGGldcA52Hbp1rUh1gCrq+Bv64rZonpIzUsvIK1j7TC2nYVSMz5zAo/JI4YDKQNuEP2rK74+c/eZUaSdqjI40rh+UT6Wkc7KArVq6AUXZCm3pUomFK7aEDG93QwB8YSmBn4tAghUxI3OR1k6UKVg5qO373F3EXLYcdOMcVkmYe/N4LxbLE/qSekyujXflKuPDAmva2KLZ7Y0iz3efXyzmQeZ7TGebgpSwABBjxDPIQz8/uW1zv84nslzOiAOOFNV8jBOqYs4PfyqPxl34rHrY8IyuI4SBH7zfHwqG42TY1i298Dz7YaNz0i0UGu80SCdQeakIG0u8uypvDQ9h7eywIDAQAB #支付宝公钥
+
+---
+
+juhe: #聚合数据
+ appKey: c0d55e1fb67efd7ae3175ee9bd8c6bc2 #
+
+
+---
+
+jiguang:
+ appKey-driver: 1a0f5e669a1115b83a297ea2 #极光推送应用唯一标识
+ masterSecret-driver: 7784969a6f471798e12e35bd #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
+ appKey-dispatch: 4ac57b1aaabc7432185e16f3 #极光推送应用唯一标识
+ masterSecret-dispatch: 4b7fb30f7eac393f1ebb5768 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
+
+
+---
+
+filePath: C:/orderPostionFile/ #存储订单轨迹文件路径
+
+
+
+#支付回调地址
+callbackPath: http://182.160.16.251/driver
+
+
+---
+
+spring:
+ mail:
+ host: smtp.gmail.com # 配置 smtp 服务器地址
+ port: 465 # smtp 服务器的端口
+ username: i-gotech@i-go.group # 配置邮箱用户名(你的邮箱地址)
+ password: mhizkqkhuknbitps # 配置申请到的授权码(刚让复制的授权码)
+ default-encoding: UTF-8 # 配置邮件编码
+ properties:
+ mail:
+ smtp:
+ socketFactoryClass: javax.net.ssl.SSLSocketFactory # 配饰 SSL 加密工厂
+ debug: true
+ from: i-gotech@i-go.group # 发送方邮件，配在yml中可方便更改
+ template-path: /usr/local/nginx/html/mailbox/
+
+---
+
+share:
+ url: http://182.160.16.251:81/share/share/pages/changeStyle/changeStyle.html
\ No newline at end of file
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml b/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
new file mode 100644
index 0000000..f367bc3
--- /dev/null
+++ b/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -0,0 +1,129 @@
+server:
+ port: 8007
+
+guns:
+ swagger-open: true #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ # file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+
+spring:
+ application:
+ name: driver-server
+ mvc:
+ static-path-pattern: /static/**
+ view:
+ prefix: /WEB-INF/view
+ devtools:
+ restart:
+ enabled: false
+ additional-paths: src/main/java
+ exclude: static/**,WEB-INF/view/**
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+
+mybatis-plus:
+ typeAliasesPackage: com.stylefeng.guns.modular
+ configuration:
+ log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+
+
+eureka:
+ client:
+ service-url: #注册中心地址
+ defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
+ register-with-eureka: true #在注册中心进行注册
+ fetch-registry: true #从Eureka中获取注册信息。
+
+---
+
+spring:
+ datasource:
+ url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
+ username: root
+ password: HjKbXilb9zajmXbl
+ db-name: guns #用来搜集数据库的所有表
+ filters: wall,mergeStat
+
+
+
+#多数据源情况的配置
+guns:
+ muti-datasource:
+ open: false
+ url: jdbc:mysql://127.0.0.1:3306/guns_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: root
+ dataSourceNames:
+ - dataSourceGuns
+ - dataSourceBiz
+
+
+
+wx:
+ grantType: authorization_code #填authorization_code
+ appid: wx97c33c052b2222f7 #应用唯一标识，在微信开放平台提交应用审核通过后获得
+ appSecret: 3cb8f3db9cd20b8ec276fe2e28979aaf #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
+ appletsAppid: #小程序APPid
+ appletsAppSecret: #
+ mchId: 1551741761 #微信支付分配的商户号
+ key: JnhREmZwHNKyFUQPEhijp1gdaCUzKg8P #key为商户平台设置的密钥key：
+
+---
+
+alipay:
+ appid: 2019080866147541 #应用程序唯一标识
+ appPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC+YuDPSRwDgk317Wp0xrMHfVr2gL/us4ue7REAP3vBT5qNGtl3EB3OycocTH2m3Y1rUhzrkkOWqG93iYb2Au11l8Q9jwv/lzyn6uQ/iiBwy5acet/5PxeKHeFytyjVrMFPNKEa1pOF5M7T5aMYTavR8xISTMiZ1ZerCOom9uPS8LT2aDP7GRUdsnJN9u6c1yIixQOpkI8FB62bSpQJvo7BP7CSm1+fa1upXoVWYWsnaDsa23TojaBR/T7ISf3Jpj6/ZSJtXoFa+CupKF6ghq85Mh3b17bClMuQ9oz7+OZq3neRfy4DEZhpo3NOX4oRH9x3xDnaTE7ZhiJTZJZUlsKFAgMBAAECggEBAKjxvWS0D7PdcakGIS23FS9UQd/0qFz93qwM2sVJkFwec5s7dDZ/irPxxPQPvIDSoafWmetBQ9Dxbti4pZaxSl7LakzmH1OTtTOc8SahP+BYCTKapx3aqtzZXzIY7peOUYwju8LBHu/19sN6R5xNcGdCN4sdr/Uy4P/ZTU9+TvTjMo5IUbomiGSt169eypy2yFXr1Ydtq0lS70ZnwCcnVlvjAI/AYRT2qOYVrBGlWs8qsoEMjRL1Cocq4lhXu1f9pw+z2FDw86Kj/nNL7oX3YS42ebGzB56CEYDnydcjZ8KMDnqGrwYjBLpulWL53x6q4d8Ht8l7yTMC/vnM46QgNAECgYEA95I8lUNWa2aTi7kyHQ9FYsdARcISnEFXypHKNiNgVmOYD5AxxIOvpz09B1tRJV2+ouiL81WnqhnRzc4pUwLeMiqJCgzAZjQsMvMAy6QMlCqintGahOhcS36L6PKU0fND/vMGWU+TPOpWkaB22zUeUI8nyJpzApscvdbhsDrhrcUCgYEAxN47kpe/jYLVUOjMzcT+GfJUJYwO4kUzSpUwQfGInPZzDM9YgUoT//BjsCF6QIVNZITKK6HbCdVmuFzPbQ/0g1cYqoBOW5SQxO4aCxkv23fSUXzhXTs29+XK7QIYh5iZ67pAg6YVxaF66MA06mgaQ/josH3LhEbzW81d84fczcECgYBJYxUIXgypC6AjJAPB73vu+weHZi8kGI6QosThZX0yPpWdz22hRjP0jEeh/aTBQde37N1HhZWM69hwfHNtgwUgs9EppHwID+EmPTh4JSoBZd4M3C9ExKhPTLTmmboZvlXipmG0ac1ImmKNCpcRBd71nGn7oiUDmb1cXO1L0ziAzQKBgBo6LR+Tfd6Bbp/P0/EZ7GxSf2ldJmJ4q6OlCn/OiM+4eY1cVkMrNkzjnrRJUXslBzF8C18SuhauSngHTU8PUBjrUorsewPyX/MMcYXG/jwz014tz+xWxjTydT1sCQ6PgvoHny6qwr3IjJJTgPk1k0I49+8DY0ilFyjEzF50XDNBAoGBAPBKfcwVzCnlch+BAeI3ovuGrnpdbTA01wvuyfE+IdTISY7KuI5JrbRx9SpkC+IPN/n9nHA6Ru0BmnM9QP4daN9P0VXKWKidXzgoKTt48U2/QNHwY/srciXRI6EdsRSY14KqMIFi0S5iRRzi8MztKYy2fDElTbwN8eHENmPxTy94 #开发者应用私钥
+ alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvmLgz0kcA4JN9e1qdMazB31a9oC/7rOLnu0RAD97wU+ajRrZdxAdzsnKHEx9pt2Na1Ic65JDlqhvd4mG9gLtdZfEPY8L/5c8p+rkP4ogcMuWnHrf+T8Xih3hcrco1azBTzShGtaTheTO0+WjGE2r0fMSEkzImdWXqwjqJvbj0vC09mgz+xkVHbJyTfbunNciIsUDqZCPBQetm0qUCb6OwT+wkptfn2tbqV6FVmFrJ2g7Gtt06I2gUf0+yEn9yaY+v2UibV6BWvgrqSheoIavOTId29e2wpTLkPaM+/jmat53kX8uAxGYaaNzTl+KER/cd8Q52kxO2YYiU2SWVJbChQIDAQAB #应用公钥
+ alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXGGldcA52Hbp1rUh1gCrq+Bv64rZonpIzUsvIK1j7TC2nYVSMz5zAo/JI4YDKQNuEP2rK74+c/eZUaSdqjI40rh+UT6Wkc7KArVq6AUXZCm3pUomFK7aEDG93QwB8YSmBn4tAghUxI3OR1k6UKVg5qO373F3EXLYcdOMcVkmYe/N4LxbLE/qSekyujXflKuPDAmva2KLZ7Y0iz3efXyzmQeZ7TGebgpSwABBjxDPIQz8/uW1zv84nslzOiAOOFNV8jBOqYs4PfyqPxl34rHrY8IyuI4SBH7zfHwqG42TY1i298Dz7YaNz0i0UGu80SCdQeakIG0u8uypvDQ9h7eywIDAQAB #支付宝公钥
+
+---
+
+juhe: #聚合数据
+ appKey: c0d55e1fb67efd7ae3175ee9bd8c6bc2 #
+
+
+---
+
+jiguang:
+ appKey-driver: 1a0f5e669a1115b83a297ea2 #极光推送应用唯一标识
+ masterSecret-driver: 7784969a6f471798e12e35bd #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
+ appKey-dispatch: 4ac57b1aaabc7432185e16f3 #极光推送应用唯一标识
+ masterSecret-dispatch: 4b7fb30f7eac393f1ebb5768 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
+
+
+---
+
+filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
+
+
+
+#支付回调地址
+callbackPath: http://182.160.16.251/driver
+
+
+---
+
+spring:
+ mail:
+ host: smtp.gmail.com # 配置 smtp 服务器地址
+ port: 465 # smtp 服务器的端口
+ username: i-gotech@i-go.group # 配置邮箱用户名(你的邮箱地址)
+ password: mhizkqkhuknbitps # 配置申请到的授权码(刚让复制的授权码)
+ default-encoding: UTF-8 # 配置邮件编码
+ properties:
+ mail:
+ smtp:
+ socketFactoryClass: javax.net.ssl.SSLSocketFactory # 配饰 SSL 加密工厂
+ debug: true
+ from: i-gotech@i-go.group # 发送方邮件，配在yml中可方便更改
+ template-path: /usr/local/nginx/html/mailbox/
+
+---
+
+share:
+ url: http://182.160.16.251:81/share/share/pages/changeStyle/changeStyle.html
\ No newline at end of file
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/application.yml b/DriverIGOTravel/guns-admin/src/main/resources/application.yml
index 169d3bc..8d56024 100644
--- a/DriverIGOTravel/guns-admin/src/main/resources/application.yml
+++ b/DriverIGOTravel/guns-admin/src/main/resources/application.yml
@@ -4,7 +4,7 @@
guns:
swagger-open: true #是否开启swagger (true/false)
kaptcha-open: false #是否开启登录时验证码 (true/false)
-# file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
+ # file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录)
spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
@@ -46,7 +46,7 @@
spring:
datasource:
- url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
username: root
password: HjKbXilb9zajmXbl
db-name: guns #用来搜集数据库的所有表
@@ -70,8 +70,8 @@
username: root
password: root
dataSourceNames:
- - dataSourceGuns
- - dataSourceBiz
+ - dataSourceGuns
+ - dataSourceBiz
diff --git a/DriverIGOTravel/pom.xml b/DriverIGOTravel/pom.xml
index 5d1b8bd..3766e59 100644
--- a/DriverIGOTravel/pom.xml
+++ b/DriverIGOTravel/pom.xml
@@ -11,7 +11,6 @@
<modules>
<module>guns-admin</module>
<module>guns-core</module>
- <module>guns-rest</module>
<module>guns-generator</module>
</modules>
--
Gitblit v1.7.1