From 43c74b9978156fd8c51b5b756024d094032d8d14 Mon Sep 17 00:00:00 2001 From: yuan <1363654894@qq.com> Date: Fri, 4 Oct 2024 14:28:38 +0800 Subject: [PATCH] =?UTF-8?q?feat():redis=E5=AD=98=E5=82=A8=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=9A=84=E5=AE=9E=E4=BE=8B=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-car-gateway/pom.xml | 130 ++++++++++++++++++ .../muyu/car/CloudCarGatewayApplication.java | 20 +++ .../domain/api/req/VehicleConnectionReq.java | 48 +++++++ .../domain/example/ExampleInformation.java | 35 +++++ .../controller/VehicleInformation.java | 21 +++ .../com/muyu/car/instance/CreateClient.java | 36 +++++ .../com/muyu/car/instance/DelInstance.java | 102 ++++++++++++++ .../muyu/car/instance/GenerateInstance.java | 121 ++++++++++++++++ .../com/muyu/car/instance/QueryInstance.java | 70 ++++++++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/logback/dev.xml | 74 ++++++++++ .../src/main/resources/logback/prod.xml | 81 +++++++++++ .../src/main/resources/logback/test.xml | 81 +++++++++++ cloud-modules/cloud-modules-carData/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- cloud-modules/pom.xml | 1 + .../src/main/resources/bootstrap.yml | 2 +- 22 files changed, 832 insertions(+), 8 deletions(-) create mode 100644 cloud-modules/cloud-modules-car-gateway/pom.xml create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/CloudCarGatewayApplication.java create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/api/req/VehicleConnectionReq.java create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/example/ExampleInformation.java create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/VehicleInformation.java create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/CreateClient.java create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/DelInstance.java create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/GenerateInstance.java create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/QueryInstance.java create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/resources/banner.txt create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/dev.xml create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/prod.xml create mode 100644 cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/test.xml diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 9a56e49..08b71f0 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 127.0.0.1:8848 user-name: nacos password: nacos - namespace: eight + namespace: psr # Spring spring: application: diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index a9335ac..273ec98 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 127.0.0.1:8848 user-name: nacos password: nacos - namespace: eight + namespace: psr # Spring spring: diff --git a/cloud-modules/cloud-modules-car-gateway/pom.xml b/cloud-modules/cloud-modules-car-gateway/pom.xml new file mode 100644 index 0000000..c602346 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/pom.xml @@ -0,0 +1,130 @@ + + 4.0.0 + + com.muyu + cloud-modules + 3.6.3 + + + + cloud-modules-car-gateway车辆网关模块 + + cloud-modules-car-gateway + jar + + cloud-modules-car-gateway + http://maven.apache.org + + + UTF-8 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + + + + com.muyu + cloud-common-api-doc + + + + com.muyu + cloud-common-rabbit + + + + com.muyu + cloud-common-core + + + + com.muyu + cloud-modules-car + 3.6.3 + + + + com.aliyun + ecs20140526 + 5.4.0 + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + + + + redis.clients + jedis + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/CloudCarGatewayApplication.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/CloudCarGatewayApplication.java new file mode 100644 index 0000000..7aac0e4 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/CloudCarGatewayApplication.java @@ -0,0 +1,20 @@ +package com.muyu.car; + +import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @Author：蓬叁 + * @Package：com.muyu.car + * @Project：cloud-server-8 + * @name：CloudCarGatewayApplication + * @Date：2024/9/29 上午10:50 + */ +@EnableMyFeignClients +@SpringBootApplication +public class CloudCarGatewayApplication { + public static void main(String[] args) { + SpringApplication.run(CloudCarGatewayApplication.class, args); + } +} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/api/req/VehicleConnectionReq.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/api/req/VehicleConnectionReq.java new file mode 100644 index 0000000..4dc38c2 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/api/req/VehicleConnectionReq.java @@ -0,0 +1,48 @@ +package com.muyu.car.domain.api.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 车辆连接请求参数 + * @Author：蓬叁 + * @Package：com.muyu.car.domain.api.req + * @Project：cloud-server-8 + * @name：VehicleConnectionReq + * @Date：2024/10/2 下午4:12 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class VehicleConnectionReq { + + /** + * { + * "vehicleVin": "VIN1234567894", + * "timestamp": "11111", + * "username": "你好", + * "nonce": "33" + * } + */ + + /** + * vin + */ + private String vin; + /** + * 时间戳 + */ + private String timestamp; + /** + * 用户名 + */ + private String userName; + /** + * 随机字符串 + */ + private String nonce; + +} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/example/ExampleInformation.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/example/ExampleInformation.java new file mode 100644 index 0000000..8387717 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/domain/example/ExampleInformation.java @@ -0,0 +1,35 @@ +package com.muyu.car.domain.example; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 实例基础信息 + * @Author：蓬叁 + * @Package：com.muyu.car.domain + * @Project：cloud-server-8 + * @name：ExampleInformation + * @Date：2024/9/29 下午10:01 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExampleInformation { + + /** + * 实例ID + */ + private String InstanceId; + /** + * 实例IP + */ + private String IpAddress; + /** + * 实例状态 + */ + private String status; + +} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/VehicleInformation.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/VehicleInformation.java new file mode 100644 index 0000000..1546865 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/controller/VehicleInformation.java @@ -0,0 +1,21 @@ +package com.muyu.car.gateway.controller; + +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 车辆信息接口 + * @Author：蓬叁 + * @Package：com.muyu.car.gateway.controller + * @Project：cloud-server-8 + * @name：VehicleInformation + * @Date：2024/10/4 上午9:40 + */ +@RestController +@RequestMapping("/vehicle") +public class VehicleInformation { + +// @PostMapping("/") + +} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/CreateClient.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/CreateClient.java new file mode 100644 index 0000000..7378035 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/CreateClient.java @@ -0,0 +1,36 @@ +package com.muyu.car.instance; + +import org.springframework.stereotype.Component; +/** + * 阿里云AccessKey ID Secret + * @Author：蓬叁 + * @Package：com.muyu.car.domain + * @Project：cloud-server-8 + * @name：CreateClient + * @Date：2024/9/29 上午10:41 + */ +@Component +public class CreateClient { + + /** + * description : + *

使用AK&SK初始化账号Client

+ * @return Client + * + * @throws Exception + */ + public static com.aliyun.ecs20140526.Client createClient() throws Exception { + // 工程代码泄露可能会导致 AccessKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考。 + // 建议使用更安全的 STS 方式，更多鉴权访问方式请参见：https://help.aliyun.com/document_detail/378657.html。 + com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() + // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。 + .setAccessKeyId("LTAI5tFtQk1KbwRBXM5pHVWw") + // 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_SECRET。 + .setAccessKeySecret("GLByUZqUqgR600eTpGmfb52ZT93mu9"); + // Endpoint 请参考 https://api.aliyun.com/product/Ecs + config.endpoint = "ecs-cn-hangzhou.aliyuncs.com"; + return new com.aliyun.ecs20140526.Client(config); + } + +} + diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/DelInstance.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/DelInstance.java new file mode 100644 index 0000000..e8aafe4 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/DelInstance.java @@ -0,0 +1,102 @@ +package com.muyu.car.instance; + +import com.aliyun.ecs20140526.models.DescribeInstancesRequest; +import com.aliyun.ecs20140526.models.DescribeInstancesResponse; +import com.aliyun.ecs20140526.models.DescribeInstancesResponseBody; +import com.aliyun.ecs20140526.models.RunInstancesResponseBody; +import com.aliyun.tea.*; +import com.aliyun.teautil.models.RuntimeOptions; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.stereotype.Component; +import redis.clients.jedis.Jedis; + +import java.util.ArrayList; +import java.util.Set; + +/** + * 项目关闭清除实例 + * @Author：蓬叁 + * @Package：com.muyu.car.domain + * @Project：cloud-server-8 + * @name：DelInstance + * @Date：2024/9/29 上午10:42 + */ +@Log4j2 +@Component +@Tag(name = "程序停止删除实例") +public class DelInstance implements DisposableBean { + + public static void delInstance() throws Exception { + // 创建ECS客户端对象，用于后续调用ECS相关API + com.aliyun.ecs20140526.Client client = CreateClient.createClient(); + DescribeInstancesRequest describeInstancesRequest = new DescribeInstancesRequest() + .setRegionId("cn-hangzhou"); + //创建运行时选择对象,用于配置运行时的选项参数 + RuntimeOptions runtimeOptions = new RuntimeOptions(); + + //获取实例列表 + DescribeInstancesResponse describeInstancesResponse = client.describeInstancesWithOptions(describeInstancesRequest, runtimeOptions); + + //提取实例ID集合 + ArrayList list = new ArrayList<>(); + DescribeInstancesResponseBody body = describeInstancesResponse.getBody(); + for (DescribeInstancesResponseBody.DescribeInstancesResponseBodyInstancesInstance instance : body.getInstances().getInstance()) { + list.add(instance.getInstanceId()); + } + log.info("Instance IDs: " + list); + // 创建删除实例请求对象，并设置请求参数 + com.aliyun.ecs20140526.models.DeleteInstancesRequest deleteInstancesRequest = new com.aliyun.ecs20140526.models.DeleteInstancesRequest() + //设置地域ID，指定删除实例的地域 + .setRegionId("cn-hangzhou") + // 设置DryRun为true,用于验证请求是否可以成功，但不实际执行删除操作 + .setDryRun(false) + // 设置Force为true，表示即使实例有正在运行的任务，也强制删除实例 + .setForce(true) + // 设置TerminateSubscription为true，表示删除按订阅付费的实例时终止订阅 + .setTerminateSubscription(true) + .setInstanceId(list); + + //创建运行时选项对象，用于配置运行时的选项参数 + com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions(); + try { + // 复制代码运行请自行打印 API 的返回值 + client.deleteInstancesWithOptions(deleteInstancesRequest, runtime); + } catch (TeaException error) { + // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 + // 错误 message + log.info(error.getMessage()); + // 诊断地址 + log.info(error.getData().get("Recommend")); + com.aliyun.teautil.Common.assertAsString(error.message); + } catch (Exception _error) { + TeaException error = new TeaException(_error.getMessage(), _error); + // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 + // 错误 message + log.info(error.getMessage()); + // 诊断地址 + log.info(error.getData().get("Recommend")); + com.aliyun.teautil.Common.assertAsString(error.message); + } + + } + + @Override + public void destroy() throws Exception { + log.info("===============>开始执行删除实例方法"); + delInstance(); + // 连接到Redis服务器 + Jedis jedis = new Jedis("159.75.188.178", 6379); + // 指定要删除的文件夹（命名空间） + String namespace = "InstanceIdKey:"; + // 获取所有以namespace为前缀的键 + Set keys = jedis.keys(namespace + "*"); + // 如果存在键，则删除它们 + if (keys.size() > 0) { + jedis.del(keys.toArray(new String[0])); + } + // 关闭连接 + jedis.close(); + } +} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/GenerateInstance.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/GenerateInstance.java new file mode 100644 index 0000000..737feca --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/GenerateInstance.java @@ -0,0 +1,121 @@ +package com.muyu.car.instance; + +import com.aliyun.ecs20140526.models.*; +import com.aliyun.tea.TeaException; +import com.muyu.car.domain.example.ExampleInformation; +import com.muyu.common.redis.service.RedisService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +/** + * 项目启动创建实例 + * @Author：蓬叁 + * @Package：com.muyu.car.domain + * @Project：cloud-server-8 + * @name：GenerateInstance + * @Date：2024/9/29 上午10:42 + */ +@Component +@Log4j2 +@Tag(name = "启动时创建实例") +public class GenerateInstance implements ApplicationRunner { + + @Autowired private RedisService redisService; + + /** + * 启动自动创建实例 + * @throws Exception + */ + public static List generateInstance() throws Exception { + + // 创建ECS客户端对象，用于后续调用ECS相关API + com.aliyun.ecs20140526.Client client = CreateClient.createClient(); + + com.aliyun.ecs20140526.models.RunInstancesRequest.RunInstancesRequestSystemDisk systemDisk = new com.aliyun.ecs20140526.models.RunInstancesRequest.RunInstancesRequestSystemDisk() + .setSize("40") + .setCategory("cloud_essd"); + com.aliyun.ecs20140526.models.RunInstancesRequest runInstancesRequest = new com.aliyun.ecs20140526.models.RunInstancesRequest() + // 设置地域ID + .setRegionId("cn-hangzhou") + // 设置镜像ID + .setImageId("m-bp10rcc4nsihqfoz0w7s") + // 设置实例类型 + .setInstanceType("ecs.t6-c1m1.large") + // 设置安全组ID + .setSecurityGroupId("sg-bp1a7fk8js5pn3fw9p2m") + // 设置虚拟交换机ID + .setVSwitchId("vsw-bp193np7r01vssqxhh24e") + // 设置实例名称 + .setInstanceName("server-mqtt") + // 设置实例付费类型为后付费按量付费 + .setInstanceChargeType("PostPaid") + // 设置互联网最大出带宽为1 Mbps + .setInternetMaxBandwidthOut(1) + // 设置系统盘配置 + .setSystemDisk(systemDisk) + // 设置主机名 + .setHostName("root") + // 设置实例密码 + .setPassword("EightGroup123.") + // 设置创建实例的数量 + .setAmount(2); + + com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions(); + try { + // 复制代码运行请自行打印 API 的返回值 + RunInstancesResponse runInstancesResponse = client.runInstancesWithOptions(runInstancesRequest, runtime); + // 获取body返回值对象 + RunInstancesResponseBody body = runInstancesResponse.getBody(); + ArrayList list = new ArrayList<>(); + // 得到实例ID数组 + for (String instance : body.getInstanceIdSets().getInstanceIdSet()) { + list.add(instance); + } + log.info("实例ID:{}",list); + return list; + } catch (TeaException error) { + // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 + // 错误 message + log.info(error.getMessage()); + // 诊断地址 + log.info(error.getData().get("Recommend")); + com.aliyun.teautil.Common.assertAsString(error.message); + } catch (Exception _error) { + TeaException error = new TeaException(_error.getMessage(), _error); + // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 + // 错误 message + log.info(error.getMessage()); + // 诊断地址 + log.info(error.getData().get("Recommend")); + com.aliyun.teautil.Common.assertAsString(error.message); + } + return null; + } + + @Override + public void run(ApplicationArguments args) throws Exception { + List InstanceIds = generateInstance(); + log.info("创建实例成功"); + log.info("正在加载实例"); + Thread.sleep(30000); + List exampleInformations = QueryInstance.queryInstance(InstanceIds); + log.info("加载成功"); + for (ExampleInformation exampleInformation : exampleInformations) { + redisService.setCacheObject("InstanceIdKey:"+exampleInformation.getInstanceId(),exampleInformation); + } +// for (ExampleInformation exampleInformation : exampleInformations) { +// ExampleInformation cacheObject = redisService.getCacheObject(exampleInformation.getInstanceId()); +// log.info(cacheObject); +// } + log.info("实例信息:{}",exampleInformations); + } + +} + diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/QueryInstance.java b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/QueryInstance.java new file mode 100644 index 0000000..ffaaf8a --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/QueryInstance.java @@ -0,0 +1,70 @@ +package com.muyu.car.instance; + +import com.alibaba.fastjson.JSON; +import com.aliyun.ecs20140526.models.DescribeInstancesResponse; +import com.aliyun.ecs20140526.models.DescribeInstancesResponseBody; +import com.aliyun.tea.TeaException; +import com.muyu.car.domain.example.ExampleInformation; +import lombok.extern.log4j.Log4j2; + +import java.util.ArrayList; +import java.util.List; + +/** + * 启动后查询实例信息 + * @Author：蓬叁 + * @Package：com.muyu.car.instance + * @Project：cloud-server-8 + * @name：QueryInstance + * @Date：2024/9/29 下午8:58 + */ +@Log4j2 +public class QueryInstance { + + public static List queryInstance(List instanceIds) throws Exception { + com.aliyun.ecs20140526.Client client = CreateClient.createClient(); + + com.aliyun.ecs20140526.models.DescribeInstancesRequest describeInstancesRequest = new com.aliyun.ecs20140526.models.DescribeInstancesRequest() + .setInstanceIds(JSON.toJSONString(instanceIds)) + .setRegionId("cn-hangzhou"); + + + com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions(); + + try { + // 复制代码运行请自行打印 API 的返回值 + DescribeInstancesResponse describeInstancesResponse = client.describeInstancesWithOptions(describeInstancesRequest, runtime); + DescribeInstancesResponseBody body = describeInstancesResponse.getBody(); + ArrayList exampleInformations = new ArrayList<>(); + for (DescribeInstancesResponseBody.DescribeInstancesResponseBodyInstancesInstance instance : body.getInstances().getInstance()){ + ExampleInformation exampleInformation = new ExampleInformation(); + exampleInformation.setInstanceId(instance.getInstanceId()); + log.info("实例ID:{}",exampleInformation.getInstanceId()); + exampleInformation.setStatus(instance.getStatus()); + log.info("实例状态:{}",exampleInformation.getStatus()); + exampleInformation.setIpAddress(String.valueOf(instance.getPublicIpAddress().getIpAddress())); + log.info("实例IP:{}",exampleInformation.getIpAddress()); + exampleInformations.add(exampleInformation); + } + log.info("实例信息:{}",exampleInformations); + return exampleInformations; + } catch (TeaException error) { + // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 + // 错误 message + System.out.println(error.getMessage()); + // 诊断地址 + System.out.println(error.getData().get("Recommend")); + com.aliyun.teautil.Common.assertAsString(error.message); + } catch (Exception _error) { + TeaException error = new TeaException(_error.getMessage(), _error); + // 此处仅做打印展示，请谨慎对待异常处理，在工程项目中切勿直接忽略异常。 + // 错误 message + System.out.println(error.getMessage()); + // 诊断地址 + System.out.println(error.getData().get("Recommend")); + com.aliyun.teautil.Common.assertAsString(error.message); + } + return null; + } + +} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/resources/banner.txt b/cloud-modules/cloud-modules-car-gateway/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..3126c46 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..8f5aff5 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/prod.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/test.xml new file mode 100644 index 0000000..8f5aff5 --- /dev/null +++ b/cloud-modules/cloud-modules-car-gateway/src/main/resources/logback/test.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-carData/pom.xml b/cloud-modules/cloud-modules-carData/pom.xml index c1ab988..28bad8d 100644 --- a/cloud-modules/cloud-modules-carData/pom.xml +++ b/cloud-modules/cloud-modules-carData/pom.xml @@ -8,7 +8,9 @@ cloud-modules 3.6.3 - + + cloud-modules-carData数据处理模块 + cloud-modules-carData diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml index 574393e..eea96e5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 127.0.0.1:8848 user-name: nacos password: nacos - namespace: eight + namespace: psr # Spring spring: diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index 2863945..f4ca65e 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 127.0.0.1:8848 user-name: nacos password: nacos - namespace: eight + namespace: psr # Spring spring: diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index 5735ae2..1d1b841 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 127.0.0.1:8848 user-name: nacos password: nacos - namespace: eight + namespace: psr # Spring spring: diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index a0052fd..1881f5b 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 127.0.0.1:8848 user-name: nacos password: nacos - namespace: eight + namespace: psr # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index 672d384..e7ac7fe 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -14,6 +14,7 @@ cloud-modules-gen cloud-modules-file cloud-modules-carData + cloud-modules-car-gateway cloud-modules diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index 10e7fb8..50b1dea 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 127.0.0.1:8848 user-name: nacos password: nacos - namespace: eight + namespace: psr # Spring spring: