From e47a578e0caace7c23b38aecf16c378eb75ff963 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 10 四月 2024 12:05:37 +0800
Subject: [PATCH] 提交1.0版本
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 21 ++--
DriverIGOTravel/guns-admin/src/main/resources/application.yml | 142 ----------------------------
DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml | 4
DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 39 ++++++-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 42 ++++----
DriverIGOTravel/guns-core/src/main/resources/default-config.properties | 2
8 files changed, 69 insertions(+), 185 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index c0acaad..e858a79 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -9,6 +9,7 @@
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
+import com.stylefeng.guns.modular.system.dao.DriverActivityHistoryMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ALiSendSms;
@@ -27,6 +28,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -84,6 +86,9 @@
@Autowired
private TEmailService emailService;
+
+ @Resource
+ private DriverActivityHistoryMapper driverActivityHistoryMapper;
@@ -1106,11 +1111,35 @@
List<Map<String, Object>> list = driverService.queryActivityIncome(language, uid, pageNum, size);
List<BaseWarpper> data = new ArrayList<>();
for(Map<String, Object> map : list){
- BaseWarpper baseWarpper = new BaseWarpper();
- baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : ""));
- baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
- baseWarpper.setName(language == 1 ? "活动奖励" : language == 2 ? "Activity reward" : "Récompenses pour événements");
- data.add(baseWarpper);
+ String incomeId = map.get("incomeId").toString();
+ DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectById(incomeId);
+ if(null == driverActivityHistory){
+ BaseWarpper baseWarpper = new BaseWarpper();
+ baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : ""));
+ baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
+ baseWarpper.setName(language == 1 ? "活动奖励" : language == 2 ? "Activity reward" : "Récompenses pour événements");
+ data.add(baseWarpper);
+ }else{
+ Integer type = driverActivityHistory.getType();
+ BaseWarpper baseWarpper = new BaseWarpper();
+ baseWarpper.setDay(String.valueOf(null != map.get("time") ? map.get("time") : ""));
+ baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
+ switch (type){
+ case 1:
+ baseWarpper.setName(language == 1 ? "邀请司机奖励(活动)" : language == 2 ? "Invite drivers and earn" : "Invitez des chauffeurs et gagnez de l’argent");
+ break;
+ case 2:
+ baseWarpper.setName(language == 1 ? "邀请用户奖励(活动)" : language == 2 ? "Invite users and earn" : "Invitez des utilisateurs et gagnez de l’argent");
+ break;
+ case 3:
+ baseWarpper.setName(language == 1 ? "在线时长奖励(活动)" : language == 2 ? "Online-duration reward activity" : "Activité de récompense en ligne");
+ break;
+ case 4:
+ baseWarpper.setName(language == 1 ? "累计接单奖励(活动)" : language == 2 ? "Cumulative order activity" : "Activité cumulée des commandes");
+ break;
+ }
+ data.add(baseWarpper);
+ }
}
return ResultUtil.success(data);
}catch (Exception e){
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index e5503ee..365e2cf 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -488,34 +488,34 @@
Element title_chinese = document.getElementById("title_chinese");
title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
+ xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_chinese = document.getElementById("yhq_chinese");
- yhq_chinese.text("GHS -" + orderLogistics.getCouponMoney());
+ yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
}else{
Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
yhq_chinese_div.remove();
}
if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
Element zk_chinese = document.getElementById("zk_chinese");
- zk_chinese.text("GHS -" + orderLogistics.getDiscountMoney());
+ zk_chinese.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
}else{
Element zk_chinese_div = document.getElementById("zk_chinese_div");
zk_chinese_div.remove();
}
if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
Element hb_chinese = document.getElementById("hb_chinese");
- hb_chinese.text("GHS -" + orderLogistics.getRedPacketMoney());
+ hb_chinese.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
}else{
Element hb_chinese_div = document.getElementById("hb_chinese_div");
hb_chinese_div.remove();
}
Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + orderLogistics.getPayMoney());
+ xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element pay_type_chinese = document.getElementById("pay_type_chinese");
pay_type_chinese.text(payTypeChinese);
Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
+ pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element pdf_chinese = document.getElementById("pdf_chinese");
pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
Element lost_item_chinese = document.getElementById("lost_item_chinese");
@@ -527,7 +527,7 @@
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_chinese = document.getElementById("cp_chinese");
cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -548,34 +548,34 @@
Element title_english = document.getElementById("title_english");
title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + orderLogistics.getOrderMoney());
+ xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_english = document.getElementById("yhq_english");
- yhq_english.text("GHS -" + orderLogistics.getCouponMoney());
+ yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
}else{
Element yhq_english_div = document.getElementById("yhq_english_div");
yhq_english_div.remove();
}
if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
Element zk_english = document.getElementById("zk_english");
- zk_english.text("GHS -" + orderLogistics.getDiscountMoney());
+ zk_english.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
}else{
Element zk_english_div = document.getElementById("zk_english_div");
zk_english_div.remove();
}
if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
Element hb_english = document.getElementById("hb_english");
- hb_english.text("GHS -" + orderLogistics.getRedPacketMoney());
+ hb_english.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
}else{
Element hb_english_div = document.getElementById("hb_english_div");
hb_english_div.remove();
}
Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + orderLogistics.getPayMoney());
+ xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element pay_type_english = document.getElementById("pay_type_english");
pay_type_english.text(payTypeEnglish);
Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderLogistics.getPayMoney());
+ pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element pdf_english = document.getElementById("pdf_english");
pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
Element lost_item_english = document.getElementById("lost_item_english");
@@ -587,7 +587,7 @@
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_english = document.getElementById("cp_english");
cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -608,34 +608,34 @@
Element title_french = document.getElementById("title_french");
title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + orderLogistics.getOrderMoney());
+ xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
Element yhq_french = document.getElementById("yhq_french");
- yhq_french.text("GHS -" + orderLogistics.getCouponMoney());
+ yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
}else{
Element yhq_french_div = document.getElementById("yhq_french_div");
yhq_french_div.remove();
}
if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
Element zk_french = document.getElementById("zk_french");
- zk_french.text("GHS -" + orderLogistics.getDiscountMoney());
+ zk_french.text("GHS -" + new BigDecimal(orderLogistics.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
}else{
Element zk_french_div = document.getElementById("zk_french_div");
zk_french_div.remove();
}
if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
Element hb_french = document.getElementById("hb_french");
- hb_french.text("GHS -" + orderLogistics.getRedPacketMoney());
+ hb_french.text("GHS -" + new BigDecimal(orderLogistics.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
}else{
Element hb_french_div = document.getElementById("hb_french_div");
hb_french_div.remove();
}
Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + orderLogistics.getPayMoney());
+ xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element pay_type_french = document.getElementById("pay_type_french");
pay_type_french.text(payTypeFrench);
Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderLogistics.getPayMoney());
+ pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
Element pdf_french = document.getElementById("pdf_french");
pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
Element lost_item_french = document.getElementById("lost_item_french");
@@ -647,7 +647,7 @@
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_french = document.getElementById("cp_french");
cp_french.text("Plaque: GS " + car.getCarLicensePlate());
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
index 5219aef..4bcfe73 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
@@ -247,7 +247,7 @@
/**
- * 获取活动奖励列表
+ * 获取列表
* @param uid
* @param pageNum
* @param size
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 68631c3..69436f8 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
@@ -327,11 +327,6 @@
List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
BigDecimal bigDecimal = new BigDecimal("0");
for(Map<String, Object> map : query){
- if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
- bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
- incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
- }
-
DriverActivityHistory dah = new DriverActivityHistory();
dah.setActivityId(Integer.valueOf(map.get("id").toString()));
dah.setDriverId(uid);
@@ -339,6 +334,10 @@
DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
driverActivityHistory.setCarryOut(2);
driverActivityHistoryMapper.updateById(driverActivityHistory);
+ if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
+ bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
+ incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, Double.valueOf(String.valueOf(map.get("money"))));
+ }
}
driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -523,10 +522,6 @@
List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
BigDecimal bigDecimal = new BigDecimal("0");
for(Map<String, Object> map : query){
- if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
- bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
- incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
- }
DriverActivityHistory dah = new DriverActivityHistory();
dah.setActivityId(Integer.valueOf(map.get("id").toString()));
dah.setDriverId(uid);
@@ -534,6 +529,10 @@
DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
driverActivityHistory.setCarryOut(2);
driverActivityHistoryMapper.updateById(driverActivityHistory);
+ if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
+ bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
+ incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, Double.valueOf(String.valueOf(map.get("money"))));
+ }
}
driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -2279,7 +2278,7 @@
this.updateById(driver);
//添加收入记录
- incomeService.saveData(2, driverOnline.getDriverId(), 1, dao.getId(), null, dah.getMoney());
+ incomeService.saveData(2, driverOnline.getDriverId(), 1, dah.getId(), null, dah.getMoney());
if(ToolUtil.isNotEmpty(driver.getEmail())) {
@@ -2399,7 +2398,7 @@
this.updateById(driver);
//添加收入记录
- incomeService.saveData(2, dah.getDriverId(), 1, dao.getId(), null, dah.getMoney());
+ incomeService.saveData(2, dah.getDriverId(), 1, dah.getId(), null, dah.getMoney());
if(ToolUtil.isNotEmpty(driver.getEmail())) {
String path1 = templatePath + "driver/index.html";
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml b/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
index f367bc3..50aef5f 100644
--- a/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
+++ b/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -28,8 +28,6 @@
mybatis-plus:
typeAliasesPackage: com.stylefeng.guns.modular
- configuration:
- log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
eureka:
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/application.yml b/DriverIGOTravel/guns-admin/src/main/resources/application.yml
index bd01da6..62b85a4 100644
--- a/DriverIGOTravel/guns-admin/src/main/resources/application.yml
+++ b/DriverIGOTravel/guns-admin/src/main/resources/application.yml
@@ -1,143 +1,3 @@
-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
profiles:
- active: @spring.active@
- 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
-
-################# 测试环境 ###################
-#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: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
-#filePath: C:/orderPostionFile/ #存储订单轨迹文件路径
-
-
-
-#支付回调地址
-#正式环境
-#callbackPath: https://okyueche.com:443/driver
-#正式测试环境
-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
+ active: @spring.active@
\ No newline at end of file
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml b/DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml
index c8762ae..2b6ef29 100644
--- a/DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml
+++ b/DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml
@@ -194,7 +194,7 @@
<appender-ref ref="ERROR_FILE" />
<appender-ref ref="ALL_FILE" />
</root>
- <logger name="com.stylefeng.guns.modular.system.dao" level="error"/>
+ <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
<logger name="business-log" level="warn"/>
</springProfile>
@@ -207,7 +207,7 @@
<appender-ref ref="ERROR_FILE" />
<appender-ref ref="ALL_FILE" />
</root>
- <logger name="com.stylefeng.guns.modular.system.dao" level="error"/>
+ <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
<logger name="business-log" level="warn"/>
</springProfile>
diff --git a/DriverIGOTravel/guns-core/src/main/resources/default-config.properties b/DriverIGOTravel/guns-core/src/main/resources/default-config.properties
index 8d458f7..e1101a5 100644
--- a/DriverIGOTravel/guns-core/src/main/resources/default-config.properties
+++ b/DriverIGOTravel/guns-core/src/main/resources/default-config.properties
@@ -21,8 +21,6 @@
mybatis-plus.configuration.lazyLoadingEnabled=true
# \u5F00\u542F\u7684\u8BDD\uFF0C\u5EF6\u65F6\u52A0\u8F7D\u4E00\u4E2A\u5C5E\u6027\u65F6\u4F1A\u52A0\u8F7D\u8BE5\u5BF9\u8C61\u5168\u90E8\u5C5E\u6027\uFF0C\u5426\u5219\u6309\u9700\u52A0\u8F7D\u5C5E\u6027
mybatis-plus.configuration.multipleResultSetsEnabled=true
-# \u6253\u5370sql\u8BED\u53E5,\u8C03\u8BD5\u7528
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
########################## beetl\u9ED8\u8BA4\u914D\u7F6E ###########################
--
Gitblit v1.7.1