From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 171 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 136 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index 38cf952..e7451ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,11 @@
<module>user-server</module>
<module>sys</module>
<module>framework</module>
+ <module>standard-server</module>
+ <module>inspection-server</module>
+ <module>laboratory-server</module>
+ <module>cnas-server</module>
+ <module>chart-server</module>
</modules>
<properties>
@@ -29,7 +34,14 @@
<swagger.version>3.0.0</swagger.version>
<knife4j-spring-ui.version>3.0.3</knife4j-spring-ui.version>
<druid.version>1.2.18</druid.version>
- <mybatis-plus.version>3.4.0</mybatis-plus.version>
+ <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
+ <openfeign.version>3.1.3</openfeign.version>
+ <feign-okhttp.version>11.0</feign-okhttp.version>
+ <shiro.version>1.5.3</shiro.version>
+ <commons.lang3>3.12.0</commons.lang3>
+ <hutool.version>5.8.18</hutool.version>
+ <!-- 鎵撳寘鍚庡鍑虹殑璺緞 -->
+ <package.path>${project.build.directory}/LIMS</package.path>
</properties>
<dependencies>
@@ -37,25 +49,54 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
- <!--鐑儴缃�-->
+
+ <!--鐑儴缃瞐-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
+
<!--lombok-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
+
+ <!--Swagger3-->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+
+ <!--mybatis-plus-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+
+ <!--鍚庣娉ㄩ噴妫�楠屽伐鍏�-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
<!--log4j-->
<dependency>
<groupId>log4j</groupId>
@@ -77,32 +118,11 @@
<version>${druid.version}</version>
</dependency>
- <!--jwt-->
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>java-jwt</artifactId>
- <version>${jwt.version}</version>
- </dependency>
-
- <!--Swagger3-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>${swagger.version}</version>
- </dependency>
-
<!--Swagger3-Ui缇庡寲-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-ui</artifactId>
<version>${knife4j-spring-ui.version}</version>
- </dependency>
-
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>${mybatis-plus.version}</version>
</dependency>
<!--mybatis-plus浠ｇ爜鐢熸垚鍣�-->
@@ -111,29 +131,110 @@
<artifactId>mybatis-plus-generator</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
+
+ <!--feign-->
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ <version>${openfeign.version}</version>
+ </dependency>
+
+ <!--okhttp-->
+ <dependency>
+ <groupId>io.github.openfeign</groupId>
+ <artifactId>feign-okhttp</artifactId>
+ <version>${feign-okhttp.version}</version>
+ </dependency>
+
+ <!--瀹夊叏妗嗘灦shiro-->
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-spring-boot-starter</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
+
+ <!--jwt-->
+ <dependency>
+ <groupId>com.auth0</groupId>
+ <artifactId>java-jwt</artifactId>
+ <version>${jwt.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
+ <!-- 涓婄嚎閮ㄧ讲 JAR鍚姩鍒嗙渚濊禆lib鍜岄厤缃� -->
+ <!-- 鎵撳寘jar -->
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
+ <!-- 涓嶆墦鍖呰祫婧愭枃浠� -->
<excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
+ <exclude>*.**</exclude>
</excludes>
- <mainClass>
- com.yunchu.limslaboratory.SysApplication
- </mainClass>
- <!--<fork>false</fork>
- <includeSystemScope>true</includeSystemScope>
- <skip>true</skip>-->
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <!-- MANIFEST.MF 涓� Class-Path 鍔犲叆鍓嶇紑 -->
+ <classpathPrefix>lib/</classpathPrefix>
+ <!-- jar鍖呬笉鍖呭惈鍞竴鐗堟湰鏍囪瘑 -->
+ <useUniqueVersions>false</useUniqueVersions>
+ <!-- 鎸囧畾鍏ュ彛绫� -->
+ <mainClass>com.yuanchu.limslaboratory.SysApplication</mainClass>
+ </manifest>
+ <!-- 鎸囧畾閰嶇疆鏂囦欢鐩綍锛岃繖鏍穓ar杩愯鏃朵細鍘绘壘鍒板悓鐩綍涓嬬殑conf鏂囦欢澶逛笅鏌ユ壘 -->
+ <manifestEntries>
+ <Class-Path>conf/</Class-Path>
+ </manifestEntries>
+ </archive>
+ <outputDirectory>${package.path}</outputDirectory>
</configuration>
</plugin>
+ <!-- 鎷疯礉渚濊禆 copy-dependencies -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${package.path}/lib/ </outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- 鎷疯礉璧勬簮鏂囦欢 copy-resources -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <!-- 鎸囧畾鍙備笌鏋勫缓鐨剅esource -->
+ <includes>
+ <include>*.**</include>
+ <!--鎺掗櫎application-dev.yml鏂囦欢-->
+ </includes>
+ </resource>
+ </resources>
+ <outputDirectory>${package.path}/conf</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
--
Gitblit v1.9.3