update

plugins/csvn/index.html

@@ -10,6 +10,7 @@
 			<p onclick="pluginInitD('csvn');">自启动</p>
 			<p onclick="csvnUserList(1);">用户管理</p>
 			<p onclick="csvnProjectList(1);">项目管理</p>
+			<p onclick="csvnReadme();">使用说明</p>
 		</div>
 		<div class="bt-w-con pd15">
 			<div class="soft-man-con"></div>
@@ -20,4 +21,14 @@
 <script type="text/javascript">
 resetPluginWinWidth(700);
 $.getScript( "/plugins/file?name=csvn&f=js/csvn.js");
+
+
+function csvnReadme(){
+	var html = '<p>* 注意:在启动时会比较慢,需要耐心等待一会</p>';
+	html += '<p>* 注意:csvn需要java环境,在安装会自动检查并安装</p>';
+	html += '<p>* 注意:牢记admin的密码,在后csvn的管理后台和这里不同步</p>';
+	html += '<p>* 注意:在这里添加用户和csvn后台并不同步</p>';
+	html += '<p>* 注意:项目管理的地址一般是正确的,但在特殊环境下,地址可能不一致</p>';
+	$('.bt-w-main .soft-man-con').html(html);
+}
 </script>

plugins/csvn/index.py

@@ -253,6 +253,28 @@ def projectDel():
     return 'fail'
 
 
+def getHttpPort():
+    http_main_conf = getServerDir() + '/data/conf/csvn_main_httpd.conf'
+    try:
+        if os.path.exists(http_main_conf):
+            content = public.readFile(http_main_conf)
+            return re.search('Listen\s(\d+)', content).groups()[0]
+    except Exception as e:
+        pass   # print e
+    return '80'
+
+
+def getCsvnPort():
+    http_main_conf = getServerDir() + '/data/conf/csvn-wrapper.conf'
+    try:
+        if os.path.exists(http_main_conf):
+            content = public.readFile(http_main_conf)
+            return re.search('wrapper.java.additional.3=-Djetty.port=(\d+)', content).groups()[0]
+    except Exception as e:
+        pass   # print e
+    return '3343'
+
+
 def projectList():
     import math
     args = getArgs()
@@ -266,10 +288,6 @@ def projectList():
             filePath = path + '/' + filename
             if os.path.isdir(filePath):
                 tmp['name'] = filename
-                verPath = filePath + '/format'
-                if os.path.exists(verPath):
-                    ver = public.readFile(verPath).strip()
-                    tmp['ver'] = ver
             dlist.append(tmp)
 
     page = 1
@@ -287,6 +305,9 @@ def projectList():
     data['page'] = page
     data['page_size'] = page_size
     data['page_count'] = int(math.ceil(dlist_sum / page_size))
+    data['ip'] = public.getLocalIp()
+    data['port'] = getHttpPort()
+    data['csvn_port'] = getCsvnPort()
 
     start = (page - 1) * page_size
     data['data'] = dlist[start:start + page_size]

plugins/csvn/js/csvn.js

@@ -152,29 +152,21 @@ function csvnAddUser(username){
             layer.msg("操作成功!",{icon:1,time:3000,shade: [0.3, '#000']});
         },'json');
     });
-
 }
 
 function csvnModPwdUser(name){
-    csvnAddUser(name);   
+    csvnAddUser(name);
 }
 
-
 function csvnProjectList(page){
-    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
     var _data = {};
     _data['page'] = page;
     _data['page_size'] = 10;
-    $.post('/plugins/run', {name:'csvn', func:'project_list', args:JSON.stringify(_data)}, function(data) {
-        layer.close(loadT);
-        
-        if (!data.status){
-            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-            return;
-        }
+
+    csvnPost('project_list', _data, function(data){
 
         var rdata = $.parseJSON($.trim(data.data));
-        // console.log(rdata);
+        var csvn_mg = project_url = 'http://' +rdata['ip'] +(rdata['csvn_port'] == '80' ? '': ':'+rdata['csvn_port']);
 
         content = '<div class="finduser"><input class="bt-input-text mr5" type="text" placeholder="查找项目" id="disable_function_val" style="height: 28px; border-radius: 3px;width: 505px;">';
         content += '<button class="btn btn-success btn-sm">查找</button></div>';
@@ -182,18 +174,21 @@ function csvnProjectList(page){
         content += '<div class="divtable" style="margin-top:5px;"><table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">';
         content += '<thead><tr>';
         content += '<th>项目名</th>';
-        content += '<th>当前版本</th>';
-        content += '<th>操作(<a class="btlink" onclick="csvnAddProject();">添加</a>)</th>';
+        content += '<th>地址</th>';
+        content += '<th>操作(<a class="btlink" onclick="csvnAddProject();">添加</a>) | <a class="btlink" target="_blank" href="'+csvn_mg+'">后台管理</a> </th>';
         content += '</tr></thead>';
-
         content += '<tbody>';
 
+        console.log(rdata);
         ulist = rdata.data;
         for (i in ulist){
+            var project_url = 'http://' +rdata['ip'] +(rdata['port'] == '80' ? '': ':'+rdata['port'])+ '/svn/'+ulist[i]['name'];
+            var code_url = 'http://' +rdata['ip'] +(rdata['port'] == '80' ? '': ':'+rdata['port'])+ '/viewvc/'+ulist[i]['name'];
             content += '<tr><td>'+ulist[i]['name']+'</td>'+
-                '<td>'+ulist[i]['ver']+'</td><td>'+
+                '<td>'+project_url+'</td><td>'+
                 '<a class="btlink" onclick="csvnDelProject(\''+ulist[i]['name']+'\')">删除</a> | ' +
-                '<a class="btlink" onclick="csvnAclProject(\''+ulist[i]['name']+'\')">权限</a>' +
+                '<a class="btlink" onclick="csvnAclProject(\''+ulist[i]['name']+'\')">权限</a> | ' +
+                '<a class="btlink" target="_blank" href="' + code_url +'">源码</a>' +
                 '</td></tr>';
         }
 
@@ -206,7 +201,7 @@ function csvnProjectList(page){
 
         content += page;
         $(".soft-man-con").html(content);
-    },'json');
+    });
 }
 
 function csvnDelProject(name){

scripts/install.sh

@@ -27,14 +27,12 @@ mv /tmp/mdserver-web-master /www/server/mdserver-web
 yum groupinstall -y "Development Tools"
 paces="wget python-devel python-imaging zip unzip openssl openssl-devel gcc libxml2 libxml2-dev libxslt* zlib zlib-devel libjpeg-devel libpng-devel libwebp libwebp-devel freetype freetype-devel lsof pcre pcre-devel vixie-cron crontabs"
 yum -y install $paces
-yum -y lsof
+yum -y lsof net-tools.x86_64
 yum -y install epel-release python-pip python-devel
 pip install --upgrade pip
 pip install -r /www/server/mdserver-web/requirements.txt
 
 
-
-
 endTime=`date +%s`
 ((outTime=($endTime-$startTime)/60))
 echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"