From 4e94fa3ebf98bb8a9a6eda39a7324461fc4ebb40 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期六, 27 二月 2021 18:08:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/pom.xml | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/pom.xml b/febs-server/febs-server-hr/pom.xml
index 75fc5a4..bd12f7a 100644
--- a/febs-server/febs-server-hr/pom.xml
+++ b/febs-server/febs-server-hr/pom.xml
@@ -11,7 +11,7 @@
<artifactId>febs-server-hr</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>febs-server-hr</name>
+ <name>FEBS-Server-Hr</name>
<description>人力资源服务模块</description>
<properties>
@@ -52,9 +52,39 @@
<groupId>com.codingapi.txlcn</groupId>
<artifactId>txlcn-txmsg-netty</artifactId>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>cc.mrbird</groupId>
+ <artifactId>febs-common-redis-starter</artifactId>
+ <version>2.2-RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.tld</include>
+ <include>**/*.yml</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.tld</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
--
Gitblit v1.8.0