diff --git a/pom.xml b/pom.xml
index a8edc63..4a10e73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,6 +207,12 @@
${zhilian.version}
+
+ com.zhilian
+ zhilian-common-resolver
+ ${zhilian.version}
+
+
com.zhilian
diff --git a/zhilian-auth/src/main/resources/bootstrap.yml b/zhilian-auth/src/main/resources/bootstrap.yml
index 94f1a14..f0725a8 100644
--- a/zhilian-auth/src/main/resources/bootstrap.yml
+++ b/zhilian-auth/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/zhilian-common/pom.xml b/zhilian-common/pom.xml
index ceac357..40dfb0d 100644
--- a/zhilian-common/pom.xml
+++ b/zhilian-common/pom.xml
@@ -18,6 +18,7 @@
zhilian-common-datascope
zhilian-common-datasource
zhilian-common-system
+ zhilian-common-resolver
zhilian-common
diff --git a/zhilian-common/zhilian-common-resolver/pom.xml b/zhilian-common/zhilian-common-resolver/pom.xml
new file mode 100644
index 0000000..80e69a3
--- /dev/null
+++ b/zhilian-common/zhilian-common-resolver/pom.xml
@@ -0,0 +1,32 @@
+
+
+ 4.0.0
+
+ com.zhilian
+ zhilian-common
+ 3.6.3
+
+
+ zhilian-common-resolver
+
+
+ 17
+ 17
+ UTF-8
+
+
+
+
+ com.zhilian
+ zhilian-common-core
+
+
+
+ com.zhilian
+ zhilian-common-redis
+
+
+
+
diff --git a/zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/Report.java b/zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/Report.java
new file mode 100644
index 0000000..f11c5ff
--- /dev/null
+++ b/zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/Report.java
@@ -0,0 +1,113 @@
+package com.zhilian.common.resolver.domain;
+
+import com.zhilian.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName Report
+ * @Description 报文实体类
+ * @Author Can.J
+ * @Date 2024/3/26 21:47
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Report extends BaseEntity {
+ /**
+ * 报文id
+ */
+ private Long reportId;
+
+ /**
+ * 车辆编码
+ */
+ private String vin;
+
+ /**
+ * 车辆在线时间
+ */
+ private Date onlineTime;
+
+ /**
+ * 车辆下线时间
+ */
+ private Date downLineTime;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 维度
+ */
+ private String latitude;
+
+ /**
+ * 电池剩余电量
+ */
+ private BigDecimal remainingBattery;
+
+ /**
+ * 电池电量
+ */
+ private BigDecimal batteryLevel;
+
+ /**
+ * 总里程
+ */
+ private BigDecimal totalMileage;
+
+ /**
+ * 当前是否在线: 1在线 0:不在线
+ */
+ private int isOnline;
+
+ /**
+ * 报文创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 车辆是否发生故障: 1是 0:否
+ */
+ private int isBreakDown;
+
+ /**
+ * 车辆故障是否解决: 1是 0:否
+ */
+ private int isSolve;
+
+ /**
+ * 车辆是否延迟:1是 0:否
+ */
+ private int isDelay;
+
+ /**
+ * 车辆是否重复: 1是 0:否
+ */
+ private int isRepeat;
+
+ /**
+ * 车辆状态: 1行驶中 0:停止
+ */
+ private int status;
+
+ /**
+ * 对应企业id
+ */
+ private Long companyId;
+
+ /**
+ * 是否展示 1展示 0:不展示
+ */
+ private Integer isDelete;
+ private String createBy;
+ private String remark;
+
+}
diff --git a/zhilian-common/zhilian-common-resolver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhilian-common/zhilian-common-resolver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..0ea9ae7
--- /dev/null
+++ b/zhilian-common/zhilian-common-resolver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+#com.zhilian.common.system.remote.factory.RemoteUserFallbackFactory
diff --git a/zhilian-gateway/src/main/resources/bootstrap.yml b/zhilian-gateway/src/main/resources/bootstrap.yml
index b426d9a..8248701 100644
--- a/zhilian-gateway/src/main/resources/bootstrap.yml
+++ b/zhilian-gateway/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
@@ -34,6 +36,7 @@ spring:
ds1:
nacos:
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
dataId: sentinel-zhilian-gateway
groupId: DEFAULT_GROUP
data-type: json
diff --git a/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml
index 2339518..1105c2a 100644
--- a/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml
+++ b/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml
index 415c871..9522161 100644
--- a/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml
+++ b/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml
index e6ae61a..b9c8fb0 100644
--- a/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml
+++ b/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml
index 1833882..510d6bb 100644
--- a/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml
+++ b/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml
index 28c6815..9fc2b73 100644
--- a/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml
+++ b/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml
index b1662f9..452f88f 100644
--- a/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml
+++ b/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/zhilian-modules/zhilian-resolver/pom.xml b/zhilian-modules/zhilian-resolver/pom.xml
index 8de8713..98c3836 100644
--- a/zhilian-modules/zhilian-resolver/pom.xml
+++ b/zhilian-modules/zhilian-resolver/pom.xml
@@ -11,12 +11,6 @@
zhilian-resolver
-
- 17
- 17
- UTF-8
-
-
zhilian-resolver 处理模块
@@ -66,6 +60,11 @@
mysql-connector-j
+
+ com.zhilian
+ zhilian-common-redis
+
+
com.zhilian
@@ -78,6 +77,39 @@
zhilian-common-swagger
+
+
+ com.zhilian
+ zhilian-common-datasource
+
+
+
+
+ com.zhilian
+ zhilian-common-datascope
+
+
+
+
+ com.zhilian
+ zhilian-common-log
+
+
+
+ com.zhilian
+ zhilian-common-core
+
+
+
+ com.zhilian
+ zhilian-common-resolver
+
+
+
+ org.elasticsearch.client
+ elasticsearch-rest-high-level-client
+
+
@@ -105,4 +137,4 @@
-
\ No newline at end of file
+
diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java
new file mode 100644
index 0000000..8b8d5fb
--- /dev/null
+++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java
@@ -0,0 +1,17 @@
+package com.zhilian.resolver;
+
+import com.zhilian.common.security.annotation.EnableCustomConfig;
+import com.zhilian.common.security.annotation.EnableMyFeignClients;
+import com.zhilian.common.swagger.annotation.EnableCustomSwagger2;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+@EnableCustomSwagger2
+@EnableMyFeignClients
+@MapperScan("com.zhilian.resolver.mapper")
+@SpringBootApplication
+public class ZhiLianResolverApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(ZhiLianResolverApplication.class, args);
+ }
+}
diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/config/InitEsRes.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/config/InitEsRes.java
new file mode 100644
index 0000000..cc41db6
--- /dev/null
+++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/config/InitEsRes.java
@@ -0,0 +1,25 @@
+package com.zhilian.resolver.config;
+
+import lombok.Data;
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "es")
+@Data
+public class InitEsRes {
+ private String host;
+ private int port;
+ private String scheme;
+
+ @Bean
+ public RestHighLevelClient restHighLevelClient(){
+ return new RestHighLevelClient(
+ RestClient.builder(new HttpHost(host,port,scheme))
+ );
+ }
+}
diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/controller/ReportController.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/controller/ReportController.java
new file mode 100644
index 0000000..e1db594
--- /dev/null
+++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/controller/ReportController.java
@@ -0,0 +1,47 @@
+package com.zhilian.resolver.controller;
+
+import com.zhilian.common.core.domain.Result;
+import com.zhilian.common.core.web.controller.BaseController;
+import com.zhilian.common.core.web.page.TableDataInfo;
+import com.zhilian.common.log.annotation.Log;
+import com.zhilian.common.log.enums.BusinessType;
+import com.zhilian.common.resolver.domain.Report;
+import com.zhilian.resolver.service.ReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName ReportController
+ * @Description 报文控制层
+ * @Author Can.J
+ * @Date 2024/3/26 22:13
+ */
+@RestController
+@RequestMapping("/report")
+public class ReportController extends BaseController {
+
+ /**
+ * @Autowired reportService
+ */
+ @Autowired
+ private ReportService reportService;
+
+ /**
+ * @Description 查询报文列表
+ * @Param [report]
+ * @Return com.zhilian.common.core.web.controller.Result>
+ */
+ @Log(title = "报文信息", businessType = BusinessType.OTHER)
+//// @RequiresPermissions("resolver:report:list")
+ @GetMapping("/queryReports")
+ public Result> list (Report report) {
+ startPage();
+ List list = reportService.pageQuery(report);
+ return getDataTable(list);
+ }
+
+}
diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/ReportMapper.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/ReportMapper.java
new file mode 100644
index 0000000..3096699
--- /dev/null
+++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/ReportMapper.java
@@ -0,0 +1,7 @@
+package com.zhilian.resolver.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhilian.common.resolver.domain.Report;
+
+public interface ReportMapper extends BaseMapper {
+
+}
diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/ReportService.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/ReportService.java
new file mode 100644
index 0000000..c151ff1
--- /dev/null
+++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/ReportService.java
@@ -0,0 +1,17 @@
+package com.zhilian.resolver.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhilian.common.resolver.domain.Report;
+
+import java.util.List;
+
+/**
+ * @ClassName ReportService
+ * @Description 报文业务层
+ * @Author Can.J
+ * @Date 2024/3/26 22:30
+ */
+public interface ReportService extends IService {
+
+ List pageQuery(Report report);
+}
diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/ReportServiceImpl.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/ReportServiceImpl.java
new file mode 100644
index 0000000..7de502e
--- /dev/null
+++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/ReportServiceImpl.java
@@ -0,0 +1,120 @@
+package com.zhilian.resolver.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhilian.common.core.utils.StringUtils;
+import com.zhilian.common.resolver.domain.Report;
+import com.zhilian.resolver.mapper.ReportMapper;
+import com.zhilian.resolver.service.ReportService;
+import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.action.bulk.BulkItemResponse;
+import org.elasticsearch.action.bulk.BulkRequest;
+import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.xcontent.XContentType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @ClassName ReportServiceImpl
+ * @Description 报文业务实现层
+ * @Author Can.J
+ * @Date 2024/3/26 22:31
+ */
+@Slf4j
+@Service
+public class ReportServiceImpl extends ServiceImpl implements ReportService {
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ @Autowired
+ private RestHighLevelClient restHighLevelClient;
+
+ @Autowired
+ private ReportMapper reportMapper;
+
+ /**
+ * 查询报文数据
+ * @param report
+ * @return
+ */
+ @Override
+ public List pageQuery(Report report) {
+ List resultList;
+ //redis中查询
+ log.info("从redis查询数据");
+ String cacheKey=generateCacheKey(report);
+ resultList =(List) redisTemplate.opsForValue().get(cacheKey);
+ if(resultList==null){
+ //如果redis中不存在,则从数据库中查询
+ log.info("从数据库查询数据");
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.isNotEmpty(report.getVin())){
+ queryWrapper.like(Report::getVin,report.getVin());
+ }
+ //status int类型 精确查询
+ if(Objects.nonNull(report.getStatus())){
+ queryWrapper.eq(Report::getStatus,report.getStatus());
+ }
+ queryWrapper.eq(Report::getIsDelete, 1); // 添加 isDelete == 1 的条件
+ resultList =this.list(queryWrapper);
+
+ // 将从数据库中获取的数据存入 Redis,设置过期时间10分钟
+ redisTemplate.opsForValue().set(cacheKey,resultList, Duration.ofMinutes(10));
+
+ //查询结果从数据库获取之后,将其批量写入Elasticsearch
+ try {
+ bulkInsert(resultList);
+ } catch (IOException e) {
+ log.info("报文数据同步ES错误",e.getMessage());
+ }
+ }
+ return resultList;
+ }
+
+
+ /**
+ * 生成缓存的key
+ * @param report
+ * @return
+ */
+ private String generateCacheKey(Report report) {
+ return "report_"+report.getVin();
+ }
+
+ public void bulkInsert(List reports) throws IOException {
+ BulkRequest bulkRequest = new BulkRequest();
+ reports.forEach(report -> {
+ // 创建一个索引请求,指定索引名称和文档ID
+ IndexRequest indexRequest = new IndexRequest("report");
+ indexRequest.id(report.getReportId().toString());
+ // 将对象转换为JSON字符串
+ String jsonString = JSON.toJSONString(report);
+ // 将JSON字符串设置为索引请求的文档内容
+ indexRequest.source(jsonString, XContentType.JSON);
+ // 将索引请求添加到批量请求中
+ bulkRequest.add(indexRequest);
+ });
+ BulkResponse bulkResponse = restHighLevelClient.bulk(bulkRequest, RequestOptions.DEFAULT);
+ if(bulkResponse.hasFailures()){
+ //处理失败的情况
+ for (BulkItemResponse item : bulkResponse.getItems()) {
+ if(item.isFailed()){
+ log.error("报文数据同步到ES失败:{}",item.getFailureMessage());
+ }
+ }
+ }else{
+ log.info("报文同步ES成功:{}条",reports.size());
+ }
+ }
+}
diff --git a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml
index 46d4b4d..f21b35a 100644
--- a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml
+++ b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml
@@ -4,6 +4,10 @@ server:
# Spring
spring:
+ redis:
+ host: 10.10.25.3
+ port: 6379
+ password: fffdev
application:
# 应用名称
name: zhilian-resolver
@@ -15,11 +19,17 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+es:
+ host: 111.229.33.194
+ port: 9200
+ scheme: http
diff --git a/zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/ReportMapper.xml b/zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/ReportMapper.xml
new file mode 100644
index 0000000..51ef54d
--- /dev/null
+++ b/zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/ReportMapper.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml
index 2eeab13..cbc7840 100644
--- a/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml
+++ b/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置
diff --git a/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml b/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml
index 14ce9aa..d8696f6 100644
--- a/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml
+++ b/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
config:
# 配置中心地址
server-addr: 10.10.25.2:8848
+ namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe
# 配置文件格式
file-extension: yml
# 共享配置