From 5979dbea8fbed8cf402e6c369b1922c2d2cc6c16 Mon Sep 17 00:00:00 2001 From: LQS <2506203757@qq.com> Date: Sun, 29 Sep 2024 11:10:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix():=E4=BF=AE=E5=A4=8D=E8=BF=9C=E8=B0=83?= =?UTF-8?q?=E9=99=8D=E7=BA=A7=E5=A4=84=E7=90=86=E5=BD=B1=E5=93=8D=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E7=B1=BB=E6=97=A0=E6=B3=95=E8=BF=90=E8=A1=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/ServiceNameConstants.java | 4 ++ .../car/MessageValueController.java | 12 ++++++ .../controller/car/VehicleController.java | 12 ++++++ .../enterprise/mapper/car/VehicleMapper.java | 9 ++++- .../service/car/MessageValueService.java | 8 ++++ .../service/car/VehicleService.java | 7 +++- .../impl/carImpl/MessageValueServiceImpl.java | 12 ++++++ .../impl/carImpl/VehicleServiceImpl.java | 11 +++++ .../parsing/ProtocolParsingApplication.java | 24 ----------- .../cloud-modules-enterprise/pom.xml | 1 - .../cloud-modules-protocol-analysis/pom.xml | 2 +- .../analysis/ProtocolAnalysisApplication.java | 40 +++++++++++++++++++ .../muyu/analysis/parsing/MQTT/DemoMQTT.java | 0 .../parsing/controller/ParsingController.java | 0 .../parsing/mapper/ParsingMapper.java | 0 .../parsing/remote/RemoteClientService.java | 8 +++- .../factory/RemoteClientServiceFactory.java | 5 ++- .../parsing/service/ParsingService.java | 0 .../service/impl/ParsingServiceImpl.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/logback/dev.xml | 0 .../src/main/resources/logback/prod.xml | 0 .../src/main/resources/logback/test.xml | 0 cloud-modules/pom.xml | 1 + 26 files changed, 126 insertions(+), 32 deletions(-) delete mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/ProtocolParsingApplication.java rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/pom.xml (98%) create mode 100644 cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/ProtocolAnalysisApplication.java rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/MQTT/DemoMQTT.java (100%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/controller/ParsingController.java (100%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/mapper/ParsingMapper.java (100%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/RemoteClientService.java (81%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/factory/RemoteClientServiceFactory.java (89%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/ParsingService.java (100%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/impl/ParsingServiceImpl.java (100%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/resources/banner.txt (100%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/resources/bootstrap.yml (97%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/resources/logback/dev.xml (100%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/resources/logback/prod.xml (100%) rename cloud-modules/{cloud-modules-enterprise => }/cloud-modules-protocol-analysis/src/main/resources/logback/test.xml (100%) diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index bb59b70..2f5b0d4 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -20,4 +20,8 @@ public class ServiceNameConstants { * 文件服务的serviceid */ public static final String FILE_SERVICE = "cloud-file"; + /** + * 企业平台服务的serviceid + */ + public static final String ENTERPRISE_SERVICE = "cloud-enterprise"; } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/car/MessageValueController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/car/MessageValueController.java index 84e649d..9883e2e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/car/MessageValueController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/car/MessageValueController.java @@ -102,6 +102,18 @@ public class MessageValueController extends BaseController return Result.success(messageValue); } + /** + * 根据报文模版id查询报文数据 + * @param templateId 请求对象 + * @return 返回结果 + */ + @GetMapping("/messageValue/findByTemplateId/{templateId}") + @Operation(summary = "根据报文模版id查询报文数据", description = "根据报文模版id查询报文数据") + public Result> findByTemplateId(@PathVariable("templateId") Long templateId){ + List list = messageValueService.findByTemplateId(templateId); + return Result.success(list); + } + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/car/VehicleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/car/VehicleController.java index 9e28514..cd14fc5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/car/VehicleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/car/VehicleController.java @@ -127,4 +127,16 @@ public class VehicleController extends BaseController util.exportExcel(response, list, "车辆数据"); } + /** + * 通过车辆vin码查询模板id + * @param vehicleVin 请求对象 + * @return 返回结果 + */ + @GetMapping("/findByVehicleVin/{vehicleVin}") + @Operation(description = "通过车辆vin码查询模板id") + public Result findByVehicleVin(@PathVariable("vehicleVin") String vehicleVin) { + Long byVehicleVin = vehicleService.findByVehicleVin(vehicleVin); + return Result.success(byVehicleVin); + } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/car/VehicleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/car/VehicleMapper.java index d79f256..2ae7282 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/car/VehicleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/car/VehicleMapper.java @@ -7,6 +7,7 @@ import com.muyu.enterprise.domain.car.Vehicle; import com.muyu.enterprise.domain.req.car.VehicleManageReq; import com.muyu.enterprise.domain.resp.car.VehicleManageResp; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -28,5 +29,11 @@ public interface VehicleMapper extends MPJBaseMapper * @return 返回结果 */ List findAll(VehicleManageReq vehicleManageReq); - + /** + * 通过车辆vin码查询模板id + * @param vehicleVin 请求对象 + * @return 返回结果 + */ + @Select("SELECT t.message_template_id FROM vehicle v LEFT JOIN vehicle_type t ON v.vehicle_type_id = t.vehicle_type_id WHERE v.vehicle_vin = #{vehicleVin}") + Long findByVehicleVin(String vehicleVin); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/car/MessageValueService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/car/MessageValueService.java index 86c8f37..9f8dc1c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/car/MessageValueService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/car/MessageValueService.java @@ -37,4 +37,12 @@ extends IService * @return 返回结果 */ JSONObject analysis(String testStr); + /** + * 根据报文模版id查询报文数据 + * @param templateId 请求对象 + * @return 返回结果 + */ + List findByTemplateId(Long templateId); + + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/car/VehicleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/car/VehicleService.java index e4de83d..0fa95d1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/car/VehicleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/car/VehicleService.java @@ -26,5 +26,10 @@ extends IService * @return 返回结果 */ List getVehicleList(VehicleManageReq vehicleManageReq); - + /** + * 通过车辆vin码查询模板id + * @param vehicleVin 请求对象 + * @return 返回结果 + */ + Long findByVehicleVin(String vehicleVin); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/carImpl/MessageValueServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/carImpl/MessageValueServiceImpl.java index 223efc9..4f638ad 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/carImpl/MessageValueServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/carImpl/MessageValueServiceImpl.java @@ -137,5 +137,17 @@ extends ServiceImpl findByTemplateId(Long templateId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MessageValue::getTemplateId,templateId); + List list = this.list(); + return list.stream() + .map(messageValue ->MessageValueListResp.valueBuild( + messageValue + ) + ).toList(); + } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/carImpl/VehicleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/carImpl/VehicleServiceImpl.java index 1f9871d..5ebd293 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/carImpl/VehicleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/carImpl/VehicleServiceImpl.java @@ -58,6 +58,17 @@ extends ServiceImpl list = vehicleMapper.selectJoinList(VehicleManageResp.class, wrapper); return list; } + /** + * 通过车辆vin码查询模板id + * @param vehicleVin 请求对象 + * @return 返回结果 + */ + @Override + public Long findByVehicleVin(String vehicleVin) { + Long templateId = vehicleMapper.findByVehicleVin(vehicleVin); + return templateId; + + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/ProtocolParsingApplication.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/ProtocolParsingApplication.java deleted file mode 100644 index 25cc5d5..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/ProtocolParsingApplication.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.analysis.parsing; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * 协议解析启动类 - * @Author: 李庆帅 - * @Package: com.muyu.cloud.protocol.parsing - * @Project: 2112-car-cloud-server - * @name: ProtocolParsingApplication - * @Date: 2024/9/28 11:54 - * @Description: 协议解析启动类 - */ -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication -public class ProtocolParsingApplication { - public static void main(String[] args) { - SpringApplication.run(ProtocolParsingApplication.class, args); - } -} diff --git a/cloud-modules/cloud-modules-enterprise/pom.xml b/cloud-modules/cloud-modules-enterprise/pom.xml index be3910e..c0d0b63 100644 --- a/cloud-modules/cloud-modules-enterprise/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/pom.xml @@ -15,7 +15,6 @@ cloud-modules-enterprise-server cloud-modules-enterprise-common - cloud-modules-protocol-analysis diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/pom.xml b/cloud-modules/cloud-modules-protocol-analysis/pom.xml similarity index 98% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/pom.xml rename to cloud-modules/cloud-modules-protocol-analysis/pom.xml index 8b08818..b0ed731 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/pom.xml +++ b/cloud-modules/cloud-modules-protocol-analysis/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.muyu - cloud-modules-enterprise + cloud-modules 3.6.3 diff --git a/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/ProtocolAnalysisApplication.java b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/ProtocolAnalysisApplication.java new file mode 100644 index 0000000..ec75253 --- /dev/null +++ b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/ProtocolAnalysisApplication.java @@ -0,0 +1,40 @@ +package com.muyu.analysis; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 协议解析启动类 + * 李庆帅 + */ +@EnableCustomConfig +@EnableMyFeignClients +@SpringBootApplication +public class ProtocolAnalysisApplication { + public static void main(String[] args) { + SpringApplication.run(ProtocolAnalysisApplication.class, args); + System.out.println(" _ooOoo_\n" + + " o8888888o\n" + + " 88\" . \"88\n" + + " (| -_- |)\n" + + " O\\ = /O\n" + + " ____/`---'\\____\n" + + " .' \\\\| |// `.\n" + + " / \\\\||| : |||// \\\n" + + " / _||||| -:- |||||- \\\n" + + " | | \\\\\\ - /// | |\n" + + " | \\_| ''\\---/'' | |\n" + + " \\ .-\\__ `-` ___/-. /\n" + + " ___`. .' /--.--\\ `. . __\n" + + " .\"\" '< `.___\\_<|>_/___.' >'\"\".\n" + + " | | : `- \\`.;`\\ _ /`;.`/ - ` : | |\n" + + " \\ \\ `-. \\_ __\\ /__ _/ .-` / /\n" + + " ======`-.____`-.___\\_____/___.-`____.-'======\n" + + " `=---='\n" + + " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + + " // 佛祖保佑 永不宕机 永无BUG //"); + + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/MQTT/DemoMQTT.java b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/MQTT/DemoMQTT.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/MQTT/DemoMQTT.java rename to cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/MQTT/DemoMQTT.java diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/controller/ParsingController.java b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/controller/ParsingController.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/controller/ParsingController.java rename to cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/controller/ParsingController.java diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/mapper/ParsingMapper.java b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/mapper/ParsingMapper.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/mapper/ParsingMapper.java rename to cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/mapper/ParsingMapper.java diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/RemoteClientService.java b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/RemoteClientService.java similarity index 81% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/RemoteClientService.java rename to cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/RemoteClientService.java index d7a0f39..43eae53 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/RemoteClientService.java +++ b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/RemoteClientService.java @@ -1,6 +1,7 @@ package com.muyu.analysis.parsing.remote; import com.muyu.analysis.parsing.remote.factory.RemoteClientServiceFactory; +import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; import com.muyu.enterprise.domain.resp.car.MessageValueListResp; import org.springframework.cloud.openfeign.FeignClient; @@ -16,9 +17,12 @@ import java.util.List; * @Project：cloud-server * @name：RemoteServiceClient * @Date：2024/9/28 20:38 + * ,,value = ServiceNameConstants.ENTERPRISE_SERVICE + * ,fallbackFactory= RemoteClientServiceFactory.class */ -@FeignClient(name = "remoteClientService" -,fallbackFactory= RemoteClientServiceFactory.class) +@FeignClient(name = "cloud-enterprise",value = ServiceNameConstants.ENTERPRISE_SERVICE + ,fallbackFactory= RemoteClientServiceFactory.class +) public interface RemoteClientService { /** * 根据报文模版id查询报文数据 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/factory/RemoteClientServiceFactory.java b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/factory/RemoteClientServiceFactory.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/factory/RemoteClientServiceFactory.java rename to cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/factory/RemoteClientServiceFactory.java index 5851bbc..e9d5106 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/factory/RemoteClientServiceFactory.java +++ b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/remote/factory/RemoteClientServiceFactory.java @@ -6,6 +6,7 @@ import com.muyu.enterprise.domain.resp.car.MessageValueListResp; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; import java.util.List; @@ -17,7 +18,9 @@ import java.util.List; * @name：RemoteServiceClientFactory * @Date：2024/9/28 21:16 */ -public class RemoteClientServiceFactory implements FallbackFactory +@Component +public class RemoteClientServiceFactory + implements FallbackFactory { private static final Logger log = LoggerFactory.getLogger(RemoteClientServiceFactory.class); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/ParsingService.java b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/ParsingService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/ParsingService.java rename to cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/ParsingService.java diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/impl/ParsingServiceImpl.java b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/impl/ParsingServiceImpl.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/impl/ParsingServiceImpl.java rename to cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/parsing/service/impl/ParsingServiceImpl.java diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-protocol-analysis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to cloud-modules/cloud-modules-protocol-analysis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/banner.txt b/cloud-modules/cloud-modules-protocol-analysis/src/main/resources/banner.txt similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/banner.txt rename to cloud-modules/cloud-modules-protocol-analysis/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-protocol-analysis/src/main/resources/bootstrap.yml similarity index 97% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/bootstrap.yml rename to cloud-modules/cloud-modules-protocol-analysis/src/main/resources/bootstrap.yml index fe6051b..02ebf66 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-protocol-analysis/src/main/resources/bootstrap.yml @@ -12,7 +12,7 @@ nacos: spring: application: # 应用名称 - name: cloud-enterprise + name: cloud-protocol-analysis profiles: # 环境配置 active: dev diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-protocol-analysis/src/main/resources/logback/dev.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/logback/dev.xml rename to cloud-modules/cloud-modules-protocol-analysis/src/main/resources/logback/dev.xml diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-protocol-analysis/src/main/resources/logback/prod.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-modules-protocol-analysis/src/main/resources/logback/prod.xml diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-protocol-analysis/src/main/resources/logback/test.xml similarity index 100% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-protocol-analysis/src/main/resources/logback/test.xml rename to cloud-modules/cloud-modules-protocol-analysis/src/main/resources/logback/test.xml diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index cd65b6b..3daec94 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -14,6 +14,7 @@ cloud-modules-file cloud-modules-enterprise cloud-weixin-mp + cloud-modules-protocol-analysis cloud-modules From a18ba509d8d40d9079d44c48c67d89d8f3841d8f Mon Sep 17 00:00:00 2001 From: LQS <2506203757@qq.com> Date: Sun, 29 Sep 2024 11:18:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix():=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E6=B3=A8=E5=85=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-modules/cloud-modules-protocol-analysis/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cloud-modules/cloud-modules-protocol-analysis/pom.xml b/cloud-modules/cloud-modules-protocol-analysis/pom.xml index b0ed731..3666dd4 100644 --- a/cloud-modules/cloud-modules-protocol-analysis/pom.xml +++ b/cloud-modules/cloud-modules-protocol-analysis/pom.xml @@ -95,6 +95,10 @@ mybatis-plus-join-boot-starter 1.4.11 + + com.muyu + cloud-common-core + From fedc3c4ea7cf3adef37573866e07ec0dc8b988bf Mon Sep 17 00:00:00 2001 From: LQS <2506203757@qq.com> Date: Sun, 29 Sep 2024 12:10:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat():=E6=B7=BB=E5=8A=A0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud-modules-enterprise-common/pom.xml | 2 +- .../cloud-modules-enterprise-server/pom.xml | 1 + cloud-modules/cloud-modules-protocol-analysis/pom.xml | 3 ++- .../java/com/muyu/analysis/ProtocolAnalysisApplication.java | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml index a51a034..0935b0a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml @@ -24,7 +24,7 @@ com.muyu cloud-common-core - + io.swagger.core.v3 swagger-annotations-jakarta diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index d817bf8..61d93d4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -22,6 +22,7 @@ + com.github.yulichang mybatis-plus-join-boot-starter diff --git a/cloud-modules/cloud-modules-protocol-analysis/pom.xml b/cloud-modules/cloud-modules-protocol-analysis/pom.xml index 3666dd4..e6f5c4c 100644 --- a/cloud-modules/cloud-modules-protocol-analysis/pom.xml +++ b/cloud-modules/cloud-modules-protocol-analysis/pom.xml @@ -89,12 +89,13 @@ cloud-modules-enterprise-server 3.6.3 - + com.github.yulichang mybatis-plus-join-boot-starter 1.4.11 + com.muyu cloud-common-core diff --git a/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/ProtocolAnalysisApplication.java b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/ProtocolAnalysisApplication.java index ec75253..8477033 100644 --- a/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/ProtocolAnalysisApplication.java +++ b/cloud-modules/cloud-modules-protocol-analysis/src/main/java/com/muyu/analysis/ProtocolAnalysisApplication.java @@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 协议解析启动类 - * 李庆帅 + * */ @EnableCustomConfig @EnableMyFeignClients