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

Merge branch 'master' into eureka

Browse Source
eureka
tanghc 5 years ago
parent 949b3ac902 eaecc720b3
commit 8c90c557c0
6 changed files with 53 additions and 40 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. 74
      doc/docs/_sidebar.md
  2. BIN
      doc/docs/files/images/10041_2.png
  3. 3
      doc/src/main/java/com/gitee/sop/doc/SidebarTest.java
  4. 7
      sop-admin/sop-admin-server/pom.xml
  5. 2
      sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/util/UploadUtil.java
  6. 7
      sop-gateway/pom.xml

74
doc/docs/_sidebar.md
Unescape View File

@ -1,39 +1,39 @@
* [首页](/?t=1582014833549) * [首页](/?t=1585023560679)
* 开发文档 * 开发文档
* [快速体验](files/10010_快速体验.md?t=1582014833552) * [快速体验](files/10010_快速体验.md?t=1585023560679)
* [项目接入到SOP](files/10011_项目接入到SOP.md?t=1582014833568) * [项目接入到SOP](files/10011_项目接入到SOP.md?t=1585023560697)
* [新增接口](files/10020_新增接口.md?t=1582014833568) * [新增接口](files/10020_新增接口.md?t=1585023560697)
* [开发流程](files/10021_开发流程.md?t=1582014833568) * [开发流程](files/10021_开发流程.md?t=1585023560697)
* [业务参数校验](files/10030_业务参数校验.md?t=1582014833568) * [业务参数校验](files/10030_业务参数校验.md?t=1585023560697)
* [错误处理](files/10040_错误处理.md?t=1582014833568) * [错误处理](files/10040_错误处理.md?t=1585023560697)
* [编写文档](files/10041_编写文档.md?t=1582014833569) * [编写文档](files/10041_编写文档.md?t=1585023560697)
* [接口交互详解](files/10050_接口交互详解.md?t=1582014833569) * [接口交互详解](files/10050_接口交互详解.md?t=1585023560697)
* [easyopen支持](files/10070_easyopen支持.md?t=1582014833569) * [easyopen支持](files/10070_easyopen支持.md?t=1585023560698)
* [使用签名校验工具](files/10080_使用签名校验工具.md?t=1582014833569) * [使用签名校验工具](files/10080_使用签名校验工具.md?t=1585023560698)
* [ISV管理](files/10085_ISV管理.md?t=1582014833569) * [ISV管理](files/10085_ISV管理.md?t=1585023560698)
* [自定义返回结果](files/10087_自定义返回结果.md?t=1582014833569) * [自定义返回结果](files/10087_自定义返回结果.md?t=1585023560698)
* [自定义过滤器](files/10088_自定义过滤器.md?t=1582014833569) * [自定义过滤器](files/10088_自定义过滤器.md?t=1585023560698)
* [自定义校验token](files/10089_自定义校验token.md?t=1582014833569) * [自定义校验token](files/10089_自定义校验token.md?t=1585023560698)
* [网关拦截器](files/10090_网关拦截器.md?t=1582014833570) * [网关拦截器](files/10090_网关拦截器.md?t=1585023560698)
* [路由授权](files/10090_路由授权.md?t=1582014833570) * [路由授权](files/10090_路由授权.md?t=1585023560698)
* [接口限流](files/10092_接口限流.md?t=1582014833570) * [接口限流](files/10092_接口限流.md?t=1585023560698)
* [监控日志](files/10093_监控日志.md?t=1582014833570) * [监控日志](files/10093_监控日志.md?t=1585023560699)
* [SDK开发](files/10095_SDK开发.md?t=1582014833570) * [SDK开发](files/10095_SDK开发.md?t=1585023560699)
* [使用SpringCloudGateway](files/10096_使用SpringCloudGateway.md?t=1582014833570) * [使用SpringCloudGateway](files/10096_使用SpringCloudGateway.md?t=1585023560699)
* [应用授权](files/10097_应用授权.md?t=1582014833570) * [应用授权](files/10097_应用授权.md?t=1585023560699)
* [提供restful接口](files/10100_提供restful接口.md?t=1582014833571) * [提供restful接口](files/10100_提供restful接口.md?t=1585023560699)
* [文件上传](files/10104_文件上传.md?t=1582014833571) * [文件上传](files/10104_文件上传.md?t=1585023560699)
* [配置Sleuth链路追踪](files/10109_配置Sleuth链路追踪.md?t=1582014833571) * [配置Sleuth链路追踪](files/10109_配置Sleuth链路追踪.md?t=1585023560699)
* [预发布灰度发布](files/10110_预发布灰度发布.md?t=1582014833571) * [预发布灰度发布](files/10110_预发布灰度发布.md?t=1585023560699)
* [动态修改请求参数](files/10111_动态修改请求参数.md?t=1582014833571) * [动态修改请求参数](files/10111_动态修改请求参数.md?t=1585023560699)
* [使用eureka](files/10112_使用eureka.md?t=1582014833571) * [使用eureka](files/10112_使用eureka.md?t=1585023560700)
* [扩展其它注册中心](files/10113_扩展其它注册中心.md?t=1582014833572) * [扩展其它注册中心](files/10113_扩展其它注册中心.md?t=1585023560700)
* 原理分析 * 原理分析
* [网关性能测试](files/90001_网关性能测试.md?t=1582014833572) * [网关性能测试](files/90001_网关性能测试.md?t=1585023560700)
* [原理分析之@ApiMapping](files/90010_原理分析之@ApiMapping.md?t=1582014833572) * [原理分析之@ApiMapping](files/90010_原理分析之@ApiMapping.md?t=1585023560700)
* [原理分析之如何存储路由](files/90011_原理分析之如何存储路由.md?t=1582014833572) * [原理分析之如何存储路由](files/90011_原理分析之如何存储路由.md?t=1585023560700)
* [原理分析之如何路由](files/90012_原理分析之如何路由.md?t=1582014833572) * [原理分析之如何路由](files/90012_原理分析之如何路由.md?t=1585023560700)
* [原理分析之文档归纳](files/90013_原理分析之文档归纳.md?t=1582014833572) * [原理分析之文档归纳](files/90013_原理分析之文档归纳.md?t=1585023560700)
* [原理分析之预发布灰度发布](files/90014_原理分析之预发布灰度发布.md?t=1582014833572) * [原理分析之预发布灰度发布](files/90014_原理分析之预发布灰度发布.md?t=1585023560700)
* [2.x升3.x注意事项](files/90099_2.x升3.x注意事项.md?t=1582014833572) * [2.x升3.x注意事项](files/90099_2.x升3.x注意事项.md?t=1585023560700)
* [常见问题](files/90100_常见问题.md?t=1582014833572) * [常见问题](files/90100_常见问题.md?t=1585023560700)

BIN
doc/docs/files/images/10041_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 853 KiB

3
doc/src/main/java/com/gitee/sop/doc/SidebarTest.java
Unescape View File

@ -52,6 +52,9 @@ public class SidebarTest {
output.append("* [首页](/?t=" + System.currentTimeMillis() + ")\n"); output.append("* [首页](/?t=" + System.currentTimeMillis() + ")\n");
for (Map.Entry<String, List<FileExt>> entry : menuMap.entrySet()) { for (Map.Entry<String, List<FileExt>> entry : menuMap.entrySet()) {
Menu menu = levelMap.get(entry.getKey()); Menu menu = levelMap.get(entry.getKey());
if (menu == null) {
continue;
}
output.append(menu.parentName); output.append(menu.parentName);
for (FileExt fileExt : entry.getValue()) { for (FileExt fileExt : entry.getValue()) {
String filename = fileExt.file.getName(); String filename = fileExt.file.getName();

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

@ -48,7 +48,7 @@
<dependency> <dependency>
<groupId>net.oschina.durcframework</groupId> <groupId>net.oschina.durcframework</groupId>
<artifactId>fastmybatis-spring-boot-starter</artifactId> <artifactId>fastmybatis-spring-boot-starter</artifactId>
<version>1.8.1</version> <version>1.8.6.1</version>
</dependency> </dependency>
<dependency> <dependency>
@ -108,6 +108,11 @@
<name>Spring Milestones</name> <name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url> <url>https://repo.spring.io/milestone</url>
</repository> </repository>
<repository>
<id>maven2</id>
<name>maven2</name>
<url>https://repo1.maven.org/maven2</url>
</repository>
</repositories> </repositories>
</project> </project>

2
sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/util/UploadUtil.java
Unescape View File

@ -32,7 +32,7 @@ public class UploadUtil {
fileMap = multiRequest.getFileMap(); fileMap = multiRequest.getFileMap();
} }
return Optional.ofNullable(fileMap) return Optional.ofNullable(fileMap)
.map(map -> map.values()) .map(Map::values)
.orElse(Collections.emptyList()); .orElse(Collections.emptyList());
} }
} }

7
sop-gateway/pom.xml
Unescape View File

@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>net.oschina.durcframework</groupId> <groupId>net.oschina.durcframework</groupId>
<artifactId>fastmybatis-spring-boot-starter</artifactId> <artifactId>fastmybatis-spring-boot-starter</artifactId>
<version>1.6.0</version> <version>1.8.6.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
@ -110,6 +110,11 @@
<name>Spring Milestones</name> <name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url> <url>https://repo.spring.io/milestone</url>
</repository> </repository>
<repository>
<id>maven2</id>
<name>maven2</name>
<url>https://repo1.maven.org/maven2</url>
</repository>
</repositories> </repositories>
</project> </project>

Write Preview
Loading…
Cancel
Save