Signed-off-by: htr <ht@rdb.y>

src/main/java/com/example/demo/DemoApplication.java

@@ -80,7 +80,7 @@ public class DemoApplication {
         return "ok";
     }
     
-    @RequestMapping(value = "/stopAll", method = RequestMethod.POST)
+    @RequestMapping(value = "/stopAll", method = RequestMethod.GET)
     @ResponseBody
     public String stopAll() throws IOException, UnknownHostException, InterruptedException, Exception {
         try {
@@ -97,7 +97,7 @@ public class DemoApplication {
     }
 	
 	
-	@RequestMapping(value = "/resumeAll", method = RequestMethod.POST)
+	@RequestMapping(value = "/resumeAll", method = RequestMethod.GET)
     @ResponseBody
     public String resumeAll() throws IOException, UnknownHostException, InterruptedException, Exception {
         try {
@@ -112,7 +112,26 @@ public class DemoApplication {
                             }
         }
         } catch (Exception e) {
-             return "not-ok";
+             return e.getMessage();
+        }
+        return "ok";
+    }
+	
+	
+	@RequestMapping(value = "/resumeOne", method = RequestMethod.GET)
+    @ResponseBody
+    public String resumeOne(@RequestParam(value = "id", required = true) String id) throws IOException, UnknownHostException, InterruptedException, Exception {
+        try {
+	
+        for (int i = 0; i < Tqtk.listWorker.size(); ++i) {
+		if (id.equals(Tqtk.listWorker.get(i).getSs().getUserId())) {
+			
+			Tqtk.listWorker.get(i).createSocket1(Tqtk.listWorker.get(i).getSs());
+    
+        }
+        }
+        } catch (Exception e) {
+             return e.getMessage();
         }
         return "ok";
     }
@@ -206,14 +225,20 @@ public class DemoApplication {
     @GetMapping("setSessionId")
     public String setSessionId(@RequestParam(value = "id", required = true) String id,
             @RequestParam(value = "session", required = true) String session) throws Exception {
-        String output = "";
-        List<SessionEntity> ss = Tqtk.listSession;
-        for (int i = 0; i < ss.size(); ++i) {
-            if (id.equals(ss.get(i).getUserId())) {
-                ss.get(i).setSessionKey(session);
-                return "ok";
-            }
+				
+				try {
+	
+        for (int i = 0; i < Tqtk.listWorker.size(); ++i) {
+		if (id.equals(Tqtk.listWorker.get(i).getSs().getUserId())) {
+			
+			Tqtk.listWorker.get(i).getSs().setSessionKey(session);
+			return "ok";
+        }
+        }
+        } catch (Exception e) {
+             return e.getMessage();
         }
+				
         return "not-ok";
     }
 

src/main/java/tqtk/XuLy/Worker.java

@@ -699,8 +699,8 @@ public class Worker extends Thread {
             GuiPacket(ss, "12302", null);
 
             // event mo ruong
-            Thread.sleep(5000);
-            GuiPacket(ss, "48113", list1);
+            //Thread.sleep(5000);
+            //GuiPacket(ss, "48113", list1);
 
             // nhiem vu thuong ngay
             Thread.sleep(5000);
@@ -723,12 +723,12 @@ public class Worker extends Thread {
             Thread.sleep(2000);
             GuiPacket(ss, "49007", list1);
             // ki ten
-            Thread.sleep(2000);
-            GuiPacket(ss, "60701", null);
-            Thread.sleep(5000);
-            GuiPacket(ss, "60702", null);
-            Thread.sleep(5000);
-            GuiPacket(ss, "60703", null);
+            //Thread.sleep(2000);
+            //GuiPacket(ss, "60701", null);
+            //Thread.sleep(5000);
+            //GuiPacket(ss, "60702", null);
+            //Thread.sleep(5000);
+            //GuiPacket(ss, "60703", null);
 
         } catch (Exception e) {
             System.out.println("NhanThuong " + ss.getUserId() + e.getMessage());
@@ -1242,7 +1242,7 @@ public class Worker extends Thread {
             StringBuilder rs = GuiPacket(ss, "62007", list1);
             Thread.sleep(5000);
             if (rs != null) {
-                if (!rs.toString().contains("Đang khai thác")) {
+                if (!rs.toString().contains("掘削中です")) {
                     Tqtk.sendMessage("gian khoan " + ss.getUserId());
                     // bat dau khoan
                     GuiPacket(ss, "62006", list2);
@@ -1492,6 +1492,17 @@ public class Worker extends Thread {
         }
         session.setSocket(socket);
     }
+	
+	public  void createSocket1(SessionEntity session) throws Exception {
+        Socket socket = new Socket();
+        socket.connect(new InetSocketAddress(InetAddress.getByName(session.getIp()), Integer.parseInt(session.getPort())), 7000);
+        socket.setSoTimeout(350000);
+        try {
+            session.getSocket().close();
+        } catch (Exception e) {
+        }
+        session.setSocket(socket);
+    }
 
     public static void createSocketApi(SessionEntity session) throws Exception {
         Socket socket1 = new Socket();
@@ -1521,7 +1532,7 @@ public class Worker extends Thread {
                     NangNha();
                     NangKiNang();
                     NhanThuong();
-//                GianKhoan();
+					GianKhoan();
 //                FarmDoLv60();
 //                ThuThue();
 

src/main/java/tqtk/XuLy/XuLyPacket.java

@@ -71,11 +71,7 @@ public class XuLyPacket {
             return rp;
         } catch (Exception e) {
             System.out.println(e.getMessage());
-			try{
-				Worker.createSocket(ss);
-			}catch(Exception e1){
-				
-			}
+			
 			
             return null;
         }

truyna.properties

@@ -1 +1 @@
-manato
+