diff --git a/Proto/RpcServer/gen/service_user.swagger.json b/Proto/RpcServer/gen/api.swagger.json
similarity index 80%
rename from Proto/RpcServer/gen/service_user.swagger.json
rename to Proto/RpcServer/gen/api.swagger.json
index 790f1fa..3fb2d67 100644
--- a/Proto/RpcServer/gen/service_user.swagger.json
+++ b/Proto/RpcServer/gen/api.swagger.json
@@ -1,10 +1,16 @@
 {
   "swagger": "2.0",
   "info": {
-    "title": "service_user.proto",
+    "title": "rs_common.proto",
     "version": "version not set"
   },
   "tags": [
+    {
+      "name": "Gateway"
+    },
+    {
+      "name": "Scene"
+    },
     {
       "name": "User"
     }
@@ -26,12 +32,6 @@
             "schema": {
               "$ref": "#/definitions/AnswerQuestionResp"
             }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
           }
         },
         "parameters": [
@@ -59,12 +59,6 @@
             "schema": {
               "$ref": "#/definitions/GenerateQuestionResp"
             }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
           }
         },
         "parameters": [
@@ -92,12 +86,6 @@
             "schema": {
               "$ref": "#/definitions/GetQuestionResp"
             }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
           }
         },
         "parameters": [
@@ -125,12 +113,6 @@
             "schema": {
               "$ref": "#/definitions/GetUserInfoResp"
             }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
           }
         },
         "parameters": [
@@ -150,6 +132,9 @@
     }
   },
   "definitions": {
+    "ActionResp": {
+      "type": "object"
+    },
     "AnswerQuestionReq": {
       "type": "object",
       "properties": {
@@ -177,6 +162,29 @@
         }
       }
     },
+    "EnterResp": {
+      "type": "object",
+      "properties": {
+        "SceneSID": {
+          "type": "string",
+          "title": "场景服务ID"
+        },
+        "UniqueNo": {
+          "type": "string",
+          "title": "副本唯一编号"
+        },
+        "MessageID": {
+          "type": "integer",
+          "format": "int32",
+          "title": "发送给客户端的消息ID"
+        },
+        "Payload": {
+          "type": "string",
+          "format": "byte",
+          "title": "消息负载"
+        }
+      }
+    },
     "GenerateQuestionReq": {
       "type": "object",
       "properties": {
@@ -239,6 +247,12 @@
         }
       }
     },
+    "KickUserResp": {
+      "type": "object"
+    },
+    "LeaveResp": {
+      "type": "object"
+    },
     "LoginResp": {
       "type": "object",
       "properties": {
@@ -252,33 +266,8 @@
         }
       }
     },
-    "protobufAny": {
-      "type": "object",
-      "properties": {
-        "@type": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": {}
-    },
-    "rpcStatus": {
-      "type": "object",
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "message": {
-          "type": "string"
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/protobufAny"
-          }
-        }
-      }
+    "ToClientResp": {
+      "type": "object"
     }
   }
 }
diff --git a/Proto/RpcServer/gen/rs_common.swagger.json b/Proto/RpcServer/gen/rs_common.swagger.json
deleted file mode 100644
index be9cdd4..0000000
--- a/Proto/RpcServer/gen/rs_common.swagger.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "rs_common.proto",
-    "version": "version not set"
-  },
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {},
-  "definitions": {
-    "protobufAny": {
-      "type": "object",
-      "properties": {
-        "@type": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": {}
-    },
-    "rpcStatus": {
-      "type": "object",
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "message": {
-          "type": "string"
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/protobufAny"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/Proto/RpcServer/gen/service_gateway.swagger.json b/Proto/RpcServer/gen/service_gateway.swagger.json
deleted file mode 100644
index 9efed40..0000000
--- a/Proto/RpcServer/gen/service_gateway.swagger.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "service_gateway.proto",
-    "version": "version not set"
-  },
-  "tags": [
-    {
-      "name": "Gateway"
-    }
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {},
-  "definitions": {
-    "KickUserResp": {
-      "type": "object"
-    },
-    "ToClientResp": {
-      "type": "object"
-    },
-    "protobufAny": {
-      "type": "object",
-      "properties": {
-        "@type": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": {}
-    },
-    "rpcStatus": {
-      "type": "object",
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "message": {
-          "type": "string"
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/protobufAny"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/Proto/RpcServer/gen/service_scene.swagger.json b/Proto/RpcServer/gen/service_scene.swagger.json
deleted file mode 100644
index 5e4e7e6..0000000
--- a/Proto/RpcServer/gen/service_scene.swagger.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "service_scene.proto",
-    "version": "version not set"
-  },
-  "tags": [
-    {
-      "name": "Scene"
-    }
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {},
-  "definitions": {
-    "ActionResp": {
-      "type": "object"
-    },
-    "EnterResp": {
-      "type": "object",
-      "properties": {
-        "SceneSID": {
-          "type": "string",
-          "title": "场景服务ID"
-        },
-        "UniqueNo": {
-          "type": "string",
-          "title": "副本唯一编号"
-        },
-        "MessageID": {
-          "type": "integer",
-          "format": "int32",
-          "title": "发送给客户端的消息ID"
-        },
-        "Payload": {
-          "type": "string",
-          "format": "byte",
-          "title": "消息负载"
-        }
-      }
-    },
-    "LeaveResp": {
-      "type": "object"
-    },
-    "protobufAny": {
-      "type": "object",
-      "properties": {
-        "@type": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": {}
-    },
-    "rpcStatus": {
-      "type": "object",
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "message": {
-          "type": "string"
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/protobufAny"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/Proto/RpcServer/gen_proto.ps1 b/Proto/RpcServer/gen_proto.ps1
index d62d129..3ca2866 100644
--- a/Proto/RpcServer/gen_proto.ps1
+++ b/Proto/RpcServer/gen_proto.ps1
@@ -9,4 +9,5 @@ protoc `
     --go-grpc_out=$gen `
     --grpc-gateway_out=$gen `
     --openapiv2_out=$gen `
+    --openapiv2_opt=allow_merge=true,merge_file_name=api,disable_default_errors=true `
     $files
\ No newline at end of file