From 97f3c16ac595493405e8cf76399dc703c088ef6f Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 03 十二月 2024 15:56:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 32a18a9..2cb73e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,8 @@
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<!-- 统一依赖管理 -->
+ <spring.framework.version>5.3.39</spring.framework.version>
+ <spring.security.version>5.8.14</spring.security.version>
<spring.boot.version>2.7.18</spring.boot.version>
<spring.cloud.version>2021.0.9</spring.cloud.version>
<spring.cloud.alibaba.version>2021.0.6.1</spring.cloud.alibaba.version>
@@ -89,6 +91,7 @@
<ip2region.version>2.7.0</ip2region.version>
<bizlog-sdk.version>3.0.6</bizlog-sdk.version>
<reflections.version>0.10.2</reflections.version>
+ <netty.version>4.1.113.Final</netty.version>
<!-- 三方云服务相关 -->
<okio.version>3.5.0</okio.version>
<okhttp3.version>4.11.0</okhttp3.version>
@@ -98,7 +101,7 @@
<aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
<tencentcloud-sdk-java.version>3.1.880</tencentcloud-sdk-java.version>
<justauth.version>1.0.8</justauth.version>
- <jimureport.version>1.6.6</jimureport.version>
+ <jimureport.version>1.9.0</jimureport.version>
<xercesImpl.version>2.12.2</xercesImpl.version>
<weixin-java.version>4.6.0</weixin-java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -119,7 +122,7 @@
<nacos.metadata.version>1.0.0</nacos.metadata.version>
<log.path>D:\DLUT\iailab-plat</log.path>
<logstash.address>127.0.0.1:4560</logstash.address>
- <deploy.server>127.0.0.1</deploy.server>
+ <deploy.server>192.168.56.1</deploy.server>
</properties>
<activation>
<!-- 默认环境 -->
@@ -145,14 +148,17 @@
<profile>
<id>prod</id>
<properties>
+ <!-- 环境标识，需要与配置文件的名称相对应 -->
<profiles.active>prod</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
- <nacos.namespace>a7112341-c9e2-4177-bc5b-0d2e8cf0b3bb</nacos.namespace>
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
+ <nacos.metadata.version>1.0.0</nacos.metadata.version>
+ <log.path>D:\iailab\logs</log.path>
<logstash.address>127.0.0.1:4560</logstash.address>
+ <deploy.server>10.88.4.131</deploy.server>
</properties>
</profile>
</profiles>
@@ -160,6 +166,27 @@
<dependencyManagement>
<dependencies>
<!-- 统一依赖管理 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>${netty.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId> <!-- JDK8 版本独有：保证 Spring Framework 尽量高 -->
+ <version>${spring.framework.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-bom</artifactId> <!-- JDK8 版本独有：保证 Spring Security 尽量高 -->
+ <version>${spring.security.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
@@ -746,6 +773,22 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- 积木仪表盘-->
+ <dependency>
+ <groupId>org.jeecgframework.jimureport</groupId>
+ <artifactId>jimureport-dashboard-spring-boot-starter</artifactId>
+ <version>${jimureport.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>autopoi-web</artifactId>
+ <groupId>org.jeecgframework</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jeecgframework.jimureport</groupId>
+ <artifactId>jimureport-spring-boot-starter</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
--
Gitblit v1.9.3