Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 62afec69 62afec69bd106ee54f34fe528ebd1bfccf3c7bd2 by root
Options

save

1 parent 4a040846
Inline Side-by-side
Showing 104 changed files with 390 additions and 77 deletions
...@@ -148,10 +148,10 @@ ...@@ -148,10 +148,10 @@
148 <dependency> 148 <dependency>
149 <groupId>org.emercit</groupId> 149 <groupId>org.emercit</groupId>
150 <artifactId>utilstools</artifactId> 150 <artifactId>utilstools</artifactId>
151 <version>1.22</version> 151 <version>1.31</version>
152 </dependency> 152 </dependency>
153 153
154 <dependency> 154 <dependency>
155 <groupId>log4j</groupId> 155 <groupId>log4j</groupId>
156 <artifactId>log4j</artifactId> 156 <artifactId>log4j</artifactId>
157 <version>1.2.14</version> 157 <version>1.2.14</version>
......
1 25c22fd6c6a4eaed88b9365348f633c9
...\ No newline at end of file ...\ No newline at end of file
1 5c2524c703fa08c2991a4bd4720b6d673824185e
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.26</version>
8 </project>
1 ffc8c4b9a9b00fc661f534b83d712e62
...\ No newline at end of file ...\ No newline at end of file
1 c498ab88373813bacf46595404a15b9407039af2
...\ No newline at end of file ...\ No newline at end of file
1 321823fb989c26997a524c82e38b5355
...\ No newline at end of file ...\ No newline at end of file
1 9f9a5f8450f7a62fa0eb54faa49f7e8647eeb2fd
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.27</version>
8 </project>
1 3cf6a0f4c7a9ee931cd15db0f26a0f6d
...\ No newline at end of file ...\ No newline at end of file
1 135df446514f14ff101e6855443772d34f19f323
...\ No newline at end of file ...\ No newline at end of file
1 f3a34e486a2425a9e18a8a800b562143
...\ No newline at end of file ...\ No newline at end of file
1 e372adeca17ff914d016c187ab909321628b72cc
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.28</version>
8 </project>
1 b657c63283875515917c9930de6edd3e
...\ No newline at end of file ...\ No newline at end of file
1 177a4b85e67fd4a0ea2409a2c071492351d65019
...\ No newline at end of file ...\ No newline at end of file
1 2400bbdf398312f03357e5123fbe219a
...\ No newline at end of file ...\ No newline at end of file
1 2eccd29220d41d88033872904b73e26338c52f23
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.29</version>
8 </project>
1 f90f62d2e5ddf84df02704c6f86130ce
...\ No newline at end of file ...\ No newline at end of file
1 836f683853caf5da4fc27a3e9eedb8a28c73a5a7
...\ No newline at end of file ...\ No newline at end of file
1 deab25eeef5ca453cc017a4caf6f8545
...\ No newline at end of file ...\ No newline at end of file
1 e0186e688d5982196a0dbb64bebc642e6f25cb68
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.30</version>
8 </project>
1 c8099c8c06b6f7552268c9b464f4a2de
...\ No newline at end of file ...\ No newline at end of file
1 f7ea3e68ec211a706aabb8d112f29886a227877f
...\ No newline at end of file ...\ No newline at end of file
1 b43bbe285795d090ad7ce4e45865951b
...\ No newline at end of file ...\ No newline at end of file
1 6c27477d01fa945e3f95964178b1099c5cff25a8
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.31</version>
8 </project>
1 472e821b4c9a7015457f84557ec163c4
...\ No newline at end of file ...\ No newline at end of file
1 068072a11227a1c1dd87c38f4d6cfd67c2428bfb
...\ No newline at end of file ...\ No newline at end of file
1 2a3403cd61ca3268e27894d526561bdc
...\ No newline at end of file ...\ No newline at end of file
1 a378ad71316e6737a0a02c9fe57d4c9aaead9896
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.32</version>
8 </project>
1 a1da1db6319207515478e2201ea0e2eb
...\ No newline at end of file ...\ No newline at end of file
1 2fc76ca297feb7fe9029288376ab09fe50ca0b57
...\ No newline at end of file ...\ No newline at end of file
1 bf2d8ba915ada17ccdf1a5d1f745f692
...\ No newline at end of file ...\ No newline at end of file
1 1fa7fb2d5a5666b7508737c87f54bcf3d7d91fa7
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.33</version>
8 </project>
1 b581b921d66344cf09e38f9f35b9914b
...\ No newline at end of file ...\ No newline at end of file
1 c9f5b4814775effb4af82d34f2ab8b9e72ca4869
...\ No newline at end of file ...\ No newline at end of file
1 2d3ffe08c45317d33fd2b798d7b1803d
...\ No newline at end of file ...\ No newline at end of file
1 cce2c0a0b5122c9348340c4251e9efab10f6906e
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.34</version>
8 </project>
1 23f8af5bc509d5b75d9520bd14f0ad4d
...\ No newline at end of file ...\ No newline at end of file
1 80cd99277b59edaaa8ed5498f361a5917b26bdd4
...\ No newline at end of file ...\ No newline at end of file
1 9c93d32e008d5a27db83ec59c27d9723
...\ No newline at end of file ...\ No newline at end of file
1 c35c35df8ac745e059a588aa1843552b0a63d19a
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.35</version>
8 </project>
1 e6006d44dd150e4d9d5c8edbd57cc3c9
...\ No newline at end of file ...\ No newline at end of file
1 afe5dca0c2285917819c7af354b3dc54d9d37236
...\ No newline at end of file ...\ No newline at end of file
1 c58e3bb462f24f3dedb2dd7ef6076292
...\ No newline at end of file ...\ No newline at end of file
1 74c9a3419e355b9f36d7e50ee246cd9de6d58a49
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <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"
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4 <modelVersion>4.0.0</modelVersion>
5 <groupId>org.emercit</groupId>
6 <artifactId>utilstools</artifactId>
7 <version>1.36</version>
8 </project>
1 982cc368d2a66a7362361502aeeffb3f
...\ No newline at end of file ...\ No newline at end of file
1 3f8c4632690f3dd8364695390a2cf92d3d2c8bc8
...\ No newline at end of file ...\ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <groupId>org.emercit</groupId> 3 <groupId>org.emercit</groupId>
4 <artifactId>utilstools</artifactId> 4 <artifactId>utilstools</artifactId>
5 <versioning> 5 <versioning>
6 <release>1.25</release> 6 <release>1.36</release>
7 <versions> 7 <versions>
8 <version>1.0</version> 8 <version>1.0</version>
9 <version>1.1</version> 9 <version>1.1</version>
...@@ -31,7 +31,18 @@ ...@@ -31,7 +31,18 @@
31 <version>1.23</version> 31 <version>1.23</version>
32 <version>1.24</version> 32 <version>1.24</version>
33 <version>1.25</version> 33 <version>1.25</version>
34 <version>1.26</version>
35 <version>1.27</version>
36 <version>1.28</version>
37 <version>1.29</version>
38 <version>1.30</version>
39 <version>1.31</version>
40 <version>1.32</version>
41 <version>1.33</version>
42 <version>1.34</version>
43 <version>1.35</version>
44 <version>1.36</version>
34 </versions> 45 </versions>
35 <lastUpdated>20150805105141</lastUpdated> 46 <lastUpdated>20150808085500</lastUpdated>
36 </versioning> 47 </versioning>
37 </metadata> 48 </metadata>
......
1 a85d629204702a51acbd08f6e9678a65
...\ No newline at end of file ...\ No newline at end of file
1 f3ca1cf4f523b1fdbd4df54d8bfb1a65
...\ No newline at end of file ...\ No newline at end of file
......
1 12274e1fab081928b91240b396b92703f0e0e5ff
...\ No newline at end of file ...\ No newline at end of file
1 82ce6a4ad78e198d3e92acef733a290e91de1bcf
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -22,19 +22,19 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -22,19 +22,19 @@ import org.springframework.web.bind.annotation.RequestBody;
22 22
23 import java.util.Vector; 23 import java.util.Vector;
24 24
25 import org.emercit.ethmanager.model.EthBean; 25 import org.emercit.utilstools.ethmanager.model.EthBean;
26 import org.emercit.proxymanager.model.ProxyBean; 26 import org.emercit.utilstools.proxymanager.model.ProxyBean;
27 import org.emercit.devinfo.model.DevInfoBean; 27 import org.emercit.utilstools.devinfo.model.DevInfoBean;
28 import org.emercit.devtools.service.DevInfoService; 28 import org.emercit.devtools.service.DevInfoService;
29 import org.emercit.devtools.service.DnsService; 29 import org.emercit.devtools.service.DnsService;
30 import org.emercit.devtools.service.EthService; 30 import org.emercit.devtools.service.EthService;
31 import org.emercit.dnsmanager.model.DnsBean; 31 import org.emercit.utilstools.dnsmanager.model.DnsBean;
32 32
33 import java.util.ArrayList; 33 import java.util.ArrayList;
34 import java.util.List; 34 import java.util.List;
35 35
36 import org.emercit.devtools.service.DevControlService; 36 import org.emercit.devtools.service.DevControlService;
37 import org.emercit.dtmanager.model.DateInfo; 37 import org.emercit.utilstools.dtmanager.model.DateInfo;
38 38
39 import org.emercit.utilstools.config.Msg; 39 import org.emercit.utilstools.config.Msg;
40 import org.emercit.utilstools.config.MsgResult; 40 import org.emercit.utilstools.config.MsgResult;
......
...@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody;
28 28
29 import java.util.Vector; 29 import java.util.Vector;
30 30
31 import org.emercit.devinfo.model.DevInfoBean; 31 import org.emercit.utilstools.devinfo.model.DevInfoBean;
32 import org.emercit.devtools.service.DevInfoService; 32 import org.emercit.devtools.service.DevInfoService;
33 33
34 import org.emercit.utilstools.config.Msg; 34 import org.emercit.utilstools.config.Msg;
......
...@@ -22,10 +22,10 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -22,10 +22,10 @@ import org.springframework.web.bind.annotation.RequestBody;
22 22
23 import java.util.Vector; 23 import java.util.Vector;
24 24
25 import org.emercit.ethmanager.model.EthBean; 25 import org.emercit.utilstools.ethmanager.model.EthBean;
26 import org.emercit.devtools.service.DnsService; 26 import org.emercit.devtools.service.DnsService;
27 import org.emercit.devtools.service.EthService; 27 import org.emercit.devtools.service.EthService;
28 import org.emercit.dnsmanager.model.DnsBean; 28 import org.emercit.utilstools.dnsmanager.model.DnsBean;
29 29
30 import java.util.ArrayList; 30 import java.util.ArrayList;
31 import java.util.List; 31 import java.util.List;
......
...@@ -16,7 +16,7 @@ import javax.xml.bind.JAXBException; ...@@ -16,7 +16,7 @@ import javax.xml.bind.JAXBException;
16 16
17 import org.apache.commons.io.IOUtils; 17 import org.apache.commons.io.IOUtils;
18 import org.emercit.devtools.service.DnsService; 18 import org.emercit.devtools.service.DnsService;
19 import org.emercit.dnsmanager.model.DnsBean; 19 import org.emercit.utilstools.dnsmanager.model.DnsBean;
20 import org.springframework.beans.factory.annotation.Autowired; 20 import org.springframework.beans.factory.annotation.Autowired;
21 import org.springframework.http.MediaType; 21 import org.springframework.http.MediaType;
22 import org.springframework.stereotype.Controller; 22 import org.springframework.stereotype.Controller;
......
...@@ -29,10 +29,10 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -29,10 +29,10 @@ import org.springframework.web.bind.annotation.RequestBody;
29 29
30 import java.util.Vector; 30 import java.util.Vector;
31 31
32 import org.emercit.ethmanager.model.EthBean; 32 import org.emercit.utilstools.ethmanager.model.EthBean;
33 import org.emercit.devtools.service.DnsService; 33 import org.emercit.devtools.service.DnsService;
34 import org.emercit.devtools.service.EthService; 34 import org.emercit.devtools.service.EthService;
35 import org.emercit.dnsmanager.model.DnsBean; 35 import org.emercit.utilstools.dnsmanager.model.DnsBean;
36 36
37 import org.emercit.utilstools.config.Msg; 37 import org.emercit.utilstools.config.Msg;
38 import org.emercit.utilstools.config.MsgResult; 38 import org.emercit.utilstools.config.MsgResult;
......
...@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody;
29 29
30 import java.util.Vector; 30 import java.util.Vector;
31 31
32 import org.emercit.gsmmanager.model.GSMBean; 32 import org.emercit.utilstools.gsmmanager.model.GSMBean;
33 import org.emercit.utilstools.config.Msg; 33 import org.emercit.utilstools.config.Msg;
34 import org.emercit.utilstools.config.MsgResult; 34 import org.emercit.utilstools.config.MsgResult;
35 35
......
...@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody;
28 28
29 import java.util.Vector; 29 import java.util.Vector;
30 30
31 import org.emercit.logreader.Reader; 31 import org.emercit.utilstools.logreader.Reader;
32 32
33 33
34 @Controller 34 @Controller
...@@ -41,8 +41,6 @@ public class LogController { ...@@ -41,8 +41,6 @@ public class LogController {
41 @RequestMapping(value = "log/show", method = RequestMethod.GET) 41 @RequestMapping(value = "log/show", method = RequestMethod.GET)
42 public @ResponseBody Vector<String> getLog() { 42 public @ResponseBody Vector<String> getLog() {
43 43
44
45
46 return log.read(); 44 return log.read();
47 45
48 } 46 }
......
...@@ -29,10 +29,10 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -29,10 +29,10 @@ import org.springframework.web.bind.annotation.RequestBody;
29 29
30 import java.util.Vector; 30 import java.util.Vector;
31 31
32 import org.emercit.proxymanager.model.ProxyBean; 32 import org.emercit.utilstools.proxymanager.model.ProxyBean;
33 import org.emercit.devtools.service.DnsService; 33 import org.emercit.devtools.service.DnsService;
34 import org.emercit.devtools.service.ProxyService; 34 import org.emercit.devtools.service.ProxyService;
35 import org.emercit.dnsmanager.model.DnsBean; 35 import org.emercit.utilstools.dnsmanager.model.DnsBean;
36 36
37 import org.emercit.utilstools.config.Msg; 37 import org.emercit.utilstools.config.Msg;
38 import org.emercit.utilstools.config.MsgResult; 38 import org.emercit.utilstools.config.MsgResult;
......
...@@ -31,8 +31,8 @@ import java.util.Vector; ...@@ -31,8 +31,8 @@ import java.util.Vector;
31 31
32 import org.emercit.devtools.service.EthService; 32 import org.emercit.devtools.service.EthService;
33 import org.emercit.devtools.service.RemoteServerManager; 33 import org.emercit.devtools.service.RemoteServerManager;
34 import org.emercit.ethmanager.model.EthBean; 34 import org.emercit.utilstools.ethmanager.model.EthBean;
35 import org.emercit.servers.model.ServerBean; 35 import org.emercit.utilstools.servers.model.ServerBean;
36 import org.emercit.utilstools.config.Msg; 36 import org.emercit.utilstools.config.Msg;
37 import org.emercit.utilstools.config.MsgResult; 37 import org.emercit.utilstools.config.MsgResult;
38 38
......
...@@ -28,7 +28,7 @@ import org.emercit.utilstools.config.MsgResult; ...@@ -28,7 +28,7 @@ import org.emercit.utilstools.config.MsgResult;
28 28
29 import org.emercit.devtools.service.SvService; 29 import org.emercit.devtools.service.SvService;
30 30
31 import org.emercit.svmanager.model.SvBean; 31 import org.emercit.utilstools.svmanager.model.SvBean;
32 32
33 @Controller 33 @Controller
34 @RequestMapping("api") 34 @RequestMapping("api")
......
...@@ -23,11 +23,11 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -23,11 +23,11 @@ import org.springframework.web.bind.annotation.RequestBody;
23 23
24 import java.util.Vector; 24 import java.util.Vector;
25 25
26 import org.emercit.ethmanager.model.EthBean; 26 import org.emercit.utilstools.ethmanager.model.EthBean;
27 import org.emercit.proxymanager.model.ProxyBean; 27 import org.emercit.utilstools.proxymanager.model.ProxyBean;
28 import org.emercit.devtools.service.DnsService; 28 import org.emercit.devtools.service.DnsService;
29 import org.emercit.devtools.service.EthService; 29 import org.emercit.devtools.service.EthService;
30 import org.emercit.dnsmanager.model.DnsBean; 30 import org.emercit.utilstools.dnsmanager.model.DnsBean;
31 31
32 import java.util.ArrayList; 32 import java.util.ArrayList;
33 import java.util.List; 33 import java.util.List;
......
1 package org.emercit.devtools.service; 1 package org.emercit.devtools.service;
2 2
3 import org.emercit.devinfo.model.DevInfoBean; 3 import org.emercit.utilstools.devinfo.model.DevInfoBean;
4 import org.emercit.dtmanager.model.DateInfo; 4 import org.emercit.utilstools.dtmanager.model.DateInfo;
5 import org.emercit.dtmanager.service.NtpLinux; 5 import org.emercit.utilstools.dtmanager.service.NtpLinux;
6 6
7 import java.util.Calendar; 7 import java.util.Calendar;
8 import java.util.Date; 8 import java.util.Date;
9 import java.util.TimeZone; 9 import java.util.TimeZone;
10 import java.text.SimpleDateFormat; 10 import java.text.SimpleDateFormat;
11 11
12 import org.emercit.pckutils.cmd.CmdExec; 12 import org.emercit.utilstools.pckutils.cmd.CmdExec;
13 import org.springframework.web.bind.annotation.RequestMapping; 13 import org.springframework.web.bind.annotation.RequestMapping;
14 import org.springframework.web.bind.annotation.RequestMethod; 14 import org.springframework.web.bind.annotation.RequestMethod;
15 import org.springframework.web.bind.annotation.ResponseBody; 15 import org.springframework.web.bind.annotation.ResponseBody;
16 16
17 import org.emercit.displaycalibrator.service.DCalibratorBB; 17 import org.emercit.utilstools.displaycalibrator.service.DCalibratorBB;
18 18
19 import org.emercit.utilstools.config.Paths; 19 import org.emercit.utilstools.config.Paths;
20 20
...@@ -60,8 +60,6 @@ public enum DevControlService { ...@@ -60,8 +60,6 @@ public enum DevControlService {
60 60
61 } 61 }
62 62
63
64
65 public void Off() { 63 public void Off() {
66 try { cmdexec.Run("shutdown -h now"); } catch (Exception e) {}; 64 try { cmdexec.Run("shutdown -h now"); } catch (Exception e) {};
67 65
......
...@@ -4,9 +4,9 @@ package org.emercit.devtools.service; ...@@ -4,9 +4,9 @@ package org.emercit.devtools.service;
4 import org.emercit.model.IPAddressValidator; 4 import org.emercit.model.IPAddressValidator;
5 5
6 6
7 import org.emercit.devinfo.model.DevInfoBean; 7 import org.emercit.utilstools.devinfo.model.DevInfoBean;
8 8
9 import org.emercit.devinfo.service.DevInfo; 9 import org.emercit.utilstools.devinfo.service.DevInfo;
10 10
11 11
12 12
......
...@@ -6,8 +6,8 @@ import org.emercit.model.IPAddressValidator; ...@@ -6,8 +6,8 @@ import org.emercit.model.IPAddressValidator;
6 import java.util.Vector; 6 import java.util.Vector;
7 7
8 8
9 import org.emercit.dnsmanager.model.DnsBean; 9 import org.emercit.utilstools.dnsmanager.model.DnsBean;
10 import org.emercit.dnsmanager.service.DnsLinux; 10 import org.emercit.utilstools.dnsmanager.service.DnsLinux;
11 11
12 12
13 public enum DnsService { 13 public enum DnsService {
......
...@@ -5,8 +5,8 @@ import org.emercit.model.IPAddressValidator; ...@@ -5,8 +5,8 @@ import org.emercit.model.IPAddressValidator;
5 5
6 import java.util.Vector; 6 import java.util.Vector;
7 7
8 import org.emercit.ethmanager.model.EthBean; 8 import org.emercit.utilstools.ethmanager.model.EthBean;
9 import org.emercit.ethmanager.service.EthLinux; 9 import org.emercit.utilstools.ethmanager.service.EthLinux;
10 10
11 11
12 public enum EthService { 12 public enum EthService {
......
1 package org.emercit.devtools.service; 1 package org.emercit.devtools.service;
2 2
3 3
4 import org.emercit.gsmmanager.model.GSMBean; 4 import org.emercit.utilstools.gsmmanager.model.GSMBean;
5 import org.emercit.gsmmanager.service.Gsm; 5 import org.emercit.utilstools.gsmmanager.service.Gsm;
6 6
7 public enum GSMService { 7 public enum GSMService {
8 8
......
...@@ -5,9 +5,9 @@ import org.emercit.model.IPAddressValidator; ...@@ -5,9 +5,9 @@ import org.emercit.model.IPAddressValidator;
5 5
6 import java.util.Vector; 6 import java.util.Vector;
7 7
8 import org.emercit.proxymanager.model.ProxyBean; 8 import org.emercit.utilstools.proxymanager.model.ProxyBean;
9 import org.emercit.proxymanager.service.ProxyLinux; 9 import org.emercit.utilstools.proxymanager.service.ProxyLinux;
10 import org.emercit.xmldbmanager.service.Db; 10 import org.emercit.utilstools.xmldbmanager.service.Db;
11 import org.emercit.utilstools.config.Paths; 11 import org.emercit.utilstools.config.Paths;
12 12
13 public enum ProxyService { 13 public enum ProxyService {
......
...@@ -7,8 +7,8 @@ import org.emercit.model.IPAddressValidator; ...@@ -7,8 +7,8 @@ import org.emercit.model.IPAddressValidator;
7 import java.util.Vector; 7 import java.util.Vector;
8 8
9 9
10 import org.emercit.servers.model.ServerBean; 10 import org.emercit.utilstools.servers.model.ServerBean;
11 import org.emercit.servers.service.Servers; 11 import org.emercit.utilstools.servers.service.Servers;
12 public enum RemoteServerManager { 12 public enum RemoteServerManager {
13 13
14 INSTANCE; 14 INSTANCE;
......
...@@ -4,17 +4,17 @@ import org.emercit.model.IPAddressValidator; ...@@ -4,17 +4,17 @@ import org.emercit.model.IPAddressValidator;
4 4
5 import java.util.Vector; 5 import java.util.Vector;
6 6
7 import org.emercit.svmanager.service.Sv; 7 import org.emercit.utilstools.svmanager.service.Sv;
8 import org.emercit.svmanager.service.SvControl; 8 import org.emercit.utilstools.svmanager.service.SvControl;
9 import org.emercit.svmanager.model.SvBean; 9 import org.emercit.utilstools.svmanager.model.SvBean;
10 10
11 import java.util.Vector; 11 import java.util.Vector;
12 12
13 import org.emercit.pckutils.checkservice.STService; 13 import org.emercit.utilstools.pckutils.checkservice.STService;
14 import org.emercit.utilstools.config.Msg; 14 import org.emercit.utilstools.config.Msg;
15 import org.emercit.utilstools.config.Paths; 15 import org.emercit.utilstools.config.Paths;
16 import org.apache.log4j.Logger; 16 import org.apache.log4j.Logger;
17 import org.emercit.pckutils.checkservice.STService; 17 import org.emercit.utilstools.pckutils.checkservice.STService;
18 18
19 19
20 public enum SvService { 20 public enum SvService {
......
...@@ -5,7 +5,7 @@ import org.emercit.model.IPAddressValidator; ...@@ -5,7 +5,7 @@ import org.emercit.model.IPAddressValidator;
5 5
6 import java.util.Vector; 6 import java.util.Vector;
7 7
8 import org.emercit.pckutils.cmd.CmdExec; 8 import org.emercit.utilstools.pckutils.cmd.CmdExec;
9 9
10 public enum UtilsService { 10 public enum UtilsService {
11 11
......
...@@ -23,21 +23,26 @@ ...@@ -23,21 +23,26 @@
23 23
24 24
25 <!-- Application Loggers --> 25 <!-- Application Loggers -->
26 <logger name="org.emercit.app"> 26 <logger name="org.emercit.utilstools">
27
28 <level value="info" /> 27 <level value="info" />
29 <appender-ref ref="console" /> 28 <appender-ref ref="console" />
30 <appender-ref ref="file" /> 29 <appender-ref ref="file" />
31 </logger> 30 </logger>
32 31
32 <logger name="oorg.emercit.utilstools">
33 <level value="warn" />
34 <appender-ref ref="console" />
35 <appender-ref ref="file" />
36 </logger>
33 37
34 <logger name="org.emercit"> 38 <logger name="oorg.emercit.utilstools">
35 <level value="info" /> 39 <level value="error" />
36 <appender-ref ref="console" /> 40 <appender-ref ref="console" />
37 <appender-ref ref="file" /> 41 <appender-ref ref="file" />
38 </logger> 42 </logger>
39 43
40 44
45
41 <!-- rdparty Loggers --> 46 <!-- rdparty Loggers -->
42 <logger name="org.springframework.core"> 47 <logger name="org.springframework.core">
43 <level value="info" /> 48 <level value="info" />
......
...@@ -256,6 +256,7 @@ Ext.application({ ...@@ -256,6 +256,7 @@ Ext.application({
256 ] 256 ]
257 }, 257 },
258 258
259
259 /* 260 /*
260 { 261 {
261 title: 'ПЕРЕМЕННЫЕ', 262 title: 'ПЕРЕМЕННЫЕ',
......
...@@ -12,25 +12,18 @@ public class App ...@@ -12,25 +12,18 @@ public class App
12 { 12 {
13 private static final Logger log = Logger.getLogger(App.class); 13 private static final Logger log = Logger.getLogger(App.class);
14 14
15
16
17
18
19 public static void main( String[] args ) 15 public static void main( String[] args )
20 { 16 {
17 /*
18 Settings settings=new Settings();
21 19
20 settings.init();
22 21
22 SettingsBean settingsbean=settings.make();
23 23
24 Settings remserv=new Settings(); 24 settings.set(settingsbean);
25
26 remserv.init();
27
28 SettingsBean settingsbean=remserv.make();
29
30
31 remserv.set(settingsbean);
32
33 25
34 System.out.println(""); 26 System.out.println("");
27 */
35 } 28 }
36 } 29 }
......
...@@ -20,7 +20,7 @@ public class DefSettings { ...@@ -20,7 +20,7 @@ public class DefSettings {
20 public static final boolean Eth0_dhcp=false; 20 public static final boolean Eth0_dhcp=false;
21 public static final String Eth0_ip="192.168.99.1"; 21 public static final String Eth0_ip="192.168.99.1";
22 public static final String Eth0_netmask="255.255.255.0"; 22 public static final String Eth0_netmask="255.255.255.0";
23 public static final String Eth0_gateway="192.168.99.2"; 23 public static final String Eth0_gateway="192.168.99.1";
24 public static final String Eth0_broadcast=""; 24 public static final String Eth0_broadcast="";
25 public static final String Eth0_extinfo=""; 25 public static final String Eth0_extinfo="";
26 //Eth1 26 //Eth1
...@@ -80,12 +80,12 @@ public class DefSettings { ...@@ -80,12 +80,12 @@ public class DefSettings {
80 public static final boolean ctrlpnl_isrun=false; 80 public static final boolean ctrlpnl_isrun=false;
81 public static final int ctrlpnl_starttime=10000; // время запуска процесса в мс 81 public static final int ctrlpnl_starttime=10000; // время запуска процесса в мс
82 public static final int ctrlpnl_stoptime=5000; // время остановки процесса 82 public static final int ctrlpnl_stoptime=5000; // время остановки процесса
83 83 //
84 public static final String devtools_title="Web интерфейс для конфигурации"; 84 public static final String devtools_title="Web интерфейс для конфигурации";
85 85 //
86 public static final String ssh_host="127.0.0.1"; 86 public static final String ssh_host="127.0.0.1";
87 public static final int ssh_port=22; 87 public static final int ssh_port=22;
88 public static final String ssh_login="root"; 88 public static final String ssh_login="debian";
89 public static final String ssh_password="root"; 89 public static final String ssh_password="temppwd";
90 90
91 } 91 }
......
1 package org.emercit.utilstools.controldevtools.bean;
2
3 import java.awt.Color;
4 import java.awt.Dimension;
5 import java.awt.EventQueue;
6 import java.awt.Font;
7 import java.awt.Graphics;
8 import java.awt.event.ActionEvent;
9 import java.awt.event.ActionListener;
10 import java.beans.PropertyChangeListener;
11 import java.beans.PropertyVetoException;
12 import java.beans.VetoableChangeListener;
13 import java.beans.VetoableChangeSupport;
14 import java.io.Externalizable;
15 import java.io.IOException;
16 import java.io.ObjectInput;
17 import java.io.ObjectOutput;
18 import java.util.Timer;
19 import java.util.TimerTask;
20
21 import javax.swing.ImageIcon;
22 import javax.swing.JButton;
23 import javax.swing.JComponent;
24 import javax.swing.JFrame;
25 import javax.swing.JLabel;
26 import javax.swing.SwingWorker;
27 import javax.swing.event.ChangeEvent;
28 import javax.swing.event.ChangeListener;
29 import javax.swing.event.EventListenerList;
30 import javax.swing.event.SwingPropertyChangeSupport;
31
32 import org.apache.log4j.Logger;
33 import org.emercit.utilstools.config.DefSettings;
34 import org.emercit.utilstools.pckutils.checkservice.STService;
35 import org.emercit.utilstools.service.Settings;
36 import org.emercit.utilstools.svmanager.model.SvBean;
37 import org.emercit.utilstools.svmanager.service.Sv;
38 import org.emercit.utilstools.svmanager.service.SvControl;
39 import org.emercit.utilstools.sshexec.SSHExec;
40
41 public class ControlDeviceBean extends RoundPanel implements Externalizable {
42
43 private static final Logger log = Logger.getLogger(DevToolsBean.class);
44
45 private Dimension beanDimension; // simple
46
47 protected EventListenerList listenerList = new EventListenerList();
48
49 private JLabel lblStatus=new JLabel();
50 private JButton btnOffStart=new JButton();
51 private JButton btnRebootStart=new JButton();
52
53 private SSHExec sshecex=new SSHExec();
54
55 private Font font = new Font(null, Font.ITALIC, 13);
56
57 public ControlDeviceBean() {
58
59 this.setLayout(null);
60 this.setBackground(new Color(168, 181, 224)); // blue
61
62 beanDimension = new Dimension(600, 130);
63
64 // BUTTON OFF
65 btnOffStart.setIcon(new ImageIcon(DevToolsBean.class.getResource("/offDevice.png")));
66 btnOffStart.setBounds(10,30,190,55);
67 btnOffStart.setFont(font);
68 btnOffStart.setText("Выключить");
69 btnOffStart.setSelected(false);
70 btnOffStart.addActionListener(new Off());
71 add(btnOffStart);
72
73 // BUTTON REBOOT
74 btnRebootStart.setIcon(new ImageIcon(DevToolsBean.class.getResource("/reloadDevice.png")));
75 btnRebootStart.setBounds(220,30,190,55);
76 btnRebootStart.setFont(font);
77 btnRebootStart.setText("Перезагрузить");
78 btnRebootStart.setSelected(false);
79 btnRebootStart.addActionListener(new Reboot());
80 add(btnRebootStart);
81
82 // STATUS
83 font = new Font(null, Font.ITALIC, 18);
84 lblStatus.setBounds(10,80,600,55);
85 lblStatus.setForeground(Color.YELLOW);
86 lblStatus.setText("");
87 lblStatus.setVisible(true);
88 lblStatus.setFont(font);
89 add(lblStatus);
90
91 }
92
93 public class Off implements ActionListener
94 {
95 public void actionPerformed(ActionEvent e)
96 {
97 new SwingWorker<Void, Void>()
98 {
99 protected Void doInBackground() throws Exception
100 {
101 lblStatus.setText("выполняется выключение...");
102 sshecex.setCmd("shutdown -h now");
103 sshecex.Exec();
104 return null;
105 }
106 }.execute();
107 }
108 }
109
110 public class Reboot implements ActionListener
111 {
112 public void actionPerformed(ActionEvent e)
113 {
114
115 new SwingWorker<Void, Void>()
116 {
117 protected Void doInBackground() throws Exception
118 {
119 lblStatus.setText("выполняется перезагрузка...");
120 sshecex.setCmd("reboot");
121 sshecex.Exec();
122 return null;
123 }
124
125 }.execute();
126
127 }
128 }
129
130
131 public void paintComponent(Graphics g) {
132 super.paintComponent(g);
133 }
134
135 public void setPreferredSize(Dimension dim) {
136 beanDimension = dim;
137 }
138
139 public Dimension getPreferredSize() {
140 return beanDimension;
141 }
142
143 public void setMinimumSize(Dimension dim) {
144 beanDimension = dim;
145 }
146
147 public Dimension getMinimumSize() {
148 return beanDimension;
149 }
150
151 public void addChangeListener(ChangeListener l) {
152 listenerList.add(ChangeListener.class, l);
153 }
154
155 public void removeChangeListener(ChangeListener l) {
156 listenerList.remove(ChangeListener.class, l);
157 }
158
159 public void writeExternal(ObjectOutput out) throws IOException {
160 out.writeObject(beanDimension);
161 }
162
163 public void readExternal(ObjectInput in) throws IOException,
164 ClassNotFoundException {
165 setPreferredSize((Dimension) in.readObject());
166 setMinimumSize(getPreferredSize());
167 }
168
169 public static void main(String[] args) {
170 JFrame frame = new JFrame("");
171 frame.getContentPane().add(new ControlDeviceBean());
172 frame.setVisible(true);
173 frame.pack();
174 }
175 }

1.23 KB | W: | H:

1.23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.81 KB | W: | H:

1.81 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.78 KB | W: | H:

3.78 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.47 KB | W: | H:

1.47 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

424 Bytes | W: | H:

424 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.13 KB | W: | H:

1.13 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin