From 18cb4236ebc214f3140e04b50c020b740730efbd Mon Sep 17 00:00:00 2001 From: Yutousama <583819556@qq.com> Date: Mon, 9 Nov 2020 23:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSQLITE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=A1=A8=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../java/com/yutou/tools/ToolsApplication.java | 9 +++------ .../yutou/tools/home/nas/MusicController.java | 3 ++- .../com/yutou/tools/sqlite/ADSQLiteManager.java | 16 ++++++++-------- .../com/yutou/tools/sqlite/SQLiteManager.java | 15 +++++++++++---- .../java/com/yutou/tools/utils/APIFilter.java | 2 +- 6 files changed, 27 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index e73ae62..a94aa50 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.yutou tools - 1.0.10.1 + 1.0.10.3 tools Demo project for Spring Boot @@ -109,7 +109,7 @@ net.mamoe mirai-core-qqandroid - 1.3.2 + 1.3.1 org.jetbrains.kotlin diff --git a/src/main/java/com/yutou/tools/ToolsApplication.java b/src/main/java/com/yutou/tools/ToolsApplication.java index 60603f9..8b3e6f0 100644 --- a/src/main/java/com/yutou/tools/ToolsApplication.java +++ b/src/main/java/com/yutou/tools/ToolsApplication.java @@ -1,10 +1,7 @@ package com.yutou.tools; import com.yutou.tools.home.nas.MusicController; -import com.yutou.tools.utils.APIFilter; -import com.yutou.tools.utils.MusicTools; -import com.yutou.tools.utils.QQBotManager; -import com.yutou.tools.utils.RedisTools; +import com.yutou.tools.utils.*; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; @@ -15,10 +12,10 @@ import java.io.IOException; public class ToolsApplication { public static void main(String[] args) { - System.out.println("当前版本号:1.0.10.1"); + System.out.println("当前版本号:1.0.10.3"); SpringApplication.run(ToolsApplication.class, args); RedisTools.initRedisPoolSub(); - if (APIFilter.isDebug) { + if (ConfigTools.load(ConfigTools.CONFIG, "model").equals("dev")) { MusicController.defaultMusicPath = "C:\\Users\\admin\\Music\\"; MusicTools.getInstance().setMusicPath("C:\\Users\\admin\\Music\\"); } else { diff --git a/src/main/java/com/yutou/tools/home/nas/MusicController.java b/src/main/java/com/yutou/tools/home/nas/MusicController.java index 3683fb5..fc82ca3 100644 --- a/src/main/java/com/yutou/tools/home/nas/MusicController.java +++ b/src/main/java/com/yutou/tools/home/nas/MusicController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.yutou.tools.home.nas.Data.MusicData; import com.yutou.tools.nas.UpdateIp; import com.yutou.tools.utils.APIFilter; +import com.yutou.tools.utils.ConfigTools; import com.yutou.tools.utils.MusicTools; import com.yutou.tools.utils.Tools; import org.springframework.core.io.FileSystemResource; @@ -88,7 +89,7 @@ public class MusicController { @ResponseBody public String getLocalHost(){ JSONObject json=new JSONObject(); - if(APIFilter.isDebug){ + if(ConfigTools.load(ConfigTools.CONFIG, "model").equals("dev")){ json.put("data",""); }else{ json.put("data", "http://"+UpdateIp.nas_ip); diff --git a/src/main/java/com/yutou/tools/sqlite/ADSQLiteManager.java b/src/main/java/com/yutou/tools/sqlite/ADSQLiteManager.java index d92faf7..77687f3 100644 --- a/src/main/java/com/yutou/tools/sqlite/ADSQLiteManager.java +++ b/src/main/java/com/yutou/tools/sqlite/ADSQLiteManager.java @@ -34,7 +34,7 @@ public class ADSQLiteManager extends SQLiteManager { String sql = "insert into `app_ad` (`appId`,`adSrc`,`adAppId`,`adAppKey`,`adOpenKey`,`adInterKey`,`adBannerKey`,`adVideoKey`,`adNativeKey`,`show`) values " + "('" + appId + "','" + adSrc + "','" + adAppId + "','" + adAppKey + "','" + adOpenKey + "','" + adInterKey + "','" + adBannerKey + "','" + adVideoKey + "','" + adNativeKey + "',1);"; boolean flag = statement.execute(sql); - statement.close(); + statement.closeOnCompletion(); return flag; } catch (Exception e) { e.printStackTrace(); @@ -48,7 +48,7 @@ public class ADSQLiteManager extends SQLiteManager { String sql = "insert into `ad_log` (`appId`,`adSrc`,`adType`,`model`,`subtime`) values ('" + appId + "','" + src + "','" + type + "','" + model + "','" + System.currentTimeMillis() + "'); "; boolean flag = statement.execute(sql); - statement.close(); + statement.closeOnCompletion(); return flag; } catch (Exception e) { e.printStackTrace(); @@ -65,7 +65,7 @@ public class ADSQLiteManager extends SQLiteManager { String appId = UUID.randomUUID().toString(); String sql = "insert into `app`(`appName`,`packageName`,`appId`) values ('" + appName + "','" + packageName + "','" + appId + "')"; statement.execute(sql); - statement.close(); + statement.closeOnCompletion(); return appId; } catch (Exception e) { e.printStackTrace(); @@ -123,7 +123,7 @@ public class ADSQLiteManager extends SQLiteManager { } } set.close(); - statement.close(); + statement.closeOnCompletion(); return json; } @@ -144,7 +144,7 @@ public class ADSQLiteManager extends SQLiteManager { array.add(item); } set.close(); - statement.close(); + statement.closeOnCompletion(); return array; } catch (Exception e) { e.printStackTrace(); @@ -157,7 +157,7 @@ public class ADSQLiteManager extends SQLiteManager { Statement statement=conn.createStatement(); String sql="select * from `app` where `appName`='"+appName+"';"; json=getApp(statement, sql); - statement.close(); + statement.closeOnCompletion(); return json; }catch (Exception e){ e.printStackTrace(); @@ -170,7 +170,7 @@ public class ADSQLiteManager extends SQLiteManager { Statement statement=conn.createStatement(); String sql="select * from `app` where `packageName`='"+packageName+"';"; json=getApp(statement, sql); - statement.close(); + statement.closeOnCompletion(); return json; }catch (Exception e){ e.printStackTrace(); @@ -208,7 +208,7 @@ public class ADSQLiteManager extends SQLiteManager { json.put("packageName",set.getString("packageName")); } set.close(); - statement.close(); + statement.closeOnCompletion(); return json; } diff --git a/src/main/java/com/yutou/tools/sqlite/SQLiteManager.java b/src/main/java/com/yutou/tools/sqlite/SQLiteManager.java index c6ab90f..844dafa 100644 --- a/src/main/java/com/yutou/tools/sqlite/SQLiteManager.java +++ b/src/main/java/com/yutou/tools/sqlite/SQLiteManager.java @@ -44,18 +44,25 @@ public class SQLiteManager { } private void createSql(JSONObject json){ + try { + sql.mkdirs(); + sql.delete(); + conn = DriverManager.getConnection(url + sql.getAbsolutePath()); + }catch (Exception e){ + e.printStackTrace(); + } + startBatch(); JSONArray array=json.getJSONArray("table"); for (Object o : array) { + System.out.println("创建表:"+((JSONObject)o).getString("name")); createSqlOfTable((JSONObject) o); } + closeBatch(); ConfigTools.save(ConfigTools.SQLITE, json.getString("file"), json); } private void createSqlOfTable(JSONObject table) { String tableName = table.getString("name"); try { - sql.mkdirs(); - sql.delete(); - conn = DriverManager.getConnection(url + sql.getAbsolutePath()); Statement statement = conn.createStatement(); JSONArray items = table.getJSONArray("item"); StringBuilder sql = new StringBuilder(); @@ -88,7 +95,7 @@ public class SQLiteManager { } sql.append(");"); statement.execute(sql.toString().replace(",);", ");")); - + statement.closeOnCompletion(); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/yutou/tools/utils/APIFilter.java b/src/main/java/com/yutou/tools/utils/APIFilter.java index bb8ff8d..19983a6 100644 --- a/src/main/java/com/yutou/tools/utils/APIFilter.java +++ b/src/main/java/com/yutou/tools/utils/APIFilter.java @@ -31,7 +31,7 @@ public class APIFilter implements Filter { @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - if(isDebug){ + if(ConfigTools.load(ConfigTools.CONFIG, "model").equals("dev")){ filterChain.doFilter(servletRequest, servletResponse); return; }