Commit b7e4ed98 by chent

服务管理增加版本控制显示

parent d642d2c5
......@@ -38,5 +38,10 @@ public class Services extends PageBean implements Serializable {
private String ipPassword;
//chent 表里没有,版本控制用 begin
private String version;
private String versionDetail;
//chent 表里没有,版本控制用 end
}
\ No newline at end of file
......@@ -11,6 +11,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.Collection;
......@@ -39,7 +40,12 @@ public class ServiceController {
@ResponseBody
public ResultMap serviceslist(Model model, Services services){
ResultMap resultMap=new ResultMap();
resultMap =serviceService.ServiceAll(services);
try {
resultMap =serviceService.ServiceAll(services);
} catch (IOException e) {
e.printStackTrace();
}
return resultMap;
}
/*
......
......@@ -6,6 +6,8 @@ import com.cc.bean.Services;
import com.cc.common.ResultMap;
import com.cc.common.XzxtRestResult;
import java.io.IOException;
/**
* @author yutons
*/
......@@ -18,7 +20,7 @@ public interface ServiceService {
*
* @return
*/
ResultMap ServiceAll(Services service);
ResultMap ServiceAll(Services service) throws IOException;
ResultMap Services(Services service);
XzxtRestResult SelectServiceList();
XzxtRestResult SelectServices(int id);
......
......@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.io.*;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
......@@ -24,8 +25,52 @@ public class ServiceIServiceImpl implements ServiceService {
@Override
public ResultMap ServiceAll(Services service) {
public ResultMap ServiceAll(Services service) throws IOException {
List<Services> serviceslist=serviceMapper.selectPageList(service);
//chent 表里没有,版本控制用 begin
for(int i=0;i<serviceslist.size();i++){
Services entity=serviceslist.get(i);
String url=entity.getServletPath()+"\\webapps\\"+entity.getApplyName()+"\\WEB-INF\\classes\\";
url=url.replace("/","\\");
long timeStart = System.currentTimeMillis();
// File file = new File(url+"version.txt");//文件路径
// FileReader fileReader = new FileReader(file);
// LineNumberReader reader = new LineNumberReader(fileReader);用这个读取,虽然reader.getLineNumber()能获取行号,但是是中文是乱码的,所以用BufferedReader读取了。
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(url+"version.txt"),"UTF-8"));
int number =1;//设置指定行数
String line = "";
int lines = 0;
String str1="";
int[] numbers=new int[2];
int numberCount=0;
//应该找到包含版本的行数,然后读取这两个行数中间。带#号的内容
//先得到第一行的版本号
String version="";
String versionDetail="";
while ((line = reader.readLine()) != null) {
lines++;
if (lines == number) {
str1=line.substring(line.indexOf("=")+1, line.length());
version=str1;
// System.out.println("第" + lines + "的内容是:" + str1 + "\n");
}else{
if(line.contains(str1)){
numbers[numberCount]=lines;
numberCount++;
}else{
if( numbers[0]>1 && numbers[1]==0&&!"".equals(line)){
// System.out.println("第" + lines + "的内容是:" + line + "\n");
versionDetail=versionDetail+line;
}
}
}
}
entity.setVersion(version);
entity.setVersionDetail(versionDetail);
}
//chent 表里没有,版本控制用 end
ResultMap resultMap=new ResultMap();
if (!StringUtils.isEmpty(serviceslist)) {
int totals=serviceMapper.selectPageCount(service);
......
......@@ -104,6 +104,7 @@
,{field:'servletPath', title:'服务位置', width:200,align:'center', edit: 'text'}
,{field:'serviceIp', title:'服务IP', width:200,align:'center', sort: true}
,{field:'sqlType', title:'SQL类型', width:120,align:'center', sort: true,templet:'#barDemo2'}
,{field:'version', title:'版本控制', width:270,align:'center', templet:'<div><span title="{{d.versionDetail}}">{{d.version}}</span></div>'}
,{field:'status', title:'服务状态', width:150,align:'center', edit: 'text', templet:'#barDemo1'}
,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo', width:140}
,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo4', width:140}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment