Merge branch 'dev' into test

@@ -14,6 +14,18 @@ info(
     group: common
     group: common
 )
 )
 service Core {
 service Core {
+    @doc "日志查询"
+    @handler commonGetLog
+    get /log/:module
+}
+
+// 通用接口
+@server(
+    prefix: v1
+    middleware: LogRequest
+    group: common
+)
+service Core {
     @doc "短信验证码"
     @doc "短信验证码"
     @handler commonSmsCode
     @handler commonSmsCode
     post /common/sms/code (CommonSmsCodeRequest) returns (CommonSmsCodeResposne)
     post /common/sms/code (CommonSmsCodeRequest) returns (CommonSmsCodeResposne)
@@ -22,10 +34,6 @@ service Core {
     @handler miniQrcodeInvite
     @handler miniQrcodeInvite
     post /mini/qrcode (MiniQrCodeRequest)
     post /mini/qrcode (MiniQrCodeRequest)
 
 
-    @doc "日志查询"
-    @handler commonGetLog
-    get /log/:module
-
     @doc "清理缓存"
     @doc "清理缓存"
     @handler commonGetClearCache
     @handler commonGetClearCache
     get /clear
     get /clear
@@ -44,7 +52,6 @@ type(
 type(
 type(
     MiniQrCodeRequest{
     MiniQrCodeRequest{
         Page string `json:"page"`    // 微信页面入口
         Page string `json:"page"`    // 微信页面入口
-        Path string `json:"path"`    //
         Scene string `json:"scene"`   // 参数
         Scene string `json:"scene"`   // 参数
     }
     }
 )
 )

@@ -22,6 +22,19 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	server.AddRoutes(
 	server.AddRoutes(
 		[]rest.Route{
 		[]rest.Route{
 			{
 			{
+				Method:  http.MethodGet,
+				Path:    "/log/:module",
+				Handler: common.CommonGetLogHandler(serverCtx),
+			},
+		},
+		rest.WithPrefix("/v1"),
+	)
+
+	server.AddRoutes(
+		rest.WithMiddlewares(
+			[]rest.Middleware{serverCtx.LogRequest},
+			[]rest.Route{
+				{
 					Method:  http.MethodPost,
 					Method:  http.MethodPost,
 					Path:    "/common/sms/code",
 					Path:    "/common/sms/code",
 					Handler: common.CommonSmsCodeHandler(serverCtx),
 					Handler: common.CommonSmsCodeHandler(serverCtx),
@@ -33,15 +46,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				},
 				},
 				{
 				{
 					Method:  http.MethodGet,
 					Method:  http.MethodGet,
-				Path:    "/log/:module",
-				Handler: common.CommonGetLogHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodGet,
 					Path:    "/clear",
 					Path:    "/clear",
 					Handler: common.CommonGetClearCacheHandler(serverCtx),
 					Handler: common.CommonGetClearCacheHandler(serverCtx),
 				},
 				},
-		},
+			}...,
+		),
 		rest.WithPrefix("/v1"),
 		rest.WithPrefix("/v1"),
 	)
 	)
 
 

@@ -10,7 +10,6 @@ type CommonSmsCodeResposne struct {
 
 
 type MiniQrCodeRequest struct {
 type MiniQrCodeRequest struct {
 	Page  string `json:"page"`  // 微信页面入口
 	Page  string `json:"page"`  // 微信页面入口
-	Path  string `json:"path"`  //
 	Scene string `json:"scene"` // 参数
 	Scene string `json:"scene"` // 参数
 }
 }