k
/
SOP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into eureka

Browse Source 
# Conflicts:
#	sop-gateway/pom.xml
#	sop-website/sop-website-server/pom.xml
eureka
tanghc 4 years ago
parent 72ced304ad 1ff4303d2f
commit e416080de4
21 changed files with 43 additions and 46 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      changelog.md
  2. 6
      doc/docs/files/90001_网关性能测试.md
  3. 2
      doc/pom.xml
  4. 9
      pom.xml
  5. 4
      sop-admin/pom.xml
  6. 4
      sop-admin/sop-admin-server/pom.xml
  7. 6
      sop-auth/pom.xml
  8. 2
      sop-common/pom.xml
  9. 6
      sop-common/sop-bridge-eureka/pom.xml
  10. 6
      sop-common/sop-bridge-nacos/pom.xml
  11. 4
      sop-common/sop-gateway-common/pom.xml
  12. 4
      sop-common/sop-service-common/pom.xml
  13. 2
      sop-example/pom.xml
  14. 4
      sop-example/sop-springmvc/pom.xml
  15. 4
      sop-example/sop-story/pom.xml
  16. 4
      sop-gateway/pom.xml
  17. 4
      sop-sdk/pom.xml
  18. 4
      sop-sdk/sdk-java/pom.xml
  19. 2
      sop-test/pom.xml
  20. 4
      sop-website/pom.xml
  21. 4
      sop-website/sop-website-server/pom.xml

4
changelog.md
Unescape View File

@ -1,5 +1,9 @@
# changelog
## 4.2.4
- 修复sop-auth模块启动失败问题
## 4.2.3
- 修复nacos的group不生效问题

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

@ -133,8 +133,8 @@ Transfer/sec: 226.50KB
`restart.sh`
```bash
echo "Stopping sop-gateway-4.2.3-SNAPSHOT.jar"
pid=`ps -ef | grep sop-gateway-4.2.3-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
echo "Stopping sop-gateway-4.2.4-SNAPSHOT.jar"
pid=`ps -ef | grep sop-gateway-4.2.4-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
if [ -n "$pid" ]
then
echo "kill -9 的id:" $pid
@ -142,7 +142,7 @@ then
fi
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:+UseConcMarkSweepGC sop-gateway-4.2.3-SNAPSHOT.jar\
-XX:+UseConcMarkSweepGC sop-gateway-4.2.4-SNAPSHOT.jar\
--spring.profiles.active=dev --server.port=8081 &
tail -f nohup.out

2
doc/pom.xml
Unescape View File

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

9
pom.xml
Unescape View File

@ -12,7 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-parent</artifactId>
<version>4.2.3-SNAPSHOT</version>
<version>4.2.4-SNAPSHOT</version>
<packaging>pom</packaging>
<description>一个开放平台解决方案项目，基于Spring Cloud实现，目标是能够让用户快速得搭建起自己的开放平台</description>
@ -60,7 +60,6 @@
<validation-api.version>2.0.1.Final</validation-api.version>
<hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
<fastmybatis.version>1.9.1</fastmybatis.version>
<spring-data-redis.version>2.3.0.RELEASE</spring-data-redis.version>
<guava.version>29.0-jre</guava.version>
<swagger.version>1.5.21</swagger.version>
<springfox-spring-web.version>2.9.2</springfox-spring-web.version>
@ -164,12 +163,6 @@
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>${spring-data-redis.version}</version>
</dependency>
<!-- commons -->
<dependency>
<groupId>org.apache.commons</groupId>

4
sop-admin/pom.xml
Unescape View File

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

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

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

6
sop-auth/pom.xml
Unescape View File

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

2
sop-common/pom.xml
Unescape View File

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

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

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

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

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

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

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

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

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

2
sop-example/pom.xml
Unescape View File

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

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

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

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

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

4
sop-gateway/pom.xml
Unescape View File

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

4
sop-sdk/pom.xml
Unescape View File

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

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

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

2
sop-test/pom.xml
Unescape View File

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

4
sop-website/pom.xml
Unescape View File

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

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

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

Write Preview
Loading…
Cancel
Save