|
@@ -19,10 +19,7 @@ import javax.servlet.http.HttpServletRequest;
|
19
|
19
|
import javax.servlet.http.HttpServletResponse;
|
20
|
20
|
import java.io.*;
|
21
|
21
|
import java.net.URLEncoder;
|
22
|
|
-import java.sql.Connection;
|
23
|
|
-import java.sql.DatabaseMetaData;
|
24
|
|
-import java.sql.DriverManager;
|
25
|
|
-import java.sql.ResultSet;
|
|
22
|
+import java.sql.*;
|
26
|
23
|
import java.util.ArrayList;
|
27
|
24
|
import java.util.List;
|
28
|
25
|
import java.util.UUID;
|
|
@@ -37,11 +34,18 @@ public class DbController {
|
37
|
34
|
String mysqlUrl = "jdbc:mysql://"+dbConfig.getMysqlIp()+":"+dbConfig.getMysqlPort()+"/"+dbConfig.getMysqlName()+"?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true";
|
38
|
35
|
try {
|
39
|
36
|
Connection con = DriverManager.getConnection(mysqlUrl,dbConfig.getMysqlUsername(),dbConfig.getMysqlUserpass());
|
40
|
|
- DatabaseMetaData meta = con.getMetaData();
|
41
|
|
- ResultSet rs = meta.getTables(null, null, null,
|
42
|
|
- new String[] { "TABLE" });
|
43
|
|
- while (rs.next()) {
|
44
|
|
- tables.add(rs.getString(3));
|
|
37
|
+// DatabaseMetaData meta = con.getMetaData();
|
|
38
|
+// ResultSet rs = meta.getTables(null, dbConfig.getMysqlUsername(), null,
|
|
39
|
+// new String[] { "TABLE" });
|
|
40
|
+// while (rs.next()) {
|
|
41
|
+// tables.add(rs.getString(3));
|
|
42
|
+// }
|
|
43
|
+ String sql = "select table_name from information_schema.tables where table_schema='" + dbConfig.getMysqlName() + "'";
|
|
44
|
+ Statement statement = con.createStatement();
|
|
45
|
+ ResultSet result = statement.executeQuery(sql);
|
|
46
|
+ while(result.next())
|
|
47
|
+ {
|
|
48
|
+ tables.add(result.getString("TABLE_NAME"));
|
45
|
49
|
}
|
46
|
50
|
con.close();
|
47
|
51
|
} catch (Exception e) {
|
|
@@ -52,6 +56,7 @@ public class DbController {
|
52
|
56
|
|
53
|
57
|
@PostMapping("/create")
|
54
|
58
|
public void create(@RequestBody DbConfig dbConfig, HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException {
|
|
59
|
+// String newFileName = "D:/" + UUID.randomUUID().toString().replaceAll("-", "") + "/" + "cj-demo";
|
55
|
60
|
String newFileName = "/home/yansen/generator/temp/" + UUID.randomUUID().toString().replaceAll("-", "") + "/" + "cj-demo";
|
56
|
61
|
dbConfig.getMysqlLib().forEach(e -> {
|
57
|
62
|
AutoGeneratorFile(dbConfig,newFileName,e);
|