Skip to content

Дмитрий Корытько / hware

Go to a project
Toggle navigation
Toggle navigation pinning
Commit e375f827 e375f8279e12ba3428a3dfe7cad216402c37ed99 by root
Options

Save

1 parent 62afec69
Inline Side-by-side
Showing 70 changed files with 226 additions and 759 deletions
......@@ -129,35 +129,34 @@
<version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
</dependency>
<!-- Test -->
<dependency>
<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.31</version>
<version>1.45</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
......
391650b476d0bde1224640b76f5a7622
\ No newline at end of file
4bd444371ee6b32a96e4c07a62ecac97dabe4238
\ 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.37</version>
</project>
797d1a192c1ddd5f1bd7312d281ec179
\ No newline at end of file
b34800578a39f4f1d61fafce7f63c481037c43bd
\ No newline at end of file
683b081a011b55a0e20feeea445c8205
\ No newline at end of file
3da196bee3c728176ded668347e4c0fa544a721e
\ 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.38</version>
</project>
3258394054c57faf212d6c10debb239a
\ No newline at end of file
7de1953ec4041c05baf8c06472d35c4934071120
\ No newline at end of file
69a4a04599977f7f3c057bedf3cac960
\ No newline at end of file
44954156ec33fa56489f6cc38d21a91d8097f7ee
\ 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.39</version>
</project>
fa25319280078b7b977ca2e82ef41343
\ No newline at end of file
a2c8fba735d34c4799822e777f8509d6575ee98a
\ No newline at end of file
b8a424099e961fcdf28b16c81384e4b1
\ No newline at end of file
12c2d76ddf54db9582b7c6934a57fd618633dc02
\ 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.40</version>
</project>
58db6e9779356078de40cdba9a727881
\ No newline at end of file
04f4e1b3b4e91f3cc02455cb1e97c14c34b42b5f
\ No newline at end of file
7bf6e4f082aacf05c97c440821bf1f80
\ No newline at end of file
46a9cf9971443a55d78e677cba7bba0fb0ad8803
\ 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.41</version>
</project>
e5d847876d86da58033dc510f1442189
\ No newline at end of file
f296f9a9991e08f52cddb41ca00abca00620f120
\ No newline at end of file
db6a41e9a811bd43265e7e85864781aa
\ No newline at end of file
579a4e261dbc22ddce2a7effea5ca9afca10e437
\ 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.42</version>
</project>
3b7539b79092b604a38496529d5e8a7a
\ No newline at end of file
86b7ad0c55294ee65e2730c4b1737e331556561a
\ No newline at end of file
7879f7b7e9fa12c6d38e02448689bb24
\ No newline at end of file
5fa041999fef685b156663188c7132a3d00161fd
\ 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.45</version>
</project>
1f369015de038ed3800bd30fcfa66ffd
\ No newline at end of file
c1fd442932616437d6c617e4dd3368ae36da9267
\ No newline at end of file
......@@ -3,7 +3,7 @@
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<versioning>
<release>1.36</release>
<release>1.45</release>
<versions>
<version>1.0</version>
<version>1.1</version>
......@@ -42,7 +42,14 @@
<version>1.34</version>
<version>1.35</version>
<version>1.36</version>
<version>1.37</version>
<version>1.38</version>
<version>1.39</version>
<version>1.40</version>
<version>1.41</version>
<version>1.42</version>
<version>1.45</version>
</versions>
<lastUpdated>20150808085500</lastUpdated>
<lastUpdated>20150811122648</lastUpdated>
</versioning>
</metadata>
......
f3ca1cf4f523b1fdbd4df54d8bfb1a65
\ No newline at end of file
620a2c75beef4761b60e181a96ea3369
\ No newline at end of file
......
82ce6a4ad78e198d3e92acef733a290e91de1bcf
\ No newline at end of file
94013eaf8466549c9d4f9a446c807a987c3ba90e
\ No newline at end of file
......
......@@ -6,7 +6,7 @@ import org.emercit.model.IPAddressValidator;
import java.util.Vector;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.servers.model.ServerBean;
import org.emercit.utilstools.servers.service.Servers;
public enum RemoteServerManager {
......@@ -41,9 +41,10 @@ public enum RemoteServerManager {
public int Update(ServerBean b) {
beans=store.get();
int code=Msg.RemoteUpdateError.getCode();
for (ServerBean bean:beans) {
for (ServerBean bean:beans) {
if (bean.getId()==b.getId()) {
......@@ -53,11 +54,13 @@ public enum RemoteServerManager {
bean.setIp(b.getIp());
bean.setPort(b.getPort());
return store.set(beans);
code=store.set(beans);
}
}
return 2;
return code;
}
}
......
......@@ -43,18 +43,8 @@ public enum SvService {
svbeans=sv.get();
for (SvBean s:svbeans) { // проверяем запущен или остановлен
try {
boolean status=st.IsRun(s.getProcess());
log.info("Процесс:"+status);
} catch (Exception e) {
}
try { s.setIsrun(st.IsRun(s.getProcess())); } catch (Exception e) {};
try { s.setIsrun(st.IsRun(s.getProcess())); } catch (Exception e) { log.error(e.getMessage());};
}
return svbeans;
}
......
......@@ -234,7 +234,7 @@ Ext.application({
},
{
title: 'НАСТРОЙКИ В JSON',
title: 'НАСТРОЙКИ',
items:[
{
xtype :'mvvm-ToolsXmlView',
......
......@@ -59,11 +59,13 @@ Ext.define('App.controller.Dns', {
success: function(response, opts) {
}, failure: function(response, opts) {
Ext.Msg.alert('Failure', 'Ошибка сохранения');
}
var result = Ext.JSON.decode(response.responseText);
Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
}, failure: function(response, opts) {
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
}
});
......
......@@ -66,7 +66,7 @@ Ext.define('App.controller.MainConfig', {
var result = Ext.JSON.decode(response.responseText);
// Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
}, failure: function(response, opts) {
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
......
......@@ -65,11 +65,11 @@ Ext.define('App.controller.RemoteServer', {
remoteserver = {
id:1,
id:0,
name:NameRemoteServer,
ip:IpRemoteServer,
port:parseInt(PortRemoteServer),
type:"",
type:"szs",
title:TitleRemoteServer,
};
......
......@@ -3,7 +3,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<!-- Appenders -->
<appender name="console" class="org.apache.log4j.ConsoleAppender">
<appender name="consoleappender" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p: %c - %m%n" />
......@@ -11,60 +11,60 @@
</appender>
<!-- LOG FILE -->
<appender name="file" class="org.apache.log4j.FileAppender">
<appender name="fileappender" class="org.apache.log4j.FileAppender">
<param name="File" value="/var/log/devtools.log" />
<param name="MaxFileSize" value="10KB"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-7p %d [%t] %c %x - %m%n"/>
<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSSS} %p %t %c \u2013 %m%n"/>
</layout>
</appender>
<appender name="socketappender" class="org.apache.log4j.net.SocketAppender">
<param name="RemoteHost" value="localhost"/>
<param name="Port" value="4560"/>
<param name="LocationInfo" value="true"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSSS} %p %t %c \u2013 %m%n"/>
</layout>
</appender>
<!-- Application Loggers -->
<logger name="org.emercit.app">
<level value="info" />
<appender-ref ref="console" />
<!--<appender-ref ref="file" />-->
<logger name="org.emercit.utilstools">
<level value="all" />
<appender-ref ref="socketappender" />
</logger>
<logger name="org.emercit">
<level value="info" />
<appender-ref ref="console" />
<!-- <appender-ref ref="file" />-->
</logger>
<!-- rdparty Loggers -->
<logger name="org.springframework.core">
<level value="info" />
<appender-ref ref="console" />
<!-- <appender-ref ref="file" /> -->
<appender-ref ref="consoleappender" />
</logger>
<logger name="org.springframework.beans">
<level value="info" />
<appender-ref ref="console" />
<!-- <appender-ref ref="file" /> -->
<appender-ref ref="consoleappender" />
</logger>
<logger name="org.springframework.context">
<level value="info" />
<appender-ref ref="console" />
<!--<appender-ref ref="file" />-->
<appender-ref ref="consoleappender" />
</logger>
<logger name="org.springframework.web">
<level value="info" />
<appender-ref ref="console" />
<!-- <appender-ref ref="file" /> -->
<appender-ref ref="consoleappender" />
</logger>
<!-- Root Logger -->
<root>
<priority value="warn" />
<appender-ref ref="console" />
<appender-ref ref="consoleappender" />
</root>
</log4j:configuration>
\ No newline at end of file
......
......@@ -14,16 +14,6 @@ public class App
public static void main( String[] args )
{
/*
Settings settings=new Settings();
settings.init();
SettingsBean settingsbean=settings.make();
settings.set(settingsbean);
System.out.println("");
*/
}
}
......
......@@ -30,7 +30,7 @@ public class DefSettings {
public static final boolean Eth1_dhcp=false;
public static final String Eth1_ip="192.168.99.1";
public static final String Eth1_netmask="255.255.255.0";
public static final String Eth1_gateway="192.168.99.2";
public static final String Eth1_gateway="192.168.99.1";
public static final String Eth1_broadcast="";
public static final String Eth1_extinfo="";
//GSM
......
package org.emercit.utilstools.config;
import org.apache.log4j.Logger;
import org.emercit.utilstools.config.TypeMsg;
import org.emercit.utilstools.config.MsgResult;
public enum Msg {
SaveFileSucc(1,TypeMsg.INFO,"Сохранение успешно выполнено"),
SaveFileError(2,TypeMsg.ERROR,"Ошибка при сохранении"),
......@@ -54,7 +56,26 @@ public enum Msg {
NTPUpdateError(27,TypeMsg.ERROR,"Конфигурация NTP не выполнена"),
ProxyUpdateSucc(28,TypeMsg.INFO,"Конфигурация Proxy выполнена успешно"),
ProxyUpdateError(29,TypeMsg.ERROR,"Конфигурация Proxy не выполнена");
ProxyUpdateError(29,TypeMsg.ERROR,"Конфигурация Proxy не выполнена"),
DescriptionUpdateSucc(30,TypeMsg.INFO,"Конфигурация описания устройства выполнена успешно"),
DescriptionUpdateError(31,TypeMsg.ERROR,"Конфигурация описания устройства не выполнена"),
RemoteServerUpdateSucc(32,TypeMsg.INFO,"Конфигурация удаленного сервера выполнена успешно"),
RemoteUpdateError(33,TypeMsg.ERROR,"Конфигурация удаленного сервера не выполнена"),
EthUpdateSucc(33,TypeMsg.INFO,"Конфигурация сетевого интерфейса eth0 выполнена успешно"),
EthError(34,TypeMsg.ERROR,"Конфигурация сетевого интерфейса eth0 не выполнена"),
GsmUpdateSucc(35,TypeMsg.INFO,"Конфигурация GSM выполнена успешно"),
GsmUpdateError(36,TypeMsg.ERROR,"Конфигурация GSM не выполнена");
private static final Logger log = Logger.getLogger(Msg.class);
private int code;
......@@ -89,22 +110,23 @@ public enum Msg {
return this.description;
}
static public MsgResult getMsgResultByCode(int code) {
for (Msg v: Msg.values()) {
if (v.getCode()==code) {
MsgResult result=new MsgResult();
result.code=v.getCode();
result.type=v.getTypeVariable().getDescription();
result.message=v.getDescription();
if (v.getTypeVariable().getCode()==0) {
log.info("Код:"+result.code+", "+"Тип:"+result.type+", "+"Текст:"+result.message);
}else {
log.error("Код:"+result.code+", "+"Тип:"+result.type+", "+"Текст:"+result.message);
}
return result;
}
}
return null;
return null;
}
}
......
......@@ -23,6 +23,6 @@ public class Paths {
public static final String JETTY="jetty";
public static final String CTRLPNL="ctrlpnl";
public static final String UTILSTOOLS_LOGFILE="/var/log/devtools.log";
public static final String UTILSTOOLS_LOGFILE="/var/log/device.log";
}
......
package org.emercit.utilstools.controldevtools.bean;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeListener;
import java.beans.PropertyVetoException;
import java.beans.VetoableChangeListener;
import java.beans.VetoableChangeSupport;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Timer;
import java.util.TimerTask;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.SwingWorker;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
import javax.swing.event.SwingPropertyChangeSupport;
import org.apache.log4j.Logger;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.pckutils.checkservice.STService;
import org.emercit.utilstools.service.Settings;
import org.emercit.utilstools.svmanager.model.SvBean;
import org.emercit.utilstools.svmanager.service.Sv;
import org.emercit.utilstools.svmanager.service.SvControl;
import org.emercit.utilstools.sshexec.SSHExec;
public class ControlDeviceBean extends RoundPanel implements Externalizable {
private static final Logger log = Logger.getLogger(DevToolsBean.class);
private Dimension beanDimension; // simple
protected EventListenerList listenerList = new EventListenerList();
private JLabel lblStatus=new JLabel();
private JButton btnOffStart=new JButton();
private JButton btnRebootStart=new JButton();
private SSHExec sshecex=new SSHExec();
private Font font = new Font(null, Font.ITALIC, 13);
public ControlDeviceBean() {
this.setLayout(null);
this.setBackground(new Color(168, 181, 224)); // blue
beanDimension = new Dimension(600, 130);
// BUTTON OFF
btnOffStart.setIcon(new ImageIcon(DevToolsBean.class.getResource("/offDevice.png")));
btnOffStart.setBounds(10,30,190,55);
btnOffStart.setFont(font);
btnOffStart.setText("Выключить");
btnOffStart.setSelected(false);
btnOffStart.addActionListener(new Off());
add(btnOffStart);
// BUTTON REBOOT
btnRebootStart.setIcon(new ImageIcon(DevToolsBean.class.getResource("/reloadDevice.png")));
btnRebootStart.setBounds(220,30,190,55);
btnRebootStart.setFont(font);
btnRebootStart.setText("Перезагрузить");
btnRebootStart.setSelected(false);
btnRebootStart.addActionListener(new Reboot());
add(btnRebootStart);
// STATUS
font = new Font(null, Font.ITALIC, 18);
lblStatus.setBounds(10,80,600,55);
lblStatus.setForeground(Color.YELLOW);
lblStatus.setText("");
lblStatus.setVisible(true);
lblStatus.setFont(font);
add(lblStatus);
}
public class Off implements ActionListener
{
public void actionPerformed(ActionEvent e)
{
new SwingWorker<Void, Void>()
{
protected Void doInBackground() throws Exception
{
lblStatus.setText("выполняется выключение...");
sshecex.setCmd("shutdown -h now");
sshecex.Exec();
return null;
}
}.execute();
}
}
public class Reboot implements ActionListener
{
public void actionPerformed(ActionEvent e)
{
new SwingWorker<Void, Void>()
{
protected Void doInBackground() throws Exception
{
lblStatus.setText("выполняется перезагрузка...");
sshecex.setCmd("reboot");
sshecex.Exec();
return null;
}
}.execute();
}
}
public void paintComponent(Graphics g) {
super.paintComponent(g);
}
public void setPreferredSize(Dimension dim) {
beanDimension = dim;
}
public Dimension getPreferredSize() {
return beanDimension;
}
public void setMinimumSize(Dimension dim) {
beanDimension = dim;
}
public Dimension getMinimumSize() {
return beanDimension;
}
public void addChangeListener(ChangeListener l) {
listenerList.add(ChangeListener.class, l);
}
public void removeChangeListener(ChangeListener l) {
listenerList.remove(ChangeListener.class, l);
}
public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(beanDimension);
}
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
setPreferredSize((Dimension) in.readObject());
setMinimumSize(getPreferredSize());
}
public static void main(String[] args) {
JFrame frame = new JFrame("");
frame.getContentPane().add(new ControlDeviceBean());
frame.setVisible(true);
frame.pack();
}
}
package org.emercit.utilstools.controldevtools.bean;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeListener;
import java.beans.PropertyVetoException;
import java.beans.VetoableChangeListener;
import java.beans.VetoableChangeSupport;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Timer;
import java.util.TimerTask;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.SwingWorker;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
import javax.swing.event.SwingPropertyChangeSupport;
import org.apache.log4j.Logger;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.pckutils.checkservice.STService;
import org.emercit.utilstools.service.Settings;
import org.emercit.utilstools.svmanager.model.SvBean;
import org.emercit.utilstools.svmanager.service.Sv;
import org.emercit.utilstools.svmanager.service.SvControl;
public class DevToolsBean extends RoundPanel implements Externalizable {
private static final Logger log = Logger.getLogger(DevToolsBean.class);
private Dimension beanDimension; // simple
private JLabel lblTitle=new JLabel();
private JLabel lblStatus=new JLabel();
private JButton btnStart=new JButton("ЗАПУСТИТЬ");
private JButton btnStop=new JButton("ОСТАНОВИТЬ");
private JButton btnDefaults=new JButton("СБРОС НАСТРОЕК");
private STService stservice=new STService();
private Timer timerAnimate=new Timer();
private Settings settings=new Settings();
protected transient ChangeEvent changeEvent = null;
public Update update=null;
public boolean block=false;
public SvBean svbean;
public SvControl svcontrol;
public Sv sv;
protected EventListenerList listenerList = new EventListenerList();
public DevToolsBean() {
this.setLayout(null);
this.setBackground(new Color(168, 181, 224)); // blue
beanDimension = new Dimension(600, 130);
Font font = new Font(null, Font.ITALIC, 13);
lblTitle.setBounds(10, 2, 600, 30);
lblTitle.setText(DefSettings.devtools_title);
lblTitle.setFont(font);
lblTitle.setForeground(Color.BLUE);
add(lblTitle);
// BUTTON START
btnStart.setIcon(new ImageIcon(DevToolsBean.class.getResource("/start.png")));
btnStart.setBounds(10,30,150,40);
btnStart.setFont(font);
btnStart.setSelected(false);
btnStart.addActionListener(new Start());
add(btnStart);
// BUTTON STOP
btnStop.setIcon(new ImageIcon(DevToolsBean.class.getResource("/stop.png")));
btnStop.setBounds(170,30,180,40);
btnStop.setFont(font);
btnStop.setSelected(false);
btnStop.addActionListener(new Stop());
add(btnStop);
// BUTTON DEFAULTS
btnDefaults.setIcon(new ImageIcon(DevToolsBean.class.getResource("/replay.png")));
btnDefaults.setBounds(360,30,230,40);
btnDefaults.setFont(font);
btnDefaults.setSelected(false);
btnDefaults.addActionListener(new Defaults());
add(btnDefaults);
// STATUS
font = new Font(null, Font.ITALIC, 18);
lblStatus.setIcon(new ImageIcon(DevToolsBean.class.getResource("/running.png")));
lblStatus.setBounds(10,80,600,55);
lblStatus.setForeground(Color.YELLOW);
lblStatus.setText("");
lblStatus.setVisible(true);
lblStatus.setFont(font);
add(lblStatus);
sv=new Sv();
for (SvBean bean:sv.get()) {
if (bean.getProcess().equals("jetty")) {
svcontrol=new SvControl(bean);
}
}
timerAnimate.schedule(new Task(),0,10000);
}
public void initCmpEnabled() {
try {
boolean jattyrun=stservice.IsRun(DefSettings.jetty_process);
if(jattyrun){
btnStop.setEnabled(true);
btnStart.setEnabled(false);
lblStatus.setIcon(new ImageIcon(DevToolsBean.class.getResource("/up.png")));
lblStatus.setForeground(Color.GREEN);
lblStatus.setText("- Web конфигуратор запущен");
}else {
btnStop.setEnabled(false);
btnStart.setEnabled(true);
lblStatus.setIcon(new ImageIcon(DevToolsBean.class.getResource("/down.png")));
lblStatus.setForeground(Color.WHITE);
lblStatus.setText("- Web конфигуратор не запущен");
}
}catch(Exception e){
log.error(e.getMessage());
}
}
public class Start implements ActionListener
{
public void actionPerformed(ActionEvent e)
{
new SwingWorker<Void, Void>()
{
protected Void doInBackground() throws Exception
{
btnStart.setEnabled(false);
btnStop.setEnabled(false);
lblStatus.setForeground(Color.YELLOW);
lblStatus.setText(" - выполняется запуск Web конфигуратора ...");
block=true;
svcontrol.start();
block=false;
return null;
}
}.execute();
}
}
public class Stop implements ActionListener
{
public void actionPerformed(ActionEvent e)
{
new SwingWorker<Void, Void>()
{
protected Void doInBackground() throws Exception
{
btnStart.setEnabled(false);
btnStop.setEnabled(false);
lblStatus.setForeground(Color.YELLOW);
lblStatus.setText(" - выполняется остановка Web конфигуратора ...");
block=true;
svcontrol.stop();
block=false;
return null;
}
}.execute();
}
}
public class Defaults implements ActionListener
{
public void actionPerformed(ActionEvent e)
{
new SwingWorker<Void, Void>()
{
protected Void doInBackground() throws Exception
{
block=true;
lblStatus.setForeground(Color.YELLOW);
lblStatus.setText(" - выполняется сброс настроек ...");
btnDefaults.setEnabled(false);
btnStart.setEnabled(false);
btnStop.setEnabled(false);
try {
settings.init();
Thread.sleep(5000);
}catch(Exception er) {
log.error(er.getMessage());
}
btnDefaults.setEnabled(true);
block=false;
return null;
}
}.execute();
}
}
public void paintComponent(Graphics g) {
super.paintComponent(g);
}
public void setPreferredSize(Dimension dim) {
beanDimension = dim;
}
public Dimension getPreferredSize() {
return beanDimension;
}
public void setMinimumSize(Dimension dim) {
beanDimension = dim;
}
public Dimension getMinimumSize() {
return beanDimension;
}
public void addChangeListener(ChangeListener l) {
listenerList.add(ChangeListener.class, l);
}
public void removeChangeListener(ChangeListener l) {
listenerList.remove(ChangeListener.class, l);
}
protected void fireStateChanged() {
Object[] listeners = listenerList.getListenerList();
for (int i = listeners.length - 2; i >= 0; i -= 2) {
if (listeners[i] == ChangeListener.class) {
if (changeEvent == null)
changeEvent = new ChangeEvent(this);
((ChangeListener) listeners[i + 1]).stateChanged(changeEvent);
}
}
}
public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(beanDimension);
}
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
setPreferredSize((Dimension) in.readObject());
setMinimumSize(getPreferredSize());
}
public class Update extends SwingWorker<Void, Void> {
@Override
public Void doInBackground()
{
// Если выполняется запуск или остановка, то не проверяем
if (!block){
initCmpEnabled();
}
return null;
}
@Override
public void done(){
}
}
private class Task extends TimerTask {
@Override
public void run() {
EventQueue.invokeLater(new Runnable() {
// @Override
public void run() {
update=new Update();
update.execute();
}
});
}
}
public static void main(String[] args) {
JFrame frame = new JFrame("Управление Web конфигуратором");
frame.getContentPane().add(new DevToolsBean());
frame.setVisible(true);
frame.pack();
}
}
\ No newline at end of file
package org.emercit.utilstools.controldevtools.bean;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import javax.swing.JPanel;
public class RoundPanel extends JPanel
{
protected int _strokeSize = 1;
protected Color _shadowColor = Color.BLACK;
protected boolean _shadowed = true;
protected boolean _highQuality = true;
protected Dimension _arcs = new Dimension(15, 15);
protected int _shadowGap = 3;
protected int _shadowOffset = 4;
protected int _shadowAlpha = 100;
public Color _backgroundColor = Color.WHITE;
public RoundPanel()
{
super();
setOpaque(false);
}
@Override
public void setBackground(Color c)
{
_backgroundColor = c;
}
@Override
protected void paintComponent(Graphics g)
{
super.paintComponent(g);
int width = getWidth();
int height = getHeight();
int shadowGap = this._shadowGap;
Color shadowColorA = new Color(_shadowColor.getRed(), _shadowColor.getGreen(), _shadowColor.getBlue(), _shadowAlpha);
Graphics2D graphics = (Graphics2D) g;
if(_highQuality)
{
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
}
if(_shadowed)
{
graphics.setColor(shadowColorA);
graphics.fillRoundRect(_shadowOffset, _shadowOffset, width - _strokeSize - _shadowOffset,
height - _strokeSize - _shadowOffset, _arcs.width, _arcs.height);
}
else
{
_shadowGap = 1;
}
graphics.setColor(_backgroundColor);
graphics.fillRoundRect(0, 0, width - shadowGap, height - shadowGap, _arcs.width, _arcs.height);
graphics.setStroke(new BasicStroke(_strokeSize));
graphics.setColor(getForeground());
graphics.drawRoundRect(0, 0, width - shadowGap, height - shadowGap, _arcs.width, _arcs.height);
graphics.setStroke(new BasicStroke());
}
}
\ No newline at end of file
/**
*
*/
/**
* @author root
*
*/
package org.emercit.utilstools.controldevtools.bean;
\ No newline at end of file
......@@ -23,15 +23,20 @@ public class DevInfo implements IDevInfo {
private DevInfoBean devinfobean;
public int set(DevInfoBean m) {
return db.create(m);
Msg res=Msg.getByCode(db.create(m));
if (res.getTypeVariable().getCode()==0) {
return Msg.DescriptionUpdateSucc.getCode();
}
return Msg.DescriptionUpdateError.getCode();
}
public DevInfoBean get() {
return (DevInfoBean)db.select();
}
public int init() {
devinfobean=new DevInfoBean();
......
......@@ -3,8 +3,6 @@ package org.emercit.utilstools.displaycalibrator.service;
import org.emercit.utilstools.config.Msg;
public interface DCalibrator {
public int Run(String cmd);
public int Run(String cmd);
}
......
......@@ -44,7 +44,6 @@ public class DCalibratorBB implements DCalibrator {
}
bw.close();
log.info(Msg.CalibrSucc.getDescription());
return Msg.CalibrSucc.getCode();
}catch(Exception e) {
......
......@@ -61,15 +61,12 @@ public class DnsLinux implements IDns{
int i=0;
for (String ip:v) {
db=new DnsBean();
db.setIp(ip);
db.setId(i);
dbs.add(db);
i++;
}
//log.info(Msg.LoadFileSucc.getDescription());
} catch(Exception e) {
log.error(e.getMessage());
}
......@@ -98,12 +95,10 @@ public class DnsLinux implements IDns{
}
bw.close();
log.info(Msg.DnsUpdateSucc.getDescription());
return Msg.DnsUpdateSucc.getCode();
} catch (IOException e) {
log.error(e.getMessage());
log.error(Msg.DnsUpdateError.getDescription());
return Msg.DnsUpdateError.getCode();
}
......@@ -114,7 +109,6 @@ public class DnsLinux implements IDns{
db=new DnsBean();
db.setIp(DefSettings.Dns_host);
dbs.add(db);
return Config(dbs);
}
......
......@@ -62,10 +62,8 @@ public class NtpLinux implements INtp {
bw.close();
log.info(Msg.NTPUpdateSucc.getDescription());
} catch (IOException e) {
log.error(e.getMessage());
log.error(Msg.NTPUpdateError.getDescription());
return Msg.NTPUpdateError.getCode();
}
return Msg.NTPUpdateSucc.getCode();
......
......@@ -37,13 +37,14 @@ public class EthLinux implements IEth {
public int reload(String name) {
try {
/*
Vector<String> buff=cmdexec.Run("ifdown"+" "+name);
Thread.sleep(5000);
Thread.sleep(2000);
buff=cmdexec.Run("ifup"+" "+name);
Thread.sleep(5000);
Thread.sleep(3000);
*/
Vector<String> buff=cmdexec.Run("/etc/init.d/networking restart");
Msg msg=Msg.RestartEthSucc;
log.info(msg.getDescription());
return msg.getCode();
}catch(Exception e) {
......@@ -193,11 +194,20 @@ public class EthLinux implements IEth {
bw.close();
return db.create(ebs);
Msg res=Msg.getByCode(db.create(ebs));
if (res.getTypeVariable().getCode()==0) {
return Msg.EthUpdateSucc.getCode();
}
return Msg.EthError.getCode();
} catch (IOException e) {
log.error(e.getMessage());
return Msg.SaveFileError.getCode();
return Msg.EthError.getCode();
}
}
......
......@@ -18,7 +18,14 @@ public class Gsm implements IGsm {
}
public int set(GSMBean m) {
return db.create(m);
Msg res=Msg.getByCode(db.create(m));
if (res.getTypeVariable().getCode()==0) {
return Msg.GsmUpdateSucc.getCode();
}
return Msg.GsmUpdateError.getCode();
}
/*
......@@ -29,7 +36,7 @@ public class Gsm implements IGsm {
m=new GSMBean();
m.setOperator("megafon");
return db.create(m);
return set(m);
}
......
......@@ -77,7 +77,6 @@ public class ProxyLinux implements IProxy {
return Msg.ProxyUpdateSucc.getCode();
} catch (IOException e) {
log.error(e.getMessage());
log.error(Msg.ProxyUpdateError.getDescription());
return Msg.ProxyUpdateError.getCode();
}
}
......
......@@ -9,6 +9,7 @@ import java.io.FileOutputStream;
import java.io.FileInputStream;
import org.apache.log4j.Logger;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.Paths;
import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.servers.model.ServerBean;
......@@ -23,7 +24,13 @@ public class Servers implements IServers {
public int set(Vector<ServerBean> beans) {
return db.create(beans);
Msg res=Msg.getByCode(db.create(beans));
if (res.getTypeVariable().getCode()==0) {
return Msg.RemoteServerUpdateSucc.getCode();
}
return Msg.RemoteUpdateError.getCode();
}
public Vector<ServerBean> get() {
......