Bug fix in RK TV

rookie-ninja · Nov 26, 2021 · 560cc44 · 560cc44
1 parent 29940d2
commit 560cc44
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/boot/assets/tv/apis.tmpl b/boot/assets/tv/apis.tmpl
@@ -17,7 +17,7 @@
         <div>
           <svg class="icon gdoc_path hidden-mobile"><use xlink:href="#gdoc_path"></use></svg>
           <ol class="breadcrumb">
-            <li><a href="/v1/rk/tv/application"><span>Application</span></a></li>
+            <li><a href="/rk/v1/tv/application"><span>Application</span></a></li>
             <li>/</li>
             <li><span itemprop="name">API</span></li>
           </ol>

diff --git a/boot/assets/tv/deps.tmpl b/boot/assets/tv/deps.tmpl
@@ -17,7 +17,7 @@
         <div>
           <svg class="icon gdoc_path hidden-mobile"><use xlink:href="#gdoc_path"></use></svg>
           <ol class="breadcrumb">
-            <li><a href="/v1/rk/tv/application"><span>Application</span></a></li>
+            <li><a href="/rk/v1/tv/application"><span>Application</span></a></li>
             <li>/</li>
             <li><span itemprop="name">Dependency</span></li>
           </ol>

diff --git a/boot/assets/tv/error-mapping.tmpl b/boot/assets/tv/error-mapping.tmpl
@@ -17,7 +17,7 @@
         <div>
           <svg class="icon gdoc_path hidden-mobile"><use xlink:href="#gdoc_path"></use></svg>
           <ol class="breadcrumb">
-            <li><a href="/v1/rk/tv/application"><span>Application</span></a></li>
+            <li><a href="/rk/v1/tv/application"><span>Application</span></a></li>
             <li>/</li>
             <li><span itemprop="name">Error Mapping</span></li>
           </ol>

diff --git a/boot/assets/tv/js/marked.min.js b/boot/assets/tv/js/marked.min.js
diff --git a/boot/assets/tv/license.tmpl b/boot/assets/tv/license.tmpl
@@ -17,7 +17,7 @@
         <div>
           <svg class="icon gdoc_path hidden-mobile"><use xlink:href="#gdoc_path"></use></svg>
           <ol class="breadcrumb">
-            <li><a href="/v1/rk/tv/application"><span>Application</span></a></li>
+            <li><a href="/rk/v1/tv/application"><span>Application</span></a></li>
             <li>/</li>
             <li><span itemprop="name">License</span></li>
           </ol>

diff --git a/boot/assets/tv/overview.tmpl b/boot/assets/tv/overview.tmpl
@@ -19,7 +19,7 @@
         <div>
           <svg class="icon gdoc_path hidden-mobile"><use xlink:href="#gdoc_path"></use></svg>
           <ol class="breadcrumb">
-            <li><a href="/v1/rk/tv/application"><span>Application</span></a></li>
+            <li><a href="/rk/v1/tv/application"><span>Application</span></a></li>
             <li>/</li>
             <li><span itemprop="name">Readme</span></li>
           </ol>
@@ -32,7 +32,7 @@
           <div class="highlight" id="readme">
             <script>
               document.getElementById('readme').innerHTML =
-              marked('{{ .Readme }}');
+              marked.parse('{{ .Readme }}');
             </script>
           </div>
         </div>

diff --git a/boot/echo_entry.go b/boot/echo_entry.go
@@ -652,9 +652,6 @@ func RegisterEchoEntry(opts ...EchoEntryOption) *EchoEntry {
 		entry.Echo.HideBanner = true
 	}
 
-	// Default interceptor should be at front
-	entry.Echo.Use(entry.Interceptors...)
-
 	rkentry.GlobalAppCtx.AddEntry(entry)
 
 	return entry
@@ -730,6 +727,9 @@ func (entry *EchoEntry) Bootstrap(ctx context.Context) {
 		entry.TvEntry.Bootstrap(ctx)
 	}
 
+	// Default interceptor should be at front
+	entry.Echo.Use(entry.Interceptors...)
+
 	logger.Info("Bootstrapping EchoEntry.", event.ListPayloads()...)
 	go func(echoEntry *EchoEntry) {
 		if entry.Echo != nil {

diff --git a/boot/pkged.go b/boot/pkged.go
diff --git a/example/interceptor/log/README.md b/example/interceptor/log/README.md
@@ -44,7 +44,7 @@ As soon as user function returns, interceptor will write the event into files.
 
 | Name | Default | Description |
 | ---- | ---- | ---- |
-| WithEntryNameAndType(entryName, entryType string) | entryName=grpc, entryType=grpc | entryName and entryType will be used to distinguish options if there are multiple interceptors in single process. |
+| WithEntryNameAndType(entryName, entryType string) | entryName=gf, entryType=gf | entryName and entryType will be used to distinguish options if there are multiple interceptors in single process. |
 | WithZapLoggerEntry(zapLoggerEntry *rkentry.ZapLoggerEntry) | [rkentry.GlobalAppCtx.GetZapLoggerEntryDefault()](https://github.com/rookie-ninja/rk-entry/blob/master/entry/context.go) | Zap logger would print to stdout with console encoding type. |
 | WithEventLoggerEntry(eventLoggerEntry *rkentry.EventLoggerEntry) | [rkentry.GlobalAppCtx.GetEventLoggerEntryDefault()](https://github.com/rookie-ninja/rk-entry/blob/master/entry/context.go) | Event logger would print to stdout with console encoding type. |
 | WithZapLoggerEncoding(ec int) | rkecholog.ENCODING_CONSOLE | rkecholog.ENCODING_CONSOLE and rkecholog.ENCODING_JSON are available options. |

diff --git a/example/interceptor/meta/README.md b/example/interceptor/meta/README.md
@@ -63,7 +63,7 @@ Meta interceptor is only available on server side. The interceptor will send bel
 
 | Name | Description | Default Values |
 | ---- | ---- | ---- |
-| rkechometa.WithEntryNameAndType(entryName, entryType string) | Provide entry name and type if there are multiple meta interceptors needs to be used. | gin, gin |
+| rkechometa.WithEntryNameAndType(entryName, entryType string) | Provide entry name and type if there are multiple meta interceptors needs to be used. | echo, echo |
 | rkechometa.WithPrefix(prefix string) | Provide prefix of meta header | RK |
 
 ```go
@@ -150,7 +150,7 @@ func main() {
     rkentry.GlobalAppCtx.GetAppInfoEntry().AppName = "demo-app"
     rkentry.GlobalAppCtx.GetAppInfoEntry().Version = "demo-version"
 
-    // 1: Create gin server
+    // 1: Create echo server
     server := startGreeterServer(opts...)
     ...
 }

diff --git a/example/interceptor/ratelimit/README.md b/example/interceptor/ratelimit/README.md
@@ -48,12 +48,12 @@ import     "github.com/rookie-ninja/rk-echo/interceptor/ratelimit"
 ## Options
 | Name | Default | Description |
 | ---- | ---- | ---- |
-| WithEntryNameAndType(entryName, entryType string) | entryName=grpc, entryType=grpc | entryName and entryType will be used to distinguish options if there are multiple interceptors in single process. |
+| WithEntryNameAndType(entryName, entryType string) | entryName=gf, entryType=gf | entryName and entryType will be used to distinguish options if there are multiple interceptors in single process. |
 | WithReqPerSec(int) | int | Global rate limit per second. |
-| WithReqPerSecByPath(path string, reqPerSec int) | "", 0 | Request limiter by gRPC method. |
+| WithReqPerSecByPath(path string, reqPerSec int) | "", 0 | Request limiter by Restful method. |
 | WithAlgorithm(algo string) | tokenBucket | Algorithm of rate limiter. |
 | WithGlobalLimiter(l Limiter) | nil | Provider user defined limiter. |
-| WithLimiterByPath(path string, l Limiter) | "", nil | Provider user defined limiter by gRPC method. |
+| WithLimiterByPath(path string, l Limiter) | "", nil | Provider user defined limiter by Restful method. |
 
 ```go
 	// ********************************************