Merge pull request 'xinwei' (#13) from xinwei into master

Reviewed-on: #13

ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: job-server
 
   profiles:
-    active: local
+    active: dev
 
 server:
   port: 9090

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/asset/AssetApi.java

@@ -1,7 +1,6 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.asset;
+package cn.iocoder.yudao.module.datacenter.controller.app.asset;
 
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.datacenter.controller.app.asset.vo.AssetRespVO;
-import cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo.AssetRespVO;
 import cn.iocoder.yudao.module.datacenter.service.asset.AssetService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,14 +14,12 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 /**
  * @Description 设备
  */
 @Tag(name = "大屏服务 - 设备")
 @RestController
-@RequestMapping("/datacenter/asset")
+@RequestMapping("/asset")
 @Validated
 public class AssetApi {
     @Resource

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/asset/vo/AssetRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.asset.vo;
 
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/CheckTicketApi.java

@@ -1,6 +1,5 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.checkticket;
+package cn.iocoder.yudao.module.datacenter.controller.app.checkticket;
 
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.datacenter.service.checkticket.CheckTicketService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -11,8 +10,6 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 /**
  * @Description 检票
  */

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.checkticket.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.checkticket.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.checkticket.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.checkticket.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.checkticket.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.checkticket.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/SaleDataApi.java

@@ -1,6 +1,5 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.saledata;
+package cn.iocoder.yudao.module.datacenter.controller.app.saledata;
 
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.datacenter.service.saledata.SaleDataService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -12,14 +11,12 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 /**
  * @Description 售票
  */
 @Tag(name = "大屏服务 - 售票")
 @RestController
-@RequestMapping("/datacenter/saledata")
+@RequestMapping("/saledata")
 @Validated
 public class SaleDataApi {
     @Resource

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/AgeVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/AggregationVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/ticssrMachine/TicssrMachineApi.java

@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.ticssrMachine;
+package cn.iocoder.yudao.module.datacenter.controller.app.ticssrMachine;
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo.AssetRespVO;
+import cn.iocoder.yudao.module.datacenter.controller.app.asset.vo.AssetRespVO;
 import cn.iocoder.yudao.module.datacenter.service.asset.AssetService;
 import cn.iocoder.yudao.module.datacenter.service.passengerInformation.PassengerInformationService;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Tag(name = "大屏服务 - 临时身份证自助补办机")
 @RestController
-@RequestMapping("/datacenter/ticssrMachine")
+@RequestMapping("/ticssrMachine")
 @Validated
 public class TicssrMachineApi {
     @Autowired

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/transitionflight/TransitionFlightApi.java

@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.transitionflight;
+package cn.iocoder.yudao.module.datacenter.controller.app.transitionflight;
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.transitionflight.vo.FerryData;
+import cn.iocoder.yudao.module.datacenter.controller.app.transitionflight.vo.FerryData;
 import cn.iocoder.yudao.module.datacenter.utlis.ResponseVO;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.alibaba.nacos.shaded.com.google.gson.JsonObject;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/transitionflight/vo/FerryData.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.transitionflight.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.transitionflight.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/VehicleAccessApi.java

@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess;
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.AreaDataVO;
+import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.AreaDataVO;
-import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.ParkingLotDataVO;
+import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.ParkingLotDataVO;
-import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.RevenueVO;
+import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.RevenueVO;
 import cn.iocoder.yudao.module.datacenter.dal.dataobject.vehicleaccess.*;
 import cn.iocoder.yudao.module.datacenter.dal.mongodb.vehicleaccess.*;
 import cn.iocoder.yudao.module.datacenter.utlis.ResponseVO;
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordCarInfoVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordChargeListVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordChargeStatisticsVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordPassInfoVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordPlaceInfoVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordProfitListVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordUserInfoVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AreaDataVO.java

@@ -1,9 +1,7 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Data
 public class AreaDataVO {
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/BlueCardHeartbeatVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordPlaceInfoVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordUserInfoVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordVo.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/ParkingLotDataVO.java

@@ -1,8 +1,7 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/RevenueVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/weather/WeatherApi.java

@@ -1,7 +1,6 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.weather;
+package cn.iocoder.yudao.module.datacenter.controller.app.weather;
 
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.datacenter.controller.app.weather.vo.WeatherInfoVO;
-import cn.iocoder.yudao.module.datacenter.controller.admin.weather.vo.WeatherInfoVO;
 import cn.iocoder.yudao.module.datacenter.utlis.GoodWeatherUtil;
 import cn.iocoder.yudao.module.datacenter.utlis.ResponseVO;
 import io.swagger.v3.oas.annotations.Operation;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/weather/vo/WeatherInfoVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.datacenter.controller.admin.weather.vo;
+package cn.iocoder.yudao.module.datacenter.controller.app.weather.vo;
 
 import lombok.Data;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/AppearanceRecord.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.datacenter.dal.dataobject.vehicleaccess;
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.AppearanceRecordVo;
+import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.AppearanceRecordVo;
 import lombok.Data;
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/BlueCardHeartbeat.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.datacenter.dal.dataobject.vehicleaccess;
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.BlueCardHeartbeatVo;
+import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.BlueCardHeartbeatVo;
 import lombok.Data;
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/EntryRecord.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.datacenter.dal.dataobject.vehicleaccess;
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.EntryRecordVo;
+import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.EntryRecordVo;
 import lombok.Data;
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/saledata/SaleDataRepository.java

@@ -1,8 +1,8 @@
 package cn.iocoder.yudao.module.datacenter.dal.mongodb.saledata;
 
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo.AgeVo;
+import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AgeVo;
-import cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo.AggregationVO;
+import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AggregationVO;
 import cn.iocoder.yudao.module.datacenter.dal.dataobject.saledata.SaleData;
 import org.springframework.data.mongodb.repository.Aggregation;
 import org.springframework.data.mongodb.repository.MongoRepository;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetService.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.datacenter.service.asset;
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo.AssetRespVO;
+import cn.iocoder.yudao.module.datacenter.controller.app.asset.vo.AssetRespVO;
 
 import java.util.List;
 import java.util.Map;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetServiceImpl.java

@@ -1,12 +1,10 @@
 package cn.iocoder.yudao.module.datacenter.service.asset;
 
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo.AssetRespVO;
+import cn.iocoder.yudao.module.datacenter.controller.app.asset.vo.AssetRespVO;
 import cn.iocoder.yudao.module.datacenter.dal.dataobject.asset.Asset;
 import cn.iocoder.yudao.module.datacenter.dal.mongodb.asset.AssetRepository;
-import com.baomidou.dynamic.datasource.annotation.Slave;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java

@@ -2,18 +2,15 @@ package cn.iocoder.yudao.module.datacenter.service.saledata;
 
 
 import cn.iocoder.yudao.framework.common.util.ticket.IdCardUtil;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo.AgeVo;
+import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AgeVo;
-import cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo.AggregationVO;
+import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AggregationVO;
 import cn.iocoder.yudao.module.datacenter.dal.dataobject.saledata.SaleData;
 import cn.iocoder.yudao.module.datacenter.dal.mongodb.saledata.SaleDataRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/utlis/GoodWeatherUtil.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.datacenter.utlis;
 
-import cn.iocoder.yudao.module.datacenter.controller.admin.weather.vo.WeatherInfoVO;
+import cn.iocoder.yudao.module.datacenter.controller.app.weather.vo.WeatherInfoVO;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: datacenter-server
 
   profiles:
-    active: local
+    active: dev
 
 server:
   port: 48092

ludu-module-parking/ludu-module-parking-api/src/main/java/cn/iocoder/yudao/module/parking/enums/ErrorCodeConstants.java

@@ -19,4 +19,8 @@ public interface ErrorCodeConstants {
     ErrorCode VEHICLE_RENEWAL_RECORD_NOT_EXISTS = new ErrorCode(22222, "固定车续费记录不存在");
     ErrorCode WARNING_NOT_EXISTS = new ErrorCode(33333, "告警记录不存在");
     ErrorCode WHITE_NOT_EXISTS = new ErrorCode(444444, "白名单管理不存在");
+    // ========== 收费信息 1_005_001_029 ==========
+    ErrorCode CHARGE_INFO_NOT_EXISTS = new ErrorCode(1_005_001_029, "收费信息不存在");
+    // ========== 远程抬杠日志 1_005_001_030 ==========
+    ErrorCode LIFTING_ROD_NOT_EXISTS = new ErrorCode(1_005_001_030, "远程抬杠日志不存在");
 }

ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/controller/admin/liftingrod/LiftingRodController.java

@@ -0,0 +1,102 @@
+package cn.iocoder.yudao.module.parking.controller.admin.liftingrod;
+
+import cn.iocoder.yudao.module.parking.util.BlueCardResult;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.parking.controller.admin.liftingrod.vo.*;
+import cn.iocoder.yudao.module.parking.dal.dataobject.liftingrod.LiftingRodDO;
+import cn.iocoder.yudao.module.parking.service.liftingrod.LiftingRodService;
+
+@Tag(name = "管理后台 - 远程抬杠日志")
+@RestController
+@RequestMapping("/parking/lifting-rod")
+@Validated
+public class LiftingRodController {
+
+    @Resource
+    private LiftingRodService liftingRodService;
+    @PostMapping("/actionLiftingRod")
+    @Operation(summary = "下发远程抬杠指令")
+    @PreAuthorize("@ss.hasPermission('parking:lifting-rod:create')")
+    public BlueCardResult actionLiftingRod(@RequestBody LiftingRodVo liftingRodVo){
+        return liftingRodService.doLiftingRod(liftingRodVo);
+    }
+
+    @PostMapping("/create")
+    @Operation(summary = "创建远程抬杠日志")
+    @PreAuthorize("@ss.hasPermission('parking:lifting-rod:create')")
+    public CommonResult<Long> createLiftingRod(@Valid @RequestBody LiftingRodSaveReqVO createReqVO) {
+        return success(liftingRodService.createLiftingRod(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新远程抬杠日志")
+    @PreAuthorize("@ss.hasPermission('parking:lifting-rod:update')")
+    public CommonResult<Boolean> updateLiftingRod(@Valid @RequestBody LiftingRodSaveReqVO updateReqVO) {
+        liftingRodService.updateLiftingRod(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除远程抬杠日志")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('parking:lifting-rod:delete')")
+    public CommonResult<Boolean> deleteLiftingRod(@RequestParam("id") Long id) {
+        liftingRodService.deleteLiftingRod(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得远程抬杠日志")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('parking:lifting-rod:query')")
+    public CommonResult<LiftingRodRespVO> getLiftingRod(@RequestParam("id") Long id) {
+        LiftingRodDO liftingRod = liftingRodService.getLiftingRod(id);
+        return success(BeanUtils.toBean(liftingRod, LiftingRodRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得远程抬杠日志分页")
+    @PreAuthorize("@ss.hasPermission('parking:lifting-rod:query')")
+    public CommonResult<PageResult<LiftingRodRespVO>> getLiftingRodPage(@Valid LiftingRodPageReqVO pageReqVO) {
+        PageResult<LiftingRodDO> pageResult = liftingRodService.getLiftingRodPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, LiftingRodRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出远程抬杠日志 Excel")
+    @PreAuthorize("@ss.hasPermission('parking:lifting-rod:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportLiftingRodExcel(@Valid LiftingRodPageReqVO pageReqVO,
+                                      HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<LiftingRodDO> list = liftingRodService.getLiftingRodPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "远程抬杠日志.xls", "数据", LiftingRodRespVO.class,
+                BeanUtils.toBean(list, LiftingRodRespVO.class));
+    }
+
+}

ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/controller/admin/liftingrod/vo/LiftingRodPageReqVO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.parking.controller.admin.liftingrod.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 远程抬杠日志分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class LiftingRodPageReqVO extends PageParam {
+
+    @Schema(description = "停车场编号")
+    private String parkNumber;
+
+    @Schema(description = "通道Id", example = "10415")
+    private String passagewayId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+    @Schema(description = "状态", example = "1")
+    private Integer status;
+}

ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/controller/admin/liftingrod/vo/LiftingRodRespVO.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.parking.controller.admin.liftingrod.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 远程抬杠日志 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class LiftingRodRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19179")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "停车场编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("停车场编号")
+    private String parkNumber;
+
+    @Schema(description = "通道Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "10415")
+    @ExcelProperty("通道Id")
+    private String passagewayId;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+    @Schema(description = "状态", example = "2")
+    @ExcelProperty("状态")
+    private Integer status;
+
+}

ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/controller/admin/liftingrod/vo/LiftingRodSaveReqVO.java

@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.parking.controller.admin.liftingrod.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 远程抬杠日志新增/修改 Request VO")
+@Data
+public class LiftingRodSaveReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19179")
+    private Long id;
+
+    @Schema(description = "停车场编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "停车场编号不能为空")
+    private String parkNumber;
+
+    @Schema(description = "通道Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "10415")
+    @NotEmpty(message = "通道Id不能为空")
+    private String passagewayId;
+
+    @Schema(description = "状态", example = "2")
+    private Integer status;
+
+}

ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/controller/admin/liftingrod/vo/LiftingRodVo.java

@@ -0,0 +1,9 @@
+package cn.iocoder.yudao.module.parking.controller.admin.liftingrod.vo;
+
+import lombok.Data;
+
+@Data
+public class LiftingRodVo {
+    private String parkNumber;
+    private String passagewayId;
+}

ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/dal/dataobject/liftingrod/LiftingRodDO.java

@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.parking.dal.dataobject.liftingrod;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 远程抬杠日志 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("lifting_rod")
+@KeySequence("lifting_rod_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class LiftingRodDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 停车场编号
+     */
+    private String parkNumber;
+    /**
+     * 通道Id
+     */
+    private String passagewayId;
+    /**
+     * 状态
+     */
+    private Integer status;
+}

ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/dal/mysql/liftingrod/LiftingRodMapper.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.parking.dal.mysql.liftingrod;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.parking.dal.dataobject.liftingrod.LiftingRodDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.parking.controller.admin.liftingrod.vo.*;
+
+/**
+ * 远程抬杠日志 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface LiftingRodMapper extends BaseMapperX<LiftingRodDO> {
+
+    default PageResult<LiftingRodDO> selectPage(LiftingRodPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<LiftingRodDO>()
+                .eqIfPresent(LiftingRodDO::getParkNumber, reqVO.getParkNumber())
+                .eqIfPresent(LiftingRodDO::getPassagewayId, reqVO.getPassagewayId())
+                .betweenIfPresent(LiftingRodDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(LiftingRodDO::getStatus, reqVO.getStatus())
+                .orderByDesc(LiftingRodDO::getId));
+    }
+
+}

ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/service/liftingrod/LiftingRodService.java

@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.parking.service.liftingrod;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.parking.controller.admin.liftingrod.vo.*;
+import cn.iocoder.yudao.module.parking.dal.dataobject.liftingrod.LiftingRodDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.parking.util.BlueCardResult;
+
+/**
+ * 远程抬杠日志 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface LiftingRodService {
+
+    /**
+     * 创建远程抬杠日志
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createLiftingRod(@Valid LiftingRodSaveReqVO createReqVO);
+
+    /**
+     * 更新远程抬杠日志
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateLiftingRod(@Valid LiftingRodSaveReqVO updateReqVO);
+
+    /**
+     * 删除远程抬杠日志
+     *
+     * @param id 编号
+     */
+    void deleteLiftingRod(Long id);
+
+    /**
+     * 获得远程抬杠日志
+     *
+     * @param id 编号
+     * @return 远程抬杠日志
+     */
+    LiftingRodDO getLiftingRod(Long id);
+
+    /**
+     * 获得远程抬杠日志分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 远程抬杠日志分页
+     */
+    PageResult<LiftingRodDO> getLiftingRodPage(LiftingRodPageReqVO pageReqVO);
+
+    /**
+     * 下发远程抬杠指令
+     * @param liftingRodVo
+     * @return cn.iocoder.yudao.module.parking.util.BlueCardResult
+     */
+    BlueCardResult doLiftingRod(LiftingRodVo liftingRodVo);
+}

ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/service/liftingrod/LiftingRodServiceImpl.java

@@ -0,0 +1,90 @@
+package cn.iocoder.yudao.module.parking.service.liftingrod;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.parking.util.BlueCarRequestUtil;
+import cn.iocoder.yudao.module.parking.util.BlueCardResult;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import cn.iocoder.yudao.module.parking.controller.admin.liftingrod.vo.*;
+import cn.iocoder.yudao.module.parking.dal.dataobject.liftingrod.LiftingRodDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.parking.dal.mysql.liftingrod.LiftingRodMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.parking.enums.ErrorCodeConstants.*;
+
+/**
+ * 远程抬杠日志 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class LiftingRodServiceImpl implements LiftingRodService {
+
+    @Resource
+    private LiftingRodMapper liftingRodMapper;
+
+    @Resource
+    private BlueCarRequestUtil blueCarRequestUtil;
+    @Override
+    public Long createLiftingRod(LiftingRodSaveReqVO createReqVO) {
+        // 插入
+        LiftingRodDO liftingRod = BeanUtils.toBean(createReqVO, LiftingRodDO.class);
+        liftingRodMapper.insert(liftingRod);
+        // 返回
+        return liftingRod.getId();
+    }
+
+    @Override
+    public void updateLiftingRod(LiftingRodSaveReqVO updateReqVO) {
+        // 校验存在
+        validateLiftingRodExists(updateReqVO.getId());
+        // 更新
+        LiftingRodDO updateObj = BeanUtils.toBean(updateReqVO, LiftingRodDO.class);
+        liftingRodMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteLiftingRod(Long id) {
+        // 校验存在
+        validateLiftingRodExists(id);
+        // 删除
+        liftingRodMapper.deleteById(id);
+    }
+
+    private void validateLiftingRodExists(Long id) {
+        if (liftingRodMapper.selectById(id) == null) {
+            throw exception(LIFTING_ROD_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public LiftingRodDO getLiftingRod(Long id) {
+        return liftingRodMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<LiftingRodDO> getLiftingRodPage(LiftingRodPageReqVO pageReqVO) {
+        return liftingRodMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public BlueCardResult doLiftingRod(LiftingRodVo liftingRodVo) {
+        // 下发抬杠指令
+        CommonResult<String> stringCommonResult = blueCarRequestUtil.doBlueCarPost(liftingRodVo, "bcopenapi/out/RemoteLiftRod");
+        LiftingRodDO liftingRod = new LiftingRodDO();
+        liftingRod.setParkNumber(liftingRodVo.getParkNumber());
+        liftingRod.setPassagewayId(liftingRodVo.getPassagewayId());
+        //具体逻辑到联调时实现
+//        liftingRod.setStatus();
+        // 记录抬杠记录
+        liftingRodMapper.insert(liftingRod);
+        return null;
+    }
+
+}

ludu-module-parking/ludu-module-parking-biz/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: parking-server
 
   profiles:
-    active: local
+    active: dev
 
 server:
   port: 48090

ludu-module-parking/ludu-module-parking-biz/src/main/resources/mapper/liftingrod/LiftingRodMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.parking.dal.mysql.liftingrod.LiftingRodMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

ludu-module-ticketing/ludu-module-ticketing-biz/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: ticket-server
 
   profiles:
-    active: local
+    active: dev
 
 server:
   port: 48088

yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java

@@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull;
 public class WebProperties {
 
     @NotNull(message = "APP API 不能为空")
-    private Api appApi = new Api("/app-api", "**.controller.app.**");
+    private Api appApi = new Api("/api", "**.controller.app.**");
     @NotNull(message = "Admin API 不能为空")
     private Api adminApi = new Api("/admin-api", "**.controller.admin.**");
 

yudao-gateway/run.sh

@@ -13,4 +13,4 @@ docker rmi ${app_name}:${app_version}
 echo '----build image----'
 docker buildx build -f Dockerfile -t ${app_name}:${app_version} .
 echo '----start container----'
-docker run -d -p 8080:48080 --name ${app_name} ${app_name}:${app_version}
+docker run -d -p 48080:48080 --name ${app_name} ${app_name}:${app_version}

yudao-gateway/src/main/resources/application.yaml

@@ -176,7 +176,7 @@ spring:
         - id: datacenter-admin-api # 路由的编号
           uri: grayLb://datacenter-server
           predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组
-            - Path=/admin-api/datacenter/**
+            - Path=/api/**
           filters:
             - RewritePath=/admin-api/datacenter/v3/api-docs, /v3/api-docs # 配置，保证转发到 /v3/api-docs
 

yudao-gateway/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: gateway-server
 
   profiles:
-    active: local
+    active: dev
 
 server:
   port: 48080

yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: infra-server
 
   profiles:
-    active: local
+    active: dev
 
 server:
   port: 48082

yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml

@@ -3,7 +3,7 @@ spring:
     name: system-server
 
   profiles:
-    active: local
+    active: dev
 
 server:
   port: 48081