From 0f9e3330d11e20669f3dc758dc85103ab1147de0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:55:45 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/resources/application-prod.yml | 2 ++
driver/guns-admin/src/main/resources/application-test.yml | 2 ++
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 32 ++++++++++++++++----------------
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index 81b70aa..92a23ac 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -355,16 +355,16 @@
// }
// }
// todo 正式放开
-// if(ToolUtil.isEmpty(driver.getReferralCode())){
-// String s = wechatMiniProgramORCode(driver.getId());
-// driver.setReferralCode(s);
-// this.updateById(driver);
-// }
-// if(ToolUtil.isEmpty(driver.getOrderQRCode())){
-// String s = wechatMiniOrderQRCode(driver.getId());
-// driver.setOrderQRCode(s);
-// this.updateById(driver);
-// }
+ if(ToolUtil.isEmpty(driver.getReferralCode())){
+ String s = wechatMiniProgramORCode(driver.getId());
+ driver.setReferralCode(s);
+ this.updateById(driver);
+ }
+ if(ToolUtil.isEmpty(driver.getOrderQRCode())){
+ String s = wechatMiniOrderQRCode(driver.getId());
+ driver.setOrderQRCode(s);
+ this.updateById(driver);
+ }
return ResultUtil.success(tokenWarpper);
}
@@ -461,12 +461,12 @@
// todo 正式放开
//下线
-// for (int i = 0; i < 5; i++) {
-// Integer code = pushUtil.pushOffline(driver.getId(), 2);
-// if(200 == code){
-// break;
-// }
-// }
+ for (int i = 0; i < 5; i++) {
+ Integer code = pushUtil.pushOffline(driver.getId(), 2);
+ if(200 == code){
+ break;
+ }
+ }
return token;
}
return "";
diff --git a/driver/guns-admin/src/main/resources/application-prod.yml b/driver/guns-admin/src/main/resources/application-prod.yml
index e8f9264..3aaaddb 100644
--- a/driver/guns-admin/src/main/resources/application-prod.yml
+++ b/driver/guns-admin/src/main/resources/application-prod.yml
@@ -1,5 +1,7 @@
server:
port: 7007
+ tomcat:
+ basedir: /etraffic/server/daijia/tomcat
guns:
swagger-open: false #是否开启swagger (true/false)
diff --git a/driver/guns-admin/src/main/resources/application-test.yml b/driver/guns-admin/src/main/resources/application-test.yml
index a2a4286..89ed9d6 100644
--- a/driver/guns-admin/src/main/resources/application-test.yml
+++ b/driver/guns-admin/src/main/resources/application-test.yml
@@ -1,5 +1,7 @@
server:
port: 7007
+ tomcat:
+ basedir: /etraffic/server/daijia/tomcat
guns:
swagger-open: false #是否开启swagger (true/false)
--
Gitblit v1.7.1