区分环境

ace-auth/ace-auth-server/src/main/resources/bootstrap.yml

 spring:
+  profiles:
+    active: dev
   application:
     name: ace-auth
   cloud:
     nacos:
       config:
-#        server-addr: 127.0.0.1:8848
-        server-addr: 10.5.52.2:8848
         file-extension: yaml
-  profiles:
-    active: dev
\ No newline at end of file
+---
+spring:
+  profiles: dev
+  cloud:
+    nacos:
+      config:
+        server-addr: 127.0.0.1:8848
+---
+spring:
+  profiles: pro
+  cloud:
+    nacos:
+      config:
+        server-addr: 10.5.52.2:8848
\ No newline at end of file

ace-gate/src/main/resources/bootstrap.yml

 spring:
+  profiles:
+    active: dev
   application:
     name: ace-gateway
   cloud:
     nacos:
       config:
-#        server-addr: 127.0.0.1:8848
-        server-addr: 10.5.52.2:8848
         file-extension: yaml
-  profiles:
-    active: dev
   main:
-    allow-bean-definition-overriding: true
\ No newline at end of file
+    allow-bean-definition-overriding: true
+
+---
+spring:
+  profiles: dev
+  cloud:
+    nacos:
+      config:
+        server-addr: 127.0.0.1:8848
+
+---
+spring:
+  profiles: pro
+  cloud:
+    nacos:
+      config:
+        server-addr: 10.5.52.2:8848
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/bootstrap.yml

 spring:
+  profiles:
+    active: dev
   application:
     name: ace-admin
   cloud:
     nacos:
       config:
-#        server-addr: 127.0.0.1:8848
-        server-addr: 10.5.52.2:8848
         file-extension: yaml
-  profiles:
-    active: dev
\ No newline at end of file
+
+
+---
+spring:
+  profiles: dev
+  cloud:
+    nacos:
+      config:
+        server-addr: 127.0.0.1:8848
+
+---
+spring:
+  profiles: pro
+  cloud:
+    nacos:
+      config:
+        server-addr: 10.5.52.2:8848
\ No newline at end of file

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleActiveService.java

@@ -48,6 +48,19 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
 
+        // 修改车辆状态，确认是空闲状态
+        int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
+                VehicleStatus.NORMAL.getCode());
+
+        if (result == 0) {
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
+                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
+        }
+
+        // 写入车辆公里数
+        vehicle.setMileageLastUpdate(departureVo.getMileage());
+        vehicleMapper.updateByPrimaryKeySelective(vehicle);
+
         // 出车记录
         VehicleDepartureLog departureLog = new VehicleDepartureLog();
         BeanUtils.copyProperties(departureVo, departureLog);
@@ -64,19 +77,6 @@ public class VehicleActiveService {
         activeLog.setCreateTime(new Date());
         vehicleActiveLogMapper.insert(activeLog);
 
-        // 写入车辆公里数
-        vehicle.setMileageLastUpdate(departureVo.getMileage());
-        vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
-
-        // 修改车辆状态，确认是空闲状态
-        int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
-                VehicleStatus.NORMAL.getCode());
-
-        if (result == 0) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
-                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
-        }
     }
 
     @Transactional
@@ -91,6 +91,18 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
         }
 
+        // 修改状态，确认是出车状态
+        int result = vehicleMapper.updateStatusByIdAndStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode(),
+                VehicleStatus.DEPARTURE.getCode());
+        if (result == 0) {
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
+                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
+        }
+
+        // 写入车辆公里数
+        vehicle.setMileageLastUpdate(arrivalVo.getMileage());
+        vehicleMapper.updateByPrimaryKeySelective(vehicle);
+
         // 出车记录
         VehicleDepartureLog departureLog = vehicleDepartureLogMapper.selectLastByVehicleId(arrivalVo.getVehicleId());
         if (departureLog == null) {
@@ -114,16 +126,5 @@ public class VehicleActiveService {
         activeLog.setUpdateTime(new Date());
         vehicleActiveLogMapper.updateByPrimaryKeySelective(activeLog);
 
-        // 写入车辆公里数
-        vehicle.setMileageLastUpdate(arrivalVo.getMileage());
-        vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
-        // 修改状态，确认是出车状态
-        int result = vehicleMapper.updateStatusByIdAndStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode(),
-                VehicleStatus.DEPARTURE.getCode());
-        if (result == 0) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
-                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-        }
     }
 }

vehicle/src/main/resources/bootstrap.yml

+#spring:
+#  application:
+#    name: vehicle
+#  cloud:
+#    nacos:
+#      config:
+#        server-addr: 127.0.0.1:8848
+#        file-extension: yaml
+#  profiles:
+#    active: dev
 spring:
+  profiles:
+    active: dev
   application:
     name: vehicle
   cloud:
     nacos:
       config:
-        server-addr: 10.5.52.2:8848
         file-extension: yaml
-  profiles:
-    active: dev
\ No newline at end of file
+---
+spring:
+  profiles: dev
+  cloud:
+    nacos:
+      config:
+        server-addr: 127.0.0.1:8848
+
+---
+spring:
+  profiles: pro
+  cloud:
+    nacos:
+      config:
+        server-addr: 10.5.52.2:8848
\ No newline at end of file