Skip to content

I
isc-common
Commit 09157f01 by hulei
Options

修正resteasy依赖

parent 8d71de82
Showing with 29 additions and 58 deletions
isc-cloud-sdk/isc-sdk-dependencies/pom.xml
......@@ -30,14 +30,14 @@
<commons-lang3.version>3.3.2</commons-lang3.version>
<gson.json>2.8.5</gson.json>
<javax.persistence.version>2.2</javax.persistence.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<commons-text.version>1.9</commons-text.version>
<fastjson.version>1.2.72</fastjson.version>
<kryo5.version>5.3.0</kryo5.version>
<swift.version>2.0</swift.version>
<hutool.version>5.7.16</hutool.version>
<javassist.version>3.29.2-GA</javassist.version>
<swagger.version>3.0.0</swagger.version>
<!-- <swagger.version>3.0.0</swagger.version>-->
<swagger-annotations.version>1.5.20</swagger-annotations.version>
<mapstruct.version>1.4.1.Final</mapstruct.version>
......@@ -52,11 +52,11 @@
<netflix-hystrix.version>2.2.10.RELEASE</netflix-hystrix.version>
<bes.version>9.5.2.007</bes.version>
<jasypt-spring.version>3.0.2</jasypt-spring.version>
<httpcore.version></httpcore.version>
<pagehelper.version>1.4.6</pagehelper.version>
<feign-jaxrs.version>10.12</feign-jaxrs.version>
<!-- <feign-jaxrs.version>10.12</feign-jaxrs.version>-->
<jboss-jaxrs-api.version>2.0.1.Final</jboss-jaxrs-api.version>
<resteasy-jaxrs.version>3.15.1.Final</resteasy-jaxrs.version>
<!-- <resteasy-jaxrs.version>3.15.1.Final</resteasy-jaxrs.version>-->
<resteasy.version>4.1.1.Final</resteasy.version>
<jboss-ejb-api.version>1.0.0.Final</jboss-ejb-api.version>
<servlet-api.version>4.0.1</servlet-api.version>
......@@ -69,7 +69,6 @@
<oracle-driver.version>11.2.0.4</oracle-driver.version>
<mysql-driver.version>8.0.28</mysql-driver.version>
<dm-driver.version>8.1.2.192</dm-driver.version>
</properties>
<!-- 依赖声明 -->
......@@ -318,11 +317,11 @@
<artifactId>commons-collections</artifactId>
<version>${commons-collections.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-jaxrs</artifactId>
<version>${feign-jaxrs.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.github.openfeign</groupId>-->
<!-- <artifactId>feign-jaxrs</artifactId>-->
<!-- <version>${feign-jaxrs.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.2_spec</artifactId>
......@@ -360,11 +359,11 @@
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
<version>${jboss-jaxrs-api.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>${resteasy-jaxrs.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.jboss.resteasy</groupId>-->
<!-- <artifactId>resteasy-jaxrs</artifactId>-->
<!-- <version>${resteasy-jaxrs.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-spring-boot-starter</artifactId>
......
isc-cloud-sdk/isc-sdk-parent/pom.xml
......@@ -142,20 +142,20 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-jaxrs</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.github.openfeign</groupId>-->
<!-- <artifactId>feign-jaxrs</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
<version>2.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>3.15.1.Final</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.jboss.resteasy</groupId>-->
<!-- <artifactId>resteasy-jaxrs</artifactId>-->
<!-- <version>3.15.1.Final</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-loadbalancer</artifactId>
......
isc-common-service-bopset/pom.xml
......@@ -21,13 +21,6 @@
<artifactId>isc-common-service</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<version>3.0.0</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
......
isc-common-service-liaccv/pom.xml
......@@ -19,11 +19,6 @@
<artifactId>isc-common-service</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>
\ No newline at end of file
isc-common-service-public/src/main/java/com/brilliance/isc/common/ptspta/resource/PtsptaResource.java
......@@ -9,6 +9,9 @@ import com.brilliance.isc.common.vo.PtsptaVo;
import com.brilliance.isc.vo.BnmVo;
import com.brilliance.isc.vo.PtsptaQueryVo;
import com.brilliance.isc.vo.ResponseSet;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -22,6 +25,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import java.util.Map;
@ConditionalOnExpression("${beans.ptspta.disabled:false} == false")
@RestController
@RequestMapping("/ptspta")
public class PtsptaResource {
......
isc-common-service-setmod/pom.xml
......@@ -18,13 +18,6 @@
<groupId>com.brilliance.isc</groupId>
<artifactId>isc-common-service</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
......
isc-common-service-task/pom.xml
......@@ -23,11 +23,7 @@
<artifactId>isc-common-service</artifactId>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
......
isc-common-service-trndia/pom.xml
......@@ -19,13 +19,6 @@
<artifactId>isc-common-service</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<version>3.0.0</version>
<optional>true</optional>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment