From db2523a95f33b92d7aa86e802d2b71d5290fbe79 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 2 Aug 2019 13:46:51 +0800
Subject: [PATCH] =?UTF-8?q?web=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/solr/index.py   | 16 ++++++++++++++--
 plugins/solr/js/solr.js |  5 +++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/plugins/solr/index.py b/plugins/solr/index.py
index 255f19155..5a54012cf 100755
--- a/plugins/solr/index.py
+++ b/plugins/solr/index.py
@@ -165,7 +165,8 @@ def initdUinstall():
 def collectionList():
     path = getServerDir() + '/server/solr'
     listDir = os.listdir(path)
-    data = []
+    data = {}
+    dlist = []
     for dirname in listDir:
         dirpath = path + '/' + dirname
         if not os.path.isdir(dirpath):
@@ -175,7 +176,18 @@ def collectionList():
 
         tmp = {}
         tmp['name'] = dirname
-        data.append(tmp)
+        dlist.append(tmp)
+    data['list'] = dlist
+    data['ip'] = public.getLocalIp()
+    data['port'] = '8983'
+
+    content = public.readFile(path+'/solr.xml')
+
+    rep = "jetty.port:(.*)\}</int>"
+    tmp = re.search(rep, content)
+    port = tmp.groups()[0]
+    data['port'] = port
+
     return public.returnJson(True, 'OK', data)
 
 
diff --git a/plugins/solr/js/solr.js b/plugins/solr/js/solr.js
index 449936cff..b9c7556df 100755
--- a/plugins/solr/js/solr.js
+++ b/plugins/solr/js/solr.js
@@ -45,12 +45,12 @@ function collectionManagement(){
 			return;
 		}
 
-		var list = rdata.data;
+		var list = rdata.data.list;
 		var con = '';
         con += '<div class="divtable" style="margin-top:5px;"><table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">';
         con += '<thead><tr>';
         con += '<th>collection</th>';
-        con += '<th>操作(<a class="btlink" onclick="addCollection()">添加</a>)</th>';
+        con += '<th>操作(<a class="btlink" onclick="addCollection()">添加</a>)'+ '|'+ '<a class="btlink" target="_blank" href="http://'+rdata.data.ip+':'+rdata.data.port+'">WEB管理</a></th>';
         con += '</tr></thead>';
 
         con += '<tbody>';
@@ -170,6 +170,7 @@ function pRead(){
 	var readme = '<ul class="help-info-text c7">';
     readme += '<li>使用默认solr端口,如有需要自行修改.</li>';
     readme += '<li>如果开启防火墙,需要放行solr设置的端口,例如(8983)。</li>';
+    readme += '<li><a target="_blank" href="https://github.com/midoks/mdserver-web/wiki/插件管理%5Bsolr使用说明%5D">wiki说明</a></li>';
     readme += '</ul>';
 
     $('.soft-man-con').html(readme);