resolve some problem

Mryan2005 · Mryan2005 · commit 9eb4f1dddb04 · 2024-12-03T21:00:49.000+08:00
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/NOTICE b/NOTICE
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>top.mryan2005</groupId>
     <artifactId>javaplusplus</artifactId>
-    <version>1.0.0-beta</version>
+    <version>1.0.1-beta</version>
 
     <developers>
         <developer>
diff --git a/src/main/java/top/mryan2005/Base64.java b/src/main/java/top/mryan2005/Base64.java
@@ -1,3 +1,5 @@
+package top.mryan2005;
+
 public class Base64 {
     public String encodeBase64(String input) {
         return java.util.Base64.getEncoder().encodeToString(input.getBytes());
diff --git a/src/main/java/top/mryan2005/EasyJSONObject.java b/src/main/java/top/mryan2005/EasyJSONObject.java
@@ -1,4 +1,4 @@
-package translate;
+package top.mryan2005;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
diff --git a/src/main/java/top/mryan2005/Hash.java b/src/main/java/top/mryan2005/Hash.java
@@ -1,3 +1,5 @@
+package top.mryan2005;
+
 public class Hash {
     String hash;
     String salt;
diff --git a/src/main/java/top/mryan2005/MD5.java b/src/main/java/top/mryan2005/MD5.java
@@ -1,3 +1,5 @@
+package top.mryan2005;
+
 import org.apache.commons.codec.digest.DigestUtils;
 
 import java.util.Random;
diff --git a/src/main/java/top/mryan2005/PostAndGet/.keep b/src/main/java/top/mryan2005/PostAndGet/.keep
diff --git a/src/main/java/top/mryan2005/RAFile.java b/src/main/java/top/mryan2005/RAFile.java
@@ -1,4 +1,5 @@
-import java.io.FileNotFoundException;
+package top.mryan2005;
+
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
diff --git a/src/main/java/top/mryan2005/Random.java b/src/main/java/top/mryan2005/Random.java
@@ -1,3 +1,5 @@
+package top.mryan2005;
+
 public class Random {
     public int RandInt() {
         java.util.Random rand = new java.util.Random();
diff --git a/src/main/java/top/mryan2005/SQL.java b/src/main/java/top/mryan2005/SQL.java
@@ -1,4 +1,9 @@
-import SQLs.*;
+package top.mryan2005;
+
+import jpp.SQLs.*;
+import top.mryan2005.SQLs.MySQL;
+import top.mryan2005.SQLs.SQLServer;
+import top.mryan2005.SQLs.SQLite;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -14,18 +19,17 @@ public class SQL {
     public String username;
     public String password;
     public String databaseName;
-    public String connectionUrl;
     public Connection ConnectToSQL(String type, String ip, String port, String username, String password, String databaseName) {
         this.type = type;
         this.ip = ip;
         this.port = port;
         this.username = username;
         this.password = password;
         this.databaseName = databaseName;
-        if("SQL Server".matches(type)) {
+        if("jpp.SQL Server".matches(type)) {
             try {
                 SQLServer sql = new SQLServer();
-                sql.ConnectToSQLServer(ip, port, databaseName, username, password);
+                sql.ConnectToSQLServer(ip, port, databaseName, username, password, false);
                 System.out.println("连接成功！");
                 con = sql.getSQLer();
             } catch (Exception e) {
diff --git a/src/main/java/top/mryan2005/SQLs/MySQL.java b/src/main/java/top/mryan2005/SQLs/MySQL.java
@@ -1,9 +1,10 @@
-package SQLs;
+package top.mryan2005.SQLs;
 
 import java.sql.Connection;
 
 public class MySQL {
     public MySQL(String ip, String port, String username, String password, String databaseName) {
+
     }
 
     public Connection getSQLer() {
diff --git a/src/main/java/top/mryan2005/SQLs/SQLServer.java b/src/main/java/top/mryan2005/SQLs/SQLServer.java
@@ -1,6 +1,5 @@
-package SQLs;
+package top.mryan2005.SQLs;
 
-import javax.naming.ContextNotEmptyException;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -10,18 +9,19 @@ public class SQLServer {
     public String ip;
     public String port;
     public String database;
-    public String username;
-    public String password;
 
     public Connection ConnectToSQLServer(String inputIp, String inputPort, String inputDatabase, String inputUsername, String inputPassword, boolean encrypt) throws ClassNotFoundException, SQLException {
         Class.forName( "com.microsoft.sqlserver.jdbc.SQLServerDriver");
         con = DriverManager.getConnection("jdbc:sqlserver://" + inputIp + ":" + inputPort + ";databaseName=" + inputDatabase + ";user=" + inputUsername + ";password=" + inputPassword + ";encrypt=" + encrypt + ";");
+        ip = inputIp;
+        port = inputPort;
+        database = inputDatabase;
         return con;
     }
 
-    public Connection ConnectToSQLServer(String inputIp, String inputPort, String inputDatabase, String inputUsername, String inputPassword) throws ClassNotFoundException, SQLException {
+    public Connection ConnectToSQLServer(String inputIp, String inputPort, String inputUsername, String inputPassword, boolean encrypt) throws ClassNotFoundException, SQLException {
         Class.forName( "com.microsoft.sqlserver.jdbc.SQLServerDriver");
-        con = DriverManager.getConnection("jdbc:sqlserver://" + inputIp + ":" + inputPort + ";databaseName=" + inputDatabase + ";user=" + inputUsername + ";password=" + inputPassword + ";");
+        con = DriverManager.getConnection("jdbc:sqlserver://" + inputIp + ":" + inputPort + ";user=" + inputUsername + ";password=" + inputPassword + ";"+ "encrypt=" + encrypt + ";");
         return con;
     }
 
@@ -64,12 +64,9 @@ public HashMap<Object, ArrayList<Object>> runSQL(String sql, String primaryKey)
 
     public static void main(String[] args) throws ClassNotFoundException, SQLException {
         SQLServer sqlServer = new SQLServer();
-        sqlServer.ConnectToSQLServer("localhost", "1433", "wuzhouDict", "sa", "123456", false);
-        sqlServer.runSQL("INSERT INTO dbo.[users] (id, username, password, name, role) VALUES (1, 'admin', 'password', 'admin', '1')");
-        ResultSet rs = sqlServer.runSQL("SELECT * FROM dbo.[users]");
-        while(rs.next()) {
-            System.out.println(rs.getString("name"));
-        }
+        sqlServer.ConnectToSQLServer("localhost", "1433", "sa", "123456", false);
+        sqlServer.CloseConnection();
+        sqlServer.ConnectToSQLServer("localhost", "1433", "master", "sa", "123456", false);
         sqlServer.CloseConnection();
     }
 }
diff --git a/src/main/java/top/mryan2005/SQLs/SQLite.java b/src/main/java/top/mryan2005/SQLs/SQLite.java
@@ -1,4 +1,4 @@
-package SQLs;
+package top.mryan2005.SQLs;
 
 import java.sql.Connection;
 
diff --git a/src/main/java/top/mryan2005/Trans.java b/src/main/java/top/mryan2005/Trans.java
@@ -1,13 +1,10 @@
-package translate;
+package top.mryan2005;
 
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.parser.Feature;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 public class Trans {
     public JSONObject object;
diff --git a/src/test/java/TransClassTest.java b/src/test/java/TransClassTest.java
@@ -1,5 +1,6 @@
+import top.mryan2005.RAFile;
 import org.junit.Test;
-import translate.Trans;
+import top.mryan2005.Trans;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package top.mryan2005;`
	`2`	`+`
`1`	`3`	`public class Base64 {`
`2`	`4`	`public String encodeBase64(String input) {`
`3`	`5`	`return java.util.Base64.getEncoder().encodeToString(input.getBytes());`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package translate;`
	`1`	`+package top.mryan2005;`
`2`	`2`
`3`	`3`	`import com.alibaba.fastjson.JSONObject;`
`4`	`4`	`import com.alibaba.fastjson.parser.Feature;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package top.mryan2005;`
	`2`	`+`
`1`	`3`	`public class Hash {`
`2`	`4`	`String hash;`
`3`	`5`	`String salt;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package top.mryan2005;`
	`2`	`+`
`1`	`3`	`import org.apache.commons.codec.digest.DigestUtils;`
`2`	`4`
`3`	`5`	`import java.util.Random;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package top.mryan2005;`
	`2`	`+`
`1`	`3`	`public class Random {`
`2`	`4`	`public int RandInt() {`
`3`	`5`	`java.util.Random rand = new java.util.Random();`