From 4b1c23438473ecec176c3d68e2dd574bc3b67482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?=
 <806783409@qq.com>
Date: Mon, 1 Apr 2019 22:01:02 +0800
Subject: [PATCH] =?UTF-8?q?grpc=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../grpc/controller/GrpcDocController.java    |  8 ++++---
 .../src/main/resources/doc-grpc.html          | 24 +++++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/zyplayer-doc-grpc/src/main/java/com/zyplayer/doc/grpc/controller/GrpcDocController.java b/zyplayer-doc-grpc/src/main/java/com/zyplayer/doc/grpc/controller/GrpcDocController.java
index 69591d5e..126d5ddf 100644
--- a/zyplayer-doc-grpc/src/main/java/com/zyplayer/doc/grpc/controller/GrpcDocController.java
+++ b/zyplayer-doc-grpc/src/main/java/com/zyplayer/doc/grpc/controller/GrpcDocController.java
@@ -17,9 +17,11 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -151,7 +153,7 @@ public class GrpcDocController {
 	private ColumnInfo findColumnInfo(String paramType) {
 		ColumnInfo columnInfo = new ColumnInfo();
 		try {
-			String paramName = paramType.substring(3);
+			String paramName = paramType.substring(paramType.lastIndexOf(".") + 1);
 			columnInfo.setName(this.toLowerCaseFirstOne(paramName));
 			columnInfo.setType(paramType);
 			List<ColumnInfo> columnInfos = this.findClassColumns(Class.forName(paramType));
diff --git a/zyplayer-doc-grpc/src/main/resources/doc-grpc.html b/zyplayer-doc-grpc/src/main/resources/doc-grpc.html
index a22e245a..a9b04e19 100644
--- a/zyplayer-doc-grpc/src/main/resources/doc-grpc.html
+++ b/zyplayer-doc-grpc/src/main/resources/doc-grpc.html
@@ -173,7 +173,7 @@
 		},
 		mounted: function () {
 			// 无论发布在哪、如何修改源码，请勿删除本行原作者信息，感谢
-			console.log("%c项目信息：\n开发者列表：暮光：城中城\n项目地址：https://gitee.com/zyplayer/zyplayer-doc", "color:red");
+			console.log("%c项目信息：\n项目地址：https://gitee.com/zyplayer/zyplayer-doc", "color:red");
 			this.doGetServiceList();
 		},
 		methods: {
@@ -214,7 +214,7 @@
 				var resultColumn = app.columnMap[grpcInfo.resultType];
 				grpcInfo.method = method;
 				grpcInfo.function = path;
-				grpcInfo.paramColumn = paramColumn || {};
+				grpcInfo.paramColumn = this.columnToJsonString(paramColumn || {});
 				grpcInfo.resultColumn = resultColumn || {};
 				grpcInfo.docInfo = {};
 				// 清空再赋值才会重新渲染
@@ -229,8 +229,24 @@
 			},
 			columnToJsonString(columns){
 				var param = {};
-				param[columns.name] = columns.type;
-
+				if(!!columns.param && columns.param.length > 0) {
+					param[columns.name] = this.columnArrToJsonString(columns.param);
+				} else {
+					param[columns.name] = "";//columns.type;
+				}
+				return param;
+			},
+			columnArrToJsonString(columns) {
+				var param = {};
+				for (var i = 0; i < columns.length; i++) {
+					var item = columns[i];
+					if (!!item.param && item.param.length > 0) {
+						param[item.name] = this.columnArrToJsonString(item.param);
+					} else {
+						param[item.name] = "";//item.type;
+					}
+				}
+				return param;
 			},
 			reloadService(){
 				ajaxTemp("zyplayer-doc-dubbo/doc-dubbo/reloadService", "post", "json", {}, function (json) {