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

4.2.3

Browse Source
This commit is contained in:
tanghc
2020-12-09 18:11:31 +08:00
parent ced55fb3b2
commit 44e321720a
23 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog.md
View File

@@ -1,5 +1,9 @@
# changelog # changelog
## 4.2.3
- 修复nacos的group不生效问题
## 4.2.2 ## 4.2.2
- 优化版本号 - 优化版本号

6
doc/docs/files/90001_网关性能测试.md
View File

@@ -133,8 +133,8 @@ Transfer/sec: 226.50KB
`restart.sh` `restart.sh`
```bash ```bash
echo "Stopping sop-gateway-4.2.2-SNAPSHOT.jar" echo "Stopping sop-gateway-4.2.3-SNAPSHOT.jar"
pid=`ps -ef | grep sop-gateway-4.2.2-SNAPSHOT.jar | grep -v grep | awk '{print $2}'` pid=`ps -ef | grep sop-gateway-4.2.3-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
if [ -n "$pid" ] if [ -n "$pid" ]
then then
echo "kill -9 的id:" $pid echo "kill -9 的id:" $pid
@@ -142,7 +142,7 @@ then
fi fi
nohup java -jar -verbose:gc -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:gc.log \ nohup java -jar -verbose:gc -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:gc.log \
-XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=128m -Xms1024m -Xmx1024m -Xmn256m -Xss256k -XX:SurvivorRatio=8\ -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=128m -Xms1024m -Xmx1024m -Xmn256m -Xss256k -XX:SurvivorRatio=8\
-XX:+UseConcMarkSweepGC sop-gateway-4.2.2-SNAPSHOT.jar\ -XX:+UseConcMarkSweepGC sop-gateway-4.2.3-SNAPSHOT.jar\
--spring.profiles.active=dev --server.port=8081 & --spring.profiles.active=dev --server.port=8081 &
tail -f nohup.out tail -f nohup.out

2
doc/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>doc</artifactId> <artifactId>doc</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<properties> <properties>
<!-- Generic properties --> <!-- Generic properties -->

2
pom.xml
View File

@@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>一个开放平台解决方案项目，基于Spring Cloud实现，目标是能够让用户快速得搭建起自己的开放平台</description> <description>一个开放平台解决方案项目，基于Spring Cloud实现，目标是能够让用户快速得搭建起自己的开放平台</description>

4
sop-admin/pom.xml
View File

@@ -6,13 +6,13 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sop-admin</artifactId> <artifactId>sop-admin</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>

4
sop-admin/sop-admin-server/pom.xml
View File

@@ -5,13 +5,13 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sop-admin-server</artifactId> <artifactId>sop-admin-server</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>

2
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/RegistryServiceNacosImpl.java
View File

@@ -56,7 +56,7 @@ public class RegistryServiceNacosImpl implements RegistryService {
@Override @Override
public List<ServiceInfo> listAllService(int pageNo, int pageSize) throws Exception { public List<ServiceInfo> listAllService(int pageNo, int pageSize) throws Exception {
ListView<String> servicesOfServer = namingService.getServicesOfServer(pageNo, pageSize); ListView<String> servicesOfServer = namingService.getServicesOfServer(pageNo, pageSize, nacosGroup);
List<String> serverList = servicesOfServer.getData(); List<String> serverList = servicesOfServer.getData();
List<ServiceInfo> serviceInfoList = new ArrayList<>(); List<ServiceInfo> serviceInfoList = new ArrayList<>();
for (String serviceName : serverList) { for (String serviceName : serverList) {

6
sop-auth/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
@@ -25,7 +25,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
</dependency> </dependency>
<!-- sop相关配置 end--> <!-- sop相关配置 end-->
@@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sdk-java</artifactId> <artifactId>sdk-java</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
</dependency> </dependency>
<!-- http请求 --> <!-- http请求 -->
<dependency> <dependency>

2
sop-common/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>

6
sop-common/sop-bridge-eureka/pom.xml
View File

@@ -5,12 +5,12 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<artifactId>sop-bridge-eureka</artifactId> <artifactId>sop-bridge-eureka</artifactId>
@@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-gateway-common</artifactId> <artifactId>sop-gateway-common</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

6
sop-common/sop-bridge-nacos/pom.xml
View File

@@ -5,12 +5,12 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<artifactId>sop-bridge-nacos</artifactId> <artifactId>sop-bridge-nacos</artifactId>
@@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-gateway-common</artifactId> <artifactId>sop-gateway-common</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

2
sop-common/sop-bridge-nacos/src/main/java/com/gitee/sop/bridge/route/NacosRegistryListener.java
View File

@@ -85,7 +85,7 @@ public class NacosRegistryListener extends BaseRegistryListener {
NamingService namingService = nacosDiscoveryProperties.namingServiceInstance(); NamingService namingService = nacosDiscoveryProperties.namingServiceInstance();
ListView<String> servicesOfServer = null; ListView<String> servicesOfServer = null;
try { try {
servicesOfServer = namingService.getServicesOfServer(1, Integer.MAX_VALUE); servicesOfServer = namingService.getServicesOfServer(1, Integer.MAX_VALUE, nacosGroup);
} catch (NacosException e) { } catch (NacosException e) {
log.error("namingService.getServicesOfServer()错误", e); log.error("namingService.getServicesOfServer()错误", e);
} }

4
sop-common/sop-gateway-common/pom.xml
View File

@@ -5,13 +5,13 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sop-gateway-common</artifactId> <artifactId>sop-gateway-common</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>

4
sop-common/sop-service-common/pom.xml
View File

@@ -6,13 +6,13 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>

2
sop-example/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>

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

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
@@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
</dependency> </dependency>
<!-- nacos --> <!-- nacos -->
<dependency> <dependency>

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

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
@@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId> <artifactId>sop-service-common</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

4
sop-gateway/pom.xml
View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
@@ -24,7 +24,7 @@
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-bridge-nacos</artifactId> <artifactId>sop-bridge-nacos</artifactId>
<!-- <artifactId>sop-bridge-eureka</artifactId>--> <!-- <artifactId>sop-bridge-eureka</artifactId>-->
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

4
sop-sdk/pom.xml
View File

@@ -6,13 +6,13 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sop-sdk</artifactId> <artifactId>sop-sdk</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>

4
sop-sdk/sdk-java/pom.xml
View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sdk-java</artifactId> <artifactId>sdk-java</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<properties> <properties>
<!-- Generic properties --> <!-- Generic properties -->

2
sop-test/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>

4
sop-website/pom.xml
View File

@@ -6,13 +6,13 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId> <artifactId>sop-parent</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>sop-website</artifactId> <artifactId>sop-website</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>

4
sop-website/sop-website-server/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-website</artifactId> <artifactId>sop-website</artifactId>
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository --> <relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
@@ -25,7 +25,7 @@
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>sop-bridge-nacos</artifactId> <artifactId>sop-bridge-nacos</artifactId>
<!--<artifactId>sop-bridge-eureka</artifactId>--> <!--<artifactId>sop-bridge-eureka</artifactId>-->
<version>4.2.2-SNAPSHOT</version> <version>4.2.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>