7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 12:56:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 5.0

Browse Source 
# Conflicts:
#	doc/docs/files/10011_项目接入到SOP.md
#	pom.xml
#	sop-common/sop-bridge-nacos/pom.xml
#	sop-common/sop-service-common/pom.xml
This commit is contained in:
六如
2024-09-04 09:58:05 +08:00
parent 7f6b3a4309 0831ddd073
commit 5dd9c597a9
80 changed files with 443 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sop-example/sop-springmvc/pom.xml
View File

@@ -107,14 +107,7 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>1.9.5</version>
</dependency>
<!-- @Inject -->
<dependency>

2
sop-example/sop-springmvc/src/main/java/com/gitee/app/config/OpenServiceConfig.java
View File

@@ -4,7 +4,7 @@ import com.alibaba.nacos.api.annotation.NacosInjected;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.client.naming.utils.NetUtils;
import com.alibaba.nacos.api.utils.NetUtils;
import com.alibaba.nacos.spring.context.annotation.discovery.EnableNacosDiscovery;
import com.gitee.sop.servercommon.configuration.SpringmvcConfiguration;
import lombok.extern.slf4j.Slf4j;

12
sop-example/sop-story/pom.xml
View File

@@ -47,18 +47,12 @@
<!-- swagger2 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
<artifactId>springfox-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>1.9.6</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
<artifactId>knife4j-spring-boot-starter</artifactId>
</dependency>
<dependency>

1
sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/param/CategoryParam.java
View File

@@ -3,6 +3,7 @@ package com.gitee.sop.storyweb.controller.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data

3
sop-example/sop-story/src/main/resources/application.properties
View File

@@ -1 +1,2 @@
spring.profiles.active=dev
spring.profiles.active=dev
spring.mvc.pathmatch.matching-strategy=ant_path_matcher