From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
pom.xml | 381 +-----------------------------------------------------
1 files changed, 8 insertions(+), 373 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1102b48..398307f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,393 +6,28 @@
<groupId>com.hz</groupId>
<artifactId>phis-service-feign</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>phis-feign</module>
- <!--涓嶉渶瑕佸垯娉ㄩ噴鍐嶆墦鍖�-->
- <!--<module>../p-his-parent</module>-->
+ <module>phis-download-feign</module>
</modules>
-
<parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.6.2</version>
+ <groupId>com.hx.gitee</groupId>
+ <artifactId>hx-parent</artifactId>
+ <version>jiayan</version>
<relativePath/>
</parent>
-
- <!-- 渚濊禆鐗堟湰缁熶竴绠＄悊 -->
- <properties>
- <mybatis.version>1.1.1</mybatis.version>
- <druid.version>1.1.9</druid.version>
- <druid-boot.version>1.1.23</druid-boot.version>
- <fastjson.version>1.2.47</fastjson.version>
- <sfjson.version>2.4</sfjson.version>
- <orgApache.commons>3.9</orgApache.commons>
- <commons-io>2.6</commons-io>
- <net.sourceforge>2.6.12</net.sourceforge>
- <pinyin4j>2.5.1</pinyin4j>
- <commons.lang.version>2.5</commons.lang.version>
- <ezmorph.version>1.0.3</ezmorph.version>
- <oss.version>2.8.3</oss.version>
- <jstl.api.version>1.2</jstl.api.version>
- <spring.redis.version>1.4.2.RELEASE</spring.redis.version>
- <cglib.version>3.1</cglib.version>
- <shiro.version>1.3.2</shiro.version>
- <commons-beanutils.version>1.9.3</commons-beanutils.version>
- <commons-collections.version>3.2.2</commons-collections.version>
- <freemarker.version>2.3.28</freemarker.version>
- <java.jwt.version>3.10.3</java.jwt.version>
- <jjwt.version>0.9.1</jjwt.version>
- <pagehelper.version>5.1.11</pagehelper.version>
- <pagehelper-boot.version>1.4.1</pagehelper-boot.version>
- <mail.version>1.6.2</mail.version>
- <jdk15on.version>1.66</jdk15on.version>
- <dom4j.version>2.1.3</dom4j.version>
- <jdom.version>1.1.3</jdom.version>
- <httpcore.version>4.4.13</httpcore.version>
- <httpclient.version>4.5.12</httpclient.version>
- <!--mybatis鑷姩鐢熸垚-->
- <mybatis.actable>1.1.1.RELEASE</mybatis.actable>
- <!--鑵捐浜慶os-->
- <cos.version>5.6.32</cos.version>
- <!--鍔犲瘑鍣�-->
- <jasypt.version>2.1.2</jasypt.version>
- <!--瀵硅薄涓嶺ML澶勭悊-->
- <jaxb.version>2.3.1</jaxb.version>
- <!--鑷姩Get Set-->
- <lombok.version>1.18.22</lombok.version>
- <!--springCloud-nacos-->
- <nacos-discovery.version>2.2.7.RELEASE</nacos-discovery.version>
- <nacos-config.version>2.2.7.RELEASE</nacos-config.version>
- <bootstrap.version>3.1.0</bootstrap.version>
- <cloud-context.version>3.1.0</cloud-context.version>
- <cloud-commons.version>3.1.0</cloud-commons.version>
- <openfeign.version>3.1.0</openfeign.version>
- <loadbalancer.version>3.1.0</loadbalancer.version>
- <seata.version>1.4.2</seata.version>
- <netflix-ribbon.version>2.2.10.RELEASE</netflix-ribbon.version>
- <netflix-hystrix.version>2.2.10.RELEASE</netflix-hystrix.version>
- <netflix-zuul.version>2.2.10.RELEASE</netflix-zuul.version>
- </properties>
-
- <!-- 澹版槑渚濊禆涓嶅紩鍏� -->
<dependencyManagement>
<dependencies>
-
<dependency>
- <groupId>com.alibaba.cloud</groupId>
- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
- <version>${nacos-discovery.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/com.alibaba.cloud/spring-cloud-starter-alibaba-nacos-config -->
- <dependency>
- <groupId>com.alibaba.cloud</groupId>
- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
- <version>${nacos-config.version}</version>
- </dependency>
-
- <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-bootstrap -->
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-bootstrap</artifactId>
- <version>${bootstrap.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-context -->
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-context</artifactId>
- <version>${cloud-context.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-commons -->
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-commons</artifactId>
- <version>${cloud-commons.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-openfeign</artifactId>
- <version>${openfeign.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-loadbalancer</artifactId>
- <version>${loadbalancer.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/io.seata/seata-spring-boot-starter -->
- <dependency>
- <groupId>io.seata</groupId>
- <artifactId>seata-spring-boot-starter</artifactId>
- <version>${seata.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-netflix-zuul -->
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
- <version>${netflix-zuul.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-netflix-ribbon -->
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
- <version>${netflix-ribbon.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-netflix-hystrix -->
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
- <version>${netflix-hystrix.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.github.ulisesbocchio</groupId>
- <artifactId>jasypt-spring-boot-starter</artifactId>
- <version>${jasypt.version}</version>
- </dependency>
-
- <!-- https://mvnrepository.com/artifact/com.qcloud/cos_api -->
- <dependency>
- <groupId>com.qcloud</groupId>
- <artifactId>cos_api</artifactId>
- <version>${cos.version}</version>
- </dependency>
-
- <!-- mybatis鍒嗛〉 -->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper</artifactId>
- <version>${pagehelper.version}</version>
- </dependency>
-
- <!--鏂扮増mybatis鍒嗛〉鍒嗛〉-->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper-boot.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>${cglib.version}</version>
- </dependency>
-
- <!-- 鏁版嵁搴撹嚜鍔ㄧ敓鎴愯〃 -->
- <dependency>
- <groupId>com.gitee.sunchenbin.mybatis.actable</groupId>
- <artifactId>mybatis-enhance-actable</artifactId>
- <version>${mybatis.actable}</version>
- </dependency>
-
- <!--鍙戦�侀偖浠�-->
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>${mail.version}</version>
- </dependency>
-
- <!-- 浜岀淮鐮佹敮鎸佸寘 -->
- <dependency>
- <groupId>com.google.zxing</groupId>
- <artifactId>core</artifactId>
- <version>3.3.0</version>
- </dependency>
-
- <dependency>
- <groupId>net.glxn</groupId>
- <artifactId>qrgen</artifactId>
- <version>1.4</version>
- </dependency>
-
- <!-- https://mvnrepository.com/artifact/org.jdom/jdom -->
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
- <dependency>
- <groupId>org.dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>${dom4j.version}</version>
- </dependency>
-
- <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
-
-
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>java-jwt</artifactId>
- <version>${java.jwt.version}</version>
- </dependency>
- <dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>${jjwt.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
- </dependency>
-
- <!-- 瀛楃涓插伐鍏风被jar:StringUtils -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${orgApache.commons}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io}</version>
- </dependency>
-
- <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${jdk15on.version}</version>
- </dependency>
-
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>${jedis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- <version>${spring.redis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>jstl-api</artifactId>
- <version>${jstl.api.version}</version>
- </dependency>
- <dependency>
- <groupId>com.aliyun.oss</groupId>
- <artifactId>aliyun-sdk-oss</artifactId>
- <version>${oss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${mybatis.version}</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid</artifactId>
- <version>${druid.version}</version>
- </dependency>
-
- <!--鏁版嵁鐩戞帶骞冲彴-->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>${druid-boot.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>${fastjson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>${sfjson.version}</version>
- <classifier>jdk15</classifier>
- </dependency>
- <!-- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>${sfjson.version}</version>
- </dependency> -->
- <!-- https://mvnrepository.com/artifact/net.sourceforge.jexcelapi/jxl -->
- <dependency>
- <groupId>net.sourceforge.jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- <version>${net.sourceforge}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/com.belerweb/pinyin4j -->
- <dependency>
- <groupId>com.belerweb</groupId>
- <artifactId>pinyin4j</artifactId>
- <version>${pinyin4j}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons.lang.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ezmorph</groupId>
- <artifactId>ezmorph</artifactId>
- <version>${ezmorph.version}</version>
+ <groupId>com.hx.gitee</groupId>
+ <artifactId>hx-common</artifactId>
+ <version>jiayan</version>
</dependency>
</dependencies>
</dependencyManagement>
+
</project>
\ No newline at end of file
--
Gitblit v1.8.0