修改成nacos注册中心
This commit is contained in:
parent
32d09735d1
commit
c6299995e5
|
|
@ -16,6 +16,19 @@
|
|||
|
||||
<dependencies>
|
||||
|
||||
<!-- SpringCloud Alibaba Nacos -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- SpringCloud Alibaba Sentinel -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- spring-boot-devtools -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,14 @@ package com.bonus;
|
|||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
|
||||
|
||||
/**
|
||||
* 启动程序
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
@EnableDiscoveryClient
|
||||
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
|
||||
public class BonusBusinessApplication
|
||||
{
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ public class QxUtils {
|
|||
try{
|
||||
builder.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
|
||||
builder.append("<M Type=\"ComReq\">");
|
||||
builder.append("<C Lang=\"en\" Type=\"").append(type).append("\">");
|
||||
builder.append("<C Type=\"").append(type).append("\">");
|
||||
builder.append("<Res Type=\"ST\" Idx=\"0\" OptID=\"").append(opeId).append("\" >");
|
||||
builder.append("<Param>");
|
||||
builder.append("<PatrolTasks>");
|
||||
|
|
@ -141,7 +141,7 @@ public class QxUtils {
|
|||
builder.append("<PatrolTask ");
|
||||
builder.append("Enable=\"").append(vo.getEnable()).append("\" ");
|
||||
builder.append("Count=\"").append(vo.getCount()).append("\" ");
|
||||
builder.append("RobotName=\"").append(vo.getRobotName()).append("\" ");
|
||||
builder.append("RobotName=\"").append(vo.getRobotId()).append("\" ");
|
||||
builder.append("MapName=\"").append(vo.getMapName()).append("\" ");
|
||||
builder.append("TaskName=\"").append(vo.getTaskName()).append("\" ");
|
||||
builder.append("TaskID=\"").append(vo.getTaskId()).append("\" ");
|
||||
|
|
@ -236,16 +236,16 @@ public class QxUtils {
|
|||
for (Action vo:actions){
|
||||
builder.append("<Action ");
|
||||
if(StringUtil.isNotEmpty(vo.getType())){
|
||||
builder.append("Type=\"").append(vo.getType()).append("\" ");
|
||||
builder.append("Type=\"").append(vo.getType()).append("\" ");
|
||||
}
|
||||
if(StringUtil.isNotEmpty(vo.getNum())){
|
||||
builder.append("Num=\"").append(vo.getNum()).append("\" ");
|
||||
builder.append("Num=\"").append(vo.getNum()).append("\" ");
|
||||
}
|
||||
if(StringUtil.isNotEmpty(vo.getInterval())){
|
||||
builder.append("Interval=\"").append(vo.getInterval()).append("\" ");
|
||||
builder.append("Interval=\"").append(vo.getInterval()).append("\" ");
|
||||
}
|
||||
if(StringUtil.isNotEmpty(vo.getTime())){
|
||||
builder.append("Time=\"").append(vo.getTime()).append("\" ");
|
||||
builder.append("Time=\"").append(vo.getTime()).append("\" ");
|
||||
}
|
||||
builder.append(">").append("</Action>");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -337,15 +337,7 @@ public class RobotServiceImpl implements IRobotService {
|
|||
public AjaxResult issuedTask(PatrolTask vo) {
|
||||
try{
|
||||
String token=QxVideotape.login(TVideoConfigUtil.getMaps(),TVideoConfigUtil.Q2HTTPURL);
|
||||
String xml2= QxUtils.getParamData(XxmSendUtils.QUERY,XxmSendUtils.ROBOT_TASK_LIST);
|
||||
String res2=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,vo.getPuid(),xml2);
|
||||
JSONArray array= XmlUtils.getRobotTask(res2);
|
||||
List<PatrolTask> list2= JSONArray.parseArray(array.toString(),PatrolTask.class);
|
||||
RobotTask vo2=new RobotTask();
|
||||
vo2.setPatrolTasks(list2);
|
||||
String data= QxUtils.setRobotInspection(XxmSendUtils.SET,XxmSendUtils.ROBOT_TASK_LIST,vo2);
|
||||
String res3=QxVideotape.sendXmlPost(token,TVideoConfigUtil.Q2HTTPURL,vo.getPuid(),data);
|
||||
// mapper.updateTaskStatus(vo);
|
||||
// mapper.updateTaskStatus(vo);
|
||||
//下发任务
|
||||
RobotTask robotTask=new RobotTask();
|
||||
//进行任务查询
|
||||
|
|
|
|||
|
|
@ -1,5 +1,15 @@
|
|||
# 数据源配置
|
||||
spring:
|
||||
application:
|
||||
name: bonus-robot
|
||||
cloud:
|
||||
nacos:
|
||||
username: nacos
|
||||
password: Jjsp@nacos2023
|
||||
discovery:
|
||||
server-addr: 127.0.0.1:18848
|
||||
namespace: robot
|
||||
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driverClassName: com.mysql.cj.jdbc.Driver
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ public class SecurityConfig
|
|||
.authorizeHttpRequests((requests) -> {
|
||||
permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
|
||||
// 对于登录login 注册register 验证码captchaImage 允许匿名访问
|
||||
requests.antMatchers("/login", "/register","/getToken", "/captchaImage").permitAll()
|
||||
requests.antMatchers("/login", "/register","/getToken","/**", "/captchaImage").permitAll()
|
||||
// 静态资源，可匿名访问
|
||||
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/robot/**").permitAll()
|
||||
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class SysConfigServiceImpl implements ISysConfigService
|
|||
/**
|
||||
* 项目启动时，初始化参数到缓存
|
||||
*/
|
||||
@PostConstruct
|
||||
// @PostConstruct
|
||||
public void init()
|
||||
{
|
||||
loadingConfigCache();
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
|
|||
/**
|
||||
* 项目启动时，初始化字典到缓存
|
||||
*/
|
||||
@PostConstruct
|
||||
// @PostConstruct
|
||||
public void init()
|
||||
{
|
||||
loadingDictCache();
|
||||
|
|
|
|||
28
pom.xml
28
pom.xml
|
|
@ -3,15 +3,18 @@
|
|||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
<groupId>com.bonus</groupId>
|
||||
<artifactId>bonus-robot</artifactId>
|
||||
<version>3.8.9</version>
|
||||
|
||||
<name>ruoyi</name>
|
||||
<url>http://www.ruoyi.vip</url>
|
||||
<description>若依管理系统</description>
|
||||
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>2.7.18</version> <!-- Latest 2.7.x -->
|
||||
</parent>
|
||||
<properties>
|
||||
<ruoyi.version>3.8.9</ruoyi.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
|
@ -35,12 +38,31 @@
|
|||
<logback.version>1.2.13</logback.version>
|
||||
<spring-security.version>5.7.12</spring-security.version>
|
||||
<spring-framework.version>5.3.39</spring-framework.version>
|
||||
<spring-cloud.version>2021.0.4</spring-cloud.version>
|
||||
<spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
|
||||
</properties>
|
||||
|
||||
<!-- 依赖声明 -->
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<!-- Nacos Discovery -->
|
||||
<!-- SpringCloud 微服务 -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-dependencies</artifactId>
|
||||
<version>${spring-cloud.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Alibaba 微服务 -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
|
||||
<version>${spring-cloud-alibaba.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<!-- 覆盖SpringFramework的依赖配置-->
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue