Commit 6b9889c5 6b9889c56109c640a8d49a78e0b70f64b90b8b2b by root

save

1 parent 1ca3c925
Showing 24 changed files with 134 additions and 80 deletions
......@@ -136,7 +136,7 @@
<dependency>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.10</version>
<version>1.12</version>
</dependency>
</dependencies>
......
0c831cca0c5124f3ffc71777c3dcdcf2
\ No newline at end of file
ce9b7ffbd258e08f0e98899ddc7ce98cb796c020
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.11</version>
</project>
94176b3faae2e97402e3986207289b36
\ No newline at end of file
38e64ab16233d080a796113e2609c7234cbc0ca0
\ No newline at end of file
528d24e7e4a499f3ffd53b20f37c1d6e
\ No newline at end of file
04c21c2a5e86f843cd60cd939caee1a12d5f75b4
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.12</version>
</project>
29a1c8d26c4092087916fac887980824
\ No newline at end of file
bf0822135245c634ab3f2d4789fd0a1238a10492
\ No newline at end of file
......@@ -3,7 +3,7 @@
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<versioning>
<release>1.10</release>
<release>1.12</release>
<versions>
<version>1.0</version>
<version>1.1</version>
......@@ -16,7 +16,9 @@
<version>1.8</version>
<version>1.9</version>
<version>1.10</version>
<version>1.11</version>
<version>1.12</version>
</versions>
<lastUpdated>20150730104601</lastUpdated>
<lastUpdated>20150730124043</lastUpdated>
</versioning>
</metadata>
......
9d106f7b79ae181205c9a30243b5a016
\ No newline at end of file
783d946983428dd9e3aa55dbcc953fce
\ No newline at end of file
......
b525ea5f10b108b6840c20968146c6608b40168c
\ No newline at end of file
916946b4b7029a982ce5dfcef1f086ac89c62019
\ No newline at end of file
......
package org.emercit.devtools.service;
import org.emercit.model.IPAddressValidator;
import java.util.Vector;
import org.emercit.svmanager.service.Sv;
import org.emercit.svmanager.service.SvControl;
import org.emercit.svmanager.model.SvBean;
import java.util.Vector;
import org.emercit.pckutils.checkservice.STService;
import org.emercit.utilstools.config.Paths;
public enum SvService {
INSTANCE;
private Sv sv=new Sv();
private Vector<SvBean> svbeans;
private SvBean svbean;
private SvControl svcontrol;
private STService st=new STService();
/*
* Список все процессов, которыми управляем
*/
public Vector<SvBean> getSvBeans() {
svbeans=new Vector<SvBean>();
for (SvBean s:svbeans) { // проверяем запущен или остановлен
try { s.setIsrun(st.IsRun(s.getProcess())); } catch (Exception e) {};
}
return svbeans;
}
/*
*
*/
public int Update(Vector<SvBean> beans) {
return sv.set(beans);
}
public int Start(SvBean svbean) {
svcontrol=new SvControl(svbean.getProcess());
return svcontrol.start();
}
public int Stop(SvBean svbean) {
svcontrol=new SvControl(svbean.getProcess());
return svcontrol.stop();
}
public int Restart(SvBean svbean) {
svcontrol=new SvControl(svbean.getProcess());
return svcontrol.restart();
}
}
\ No newline at end of file
......@@ -2,22 +2,8 @@
Ext.define('App.view.Log', {
extend : 'Ext.form.Panel',
xtype : 'mvvm-LogView',
alias: 'widget.showPreview',
// renderTo: document.body,
/*
layout: {
type: 'vbox',
align: 'stretch'
},
*/
layout: 'fit',
layout: 'fit',
height: 400,
// width : 600,
// title : 'MyPanel',
initComponent: function() {
Ext.apply(this, {
......@@ -39,60 +25,18 @@ Ext.define('App.view.Log', {
items: [
{
xtype : 'textareafield',
//grow : true,
id:'logResult',
readOnly : true,
// height: 300,
// anchor: '100%'
}
// {
// xtype: 'textareafield',
// itemId: 'txtFld',
// border: false,
//height: 660,
//width: 370,
//autoScroll: true,
// margin: '0 10 10 10',
//hidden: true
// }
{
xtype : 'textareafield',
id:'logResult',
readOnly : true,
}
],
});
this.callParent(arguments);
}
});
/*
Ext.application({
name: 'Fiddle',
launch: function() {
var textarea,
ipsum = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum";
var preview = Ext.create('Test.view.ShowPreview', {
renderTo: Ext.getBody()
});
textarea = preview.down('#txtFld');
textarea.setValue(ipsum+ipsum);
}
});
*/
\ No newline at end of file
......
......@@ -69,7 +69,7 @@ public class DnsLinux implements IDns{
dbs.add(db);
i++;
}
log.info(Msg.LoadFileSucc);
//log.info(Msg.LoadFileSucc.getDescription());
} catch(Exception e) {
log.error(e.getMessage());
}
......@@ -98,7 +98,7 @@ public class DnsLinux implements IDns{
}
bw.close();
log.info(Msg.SaveFileSucc.getDescription());
//log.info(Msg.SaveFileSucc.getDescription());
return Msg.SaveFileSucc.getCode();
} catch (IOException e) {
......
......@@ -62,7 +62,7 @@ public class NtpLinux implements INtp {
bw.close();
log.info(Msg.SaveFileSucc.getDescription());
//log.info(Msg.SaveFileSucc.getDescription());
} catch (IOException e) {
log.error(e.getMessage());
return Msg.SaveFileError.getCode();
......
......@@ -13,18 +13,15 @@ public class Sv {
public Db db=new Db(Paths.BEAN_SV);
private SvBean svbean;
private Vector<SvBean> svbeans;
private SvControl svcontrol;
public int set(Vector<SvBean> m) {
return db.create(m);
}
public Vector<SvBean> get() {
return (Vector<SvBean>)db.select();
}
......
......@@ -5,12 +5,17 @@ import org.emercit.pckutils.cmd.CmdExec;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.config.Msg;
import org.emercit.pckutils.checkservice.STService;
public class SvControl implements ISvControl {
private CmdExec cmdexec=new CmdExec();
private STService st=new STService();
private String process;
public SvControl(String process) {
this.process=process;
......@@ -18,8 +23,14 @@ public class SvControl implements ISvControl {
public int stop() {
try { cmdexec.Run(Paths.dirInit_d+" "+process+" "+"stop"); }catch(Exception e) { return Msg.ProcessStopError.getCode(); };
try {
cmdexec.Run(Paths.dirInit_d+" "+process+" "+"stop");
}catch(Exception e)
{
return Msg.ProcessStopError.getCode();
};
return Msg.ProcessStopSucc.getCode();
}
......
......@@ -7,8 +7,8 @@ import org.emercit.utilstools.config.MsgResult;
public enum Msg {
SaveFileSucc(1,TypeMsg.INFO,"Выполнено сохранение файла"),
SaveFileError(2,TypeMsg.ERROR,"Сохранение файла не выполнено"),
SaveFileSucc(1,TypeMsg.INFO,"Сохранение успешно выполнено"),
SaveFileError(2,TypeMsg.ERROR,"Ошибка при сохранении"),
LoadFileSucc(3,TypeMsg.INFO,"Чтение файла выполнено"),
LoadFileError(4,TypeMsg.ERROR,"Ошибка чтения файла"),
......
......@@ -35,7 +35,7 @@ public class Db implements IDb {
XMLEncoder xmlEncoder = new XMLEncoder(bos);
xmlEncoder.writeObject(o);
xmlEncoder.close();
log.info(Msg.SaveFileSucc.getDescription());
//log.info(Msg.SaveFileSucc.getDescription());
}catch(Exception e) {
log.error(e.getMessage());
return Msg.SaveFileError.getCode();
......@@ -55,7 +55,7 @@ public class Db implements IDb {
new FileInputStream(pathfile)));
Object result=(Object)d.readObject();
d.close();
log.info(Msg.LoadFileSucc.getDescription());
//log.info(Msg.LoadFileSucc.getDescription());
return result;
}catch(Exception e) {
log.error(e.getMessage());
......