修复BaseURL与接口相对路径问题

core-lib · Aug 26, 2019 · 87b8cba · 87b8cba
1 parent c79af0b
commit 87b8cba
Show file tree

Hide file tree

Showing 24 changed files with 55 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # HttpDoc [![](https://www.jitpack.io/v/core-lib/httpdoc.svg)](https://www.jitpack.io/#core-lib/httpdoc)
 ##### 基于Java标准doc注释构建的代码零侵入的HTTP RESTful API在线测试，文档阅览以及SDK导出框架，支持Spring-Boot和Spring-MVC
-JSON-Editor: [httpdoc-ui](http://106.13.16.25:8080/httpdoc-sample-v1.7.8/httpdoc-ui/index.html) TextArea: [httpdoc-ui-v1](http://106.13.16.25:8080/httpdoc-sample-v1.7.8/httpdoc-ui-v1/index.html)
+JSON-Editor: [httpdoc-ui](http://106.13.16.25:8080/httpdoc-sample-v1.7.9/httpdoc-ui/index.html) TextArea: [httpdoc-ui-v1](http://106.13.16.25:8080/httpdoc-sample-v1.7.9/httpdoc-ui-v1/index.html)
 
 ## 功能特性
 * 基础功能无需为配合HttpDoc框架而多写一句代码，甚至连doc注释都不必写，即可拥有项目的API文档和测试界面。
@@ -31,7 +31,7 @@ JDK 1.7 +
         <dependency>
             <groupId>com.github.core-lib.httpdoc</groupId>
             <artifactId>httpdoc-spring-mvc</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
 
         <!-- 添加JDK的tools.jar依赖用于解析源码注释，采用这种方式部署到Tomcat时需要往Tomcat的lib目录增加该tools.jar -->
@@ -131,7 +131,7 @@ JDK 1.7 +
     <dependency>
       <groupId>com.github.core-lib.httpdoc</groupId>
       <artifactId>httpdoc-spring-boot</artifactId>
-      <version>v1.7.8</version>
+      <version>v1.7.9</version>
     </dependency>
     ```
     ```java
@@ -166,9 +166,11 @@ JDK 1.7 +
 | serializer   | 文档序列化器| JSON序列化器，所以项目中需要依赖jackson-databind |
 
 ## 在线示例
-项目中的httpdoc-sample模块就是一个HttpDoc + SpringMVC的一个标准示例，可checkout后查看源码和编译运行查看效果，也可立即预览：JSON-Editor: [httpdoc-ui](http://106.13.16.25:8080/httpdoc-sample-v1.7.8/httpdoc-ui/index.html) TextArea: [httpdoc-ui-v1](http://106.13.16.25:8080/httpdoc-sample-v1.7.8/httpdoc-ui-v1/index.html)
+项目中的httpdoc-sample模块就是一个HttpDoc + SpringMVC的一个标准示例，可checkout后查看源码和编译运行查看效果，也可立即预览：JSON-Editor: [httpdoc-ui](http://106.13.16.25:8080/httpdoc-sample-v1.7.9/httpdoc-ui/index.html) TextArea: [httpdoc-ui-v1](http://106.13.16.25:8080/httpdoc-sample-v1.7.9/httpdoc-ui-v1/index.html)
 
 ## 变更记录
+* v1.7.9
+    * 修复BaseURL与接口相对路径问题
 * v1.7.8
     * UI 默认采用 grid 方式展示API参数
 * v1.7.7

diff --git a/httpdoc-core/pom.xml b/httpdoc-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/httpdoc-gson/pom.xml b/httpdoc-gson/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-core</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/httpdoc-jackson/pom.xml b/httpdoc-jackson/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-core</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>

diff --git a/httpdoc-jestful-client/pom.xml b/httpdoc-jestful-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-core</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
 
         <dependency>

diff --git a/httpdoc-jestful-client/src/main/resources/httpdoc-sdk/jestful-sdk/pom.xml b/httpdoc-jestful-client/src/main/resources/httpdoc-sdk/jestful-sdk/pom.xml
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>com.github.core-lib.httpdoc</groupId>
             <artifactId>httpdoc-jestful-client</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.core-lib.httpdoc</groupId>
             <artifactId>httpdoc-jackson</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/httpdoc-jestful-server/pom.xml b/httpdoc-jestful-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-web</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
         <dependency>
             <groupId>com.github.core-lib.jestful</groupId>

diff --git a/httpdoc-nutz/pom.xml b/httpdoc-nutz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-web</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
         <dependency>
             <groupId>org.nutz</groupId>

diff --git a/httpdoc-objc/pom.xml b/httpdoc-objc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-core</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
     </dependencies>
 

diff --git a/httpdoc-objc/src/main/java/io/httpdoc/objc/ObjCRSNetworkingGenerator.java b/httpdoc-objc/src/main/java/io/httpdoc/objc/ObjCRSNetworkingGenerator.java
@@ -177,7 +177,6 @@ protected Collection<ObjCSelectorFragment> generate(OperationGenerateContext con
         selector.setResultFragment(call);
         selector.setName(operation.getName());
         Generation generation = context.getGeneration();
-        Document document = context.getDocument();
         Controller controller = context.getController();
         List<Parameter> parameters = operation.getParameters() != null ? operation.getParameters() : Collections.<Parameter>emptyList();
         Collection<ObjCParameterFragment> fragments = generate(new ParameterGenerateContext(generation, controller, operation, parameters));
@@ -206,12 +205,15 @@ protected Collection<ObjCSelectorFragment> generate(OperationGenerateContext con
         selector.getParameterFragments().add(success);
 
         StringBuilder builder = new StringBuilder();
-        List<String> segments = Arrays.asList(document.getContext(), controller.getPath(), operation.getPath());
+        List<String> segments = Arrays.asList(controller.getPath(), operation.getPath());
         for (String segment : segments) {
             if (segment == null) continue;
             builder.append("/").append(segment);
         }
         String uri = builder.toString().replaceAll("/+", "/");
+        while (uri.startsWith("/")) {
+            uri = uri.substring(1);
+        }
         String method = operation.getMethod();
 
         selector.addSentence("RSInvocation *invocation = [RSInvocation " + method.toUpperCase() + ":@\"" + uri + "\"];", RSInvocation.class);

diff --git a/httpdoc-retrofit/pom.xml b/httpdoc-retrofit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-core</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
 
         <dependency>

diff --git a/httpdoc-retrofit/src/main/java/io/httpdoc/retrofit/RetrofitAbstractGenerator.java b/httpdoc-retrofit/src/main/java/io/httpdoc/retrofit/RetrofitAbstractGenerator.java
@@ -203,12 +203,15 @@ protected Collection<HDAnnotation> annotate(Document document, Controller contro
         }
 
         StringBuilder builder = new StringBuilder();
-        List<String> segments = Arrays.asList(document.getContext(), controller.getPath(), operation.getPath());
+        List<String> segments = Arrays.asList(controller.getPath(), operation.getPath());
         for (String segment : segments) {
             if (segment == null) continue;
             builder.append("/").append(segment);
         }
         String path = builder.toString().replaceAll("/+", "/");
+        while (path.startsWith("/")) {
+            path = path.substring(1);
+        }
 
         switch (operation.getMethod()) {
             case "HEAD": {

diff --git a/httpdoc-retrofit/src/main/resources/httpdoc-sdk/retrofit-sdk/pom.xml b/httpdoc-retrofit/src/main/resources/httpdoc-sdk/retrofit-sdk/pom.xml
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>com.github.core-lib.httpdoc</groupId>
             <artifactId>httpdoc-retrofit</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.core-lib.httpdoc</groupId>
             <artifactId>httpdoc-jackson</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/httpdoc-retrofit2/pom.xml b/httpdoc-retrofit2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-core</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
 
         <dependency>

diff --git a/httpdoc-retrofit2/src/main/java/io/httpdoc/retrofit2/Retrofit2AbstractGenerator.java b/httpdoc-retrofit2/src/main/java/io/httpdoc/retrofit2/Retrofit2AbstractGenerator.java
@@ -206,12 +206,15 @@ protected Collection<HDAnnotation> annotate(Document document, Controller contro
         }
 
         StringBuilder builder = new StringBuilder();
-        List<String> segments = Arrays.asList(document.getContext(), controller.getPath(), operation.getPath());
+        List<String> segments = Arrays.asList(controller.getPath(), operation.getPath());
         for (String segment : segments) {
             if (segment == null) continue;
             builder.append("/").append(segment);
         }
         String path = builder.toString().replaceAll("/+", "/");
+        while (path.startsWith("/")) {
+            path = path.substring(1);
+        }
 
         switch (operation.getMethod()) {
             case "HEAD": {

diff --git a/httpdoc-retrofit2/src/main/resources/httpdoc-sdk/retrofit2-sdk/pom.xml b/httpdoc-retrofit2/src/main/resources/httpdoc-sdk/retrofit2-sdk/pom.xml
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>com.github.core-lib.httpdoc</groupId>
             <artifactId>httpdoc-retrofit2</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.core-lib.httpdoc</groupId>
             <artifactId>httpdoc-jackson</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/httpdoc-sample/pom.xml b/httpdoc-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
     <properties>
         <spring.version>4.3.9.RELEASE</spring.version>
         <jackson.version>2.9.5</jackson.version>
-        <httpdoc.version>v1.7.8</httpdoc.version>
+        <httpdoc.version>v1.7.9</httpdoc.version>
     </properties>
 
     <dependencies>

diff --git a/httpdoc-spring-boot/pom.xml b/httpdoc-spring-boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-spring-mvc</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
     </dependencies>
 

diff --git a/httpdoc-spring-mvc/pom.xml b/httpdoc-spring-mvc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>io.httpdoc</groupId>
             <artifactId>httpdoc-web</artifactId>
-            <version>v1.7.8</version>
+            <version>v1.7.9</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/httpdoc-ui/pom.xml b/httpdoc-ui/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>httpdoc</artifactId>
         <groupId>io.httpdoc</groupId>
-        <version>v1.7.8</version>
+        <version>v1.7.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/httpdoc-ui/src/main/resources/META-INF/resources/httpdoc-ui-v1/index.html b/httpdoc-ui/src/main/resources/META-INF/resources/httpdoc-ui-v1/index.html
@@ -15,7 +15,7 @@
             <div class="navbar-header">
                 <a class="navbar-brand" href="https://github.com/core-lib/httpdoc" target="_blank">
                     HttpDoc UI
-                    <span class="badge">v1.7.8</span>
+                    <span class="badge">v1.7.9</span>
                 </a>
             </div>
         </div>

diff --git a/httpdoc-ui/src/main/resources/META-INF/resources/httpdoc-ui/index.html b/httpdoc-ui/src/main/resources/META-INF/resources/httpdoc-ui/index.html
@@ -15,7 +15,7 @@
             <div class="navbar-header">
                 <a class="navbar-brand" href="https://github.com/core-lib/httpdoc" target="_blank">
                     HttpDoc UI
-                    <span class="badge">v1.7.8</span>
+                    <span class="badge">v1.7.9</span>
                 </a>
             </div>
         </div>