From 7bf07f46d7c39fa01b6d8abd860bd80c210d86cb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 09 十月 2025 15:48:31 +0800
Subject: [PATCH] 修改上传图片配置
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java | 8 ++++----
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 2 +-
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java | 4 ++--
UserIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/TestGunsApplication.java | 12 +++++++-----
ZuulIGOTravel/src/main/resources/application.yml | 2 +-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 3 +++
UserIGOTravel/guns-admin/src/main/resources/application-produce.yml | 2 +-
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 14 +++++++-------
DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml | 2 +-
ManagementIGOTravel/guns-admin/src/main/resources/application-produce.yml | 2 +-
10 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index fd86d81..668d62a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -512,6 +512,9 @@
@Override
public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat,String phone, Integer language, Integer uid) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if((orderPrivateCar.getState() + 1) != state){
+ return ResultUtil.error(language == 1 ? "操作失败，请刷新订单" : language == 2 ? "Operation failed, please refresh the order" : "L’opération a échoué, veuillez actualiser la commande");
+ }
String tripId = redisUtil.getValue("trip" + orderPrivateCar.getUserId());
ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lon, tripId);
if(null == reverseGeocode){
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml b/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
index 46b786c..199b892 100644
--- a/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
+++ b/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -30,7 +30,7 @@
file-size-threshold: 100MB
redis:
database: 0
- host: 172.17.0.3
+ host: 127.0.0.1
port: 6379
password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java
index 6b5e89d..c750453 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java
@@ -36,8 +36,8 @@
// The path to your file to upload
// String filePath = "path/to/your/file"
String fileName = file.getOriginalFilename();
- String projectId = "i-go-gcp";
- String bucketName = "i-go";
+ String projectId = "i-go-cloud";
+ String bucketName = "i-go-gcs-public";
GoogleCredentials defaultCredentials = null;
try {
defaultCredentials = GoogleCredentials.getApplicationDefault();
@@ -74,7 +74,7 @@
storage.createFrom(blobInfo, file.getInputStream(), precondition);
System.out.println(
"File uploaded to bucket " + bucketName + " as " + fileName);
-
+
makeObjectPublic(projectId, bucketName, fileName);
return "https://storage.googleapis.com/i-go/" + fileName;
} catch (IOException e) {
@@ -99,5 +99,5 @@
System.out.println(
"Object " + objectName + " in bucket " + bucketName + " was made publicly readable");
}
-
+
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/resources/application-produce.yml b/ManagementIGOTravel/guns-admin/src/main/resources/application-produce.yml
index 7d26b3c..07190af 100644
--- a/ManagementIGOTravel/guns-admin/src/main/resources/application-produce.yml
+++ b/ManagementIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -31,7 +31,7 @@
max-file-size: 100MB
redis:
database: 0
- host: 172.17.0.3
+ host: 127.0.0.1
port: 6379
password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index daf0d7a..97f924e 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1095,7 +1095,7 @@
UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderLogistics.getCompanyId());
if(null != query2){
Integer orderNum=this.selectCount(new EntityWrapper<OrderLogistics>().eq("userId",orderLogistics.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
- if(query2.getDistance()*1000>orderLogistics.getMileage() && query2.getOrderNum()>orderNum){
+ if(orderLogistics.getMileage() > (query2.getDistance() * 1000) && query2.getOrderNum() > orderNum){
Double special = query2.getLogistics();
if(null != special){
orderLogistics.setDiscount(special);
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 185eefa..d472e8f 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -1291,12 +1291,12 @@
@Transactional(rollbackFor = Exception.class)
public ResultUtil payPrivateCarOrder(Integer payType, Integer bankCardId, Integer orderId, Integer couponId, Integer redDeduction, Integer type, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
- return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.", "");
- }
- if(orderPrivateCar.getState() != 7){
- return ResultUtil.error(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is no longer with Pending Payment, making payments is not allowed." : "La commande n’est plus en attente de paiement, il n’est pas permis d’effectuer des paiements.", "");
- }
+// if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
+// return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.", "");
+// }
+// if(orderPrivateCar.getState() != 7){
+// return ResultUtil.error(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is no longer with Pending Payment, making payments is not allowed." : "La commande n’est plus en attente de paiement, il n’est pas permis d’effectuer des paiements.", "");
+// }
Integer uid = orderPrivateCar.getUserId();
BigDecimal orderMoney = new BigDecimal(orderPrivateCar.getOrderMoney());
UserInfo userInfo = userInfoService.selectById(uid);
@@ -1309,7 +1309,7 @@
if(null != query2){
Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId())
.eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
- if(query2.getDistance() * 1000 > orderPrivateCar.getMileage() && query2.getOrderNum().compareTo(orderNum) > 0){
+ if(orderPrivateCar.getMileage() > (query2.getDistance() * 1000) && query2.getOrderNum().compareTo(orderNum) > 0){
Double special = query2.getSpecial();
if(null != special){
orderPrivateCar.setDiscount(special);
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java
index 6a91d7c..11041a5 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleCloudStorageUtil.java
@@ -27,8 +27,8 @@
// The path to your file to upload
// String filePath = "path/to/your/file"
String fileName = file.getOriginalFilename();
- String projectId = "i-go-gcp";
- String bucketName = "i-go";
+ String projectId = "i-go-cloud";
+ String bucketName = "i-go-gcs-public";
Storage storage = StorageOptions.newBuilder().setProjectId(projectId).build().getService();
BlobId blobId = BlobId.of(bucketName, fileName);
BlobInfo blobInfo = BlobInfo.newBuilder(blobId).build();
diff --git a/UserIGOTravel/guns-admin/src/main/resources/application-produce.yml b/UserIGOTravel/guns-admin/src/main/resources/application-produce.yml
index 9b7cf1b..d6d4334 100644
--- a/UserIGOTravel/guns-admin/src/main/resources/application-produce.yml
+++ b/UserIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -29,7 +29,7 @@
max-file-size: 100MB
redis:
database: 0
- host: 172.17.0.3
+ host: 127.0.0.1
port: 6379
password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5
diff --git a/UserIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/TestGunsApplication.java b/UserIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/TestGunsApplication.java
index 0ac37ba..cb13980 100644
--- a/UserIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/TestGunsApplication.java
+++ b/UserIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/TestGunsApplication.java
@@ -1,6 +1,7 @@
//package com.stylefeng.guns;
//
//import com.alibaba.fastjson.JSON;
+//import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
//import com.stylefeng.guns.modular.system.util.SMSUtil;
//import com.stylefeng.guns.modular.system.util.Tingg.TinggPayoutUtil;
//import com.stylefeng.guns.modular.system.util.Tingg.model.PayoutResponse;
@@ -24,14 +25,15 @@
//public class TestGunsApplication {
//
// @Autowired
-// private TinggPayoutUtil tinggPayoutUtil;
-//
-// @Autowired
-// private SMSUtil smsUtil;
+// private IOrderPrivateCarService orderPrivateCarService;
//
//
// @Test
// public void test(){
-// smsUtil.sendCellulantMessage("233203716998", "您的验证码为：123456，该验证码5分钟内有效，请勿泄漏于他人！");
+// try {
+// orderPrivateCarService.payPrivateCarOrder(1, null, 13083, null, null, 1, 1);
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
// }
//}
diff --git a/ZuulIGOTravel/src/main/resources/application.yml b/ZuulIGOTravel/src/main/resources/application.yml
index d394fbd..86a8cc5 100644
--- a/ZuulIGOTravel/src/main/resources/application.yml
+++ b/ZuulIGOTravel/src/main/resources/application.yml
@@ -12,7 +12,7 @@
file-size-threshold: 100MB
redis:
database: 0
- host: 172.17.0.3
+ host: 127.0.0.1
port: 6379
password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5
--
Gitblit v1.7.1