Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 541a1351 541a1351d41f11cf114a457faf94d23dab9d1174 by root
Options

save

1 parent d27f4cd8
Inline Side-by-side
Showing 77 changed files with 432 additions and 256 deletions
......@@ -136,7 +136,7 @@
<dependency>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.3</version>
<version>1.10</version>
</dependency>
</dependencies>
......
6f13b6f9fb79652a6aac0b78f2380bd5
\ No newline at end of file
0e40e1ccef32125b11c78d64436af5454189aa01
\ 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.10</version>
</project>
fbc8e29a6fc8ed1308256ea1a718cf44
\ No newline at end of file
97922d063626fc90f509e731ddfcfc5172741cc4
\ No newline at end of file
16b24a6d9f04bae73304ca817b233fda
\ No newline at end of file
2197f21c750bc525f319ca880168cee607c1bec9
\ 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.4</version>
</project>
d90a4a325b54b454fc18ff3390e910fe
\ No newline at end of file
6cfb23e1135c818d3907369d381053eedbbd53c1
\ No newline at end of file
9bfff7a8f3552afa1575707e621ba2da
\ No newline at end of file
38e78707725e4441cb8790413d0d2173954e999e
\ 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.5</version>
</project>
0e856d2372abd3a4b8a60c351ffb4923
\ No newline at end of file
63601f61f2ab24e4c5d64adaaa04045e2dcc7a92
\ No newline at end of file
06d4ce453a4a8874c87ec31f9e16a88c
\ No newline at end of file
6eb801d8ddceaa06291f6876758c61cb3839d0cc
\ 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.6</version>
</project>
ea143d61f07743e16446c8e357d6f440
\ No newline at end of file
692d2d7b9aca8a6741d47b04e7be5010e0e15448
\ No newline at end of file
594a3ca4edce91ca5480f62cb7a5a787
\ No newline at end of file
b6fd221377336f3192b827cc1b7ca6b705d957b3
\ 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.7</version>
</project>
114662813466d86e074e5cd5ad8d77a0
\ No newline at end of file
ea637e7c763763ab67bcc19a4fa19729f2613702
\ No newline at end of file
be99a653df3112c4595c6b25c1dc4878
\ No newline at end of file
b2c6709a31fcd0cd2c6acbdcdbf52ee40b5b8b92
\ 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.8</version>
</project>
18bf10a6c67fd7a878c5325eb82f3866
\ No newline at end of file
dd8b28080eade78b8679e3fbf899a5f11870494d
\ No newline at end of file
6d4186d224e70ecfc2e45e56bffa58fa
\ No newline at end of file
0bc2676e90a99467fcff40ef9e600e8d80041ee3
\ 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.9</version>
</project>
5a6d7080d89a71485c2ac63dc595d711
\ No newline at end of file
678ee19fd36756ecf7b485831708c6a4197ffeb3
\ No newline at end of file
......@@ -3,13 +3,20 @@
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<versioning>
<release>1.3</release>
<release>1.10</release>
<versions>
<version>1.0</version>
<version>1.1</version>
<version>1.2</version>
<version>1.3</version>
<version>1.4</version>
<version>1.5</version>
<version>1.6</version>
<version>1.7</version>
<version>1.8</version>
<version>1.9</version>
<version>1.10</version>
</versions>
<lastUpdated>20150730083754</lastUpdated>
<lastUpdated>20150730104601</lastUpdated>
</versioning>
</metadata>
......
f694c82e4fbd3e4132fed50768c031e6
\ No newline at end of file
9d106f7b79ae181205c9a30243b5a016
\ No newline at end of file
......
500d42766cac423c8bf0bbead4ea70c1483b96f8
\ No newline at end of file
b525ea5f10b108b6840c20968146c6608b40168c
\ No newline at end of file
......
......@@ -36,14 +36,18 @@ import java.util.List;
import org.emercit.devtools.service.DevControlService;
import org.emercit.dtmanager.model.DateInfo;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.MsgResult;
@Controller
@RequestMapping("api")
public class DevControlController {
@RequestMapping(value="devcontrol/ntp" , method = RequestMethod.POST)
public @ResponseBody boolean changeNtp(@RequestBody DateInfo m) {
public @ResponseBody MsgResult changeNtp(@RequestBody DateInfo m) {
return Msg.getMsgResultByCode(DevControlService.INSTANCE.ChangeNtp(m.getNtp()));
return DevControlService.INSTANCE.ChangeNtp(m.getNtp());
}
@RequestMapping(value = "devcontrol/dateinfo", method = RequestMethod.GET)
......@@ -61,11 +65,10 @@ public class DevControlController {
}
@RequestMapping(value = "devcontrol/calibration", method = RequestMethod.GET)
public @ResponseBody boolean DvCalibration() {
public @ResponseBody MsgResult DvCalibration() {
DevControlService.INSTANCE.Calibration();
return Msg.getMsgResultByCode(DevControlService.INSTANCE.Calibration());
return true;
}
}
......
......@@ -31,6 +31,8 @@ import java.util.Vector;
import org.emercit.devinfo.model.DevInfoBean;
import org.emercit.devtools.service.DevInfoService;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.MsgResult;
@Controller
......@@ -41,19 +43,13 @@ public class DevInfoController {
@RequestMapping(value = "devinfo", method = RequestMethod.GET)
public @ResponseBody DevInfoBean getDevInfo() {
return DevInfoService.INSTANCE.get();
return DevInfoService.INSTANCE.get();
}
@RequestMapping(value="devinfo/update" , method = RequestMethod.POST)
public @ResponseBody MsgResult update(@RequestBody DevInfoBean m) {
@RequestMapping(value="devinfo/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody DevInfoBean m) {
return DevInfoService.INSTANCE.set(m);
}
return Msg.getMsgResultByCode(DevInfoService.INSTANCE.set(m));
}
}
......
......@@ -30,23 +30,22 @@ import org.emercit.dnsmanager.model.DnsBean;
import java.util.ArrayList;
import java.util.List;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.MsgResult;
@Controller
@RequestMapping("api")
public class DnsController {
@RequestMapping(value = "dns/all", method = RequestMethod.GET)
public @ResponseBody Vector<DnsBean> getAllDns() {
return DnsService.INSTANCE.getAllDnsBean();
}
@RequestMapping(value="dns/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody DnsBean[] beans) {
public @ResponseBody MsgResult update(@RequestBody DnsBean[] beans) {
Vector<DnsBean> dbs=new Vector<DnsBean>();
for (DnsBean d:beans) {
......@@ -57,10 +56,7 @@ public class DnsController {
dbs.add(db);
}
return DnsService.INSTANCE.Upd(dbs);
return Msg.getMsgResultByCode(DnsService.INSTANCE.Upd(dbs));
}
}
......
......@@ -34,7 +34,8 @@ import org.emercit.devtools.service.DnsService;
import org.emercit.devtools.service.EthService;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.MsgResult;
@Controller
@RequestMapping("api")
......@@ -45,7 +46,7 @@ public class EthController {
@RequestMapping(value = "eth/all", method = RequestMethod.GET)
public @ResponseBody Vector<EthBean> getAllEth() {
try {
try {
return EthService.INSTANCE.getAllEthbean();
}
catch(Exception e)
......@@ -54,45 +55,15 @@ public class EthController {
}
}
/*
@RequestMapping(value = "net/proxy", method = RequestMethod.GET)
public @ResponseBody Vector<ProxyBean> getAllProxy() {
try {
return NetService.INSTANCE.getProxy();
}
catch(Exception e)
{
return null;
}
}
*/
/*
export http_proxy='http://user:password@prox-server:3128'
export https_proxy='http://user:password@prox-server:3128'
export ftp_proxy='http://user:password@prox-server:3128'
*/
/*
*
*/
@RequestMapping(value = "eth/byeth/{eth}", method = RequestMethod.GET)
public @ResponseBody EthBean getEth(@PathVariable String eth) {
return EthService.INSTANCE.getByName(eth);
return EthService.INSTANCE.getByName(eth);
}
@RequestMapping(value="eth/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody EthBean m) {
return EthService.INSTANCE.Upd(m);
}
@RequestMapping(value="eth/update" , method = RequestMethod.POST)
public @ResponseBody MsgResult update(@RequestBody EthBean m) {
return Msg.getMsgResultByCode(EthService.INSTANCE.Upd(m));
}
}
......
package org.emercit.devtools.app;
import java.util.Locale;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.*;
import javax.servlet.ServletContext;
import java.io.*;
import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Vector;
import org.emercit.logreader.Reader;
@Controller
@RequestMapping("api")
public class LogController {
private Reader log=new Reader();
@RequestMapping(value = "log/show", method = RequestMethod.GET)
public @ResponseBody Vector<String> getLog() {
return log.read();
}
}
......@@ -34,17 +34,12 @@ import org.emercit.devtools.service.DnsService;
import org.emercit.devtools.service.ProxyService;
import org.emercit.dnsmanager.model.DnsBean;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.MsgResult;
@Controller
@RequestMapping("api")
public class ProxyController {
@RequestMapping(value = "proxy/all", method = RequestMethod.GET)
public @ResponseBody Vector<ProxyBean> getAllProxy() {
......@@ -59,9 +54,8 @@ public class ProxyController {
@RequestMapping(value="proxy/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody ProxyBean[] beans) {
public @ResponseBody MsgResult update(@RequestBody ProxyBean[] beans) {
Vector<ProxyBean> dbs=new Vector<ProxyBean>();
for (ProxyBean d:beans) {
......@@ -77,29 +71,12 @@ public class ProxyController {
db.setPass(d.getPass());
db.setEnabled(d.getEnabled());
// db.setAuth(d.getAuth());
dbs.add(db);
}
return ProxyService.INSTANCE.Upd(dbs);
return Msg.getMsgResultByCode(ProxyService.INSTANCE.Upd(dbs));
}
/*
export http_proxy='http://user:password@prox-server:3128'
export https_proxy='http://user:password@prox-server:3128'
export ftp_proxy='http://user:password@prox-server:3128'
*/
/*
*
*/
}
......
......@@ -33,16 +33,13 @@ import org.emercit.devtools.service.EthService;
import org.emercit.devtools.service.RemoteServerManager;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.servers.model.ServerBean;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.config.MsgResult;
@Controller
@RequestMapping("api")
public class RemoteServerController {
@RequestMapping(value = "remoteserver/bytype/{type}", method = RequestMethod.GET)
public @ResponseBody ServerBean getRemoteServerByType(@PathVariable String type) {
......@@ -50,13 +47,10 @@ public class RemoteServerController {
}
@RequestMapping(value="remoteserver/update" , method = RequestMethod.POST)
public @ResponseBody boolean update(@RequestBody ServerBean b) {
@RequestMapping(value="remoteserver/update" , method = RequestMethod.POST)
public @ResponseBody MsgResult update(@RequestBody ServerBean b) {
return RemoteServerManager.INSTANCE.Update(b);
return Msg.getMsgResultByCode(RemoteServerManager.INSTANCE.Update(b));
}
}
......
......@@ -14,6 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.emercit.displaycalibrator.service.DCalibratorBB;
import org.emercit.utilstools.config.Paths;
public enum DevControlService {
INSTANCE;
......@@ -22,6 +26,7 @@ public enum DevControlService {
private CmdExec cmdexec=new CmdExec();
private DCalibratorBB calibrator=new DCalibratorBB();
public DateInfo getDateInfo() {
DateInfo dateinfo=new DateInfo();
......@@ -43,16 +48,10 @@ public enum DevControlService {
}
public boolean ChangeNtp(String value) {
public int ChangeNtp(String value) {
boolean result=ntplinux.setUsNtpServer(value);
if (result) {
int result=ntplinux.setUsNtpServer(value);
try { cmdexec.Run("/etc/init.d/ntp restart"); } catch (Exception e) {};
}
return result;
}
......@@ -70,10 +69,11 @@ public enum DevControlService {
}
public void Calibration() {
public int Calibration() {
try { cmdexec.Run("/opt/devtools/calibrator.sh"); } catch (Exception e) {};
//try { cmdexec.Run("/opt/devtools/calibrator.sh"); } catch (Exception e) {};
return calibrator.Run(Paths.dirScripts+"calibrator.sh");
}
......
......@@ -21,7 +21,7 @@ public enum DevInfoService {
return devinfo.get();
}
public boolean set(DevInfoBean m) {
public int set(DevInfoBean m) {
return devinfo.set(m);
}
......
......@@ -19,16 +19,11 @@ public enum DnsService {
private Vector<DnsBean> vDbns;
public Vector<DnsBean> getAllDnsBean() {
return dnslinux.getAllDns();
return dnslinux.getAllDns();
}
public boolean Upd(Vector<DnsBean> beans) {
return dnslinux.Config(beans);
public int Upd(Vector<DnsBean> beans) {
return dnslinux.Config(beans);
}
......
......@@ -9,7 +9,6 @@ import org.emercit.ethmanager.model.EthBean;
import org.emercit.ethmanager.service.EthLinux;
public enum EthService {
INSTANCE;
......@@ -31,26 +30,13 @@ public enum EthService {
return vEbns;
}
public boolean ApplyConfig(EthBean eb) {
//return ethlinux.;
return true;
}
public EthBean getByName(String value) {
return ethlinux.getEthByName(value);
}
public boolean Upd(EthBean m) {
public int Upd(EthBean m) {
return ethlinux.Update(m);
}
......
......@@ -12,11 +12,10 @@ public enum GSMService {
public GSMBean getGsm() {
return gsm.get();
return gsm.get();
}
public boolean Update(GSMBean m) {
return gsm.set(m);
public int Update(GSMBean m) {
return gsm.set(m);
}
}
\ No newline at end of file
......
......@@ -5,12 +5,10 @@ import org.emercit.model.IPAddressValidator;
import java.util.Vector;
import org.emercit.proxymanager.model.ProxyBean;
import org.emercit.proxymanager.service.ProxyLinux;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.projecttools.constants.Paths;
import org.emercit.utilstools.config.Paths;
public enum ProxyService {
......@@ -23,14 +21,11 @@ public enum ProxyService {
private Vector<ProxyBean> vPb;
public Vector<ProxyBean> getAllProxyBean() {
return (Vector<ProxyBean> )db.select();
return (Vector<ProxyBean> )db.select();
}
public boolean Upd(Vector<ProxyBean> beans) {
// proxy.Config(beans);
return true;
public int Upd(Vector<ProxyBean> beans) {
return proxy.Config(beans);
}
}
......
......@@ -38,9 +38,10 @@ public enum RemoteServerManager {
}
public boolean Update(ServerBean b) {
public int Update(ServerBean b) {
beans=store.get();
beans=store.get();
for (ServerBean bean:beans) {
......@@ -55,10 +56,8 @@ public enum RemoteServerManager {
return store.set(beans);
}
}
return false;
return 2;
}
}
......
......@@ -13,9 +13,11 @@
<appender name="file" class="org.apache.log4j.FileAppender">
<param name="File" value="/var/log/devtools.log" />
<param name="MaxFileSize" value="10KB"/>
<param name="MaxFileSize" value="1KB"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-7p %d [%t] %c %x - %m%n"/>
<param name="ConversionPattern" value="%-7p %d [%t] %c %x - %m%n"/>
</layout>
</appender>
......
......@@ -12,7 +12,8 @@ Ext.application({
'DetailDns',
'DetailProxy',
'RemoteServer',
'DeviceControl'
'DeviceControl',
'Log'
......@@ -25,7 +26,8 @@ Ext.application({
'Dns',
'Proxy',
'RemoteServer',
'DeviceControl'
'DeviceControl',
'Log'
],
......@@ -222,6 +224,23 @@ Ext.application({
]
},
{
title: 'ЖУРНАЛ',
items:[
{
region: 'center',
xtype: 'tabpanel',
items: [{
xtype : 'mvvm-LogView',
id:'formlog'
}
]
}
]
},
/*
{
title: 'ПЕРЕМЕННЫЕ',
......
......@@ -45,6 +45,7 @@ Ext.define('App.controller.DeviceControl', {
this.LoadDTParams();
Ext.TaskManager.start({
run: this.LoadDTParams,
interval: 15000 ,
......@@ -74,11 +75,11 @@ Ext.define('App.controller.DeviceControl', {
var result = Ext.JSON.decode(response.responseText);
Ext.getCmp('dtCurrent').setValue(result.dt);
// Ext.getCmp('ntpServer').setValue(result.ntp);
}, failure: function(response, opts) {
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
}
});
......@@ -100,7 +101,10 @@ Ext.define('App.controller.DeviceControl', {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
}
}, failure: function(response, opts) {
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
}
});
......@@ -119,6 +123,8 @@ Ext.define('App.controller.DeviceControl', {
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
}, failure: function(response, opts) {
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
}
});
......@@ -144,6 +150,8 @@ Ext.define('App.controller.DeviceControl', {
success: function(response, opts) {
Ext.getCmp('fsdisplay').unmask();
}, failure: function(response, opts) {
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
}
});
......@@ -183,21 +191,11 @@ Ext.define('App.controller.DeviceControl', {
var result = Ext.JSON.decode(response.responseText);
Ext.getCmp('fsdateinfo').unmask();
/*
if(result) {
Ext.Msg.alert('Успешно', 'Обновление конфигурации выполнено!');
}
else
{
Ext.Msg.alert('Ошибка', 'Обновление конфигурации не выполнено!');
}
*/
Ext.getCmp('fsdateinfo').unmask();
Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
}, failure: function(response, opts) {
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
}
});
......
Ext.define('App.controller.Log', {
extend : 'Ext.app.Controller',
init : function() {
this.control({
'toolbar button[action=loadLog]' : {
click : this.onLoadLog
}
});
},
onLoadLog :function (btn, e, options) {
var form = Ext.getCmp('formlog');
if (form!=null) {
Ext.Ajax.request({
method: "GET",
url: 'api/log/show',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
success: function(response, opts) {
var result = Ext.JSON.decode(response.responseText);
var str="";
for(var i in result){
str=str+result[i]+"\n";
}
Ext.getCmp('logResult').setValue(str);
form.unmask();
}, failure: function(response, opts) {
form.unmask();
Ext.Msg.alert('Failure', 'Ошибка связи с сервером');
}
});
}
}
});
\ No newline at end of file
......@@ -40,12 +40,8 @@ Ext.define('App.controller.MainConfig', {
}, failure: function(response, opts) {
}
});
},
onSaveButtonClick : function(btn) {
Ext.getCmp('formmainconfig').mask('Загрузка...');
......@@ -68,22 +64,12 @@ Ext.define('App.controller.MainConfig', {
params: data,
success: function(response, opts) {
// var result = Ext.JSON.decode(response.responseText);
/*
if(result) {
Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
//record.commit();
}
else
{
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('Failure', 'Обновление конфигурации не выполнено!');
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
}
});
......
......@@ -160,13 +160,11 @@ Ext.define('App.controller.Proxy', {
var result = Ext.JSON.decode(response.responseText);
for(var i in result){
this.setModelToForm(result[i]);
this.setModelToForm(result[i]);
}
}, failure: function(response, opts) {
}
}, failure: function(response, opts) {
Ext.Msg.alert('Failure', 'Ошибка сохранения');
}
});
}
......
......@@ -20,10 +20,6 @@ Ext.define('App.controller.RemoteServer', {
onLoad:function() {
//mask
//Ext.getCmp('formremoteserver').mask("Загрузка...");
Ext.Ajax.request({
method: "GET",
url: 'api/remoteserver/bytype/szs',
......@@ -45,15 +41,9 @@ Ext.define('App.controller.RemoteServer', {
remoteServerView.down('#IdRemoteServer').setValue(result.id);
/*
Ext.getCmp('guid').setValue(result.guid);
Ext.getCmp('title').setValue(result.description);
*/
}, failure: function(response, opts) {
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
}
});
......@@ -97,21 +87,10 @@ Ext.define('App.controller.RemoteServer', {
success: function(response, opts) {
var result = Ext.JSON.decode(response.responseText);
if(result) {
Ext.Msg.alert('Success', 'Обновление конфигурации выполнено!');
//record.commit();
}
else
{
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
}
Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
}, failure: function(response, opts) {
Ext.Msg.alert('Failure', 'Обновление конфигурации не выполнено!');
Ext.Msg.alert('Ошибка', 'Сервер недоступен');
}
});
......
Ext.define('App.view.Log', {
extend : 'Ext.form.Panel',
xtype : 'mvvm-LogView',
width : 400,
height:300,
bodyPadding: 10,
bbar: {
items: [
{
xtype: 'button',
iconCls:'load',
itemId: 'LoadLogButton',
text: 'Обновить',
action: 'loadLog',
disabled:false
}
]
},
items: [{
xtype : 'textareafield',
grow : true,
id:'logResult',
readOnly : true,
allowBlank: false,
style:'overflow-y: scroll',
height: 100,
anchor: '95%'
}
]
});
\ No newline at end of file
......@@ -71,6 +71,7 @@ Ext.define('App.view.PingUtil', {
margin:'5 5 10 3',
id:'pingResult',
xtype : 'textareafield',
readOnly : true,
grow : true,
preventScrollbars: false,
width:700,
......
......@@ -10,32 +10,61 @@
</layout>
</appender>
<appender name="file" 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"/>
</layout>
</appender>
<!-- Application Loggers -->
<logger name="org.emercit.app">
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
</logger>
<!-- 3rdparty Loggers -->
<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" />
</logger>
<appender-ref ref="console" />
<appender-ref ref="file" />
</logger>
<logger name="org.springframework.beans">
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
</logger>
<logger name="org.springframework.context">
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
</logger>
<logger name="org.springframework.web">
<level value="info" />
<appender-ref ref="console" />
<appender-ref ref="file" />
</logger>
<!-- Root Logger -->
<root>
<priority value="info" />
<priority value="warn" />
<appender-ref ref="console" />
</root>
</log4j:configuration>
</log4j:configuration>
\ No newline at end of file
......
......@@ -67,7 +67,7 @@ public class NtpLinux implements INtp {
log.error(e.getMessage());
return Msg.SaveFileError.getCode();
}
return Msg.SaveFileError.getCode();
return Msg.SaveFileSucc.getCode();
}
public int init() {
......
......@@ -24,7 +24,7 @@ public class Reader {
reader = new BufferedReader(new InputStreamReader(fis));
String line = reader.readLine();
while(line != null){
System.out.println(line);
result.add(line);
line = reader.readLine();
}
......
......@@ -29,7 +29,7 @@ public class CmdExec {
while(br.ready()) {
String message=br.readLine();
v.add(message);
log.info(message);
//log.info(message);
}
return v;
}
......
......@@ -2,6 +2,9 @@ package org.emercit.utilstools.config;
import org.emercit.utilstools.config.TypeMsg;
import org.emercit.utilstools.config.MsgResult;
public enum Msg {
SaveFileSucc(1,TypeMsg.INFO,"Выполнено сохранение файла"),
......@@ -47,7 +50,7 @@ public enum Msg {
this.description=description;
}
static public Msg getCode(int code) {
static public Msg getByCode(int code) {
for (Msg v: Msg.values()) {
if (v.getCode()==code) {
return v;
......@@ -68,19 +71,21 @@ public enum Msg {
}
/*
public static final String msgUpdSucc="Выполнено обновление";
public static final String msgUpdErr="Обновление не выполнено";
public static final String mdgCalibratorSucc="Выполнена калибровка экрана";
public static final String msgCalibratorError="Калибровка экрана не выполнена";
*/
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();
return result;
}
}
return null;
}
}
......
package org.emercit.utilstools.config;
public class MsgResult {
public int code;
public String type;
public String message;
}
......@@ -78,11 +78,7 @@ public class Settings implements ISettings {
proxylinux.Config(model.getProxyBeans());
remserv.set(model.getRserverbeans());
}
public SettingsBean make() {
......
......@@ -35,7 +35,7 @@ public class Db implements IDb {
XMLEncoder xmlEncoder = new XMLEncoder(bos);
xmlEncoder.writeObject(o);
xmlEncoder.close();
log.error(Msg.SaveFileSucc.getDescription());
log.info(Msg.SaveFileSucc.getDescription());
}catch(Exception e) {
log.error(e.getMessage());
return Msg.SaveFileError.getCode();
......