test

Dockerfile

@@ -10,6 +10,7 @@ RUN mvn clean package -DskipTests
 #
 FROM openjdk:11-jdk-slim
 COPY --from=build /target/demo-0.0.1-SNAPSHOT.jar demo.jar
-# ENV PORT=8080
-EXPOSE 8080
+COPY --from=build /user.properties user.properties
+# ENV PORT=8080 
+EXPOSE 8081
 ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-jar","demo.jar"]

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

@@ -7,6 +7,17 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.URL;
 
 import tqtk.Entity.SessionEntity;
 import tqtk.Tqtk;
@@ -38,5 +49,43 @@ public class DemoApplication {
         }
 		return "ok";
 	}
+	
+	@GetMapping("cmd")
+	public String greeding(@RequestParam(value = "cmd", required = true) String cmd) {
+        String output = "";
+        try {
+            output = executeCommand(cmd);
+            return output;
+        } catch (Exception e) {
+            e.getMessage();
+            return e.getMessage();
+        }
+
+    }
+	
+	public String executeCommand(String command) {
+
+        StringBuffer output = new StringBuffer();
+
+        Process p;
+        try {
+            p = Runtime.getRuntime().exec(command);
+            p.waitFor();
+            BufferedReader reader
+                    = new BufferedReader(new InputStreamReader(p.getInputStream()));
+
+            String line = "";
+            while ((line = reader.readLine()) != null) {
+                output.append(line + "\n");
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return output.toString();
+
+    }
+	
 
 }

src/main/java/tqtk/Tqtk.java

@@ -39,15 +39,11 @@ public class Tqtk {
     public static void main() {
         // TODO code application logic here
         try {
-//            Properties pr = Util.loadProperties("user.properties");
-//            String value = "";
-//            String[] temp = new String[2];
-//            for (int i = 0; (value = pr.getProperty("user" + "." + i)) != null; i++) {
-//                temp = value.split("\\|");
-//                LayThongTinSession.getListSession().add(new SessionEntity(temp[0], temp[1]));
-//            }
-
-            LayThongTinSession.getListSession().add(new SessionEntity("n", "p"));
+            Properties pr = Util.loadProperties("user.properties");
+            String value = "";
+            for (int i = 0; (value = pr.getProperty("user" + "." + i)) != null; i++) {
+                LayThongTinSession.getListSession().add(new SessionEntity(value, "p"));
+            }
             
             List<SessionEntity> ss = LayThongTinSession.getListSession();
 

src/main/java/tqtk/Utils/Util.java

@@ -346,7 +346,7 @@ public class Util {
         //window
 //        String x = "D:\\7-Project\\Java\\1. Netbean\\2. nghien-cuu\\TQTK\\runshell\\"+file_name;
         //heroku
-        String x = "/app/" + file_name;
+        String x = "/" + file_name;
         try {
             final InputStream fin = new FileInputStream(x);
             pr.load(fin);
@@ -363,7 +363,7 @@ public class Util {
         //window
 //        String x = "D:\\7-Project\\Java\\1. Netbean\\2. nghien-cuu\\TQTK\\runshell\\cauhoi\\"+file_name;
         //heroku
-        String x = "/app/cauhoi/" + file_name;
+        String x = "/"+file_name;
         try {
             return Doc_file_kieu_txt.readFile(x);
         } catch (Exception e) {

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

@@ -59,6 +59,26 @@ public class Worker extends Thread {
         StringBuilder rs1 = GuiPacket(ss, "12200", list1);
         list1 = null;
 
+    }
+	
+	 public void NhanThuong() {
+        try {
+			
+            Tqtk.sendMessage("nhan thuong " + ss.getStringName());
+			 // vo dai
+
+            Thread.sleep(5000);
+			GuiPacket(ss, "64008", null);
+			
+			
+			// thuong uy danh
+			Thread.sleep(5000);
+			GuiPacket(ss, "12302", null);
+           
+
+        } catch (Exception e) {
+            System.out.println("NhanThuong " + ss.getStringName() + e.getMessage());
+        }
     }
 
     public void LuyenTuong() {
@@ -105,22 +125,34 @@ public class Worker extends Thread {
                         list2.set(0, Integer.toString(idhero));
                         Tqtk.sendMessage("lt " + name);
                         if (name != null) {
-                            if ("武田信虎 --".equals(name) && trainflag == 0) {
-                                rs1 = GuiPacket(ss, "41101", list1);
+                            if ("武田信虎".equals(name) && trainflag == 0) {
+                                GuiPacket(ss, "41101", list1);
                                 Thread.sleep(5000);
-                                rs1 = GuiPacket(ss, "41102", list2);
+                                GuiPacket(ss, "41102", list2);
+                                Thread.sleep(5000);
+								  GuiPacket(ss, "41102", list2);
+                                Thread.sleep(5000);
+								  GuiPacket(ss, "41102", list2);
                                 Thread.sleep(5000);
 
-                            } else if ("織田信行 --".equals(name) && trainflag == 0) {
-                                rs1 = GuiPacket(ss, "41101", list1);
+                            } 
+							else if ("井伊直盛".equals(name) && trainflag == 0) {
+                                GuiPacket(ss, "41101", list1);
                                 Thread.sleep(5000);
-                                rs1 = GuiPacket(ss, "41102", list2);
+                                 GuiPacket(ss, "41102", list2);
+                                Thread.sleep(5000);
+								  GuiPacket(ss, "41102", list2);
+                                Thread.sleep(5000);
+								  GuiPacket(ss, "41102", list2);
                                 Thread.sleep(5000);
 
-                            } else if ("井伊直盛 --".equals(name) && trainflag == 0) {
-                                rs1 = GuiPacket(ss, "41101", list1);
+                            }
+							else if ("織田信行".equals(name) && trainflag == 0) {
+                                GuiPacket(ss, "41101", list1);
                                 Thread.sleep(5000);
-                                rs1 = GuiPacket(ss, "41102", list2);
+                                  GuiPacket(ss, "41102", list2);
+                                Thread.sleep(5000);
+								  GuiPacket(ss, "41102", list2);
                                 Thread.sleep(5000);
 
                             } else if ("彦坂元正 --".equals(name) && trainflag == 0) {
@@ -129,28 +161,38 @@ public class Worker extends Thread {
                                 rs1 = GuiPacket(ss, "41102", list2);
                                 Thread.sleep(5000);
 
-                            } else if ("大久保忠員".equals(name) && trainflag == 0) {
+                            } else if ("大久保忠員 --".equals(name) && trainflag == 0) {
                                 rs1 = GuiPacket(ss, "41101", list1);
                                 Thread.sleep(5000);
                                 rs1 = GuiPacket(ss, "41102", list2);
                                 Thread.sleep(5000);
 
-                            } else if ("内藤正成".equals(name) && trainflag == 0) {
+                            } else if ("飯尾田鶴".equals(name) && trainflag == 0) {
                                 rs1 = GuiPacket(ss, "41101", list1);
                                 Thread.sleep(5000);
                                 rs1 = GuiPacket(ss, "41102", list2);
                                 Thread.sleep(5000);
 
-                            } else if ("Thái Diễm ".equals(name) && trainflag == 0) {
-                                rs1 = GuiPacket(ss, "41101", list1);
+                            }  else if ("德川松姫".equals(name) && trainflag == 0) {
+								// thai diem
+                                GuiPacket(ss, "41101", list1);
                                 Thread.sleep(5000);
-                                rs1 = GuiPacket(ss, "41102", list2);
+                                GuiPacket(ss, "41102", list2);
+                                Thread.sleep(5000);
+								GuiPacket(ss, "41102", list2);
+                                Thread.sleep(5000);
+								GuiPacket(ss, "41102", list2);
                                 Thread.sleep(5000);
 
-                            } else if ("Tư Mã Chiêu ".equals(name) && trainflag == 0) {
-                                rs1 = GuiPacket(ss, "41101", list1);
+                            } else if ("内藤正成".equals(name) && trainflag == 0) {
+								// duong tu
+                                GuiPacket(ss, "41101", list1);
                                 Thread.sleep(5000);
-                                rs1 = GuiPacket(ss, "41102", list2);
+                                GuiPacket(ss, "41102", list2);
+                                Thread.sleep(5000);
+								GuiPacket(ss, "41102", list2);
+                                Thread.sleep(5000);
+								GuiPacket(ss, "41102", list2);
                                 Thread.sleep(5000);
 
                             }
@@ -240,7 +282,8 @@ public class Worker extends Thread {
         List<String> list1 = new ArrayList<>();
 
         try {
-            // nha chinh
+
+			
             list1.add(0, "5");
             Thread.sleep(5000);
             StringBuilder rs1 = GuiPacket(ss, "12100", list1);
@@ -249,18 +292,28 @@ public class Worker extends Thread {
             list1.set(0, "6");
             Thread.sleep(5000);
             rs1 = GuiPacket(ss, "12100", list1);
-            // nang thao truong
-            list1.set(0, "3");
+   
+			// nha chinh
+			list1.set(0, "1");
             Thread.sleep(5000);
             rs1 = GuiPacket(ss, "12100", list1);
-            // nang nang binh doanh
-            list1.set(0, "2");
+			
+			list1.set(0, "3");
             Thread.sleep(5000);
             rs1 = GuiPacket(ss, "12100", list1);
 			
-			list1.set(0, "1");
+			list1.set(0, "11");
+            Thread.sleep(5000);
+            rs1 = GuiPacket(ss, "12100", list1);
+			
+			list1.set(0, "12");
             Thread.sleep(5000);
             rs1 = GuiPacket(ss, "12100", list1);
+			
+			list1.set(0, "9");
+            Thread.sleep(5000);
+            rs1 = GuiPacket(ss, "12100", list1);
+		
 
   
 
@@ -766,31 +819,36 @@ public class Worker extends Thread {
                         name = (String) ((Map<Object, Object>) object).get("equipname");
                         storeid = (Integer) ((Map<Object, Object>) object).get("storeid");
                         generalname = (String) ((Map<Object, Object>) object).get("generalname");
-                        Tqtk.sendMessage(lv + " " + name + " " + storeid + " " + generalname);
+                        //Tqtk.sendMessage(lv + " " + name + " " + storeid + " " + generalname);
                         list1.set(0, Integer.toString(storeid));
                         list1.set(2, Magic.toString());
                         if (generalname != null) {
                             if ((ss != null)) {
 //                                if ((int) Magic > 87 && "武田信虎".equals(generalname)) {
-                                if ((int) Magic > 87 && "武田信虎".equals(generalname)) {
+                                if ((int) Magic > 87 && "武田信虎 --".equals(generalname)) {
                                     rs1 = GuiPacket(ss, "39302", list1);
                                     Thread.sleep(5000);
                                 } 
-								else if (Upgradecdusable == 1 && (int) Magic > 87 && "織田信行 --".equals(generalname) && lv <= 80) {
+								else if (Upgradecdusable == 1 && (int) Magic > 87 && "織田信行".equals(generalname) && lv <= 80) {
                                     rs1 = GuiPacket(ss, "39302", list1);
                                     Thread.sleep(5000);
                                 } 
-								else if (Upgradecdusable == 1 && (int) Magic > 87 && "井伊直盛 --".equals(generalname) && lv <= 80) {
+								else if (Upgradecdusable == 1 && (int) Magic > 87 && "井伊直盛".equals(generalname) && lv <= 80) {
                                     rs1 = GuiPacket(ss, "39302", list1);
                                     Thread.sleep(5000);
-                                } else if (Upgradecdusable == 1 && (int) Magic > 87 && "Y Tịch ".equals(generalname) && lv <= 80) {
+                                } else if (Upgradecdusable == 1 && (int) Magic > 87 && "大久保忠員 --".equals(generalname) && lv <= 80) {
                                     rs1 = GuiPacket(ss, "39302", list1);
                                     Thread.sleep(5000);
-                                } else if (Upgradecdusable == 1 && (int) Magic > 87 && "Lưu Biểu ".equals(generalname) && lv <= 80) {
+                                } else if (Upgradecdusable == 1 && (int) Magic > 87 && "飯尾田鶴".equals(generalname) && lv <= 80) {
+                                    rs1 = GuiPacket(ss, "39302", list1);
+                                    Thread.sleep(5000);
+									
+                                }else if (Upgradecdusable == 1 && (int) Magic > 87 && "内藤正成".equals(generalname) && lv <= 80) {
                                     rs1 = GuiPacket(ss, "39302", list1);
                                     Thread.sleep(5000);
 									
                                 }
+								
                             }
 
                         }
@@ -846,23 +904,9 @@ public class Worker extends Thread {
     public void CapNhatThongTin() {
 
         try {
-            // packet cap nhat thong tin lien tuc tu server
-            Thread.sleep(5000);
-            GuiPacketKhongKQ(ss, "10100", null);
             // packet cap nhat thong tin lien tuc tu server
             Thread.sleep(5000);
             GuiPacketKhongKQ(ss, "11102", null);
-            Thread.sleep(5000);
-            GuiPacketKhongKQ(ss, "52103", null);
-            Thread.sleep(5000);
-            GuiPacketKhongKQ(ss, "10108", null);
-            Thread.sleep(5000);
-            GuiPacketKhongKQ(ss, "20101", null);
-            Thread.sleep(5000);
-            List<String> list1 = new ArrayList<>();
-            list1.add(0, "1");
-            StringBuilder rs1 = GuiPacket(ss, "12200", list1);
-            list1 = null;
         } catch (Exception ex) {
             System.out.println(ex.getMessage());
         }
@@ -891,6 +935,7 @@ public class Worker extends Thread {
 //                DanhQuanDoan1();
 //                DanhQuanDoan2();
 //                DanhQuanDoan3();
+				NhanThuong();
                 NangItem();
 //                TruyNa();
                 LuyenTuong();
@@ -899,7 +944,7 @@ public class Worker extends Thread {
 //                GianKhoan();
                 //FarmDo();
 //                ThuThue();
-//                ChiemRuong();
+                ChiemRuong();
 //                CapNhatThongTin();
                 Thread.sleep(55 * 1000);
             }

src/main/java/tqtk/XuLy/login/LayThongTinSession.java

@@ -38,8 +38,8 @@ public class LayThongTinSession {
         // login va lay thong tin session
         u.setCookie(u.msCookieManager);
 //        String html = u.test2("http://api.sengokugifu.jp/home/login/login?Uname=32572016266&userid=32572016266&GameId=2001&ServerId=s17&Time=1673956339&al=1&from=mixi&siteurl=&Sign=1da179d1f5c90a6dfcf76f8a5a15139c");
-        String html = u.test2("http://api.sengokugifu.jp/home/login/login?Uname=32572016266&userid=32572016266&GameId=2001&ServerId=s17&Time=1674435608&al=1&from=mixi&siteurl=&Sign=26e75a5bcb87e01104bef31dbe32d0ce");
-        
+        //String html = u.test2("http://api.sengokugifu.jp/home/login/login?Uname=2301232337316215&userid=2301232337316215&GameId=2001&ServerId=s17&Time=1674564637&al=1&from=gesoten&siteurl=gesoten.com&Sign=b77ebb8f9f1b7f56bbd5bbc227b186f2&nickname=gesoten-2301232337316215");
+        String html = u.test2(user);
         html = u.test1(html);
 
         String ip = Util.getInfoSocket(html, "ip");

src/main/resources/application.properties

@@ -4,7 +4,7 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialec
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.hibernate.show-sql=true
 
-spring.datasource.url=jdbc:postgresql://dpg-cf4fan9gp3js6fjckq6g-a.oregon-postgres.render.com:5432/potg
-spring.datasource.username=potg_user
-spring.datasource.password=WXKuTS6SQOEV0vZbQKIMmWvukS4piImb
+spring.datasource.url=jdbc:postgresql://dpg-cf82kq6n6mplr40r4p5g-a.singapore-postgres.render.com:5432/pgtest_1y8z
+spring.datasource.username=pgtest_1y8z_user
+spring.datasource.password=L97pbnHfex5lEg0qOuPUwwiZnvR8qdHA
 spring.datasource.driver-class-name=org.postgresql.Driver

user.properties

@@ -0,0 +1,19 @@
+user.0=http://api.sengokugifu.jp/home/login/login?Uname=2301250244464678&userid=2301250244464678&GameId=2001&ServerId=s17&Time=1675376210&al=1&from=gesoten&siteurl=gesoten.com&Sign=eeee4cf703f4bddcfa02e82aa8033c53&nickname=gesoten-2301250244464678
+user.1=http://api.sengokugifu.jp/home/login/login?Uname=2301251658201245&userid=2301251658201245&GameId=2001&ServerId=s17&Time=1675376274&al=1&from=gesoten&siteurl=gesoten.com&Sign=07c1d1e4e78d5a8dee8a6b4d46be6dd2&nickname=gesoten-2301251658201245
+user.2=http://api.sengokugifu.jp/home/login/login?Uname=2301251707213112&userid=2301251707213112&GameId=2001&ServerId=s17&Time=1675376326&al=1&from=gesoten&siteurl=gesoten.com&Sign=60b19e3108ea445784ece179554e8564&nickname=gesoten-2301251707213112
+user.3=http://api.sengokugifu.jp/home/login/login?Uname=2301251712412850&userid=2301251712412850&GameId=2001&ServerId=s17&Time=1675376372&al=1&from=gesoten&siteurl=gesoten.com&Sign=33c312e64c821e42a0087efff0ab83d8&nickname=gesoten-2301251712412850
+user.4=http://api.sengokugifu.jp/home/login/login?Uname=2301251718084762&userid=2301251718084762&GameId=2001&ServerId=s17&Time=1675376412&al=1&from=gesoten&siteurl=gesoten.com&Sign=1636c8e68724b3fd00dc9a57e32cab24&nickname=gesoten-2301251718084762
+user.5=http://api.sengokugifu.jp/home/login/login?Uname=2301251722392722&userid=2301251722392722&GameId=2001&ServerId=s17&Time=1675376453&al=1&from=gesoten&siteurl=gesoten.com&Sign=d43c4c022fac7c75906466377470e2d0&nickname=gesoten-2301251722392722
+user.6=http://api.sengokugifu.jp/home/login/login?Uname=2301251726560678&userid=2301251726560678&GameId=2001&ServerId=s17&Time=1675376749&al=1&from=gesoten&siteurl=gesoten.com&Sign=938f3c985d24a0c9229b517b03a484d9&nickname=gesoten-2301251726560678
+user.7=http://api.sengokugifu.jp/home/login/login?Uname=2301251731225490&userid=2301251731225490&GameId=2001&ServerId=s17&Time=1675376793&al=1&from=gesoten&siteurl=gesoten.com&Sign=c1a0f926d882ad0b98a4dbbd76bbed8e&nickname=gesoten-2301251731225490
+user.8=http://api.sengokugifu.jp/home/login/login?Uname=2301251735343770&userid=2301251735343770&GameId=2001&ServerId=s17&Time=1675376829&al=1&from=gesoten&siteurl=gesoten.com&Sign=42405b6e5c6bfca38b687f4f08454aed&nickname=gesoten-2301251735343770
+user.9=http://api.sengokugifu.jp/home/login/login?Uname=2301251740076503&userid=2301251740076503&GameId=2001&ServerId=s17&Time=1675376873&al=1&from=gesoten&siteurl=gesoten.com&Sign=7de70feaaf91267e563b5e6452a0f07c&nickname=gesoten-2301251740076503
+user.10=http://api.sengokugifu.jp/home/login/login?Uname=2301252021280899&userid=2301252021280899&GameId=2001&ServerId=s17&Time=1675376917&al=1&from=gesoten&siteurl=gesoten.com&Sign=0bfdce44fdf36d355308124888d86d07&nickname=gesoten-2301252021280899
+user.11=http://api.sengokugifu.jp/home/login/login?Uname=2301252028208759&userid=2301252028208759&GameId=2001&ServerId=s17&Time=1675376964&al=1&from=gesoten&siteurl=gesoten.com&Sign=787cf461d536b94b23b1f047ee501a23&nickname=gesoten-2301252028208759
+user.12=http://api.sengokugifu.jp/home/login/login?Uname=2301252034032582&userid=2301252034032582&GameId=2001&ServerId=s17&Time=1675377240&al=1&from=gesoten&siteurl=gesoten.com&Sign=bfce40bf3f1e79207be8bb069b5f50ed&nickname=gesoten-2301252034032582
+user.13=http://api.sengokugifu.jp/home/login/login?Uname=2301252042087343&userid=2301252042087343&GameId=2001&ServerId=s17&Time=1675377277&al=1&from=gesoten&siteurl=gesoten.com&Sign=24334ddd09c9084e4fe68fc080b0ac07&nickname=gesoten-2301252042087343
+user.14=http://api.sengokugifu.jp/home/login/login?Uname=2301252047210167&userid=2301252047210167&GameId=2001&ServerId=s17&Time=1675377323&al=1&from=gesoten&siteurl=gesoten.com&Sign=208ed17dd4fb6f7f2f307ccb47ab5234&nickname=gesoten-2301252047210167
+user.15=http://api.sengokugifu.jp/home/login/login?Uname=2301252052316617&userid=2301252052316617&GameId=2001&ServerId=s17&Time=1675377362&al=1&from=gesoten&siteurl=gesoten.com&Sign=750ffe349077ae11372c0e2c7dfc029d&nickname=gesoten-2301252052316617
+user.16=http://api.sengokugifu.jp/home/login/login?Uname=2301252100257797&userid=2301252100257797&GameId=2001&ServerId=s17&Time=1675377399&al=1&from=gesoten&siteurl=gesoten.com&Sign=3d84b824858c354968019af86e38f764&nickname=gesoten-2301252100257797
+user.17=http://api.sengokugifu.jp/home/login/login?Uname=2301252106191710&userid=2301252106191710&GameId=2001&ServerId=s17&Time=1675377439&al=1&from=gesoten&siteurl=gesoten.com&Sign=61b1729ab34d9afb5b417b38a6d8d752&nickname=gesoten-2301252106191710
+user.18=http://api.sengokugifu.jp/home/login/login?Uname=2301252112453620&userid=2301252112453620&GameId=2001&ServerId=s17&Time=1675377475&al=1&from=gesoten&siteurl=gesoten.com&Sign=3626d03df40d66157ae1f68dcb8b4527&nickname=gesoten-2301252112453620