dev合并到master分支 # 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支 # 合并到主题分支。 # # 以 …

…'#' 开头的行将被忽略，而且空提交说明将会终止提交。
bruce3x · Jan 15, 2016 · 76f3336 · 76f3336
2 parents dbdf0ff + 62bc511
commit 76f3336
Show file tree

Hide file tree

Showing 23 changed files with 472 additions and 399 deletions.
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: me.brucezz.crawler.Main
+
diff --git a/src/db/BarrageDao.java b/src/db/BarrageDao.java
diff --git a/src/db/DBUtil.java b/src/db/DBUtil.java
diff --git a/src/Main.java → src/me/brucezz/crawler/Main.java b/src/Main.java → src/me/brucezz/crawler/Main.java
@@ -1,12 +1,13 @@
+package me.brucezz.crawler;
 
-import config.Config;
-import thread.CrawlerThread;
+import me.brucezz.crawler.config.Config;
+import me.brucezz.crawler.thread.CrawlerThread;
 
 import java.util.Set;
 
 /**
- * Created by zero on 2016/01/04.
- * Douyu
+ * Created by Brucezz on 2016/01/04.
+ * DouyuCrawler
  */
 public class Main {
     public static void main(String[] args) {
@@ -16,7 +17,7 @@ public static void main(String[] args) {
         Set<String> nameSet = Config.ROOM_MAP.keySet();
 
         for (String name : nameSet) {
-            new Thread(new CrawlerThread(name, Config.ROOM_MAP.get(name))).start();
+            new Thread(new CrawlerThread(name, Config.ROOM_MAP.get(name)), "Crawler-"+name).start();
         }
     }
 }
diff --git a/src/model/Barrage.java → src/me/brucezz/crawler/bean/Barrage.java b/src/model/Barrage.java → src/me/brucezz/crawler/bean/Barrage.java
@@ -1,10 +1,10 @@
-package model;
+package me.brucezz.crawler.bean;
 
 import java.util.Date;
 
 /**
- * Created by zero on 2016/01/03.
- * Douyu
+ * Created by Brucezz on 2016/01/03.
+ * DouyuCrawler
  */
 public class Barrage {
 

diff --git a/src/model/Message.java → src/me/brucezz/crawler/bean/Message.java b/src/model/Message.java → src/me/brucezz/crawler/bean/Message.java
@@ -1,12 +1,12 @@
-package model;
+package me.brucezz.crawler.bean;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 
 /**
- * Created by zero on 2016/01/03.
- * Douyu
+ * Created by Brucezz on 2016/01/03.
+ * DouyuCrawler
  */
 public class Message {
 
@@ -33,6 +33,9 @@ public Message(String content) {
         end = new int[]{0x00};
     }
 
+    /**
+     * 计算消息体长度
+     */
     private int calcMessageLength(String content) {
         return 4 + 4 + (content == null ? 0 : content.length()) + 1;
     }
@@ -88,14 +91,13 @@ public String toString() {
                 '}';
     }
 
+    private  ByteArrayOutputStream baos;
+
     /**
-     * 把Message对象填充到ByteArrayOutputStream里
-     *
-     * @throws IOException
+     * 将Message对象转化为字节数组
      */
-    public void putIntoStream(ByteArrayOutputStream baos) throws IOException {
-        if (baos == null) return;
-
+    public byte[] getBytes() throws IOException {
+        if (baos == null ) baos = new ByteArrayOutputStream();
         baos.reset();
 
         for (int b : length) baos.write(b);
@@ -104,5 +106,6 @@ public void putIntoStream(ByteArrayOutputStream baos) throws IOException {
         if (content != null) baos.write(content.getBytes());
         for (int b : end) baos.write(b);
 
+        return baos.toByteArray();
     }
 }
diff --git a/src/model/Request.java → src/me/brucezz/crawler/bean/Request.java b/src/model/Request.java → src/me/brucezz/crawler/bean/Request.java
@@ -1,13 +1,15 @@
-package model;
+package me.brucezz.crawler.bean;
 
 /**
- * Created by zero on 2016/01/05.
- * Douyu
+ * Created by Brucezz on 2016/01/05.
+ * DouyuCrawler
  */
 public class Request {
+    /**
+     * 程序需要发送的各种请求正文
+     */
 
     public static String gid(int roomId, String devid, String rt, String vk) {
-
         return String.format("type@=loginreq/username@=/ct@=0/password@=/roomid@=%d/devid@=%s/rt@=%s/vk@=%s/ver@=20150929/", roomId, devid, rt, vk);
     }
 
@@ -21,6 +23,5 @@ public static String joinGroup(int rid, int gid) {
 
     public static String keepLive(int tick) {
         return String.format("type@=keeplive/tick@=%d/", tick);
-//        return String.format("type@=mrkl/", tick);
     }
 }
diff --git a/src/model/ServerInfo.java → src/me/brucezz/crawler/bean/ServerInfo.java b/src/model/ServerInfo.java → src/me/brucezz/crawler/bean/ServerInfo.java
@@ -1,9 +1,9 @@
-package model;
+package me.brucezz.crawler.bean;
 
 
 /**
- * Created by zero on 2016/01/05.
- * Douyu
+ * Created by Brucezz on 2016/01/05.
+ * DouyuCrawler
  */
 public class ServerInfo {
     private String host;

diff --git a/src/config/Config.java → src/me/brucezz/crawler/config/Config.java b/src/config/Config.java → src/me/brucezz/crawler/config/Config.java
@@ -1,24 +1,32 @@
-package config;
+package me.brucezz.crawler.config;
 
 
-import util.LogUtil;
+import me.brucezz.crawler.util.LogUtil;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
 /**
- * Created by zero on 2016/01/04.
- * Douyu
+ * Created by Brucezz on 2016/01/04.
+ * DouyuCrawler
  */
 public class Config {
     private static final String PROPERTIES_NAME = "conf.properties";
     public static boolean loadSuccess = false;
 
     public static boolean DEBUG_MODE = true;
 
+    public static boolean DB_ENABLE = false;
+    public static String DB_NAME = null;
+    public static String DB_USERNAME = null;
+    public static String DB_PASSWORD = null;
+
     /**
      * 键  房间简称( 即room.url.XXX中的XXX )
      * 值  房间地址
@@ -34,20 +42,23 @@ public class Config {
 
             DEBUG_MODE = Boolean.parseBoolean(properties.getProperty("debug"));
 
+            DB_ENABLE = Boolean.parseBoolean(properties.getProperty("db.enable"));
+            DB_NAME = properties.getProperty("db.name");
+            DB_USERNAME = properties.getProperty("db.username");
+            DB_PASSWORD = properties.getProperty("db.password");
+
             Set<Object> objects = properties.keySet();
             for (Object object : objects) {
-                String key = (String) object;
-                if (key.startsWith("room.url.")) {
-                    String name = key.substring(9).trim();
-                    if (name.length() > 0)
-                        ROOM_MAP.put(name, properties.getProperty(key));
-                }
+                String key = ((String) object).trim();
+                if (!key.startsWith("room.url.") || key.length() <= 9) continue;
+
+                ROOM_MAP.put(key.substring(9), properties.getProperty(key));
             }
 
             loadSuccess = true;
             LogUtil.i("读取配置信息成功！");
 
-            displayConfig();
+            showConfig();
 
         } catch (Exception e) {
             LogUtil.e(e.toString());
@@ -63,13 +74,14 @@ public class Config {
         }
     }
 
-    private static void displayConfig() {
+    private static void showConfig() {
         LogUtil.d("Config", "----------------------------------------------------------------");
 
         LogUtil.d("Config", "DEBUG_MODE: " + DEBUG_MODE);
+        LogUtil.d("Config", "DB_ENABLE: " + DB_ENABLE);
         Set<String> nameSet = ROOM_MAP.keySet();
         for (String name : nameSet) {
-            LogUtil.d("Config", "ROOM_URL: " + name +" >> "+ROOM_MAP.get(name));
+            LogUtil.d("Config", "ROOM_URL: " + name + " >> " + ROOM_MAP.get(name));
         }
 
         LogUtil.d("Config", "----------------------------------------------------------------");
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Manifest-Version: 1.0
		Main-Class: me.brucezz.crawler.Main