From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index f50f167..d372146 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,8 @@
<module>inspect-server</module>
<module>inventory-server</module>
<module>system-run</module>
- <module>sale-server</module>
+ <module>production-server</module>
+ <module>base-server</module>
</modules>
<properties>
@@ -37,7 +38,7 @@
<openfeign.version>3.1.3</openfeign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
<shiro.version>1.5.3</shiro.version>
- <velocity-engine.version>2.3</velocity-engine.version>
+ <hutool.version>5.8.16</hutool.version>
<!--鎻愪氦鍓�-->
<!-- 鎵撳寘鍚庡鍑虹殑璺緞 -->
<package.path>${project.build.directory}/BLOG</package.path>
@@ -87,6 +88,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
</dependencies>
<dependencyManagement>
@@ -126,6 +133,13 @@
<version>${mybatis-plus.version}</version>
</dependency>
+ <!--浠ｇ爜鐢熸垚鍣ㄦā鏉�-->
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
+ </dependency>
+
<!--feign-->
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -145,13 +159,6 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId>
<version>${shiro.version}</version>
- </dependency>
-
- <!-- 浠ｇ爜鐢熸垚鍣ㄦā鏉匡紝鐢ㄤ簬鐢熸垚浠ｇ爜 -->
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <version>${velocity-engine.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
--
Gitblit v1.9.3