From 0301b8a094f98f15687d6066f0c858a3312ac4c1 Mon Sep 17 00:00:00 2001
From: gaopu_dxm <gaopu@duxiaoman.com>
Date: 2018年10月27日 17:06:43 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=96=97=E9=B1=BC?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=8D=8F=E8=AE=AE=E6=9B=B4=E6=94=B9=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 .idea/Java.iml &#124; 9 +
 .idea/misc.xml &#124; 7 +
 .idea/modules.xml &#124; 8 +
 .idea/vcs.xml &#124; 6 +
 .idea/workspace.xml &#124; 232 ++++++++++++++++++
 .../Maven__org_jsoup_jsoup_1_8_3.xml &#124; 13 -
 CrawlDouyuDanmu/src/main/java/Crawl.java &#124; 141 -----------
 .../src/main/java/DouyuBarrageHandler.java &#124; 108 ++++++++
 CrawlDouyuDanmu/src/main/java/Main.java &#124; 11 -
 CrawlDouyuDanmu/src/main/java/Message.java &#124; 65 -----
 .../src/main/java/MessageHandler.java &#124; 52 ----
 .../src/main/java/MessageType.java &#124; 13 +
 CrawlDouyuDanmu/src/main/java/Start.java &#124; 12 +
 CrawlDouyuDanmu/src/main/java/Utils.java &#124; 139 -----------
 .../src/main/resources/config.properties &#124; 10 -
 15 files changed, 395 insertions(+), 431 deletions(-)
 create mode 100644 .idea/Java.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 delete mode 100644 CrawlDouyuDanmu/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml
 delete mode 100644 CrawlDouyuDanmu/src/main/java/Crawl.java
 create mode 100644 CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java
 delete mode 100644 CrawlDouyuDanmu/src/main/java/Main.java
 delete mode 100644 CrawlDouyuDanmu/src/main/java/Message.java
 delete mode 100644 CrawlDouyuDanmu/src/main/java/MessageHandler.java
 create mode 100644 CrawlDouyuDanmu/src/main/java/MessageType.java
 create mode 100644 CrawlDouyuDanmu/src/main/java/Start.java
 delete mode 100644 CrawlDouyuDanmu/src/main/java/Utils.java
 delete mode 100644 CrawlDouyuDanmu/src/main/resources/config.properties
diff --git a/.idea/Java.iml b/.idea/Java.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/Java.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$" />
+ <orderentry type="inheritedJdk" />
+ <orderentry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..f091b54
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="JavaScriptSettings">
+ <option name="languageLevel" value="ES6" />
+ </component>
+ <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..11e3c07
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/Java.iml" filepath="$PROJECT_DIR$/.idea/Java.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <ul class="image_map">
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..fba3ee6
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ChangeListManager">
+ <list default="true" id="03dda6f3-07e9-41ed-9af0-6926c3d0a881" name="Default" comment="" />
+ <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+ <option name="TRACKING_ENABLED" value="true" />
+ <option name="SHOW_DIALOG" value="false" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
+ </component>
+ <component name="FileEditorManager">
+ <leaf>
+ <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/CrawlPandaDanmu/src/main/java/Main.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="168">
+ <caret line="8" column="18" lean-forward="true" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
+ <component name="Git.Settings">
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ </component>
+ <component name="GradleLocalSettings">
+ <option name="projectSyncType">
+ <ul class="image_map">
+ <entry key="$PROJECT_DIR$/../spring-framework" value="PREVIEW" />
+ </ul>
+ </option>
+ </component>
+ <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsGulpfileManager">
+ <detection-done>true</detection-done>
+ <sorting>DEFINITION_ORDER</sorting>
+ </component>
+ <component name="NodePackageJsonFileManager">
+ <packagejsonpaths />
+ </component>
+ <component name="ProjectFrameBounds">
+ <option name="y" value="23" />
+ <option name="1280" />
+ <option name="777" />
+ </component>
+ <component name="ProjectView">
+ <navigator proportions="" version="1">
+ <foldersalwaysontop value="true" />
+ </navigator>
+ <panes>
+ <pane id="ProjectPane">
+ <subpane>
+ <expand>
+ <path>
+ <item name="Java" type="b2602c69:ProjectViewProjectNode" />
+ <item name="Java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="Java" type="b2602c69:ProjectViewProjectNode" />
+ <item name="Java" type="462c0819:PsiDirectoryNode" />
+ <item name="CrawlPandaDanmu" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="Java" type="b2602c69:ProjectViewProjectNode" />
+ <item name="Java" type="462c0819:PsiDirectoryNode" />
+ <item name="CrawlPandaDanmu" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="Java" type="b2602c69:ProjectViewProjectNode" />
+ <item name="Java" type="462c0819:PsiDirectoryNode" />
+ <item name="CrawlPandaDanmu" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="Java" type="b2602c69:ProjectViewProjectNode" />
+ <item name="Java" type="462c0819:PsiDirectoryNode" />
+ <item name="CrawlPandaDanmu" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subpane>
+ </pane>
+ <pane id="PackagesPane" />
+ <pane id="Scope" />
+ <pane id="AndroidView" />
+ </panes>
+ </component>
+ <component name="PropertiesComponent">
+ <property name="WebServerToolWindowFactoryState" value="false" />
+ <property name="aspect.path.notification.shown" value="true" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+ <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+ <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+ </component>
+ <component name="RunDashboard">
+ <option name="ruleStates">
+ <list>
+ <rulestate>
+ <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+ </rulestate>
+ <rulestate>
+ <option name="name" value="StatusDashboardGroupingRule" />
+ </rulestate>
+ </list>
+ </option>
+ </component>
+ <component name="RunManager">
+ <configuration default="true" type="Application" factoryName="Application">
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ </configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <patterns />
+ </configuration>
+ <configuration default="true" type="TestNG" factoryName="TestNG">
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
+ <option name="PROPERTIES_FILE" />
+ <properties />
+ <listeners />
+ </configuration>
+ </component>
+ <component name="SvnConfiguration">
+ <configuration />
+ </component>
+ <component name="TaskManager">
+ <task active="true" id="Default" summary="Default task">
+ <changelist id="03dda6f3-07e9-41ed-9af0-6926c3d0a881" name="Default" comment="" />
+ <created>1540563728647</created>
+ <option name="number" value="Default" />
+ <option name="presentableId" value="Default" />
+ <updated>1540563728647</updated>
+ <workitem from="1540563732494" duration="168000" />
+ </task>
+ <servers />
+ </component>
+ <component name="TimeTrackingManager">
+ <option name="totallyTimeSpent" value="168000" />
+ </component>
+ <component name="ToolWindowManager">
+ <frame x="0" y="23" height="777" extended-state="0" />
+ <editor active="true" />
+ <layout>
+ <window_info anchor="right" id="Palette" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="right" id="Palette&#9;" />
+ <window_info id="Image Layers" />
+ <window_info anchor="right" id="Capture Analysis" />
+ <window_info anchor="bottom" id="Event Log" side_tool="true" />
+ <window_info anchor="right" id="Maven Projects" />
+ <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Version Control" />
+ <window_info anchor="bottom" id="Run" order="2" />
+ <window_info anchor="bottom" id="Terminal" />
+ <window_info id="Capture Tool" />
+ <window_info id="Designer" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959612" />
+ <window_info anchor="right" id="Database" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info id="UI Designer" />
+ <window_info anchor="right" id="Theme Preview" />
+ <window_info id="Favorites" side_tool="true" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info anchor="bottom" id="Find" order="1" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ </layout>
+ </component>
+ <component name="TypeScriptGeneratedFilesManager">
+ <option name="version" value="1" />
+ </component>
+ <component name="VcsContentAnnotationSettings">
+ <option name="myLimit" value="2678400000" />
+ </component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/CrawlPandaDanmu/src/main/java/Crawl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state>
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CrawlPandaDanmu/src/main/java/Main.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="168">
+ <caret line="8" column="18" lean-forward="true" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ </component>
+</project>
\ No newline at end of file
diff --git a/CrawlDouyuDanmu/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml b/CrawlDouyuDanmu/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml
deleted file mode 100644
index de00ad0..0000000
--- a/CrawlDouyuDanmu/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: org.jsoup:jsoup:1.8.3">
- <classes>
- <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.8.3/jsoup-1.8.3.jar!/" />
- </classes>
- <javadoc>
- <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.8.3/jsoup-1.8.3-javadoc.jar!/" />
- </javadoc>
- <sources>
- <root url="jar://$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.8.3/jsoup-1.8.3-sources.jar!/" />
- </sources>
- </library>
-</component>
\ No newline at end of file
diff --git a/CrawlDouyuDanmu/src/main/java/Crawl.java b/CrawlDouyuDanmu/src/main/java/Crawl.java
deleted file mode 100644
index 809bd5b..0000000
--- a/CrawlDouyuDanmu/src/main/java/Crawl.java
+++ /dev/null
@@ -1,141 +0,0 @@
-import java.io.IOException;
-import java.net.Socket;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by geekgao on 16-1-28.
- */
-public class Crawl extends Thread {
- //弹幕服务器端口
- List<integer> ports = new LinkedList<integer>();
- //房间id
- String rid;
- //弹幕分组
- String gid;
- //与弹幕服务器交互的控制器
- MessageHandler messageHandler;
- //登录名
- String username;
-
- public Crawl() throws IOException {
- rid = Utils.getRoomId();
- }
-
- /**
- *
- * 初始化"弹幕服务器地址数据"和"弹幕分组信息"和"登录用户名"
- */
- public void init() throws IOException {
- String ip = Utils.getServerIP();
- int port = Integer.valueOf(Utils.getServerPort());
- Socket socket = new Socket(ip,port);
- System.out.println("从服务器(" + ip + ":" + port + ")获取弹幕服务器数据");
- MessageHandler messageHandler = new MessageHandler(socket);
-
- String s = "type@=loginreq/username@=/ct@=0/password@=/roomid@=" + Utils.getRoomId() + "/";
- String time = String.valueOf(System.currentTimeMillis() / 1000);
- String uuid = UUID.randomUUID().toString().replaceAll("-","").toUpperCase();
- String rt = "rt@=" + time + "/";
- String devid = "devid@=" + uuid + "/";
- String vk = "vk@=" + Utils.md5(time + "7oE9nPEG9xXV69phU31FYCLUagKeYtsF" + uuid) + "/";
- String ver = "ver@=20150929/";
- String content = s + devid + rt + vk + ver;
-
- messageHandler.send(content);
- for (int i = 0;i < 3;i++) { - byte[] bytes = messageHandler.read(); - String msg = new String(Arrays.copyOfRange(bytes, 8, bytes.length)); - if (msg.startsWith("type@=msgrepeaterlist")) { - Pattern p = Pattern.compile("@ASip(.*?)@AS@S"); - Matcher m = p.matcher(msg); - - while (m.find()) { - String str = m.group(1); - Integer po = Integer.valueOf(str.split("@ASport@AA=")[1]); - ports.add(po); - } - } else if (msg.startsWith("type@=setmsggroup")) { - gid = msg.split("gid@=")[1].split("/")[0]; - } else if (msg.startsWith("type@=loginres")) { - username = msg.split("username@=")[1].split("/")[0]; - } - } - socket.close(); - } - - public void login() throws IOException { - Socket socket = new Socket("danmu.douyutv.com",ports.get(0)); - System.out.println("连接弹幕服务器(danmu.douyutv.com:" + ports.get(0) + ")"); - messageHandler = new MessageHandler(socket); - - String loginreq = "type@=loginreq/username@=" + username + "/password@=1234567890123456/roomid@=" + rid + "/"; - messageHandler.send(loginreq); - System.out.println("登录名:" + username); - - String joinGroup; - if (Utils.isSeaMode()) { - joinGroup = "type@=joingroup/rid@=" + rid + "/gid@=-9999/"; - System.out.println("海量弹幕模式:开启"); - } else { - joinGroup = "type@=joingroup/rid@=" + rid + "/gid@=" + gid + "/"; - System.out.println("海量弹幕模式:关闭"); - System.out.println("进入" + gid + "号弹幕分组"); - } - - messageHandler.send(joinGroup); - } - - @Override - public void run() { - try { - System.out.println("房间名:" + Utils.getRoomName()); - System.out.println("主播:" + Utils.getOwnerName()); - /*if (!Utils.roomIsAlive()) { - System.out.println("房间未开播,程序结束."); - return; - } else { - System.out.println("状态:正在直播"); - }*/ - } catch (IOException e) { - e.printStackTrace(); - } - - try { - init(); - login(); - System.out.println("--------------------------"); - - long start = System.currentTimeMillis(); - while (true) { - byte[] bytes = messageHandler.read(); - String msg = new String(Arrays.copyOfRange(bytes,8,bytes.length)); - - if (msg.startsWith("type@=chatmessage")) { - String nickname = msg.split("Snick@A=",2)[1].split("@",2)[0]; - String content = msg.split("content@=",2)[1].split("/",2)[0]; - System.out.println("[" + nickname + "]:" + content); - } - - long end = System.currentTimeMillis(); - if (end - start> 30000) {
- messageHandler.send("type=mrkl/");
- start = System.currentTimeMillis();
- }
-
- Thread.sleep(1);
- }
- } catch (IOException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } finally {
- try {
- messageHandler.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-}
diff --git a/CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java b/CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java
new file mode 100644
index 0000000..ea8fbbb
--- /dev/null
+++ b/CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java
@@ -0,0 +1,108 @@
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+public class DouyuBarrageServerHandler {
+ private static String host = "openbarrage.douyutv.com";
+
+ private static int port = 8601;
+
+ private Socket serverSocket;
+
+ private String roomId;
+
+ public DouyuBarrageServerHandler(String roomId) {
+ this.roomId = roomId;
+
+ try {
+ connect();
+ login();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void connect() throws IOException {
+ serverSocket = new Socket(host, port);
+
+ new Thread(new Runnable() {
+ public void run() {
+ while (true) {
+ try {
+ send("type@=mrkl");
+ Thread.sleep(30000);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }).start();
+ }
+
+ private void login() throws IOException {
+ send("type@=loginreq/roomid@=" + roomId);
+ send("type@=joingroup/rid@=" + roomId + "/gid@=-9999");
+ }
+
+ public String read() throws IOException {
+ int msgSize = ByteBuffer.wrap(getBytes(4)).order(ByteOrder.LITTLE_ENDIAN).getInt();
+ byte[] msgBytes =getBytes(msgSize);
+
+ return new String(msgBytes, 8, msgSize - 9);
+ }
+
+ public void send(String msg) throws IOException {
+ serverSocket.getOutputStream().write(getSendBytes(msg));
+ serverSocket.getOutputStream().flush();
+ }
+
+ private byte[] getBytes(int byteCount) throws IOException {
+ byte[] result = new byte[byteCount];
+ int alreadyReadSize = 0;
+
+ while (alreadyReadSize != byteCount) {
+ alreadyReadSize += serverSocket.getInputStream().read(result, alreadyReadSize, byteCount - alreadyReadSize);
+ }
+
+ return result;
+ }
+
+ private byte[] getSendBytes(String msg) throws IOException {
+ ByteArrayOutputStream outBytes = new ByteArrayOutputStream(getPacketSize(msg));
+ outBytes.write(intToggle(getPacketSize(msg)));
+ outBytes.write(intToggle(getPacketSize(msg)));
+ outBytes.write(shortToggle(MessageType.SEND.getCode()));
+ outBytes.write(0);
+ outBytes.write(0);
+ outBytes.write(msg.getBytes());
+ outBytes.write(0);
+
+ return outBytes.toByteArray();
+ }
+
+ private int getPacketSize(String msg) {
+ return 9 + msg.length();
+ }
+
+ private byte[] intToggle(int value) {
+ byte[] result = new byte[4];
+ result[3] = (byte) ((value>> 24) & 0xFF);
+ result[2] = (byte) ((value>> 16) & 0xFF);
+ result[1] = (byte) ((value>> 8) & 0xFF);
+ result[0] = (byte) (value & 0xFF);
+
+ return result;
+ }
+
+ private byte[] shortToggle(short value) {
+ byte[] result = new byte[2];
+ result[1] = (byte) ((value>> 8) & 0xFF);
+ result[0] = (byte) (value & 0xFF);
+
+ return result;
+ }
+}
diff --git a/CrawlDouyuDanmu/src/main/java/Main.java b/CrawlDouyuDanmu/src/main/java/Main.java
deleted file mode 100644
index a5a9d77..0000000
--- a/CrawlDouyuDanmu/src/main/java/Main.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import java.io.IOException;
-
-/**
- * Created by geekgao on 16-1-26.
- */
-public class Main {
- public static void main(String[] args) throws IOException {
- Crawl c = new Crawl();
- c.start();
- }
-}
diff --git a/CrawlDouyuDanmu/src/main/java/Message.java b/CrawlDouyuDanmu/src/main/java/Message.java
deleted file mode 100644
index e866122..0000000
--- a/CrawlDouyuDanmu/src/main/java/Message.java
+++ /dev/null
@@ -1,65 +0,0 @@
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-/**
- * Created by geekgao on 2016年01月27日.
- */
-public class Message {
-
- /**
- * 请求消息体包含五部分:
- * 1.计算后四部分的字节长度,占4个字节
- * 2.内容同上
- * 3.请求代码,固定,发到斗鱼是0xb1,0x02,0x00,0x00,接收是0xb2,0x02,0x00,0x00,4个字节
- * 4.消息正文
- * 5.尾部1个空字节
- */
-
- private int[] length1;
- private int[] length2;
- private int[] magic;
- private String content;
- private int[] end;
-
- public Message(String content) {
- length1 = new int[]{calcMessageLength(content), 0x00, 0x00, 0x00};
- length2 = new int[]{calcMessageLength(content), 0x00, 0x00, 0x00};
- magic = new int[]{0xb1, 0x02, 0x00, 0x00};
- this.content = content;
- end = new int[]{0x00};
- }
-
- /**
- * 计算消息体长度
- */
- private int calcMessageLength(String content) {
- return 4 + 4 + (content == null ? 0 : content.length()) + 1;
- }
-
- @Override
- public String toString() {
- return "Message{" +
- "length1=" + Arrays.toString(length1) +
- ", length2=" + Arrays.toString(length2) +
- ", magic=" + Arrays.toString(magic) +
- ", content='" + content + '\'' +
- ", end=" + Arrays.toString(end) +
- '}';
- }
-
- /**
- * 将Message对象转化为字节数组
- */
- public byte[] getBytes() throws IOException {
- ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
-
- for (int b : length1) byteArray.write(b);
- for (int b : length2) byteArray.write(b);
- for (int b : magic) byteArray.write(b);
- if (content != null) byteArray.write(content.getBytes("ISO-8859-1"));
- for (int b : end) byteArray.write(b);
-
- return byteArray.toByteArray();
- }
-}
diff --git a/CrawlDouyuDanmu/src/main/java/MessageHandler.java b/CrawlDouyuDanmu/src/main/java/MessageHandler.java
deleted file mode 100644
index dd7a4dd..0000000
--- a/CrawlDouyuDanmu/src/main/java/MessageHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-
-/**
- * Created by geekgao on 16-1-27.
- */
-public class MessageHandler {
- private Socket socket;
-
- public MessageHandler(Socket socket) {
- this.socket = socket;
- }
-
- public void send(String content) throws IOException {
- Message message = new Message(content);
- OutputStream out = socket.getOutputStream();
- out.write(message.getBytes());
- }
-
- public byte[] read() throws IOException {
- InputStream inputStream = socket.getInputStream();
- //下条信息的长度
- int contentLen = 0;
-
- //读取前4个字节,得到数据长度
- for (int i = 0;i < 4;i++) { - int tmp = inputStream.read(); - contentLen += tmp * Math.pow(16,2 * i); - } - - int len = 0; - int readLen = 0; - byte[] bytes = new byte[contentLen]; - ByteArrayOutputStream byteArray = new ByteArrayOutputStream(); - while ((len = inputStream.read(bytes,0,contentLen - readLen)) != -1) { - byteArray.write(bytes,0,len); - readLen += len; - if (readLen == contentLen) { - break; - } - } - - return byteArray.toByteArray(); - } - - public void close() throws IOException { - socket.close(); - } -} diff --git a/CrawlDouyuDanmu/src/main/java/MessageType.java b/CrawlDouyuDanmu/src/main/java/MessageType.java new file mode 100644 index 0000000..be72ae4 --- /dev/null +++ b/CrawlDouyuDanmu/src/main/java/MessageType.java @@ -0,0 +1,13 @@ +public enum MessageType { + SEND(689), RECV(690); + + private short code; + + MessageType(int code) { + this.code = (short) code; + } + + public short getCode() { + return code; + } +} diff --git a/CrawlDouyuDanmu/src/main/java/Start.java b/CrawlDouyuDanmu/src/main/java/Start.java new file mode 100644 index 0000000..18b97da --- /dev/null +++ b/CrawlDouyuDanmu/src/main/java/Start.java @@ -0,0 +1,12 @@ +import java.io.IOException; + +public class Start { + public static void main(String[] args) throws IOException, InterruptedException { + DouyuBarrageServerHandler server = new DouyuBarrageServerHandler("288016"); + + while (true) { + System.out.println(server.read()); + Thread.sleep(1); + } + } +} diff --git a/CrawlDouyuDanmu/src/main/java/Utils.java b/CrawlDouyuDanmu/src/main/java/Utils.java deleted file mode 100644 index 8c42b74..0000000 --- a/CrawlDouyuDanmu/src/main/java/Utils.java +++ /dev/null @@ -1,139 +0,0 @@ -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; - -import java.io.IOException; -import java.net.Socket; -import java.security.MessageDigest; -import java.util.*; - -/** - * Created by geekgao on 16-1-26. - */ -public class Utils { - private static String roomSrc; - private static Properties config = new Properties(); - - static { - try { - config.load(Utils.class.getResourceAsStream("/config.properties")); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public static String getRoomId() throws IOException { - if (roomSrc == null) { - Document roomDoc = Jsoup.connect(getRoomUrl()).get(); - roomSrc = roomDoc.toString(); - } - - return roomSrc.split("room_id\":")[1].split(",")[0]; - } - - public static boolean roomIsAlive() throws IOException { - Document roomDoc = Jsoup.connect(getRoomUrl()).get(); - roomSrc = roomDoc.toString(); - - String status = roomSrc.split("show_status\":")[1].split(",")[0]; - - return status.equals("1"); - } - - public static String getRoomName() throws IOException { - if (roomSrc == null) { - Document roomDoc = Jsoup.connect(getRoomUrl()).get(); - roomSrc = roomDoc.toString(); - } - - String name = roomSrc.split("room_name\":\"")[1].split("\",")[0]; - return unicode2String(name); - } - - public static String getOwnerName() throws IOException { - if (roomSrc == null) { - Document roomDoc = Jsoup.connect(getRoomUrl()).get(); - roomSrc = roomDoc.toString(); - } - - String name = roomSrc.split("owner_name\":\"")[1].split("\",")[0]; - return unicode2String(name); - } - - public static String getRoomUrl() throws IOException { - String url = config.getProperty("url"); - - if (url.startsWith("http://")) { - return url; - } else { - return "http://" + url; - } - } - - /** - * - * @return 返回值代表是否开启海量弹幕模式 - */ - public static boolean isSeaMode() { - return config.getProperty("seaMode").equals("true"); - } - - public static String getServerIP() throws IOException { - return config.getProperty("serverIP"); - } - - public static String getServerPort() throws IOException { - return config.getProperty("serverPort"); - } - - public static String md5(String s) { - char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; - try { - // 获得MD5摘要算法的 MessageDigest 对象 - MessageDigest mdInst = MessageDigest.getInstance("MD5"); - // 使用指定的字节更新摘要, 获得密文 - byte[] md = mdInst.digest(s.getBytes()); - // 把密文转换成十六进制的字符串形式 - int j = md.length; - char str[] = new char[j * 2]; - int k = 0; - for (byte b : md) { - str[k++] = hexDigits[b>>> 4 & 0xf];
- str[k++] = hexDigits[b & 0xf];
- }
- return new String(str).toLowerCase();
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
- /**
- * 将包含unicode的字符串 转 中文字符串
- * 将每个unicode编码计算出其值,再强转成char类型,然后将这个字符存储到字符串中
- */
- private static String unicode2String(String str) {
- StringBuilder result = new StringBuilder();
- for (int i = 0;i < str.length();) { - if (str.charAt(i) == '\\' && str.charAt(i + 1) == 'u') { - String unicode = str.substring(i + 2, i + 6); - //确定是unicode编码 - if (unicode.matches("[0-9a-fA-F]{4}")) { - //将得到的数值按照16进制解析为十进制整数,再強转为字符 - char ch = (char) Integer.parseInt(unicode, 16); - //用得到的字符替换编码表达式 - result.append(ch); - i += 6; - } else { - result.append("\\u"); - i += 2; - } - } else { - result.append(str.charAt(i)); - i++; - } - } - - return result.toString(); - } - -} diff --git a/CrawlDouyuDanmu/src/main/resources/config.properties b/CrawlDouyuDanmu/src/main/resources/config.properties deleted file mode 100644 index 821fedf..0000000 --- a/CrawlDouyuDanmu/src/main/resources/config.properties +++ /dev/null @@ -1,10 +0,0 @@ -#要抓取的斗鱼房间网址 -url = http://www.douyutv.com/301712 - -#一开始通讯的服务器,不是弹幕服务器,弹幕服务器地址是与这个服务器通讯后返回的(抓包得到这个地址) -serverIP = 119.90.49.93 -serverPort = 8062 - -#海量弹幕模式 (true &#124;&#124; false) -#在某些主播房间好像是不管用的,尤其是人少的房间,看人气少的主播弹幕建议设置为false -seaMode = true \ No newline at end of file From a85972ee5b297f6a2d62b6b031244ff29848342b Mon Sep 17 00:00:00 2001 From: gaopu_dxm <gaopu@duxiaoman.com>
Date: 2018年10月27日 17:08:27 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=96=97=E9=B1=BC?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=8D=8F=E8=AE=AE=E6=9B=B4=E6=94=B9=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 CrawlDouyuDanmu/.gitignore &#124; 3 +-
 CrawlDouyuDanmu/.idea/compiler.xml &#124; 18 +-
 CrawlDouyuDanmu/.idea/misc.xml &#124; 15 +-
 CrawlDouyuDanmu/.idea/workspace.xml &#124; 856 +++++++++---------
 CrawlDouyuDanmu/CrawlDouyuDanmu.iml &#124; 3 +-
 CrawlDouyuDanmu/pom.xml &#124; 8 -
 .../src/main/java/DouyuBarrageHandler.java &#124; 4 +-
 CrawlDouyuDanmu/src/main/java/Start.java &#124; 2 +-
 CrawlPandaDanmu/.idea/workspace.xml &#124; 719 ++++++---------
 9 files changed, 735 insertions(+), 893 deletions(-)
diff --git a/CrawlDouyuDanmu/.gitignore b/CrawlDouyuDanmu/.gitignore
index 1de5659..5bd05d6 100644
--- a/CrawlDouyuDanmu/.gitignore
+++ b/CrawlDouyuDanmu/.gitignore
@@ -1 +1,2 @@
-target
\ No newline at end of file
+target
+.idea
\ No newline at end of file
diff --git a/CrawlDouyuDanmu/.idea/compiler.xml b/CrawlDouyuDanmu/.idea/compiler.xml
index e4ba787..b9e2fcd 100644
--- a/CrawlDouyuDanmu/.idea/compiler.xml
+++ b/CrawlDouyuDanmu/.idea/compiler.xml
@@ -1,27 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
 <component name="CompilerConfiguration">
- <resourceextensions />
- <wildcardresourcepatterns>
- <entry name="!?*.java" />
- <entry name="!?*.form" />
- <entry name="!?*.class" />
- <entry name="!?*.groovy" />
- <entry name="!?*.scala" />
- <entry name="!?*.flex" />
- <entry name="!?*.kt" />
- <entry name="!?*.clj" />
- <entry name="!?*.aj" />
- </wildcardresourcepatterns>
 <annotationprocessing>
- <profile default="true" name="Default" enabled="false">
- <processorpath useClasspath="true" />
- </profile>
- <profile default="false" name="Maven default annotation processors profile" enabled="true">
+ <profile name="Maven default annotation processors profile" enabled="true">
 <sourceoutputdir name="target/generated-sources/annotations" />
 <sourcetestoutputdir name="target/generated-test-sources/test-annotations" />
 <outputrelativetocontentroot value="true" />
- <processorpath useClasspath="true" />
 <module name="CrawlDouyuDanmu" />
 </profile>
 </annotationprocessing>
diff --git a/CrawlDouyuDanmu/.idea/misc.xml b/CrawlDouyuDanmu/.idea/misc.xml
index ddb5070..9338466 100644
--- a/CrawlDouyuDanmu/.idea/misc.xml
+++ b/CrawlDouyuDanmu/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
- <component name="EntryPointsManager">
- <entry_points version="2.0" />
- </component>
 <component name="MavenProjectsManager">
 <option name="originalFiles">
 <list>
@@ -10,17 +7,7 @@
 </list>
 </option>
 </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
- <optionssetting value="true" id="Add" />
- <optionssetting value="true" id="Remove" />
- <optionssetting value="true" id="Checkout" />
- <optionssetting value="true" id="Update" />
- <optionssetting value="true" id="Status" />
- <optionssetting value="true" id="Edit" />
- <confirmationssetting value="0" id="Add" />
- <confirmationssetting value="0" id="Remove" />
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
 <output url="file://$PROJECT_DIR$/out" />
 </component>
 <component name="masterDetails">
diff --git a/CrawlDouyuDanmu/.idea/workspace.xml b/CrawlDouyuDanmu/.idea/workspace.xml
index 5004fb9..f66b848 100644
--- a/CrawlDouyuDanmu/.idea/workspace.xml
+++ b/CrawlDouyuDanmu/.idea/workspace.xml
@@ -2,8 +2,23 @@
 <project version="4">
 <component name="ChangeListManager">
 <list default="true" id="6124cc17-3d25-416b-a459-58a8a6096601" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../CrawlPandaDanmu/.idea/workspace.xml" afterPath="$PROJECT_DIR$/../CrawlPandaDanmu/.idea/workspace.xml" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/DouyuBarrageHandler.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/MessageType.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/Start.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/CrawlDouyuDanmu.iml" beforeDir="false" afterPath="$PROJECT_DIR$/CrawlDouyuDanmu.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/Crawl.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/Message.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/MessageHandler.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/Utils.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/config.properties" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlPandaDanmu/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlPandaDanmu/.idea/workspace.xml" afterDir="false" />
 </list>
 <ignored path="CrawlDouyuDanmu.iws" />
 <ignored path=".idea/workspace.xml" />
@@ -17,81 +32,65 @@
 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
 <option name="LAST_RESOLUTION" value="IGNORE" />
 </component>
- <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
 <component name="CreatePatchCommitExecutor">
 <option name="PATCH_PATH" value="" />
 </component>
 <component name="DatabaseView">
- <option name="FLATTEN" value="false" />
- <option name="GROUP_BY_TYPE" value="true" />
- <option name="SORT_CHILDREN" value="false" />
- <option name="SHOW_TABLE_CONSTRAINTS" value="true" />
+ <option name="SHOW_INTERMEDIATE" value="true" />
+ <option name="GROUP_DATA_SOURCES" value="true" />
+ <option name="GROUP_SCHEMA" value="true" />
+ <option name="GROUP_CONTENTS" value="false" />
+ <option name="SORT_POSITIONED" value="false" />
+ <option name="SHOW_EMPTY_GROUPS" value="false" />
+ <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+ <option name="HIDDEN_KINDS">
+ <set />
+ </option>
+ <expand />
+ <select />
 </component>
- <component name="ExecutionTargetManager" SELECTED_ />
 <component name="FavoritesManager">
 <favorites_list name="CrawlDouyuDanmu" />
 </component>
 <component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="Start.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Start.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.28668943">
- <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
- <folding />
+ <state relative-caret-position="168">
+ <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
 </state>
 </provider>
 </entry>
 </file>
- <file leaf-file-name="Crawl.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
+ <file leaf-file-name="DouyuBarrageHandler.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/DouyuBarrageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="121" column="42" selection-start-line="121" selection-start-column="42" selection-end-line="121" selection-end-column="42" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#269#278#0" expanded="true" />
- </folding>
+ <state relative-caret-position="42">
+ <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
 </state>
 </provider>
 </entry>
 </file>
- <file leaf-file-name="config.properties" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
- <folding />
- </state>
- </provider>
+ <file leaf-file-name="MessageType.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/MessageType.java">
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 </file>
- <file leaf-file-name="MessageHandler.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
- <folding />
+ <state relative-caret-position="168">
+ <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
 </state>
 </provider>
 </entry>
 </file>
- <file leaf-file-name="Message.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
+ <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/.gitignore">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="59" column="77" selection-start-line="59" selection-start-column="77" selection-end-line="59" selection-end-column="77" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Utils.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="74" column="7" selection-start-line="74" selection-start-column="7" selection-end-line="74" selection-end-column="7" />
- <folding />
+ <state relative-caret-position="21">
+ <caret line="1" column="5" selection-start-line="1" selection-start-column="5" selection-end-line="1" selection-end-column="5" />
 </state>
 </provider>
 </entry>
@@ -105,118 +104,254 @@
 </list>
 </option>
 </component>
+ <component name="FindInProjectRecents">
+ <findstrings>
+ <find>继续读取真正的消息内容</find>
+ </findstrings>
+ </component>
 <component name="Git.Settings">
 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
 </component>
- <component name="GradleLocalSettings">
- <option name="externalProjectsViewState">
- <projects_view />
- </option>
- </component>
 <component name="IdeDocumentHistory">
 <option name="CHANGED_PATHS">
 <list>
- <option value="$PROJECT_DIR$/pom.xml" />
 <option value="$PROJECT_DIR$/src/main/java/Messagee.java" />
 <option value="$PROJECT_DIR$/src/main/java/CrawlUtils.java" />
 <option value="$PROJECT_DIR$/src/main/java/Message.java" />
 <option value="$PROJECT_DIR$/src/main/java/CrawlDanmu.java" />
 <option value="$PROJECT_DIR$/src/main/java/Main.java" />
 <option value="$PROJECT_DIR$/src/main/java/SendMessage.java" />
- <option value="$PROJECT_DIR$/src/main/java/Utils.java" />
 <option value="$PROJECT_DIR$/src/main/java/MessageHandler.java" />
+ <option value="$PROJECT_DIR$/src/main/java/Utils.java" />
 <option value="$PROJECT_DIR$/src/main/java/Crawl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/Test.java" />
 <option value="$PROJECT_DIR$/src/main/resources/config.properties" />
+ <option value="$PROJECT_DIR$/pom.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/Start.java" />
+ <option value="$PROJECT_DIR$/.gitignore" />
 </list>
 </option>
 </component>
- <component name="JsBuildToolGruntFileManager" detection-done="true" />
+ <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
 <component name="JsGulpfileManager">
 <detection-done>true</detection-done>
+ <sorting>DEFINITION_ORDER</sorting>
 </component>
 <component name="MavenImportPreferences">
- <option name="generalSettings">
- <mavengeneralsettings>
- <option name="mavenHome" value="Bundled (Maven 3)" />
- </mavengeneralsettings>
+ <option name="importingSettings">
+ <mavenimportingsettings>
+ <option name="importAutomatically" value="true" />
+ </mavenimportingsettings>
 </option>
 </component>
- <component name="NamedScopeManager">
- <order />
+ <component name="MavenProjectNavigator">
+ <div class="naked_tr">+ <expand>
+ <path>
+ <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+ <item name="DouyuDanmu" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+ </path>
+ <path>
+ <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+ <item name="DouyuDanmu" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+ <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
+ </path>
+ </expand>
+ <select />
+ </treestate>
+ </component>
+ <component name="NodePackageJsonFileManager">
+ <packagejsonpaths />
 </component>
 <component name="ProjectFrameBounds">
 <option name="y" value="27" />
 <option name="1920" />
 <option name="1053" />
 </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="true">
- <optionssetting value="true" id="Add" />
- <optionssetting value="true" id="Remove" />
- <optionssetting value="true" id="Checkout" />
- <optionssetting value="true" id="Update" />
- <optionssetting value="true" id="Status" />
- <optionssetting value="true" id="Edit" />
- <confirmationssetting value="0" id="Add" />
- <confirmationssetting value="0" id="Remove" />
- </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
 <component name="ProjectView">
 <navigator proportions="" version="1">
- <flattenpackages />
- <showmembers />
- <showmodules />
- <showlibrarycontents />
- <hideemptypackages />
- <abbreviatepackagenames />
- <autoscrolltosource />
- <autoscrollfromsource />
- <sortbytype />
+ <foldersalwaysontop value="true" />
 </navigator>
- <panes />
+ <panes>
+ <pane id="Scope" />
+ <pane id="AndroidView" />
+ <pane id="PackagesPane" />
+ <pane id="ProjectPane">
+ <subpane>
+ <expand>
+ <path>
+ <item name="CrawlDouyuDanmu" type="b2602c69:ProjectViewProjectNode" />
+ <item name="CrawlDouyuDanmu" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="CrawlDouyuDanmu" type="b2602c69:ProjectViewProjectNode" />
+ <item name="CrawlDouyuDanmu" type="462c0819:PsiDirectoryNode" />
+ <item name=".idea" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="CrawlDouyuDanmu" type="b2602c69:ProjectViewProjectNode" />
+ <item name="CrawlDouyuDanmu" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="CrawlDouyuDanmu" type="b2602c69:ProjectViewProjectNode" />
+ <item name="CrawlDouyuDanmu" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="CrawlDouyuDanmu" type="b2602c69:ProjectViewProjectNode" />
+ <item name="CrawlDouyuDanmu" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subpane>
+ </pane>
+ </panes>
 </component>
 <component name="PropertiesComponent">
+ <property name="FullScreen" value="false" />
+ <property name="WebServerToolWindowFactoryState" value="false" />
+ <property name="aspect.path.notification.shown" value="true" />
+ <property name="dynamic.classpath" value="false" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
 <property name="project.structure.last.edited" value="Project" />
 <property name="project.structure.proportion" value="0.0" />
 <property name="project.structure.side.proportion" value="0.0" />
+ <property name="recentsLimit" value="5" />
 <property name="settings.editor.selected.configurable" value="template.copyright.formatting" />
 <property name="settings.editor.splitter.proportion" value="0.2" />
- <property name="aspect.path.notification.shown" value="true" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="recentsLimit" value="5" />
- <property name="dynamic.classpath" value="false" />
- <property name="OverrideImplement.combined" value="true" />
- <property name="OverrideImplement.overriding.sorted" value="false" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="FullScreen" value="false" />
 </component>
 <component name="RecentsManager">
- <key name="CopyFile.RECENT_KEYS">
- <recent name="$PROJECT_DIR$/src/main/java" />
- </key>
 <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
 <recent name="" />
 </key>
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/src/main/java" />
+ </key>
 </component>
- <component name="RunManager" selected="Application.Main">
- <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="MAIN_CLASS_NAME" value="Main" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
+ <component name="RunDashboard">
+ <option name="ruleStates">
+ <list>
+ <rulestate>
+ <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+ </rulestate>
+ <rulestate>
+ <option name="name" value="StatusDashboardGroupingRule" />
+ </rulestate>
+ </list>
+ </option>
+ </component>
+ <component name="RunManager">
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ </configuration>
+ <configuration name="Start" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="Start" />
+ <module name="CrawlDouyuDanmu" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application">
 <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ </configuration>
+ <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
+ <option name="BCName" value="" />
+ <option name="IOSSimulatorSdkPath" value="" />
+ <option name="adlOptions" value="" />
+ <option name="airProgramParameters" value="" />
+ <option name="appDescriptorForEmulator" value="Android" />
+ <option name="debugTransport" value="USB" />
+ <option name="debuggerSdkRaw" value="BC SDK" />
+ <option name="emulator" value="NexusOne" />
+ <option name="emulatorAdlOptions" value="" />
+ <option name="fastPackaging" value="true" />
+ <option name="fullScreen0" />
+ <option name="fullScreen0" />
+ <option name="launchUrl" value="false" />
+ <option name="launcherParameters">
+ <launcherparameters>
+ <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
+ <option name="launcherType" value="OSDefault" />
+ <option name="newPlayerInstance" value="false" />
+ <option name="playerPath" value="/usr/bin/flashplayerdebugger" />
+ </launcherparameters>
+ </option>
+ <option name="mobileRunTarget" value="Emulator" />
+ <option name="moduleName" value="" />
+ <option name="overriddenMainClass" value="" />
+ <option name="overriddenOutputFileName" value="" />
+ <option name="overrideMainClass" value="false" />
+ <option name="runTrusted" value="true" />
+ <option name="screenDpi" value="0" />
+ <option name="screen0" />
+ <option name="screen0" />
+ <option name="url" value="http://" />
+ <option name="usbDebugPort" value="7936" />
+ </configuration>
+ <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
+ <option name="BCName" value="" />
+ <option name="launcherParameters">
+ <launcherparameters>
+ <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
+ <option name="launcherType" value="OSDefault" />
+ <option name="newPlayerInstance" value="false" />
+ <option name="playerPath" value="/usr/bin/flashplayerdebugger" />
+ </launcherparameters>
+ </option>
+ <option name="moduleName" value="" />
+ <option name="trusted" value="true" />
+ </configuration>
+ <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
+ <setting name="vmparams" value="" />
+ <setting name="cmdLine" value="run-app" />
+ <setting name="passParentEnv" value="true" />
+ <setting name="launchBrowser" value="false" />
+ <setting name="launchBrowserUrl" value="" />
+ <setting name="depsClasspath" value="false" />
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ </configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit">
 <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
 <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
 <option name="PASS_PARENT_ENVS" value="true" />
- <module name="CrawlDouyuDanmu" />
- <envs />
- <method />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <patterns />
 </configuration>
- <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
- <module name="" />
- <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
- <option name="PROGRAM_PARAMETERS" />
- <method />
+ <configuration default="true" type="TestNG" factoryName="TestNG">
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
+ <option name="PROPERTIES_FILE" />
+ <properties />
+ <listeners />
 </configuration>
 <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
 <module name="" />
@@ -259,28 +394,6 @@
 <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
 <method />
 </configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <option name="400" />
- <option name="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <module />
- <method />
- </configuration>
- <configuration default="true" type="Application" factoryName="Application">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
- <method />
- </configuration>
 <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
 <option name="myFilePath" />
@@ -300,55 +413,6 @@
 <envs />
 <method />
 </configuration>
- <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
- <option name="BCName" value="" />
- <option name="IOSSimulatorSdkPath" value="" />
- <option name="adlOptions" value="" />
- <option name="airProgramParameters" value="" />
- <option name="appDescriptorForEmulator" value="Android" />
- <option name="debugTransport" value="USB" />
- <option name="debuggerSdkRaw" value="BC SDK" />
- <option name="emulator" value="NexusOne" />
- <option name="emulatorAdlOptions" value="" />
- <option name="fastPackaging" value="true" />
- <option name="fullScreen0" />
- <option name="fullScreen0" />
- <option name="launchUrl" value="false" />
- <option name="launcherParameters">
- <launcherparameters>
- <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
- <option name="launcherType" value="OSDefault" />
- <option name="newPlayerInstance" value="false" />
- <option name="playerPath" value="/usr/bin/flashplayerdebugger" />
- </launcherparameters>
- </option>
- <option name="mobileRunTarget" value="Emulator" />
- <option name="moduleName" value="" />
- <option name="overriddenMainClass" value="" />
- <option name="overriddenOutputFileName" value="" />
- <option name="overrideMainClass" value="false" />
- <option name="runTrusted" value="true" />
- <option name="screenDpi" value="0" />
- <option name="screen0" />
- <option name="screen0" />
- <option name="url" value="http://" />
- <option name="usbDebugPort" value="7936" />
- <method />
- </configuration>
- <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
- <option name="BCName" value="" />
- <option name="launcherParameters">
- <launcherparameters>
- <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
- <option name="launcherType" value="OSDefault" />
- <option name="newPlayerInstance" value="false" />
- <option name="playerPath" value="/usr/bin/flashplayerdebugger" />
- </launcherparameters>
- </option>
- <option name="moduleName" value="" />
- <option name="trusted" value="true" />
- <method />
- </configuration>
 <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
 <externalsystemsettings>
 <option name="executionName" />
@@ -365,37 +429,6 @@
 </externalsystemsettings>
 <method />
 </configuration>
- <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
- <module name="" />
- <setting name="vmparams" value="" />
- <setting name="cmdLine" value="run-app" />
- <setting name="depsClasspath" value="false" />
- <setting name="passParentEnv" value="true" />
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <setting name="launchBrowser" value="false" />
- <method />
- </configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <envs />
- <patterns />
- <method />
- </configuration>
 <configuration default="true" type="JarApplication" factoryName="JAR Application">
 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
 <envs />
@@ -418,59 +451,32 @@
 <envs />
 <method />
 </configuration>
- <configuration default="true" type="TestNG" factoryName="TestNG">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
 <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <envs />
- <properties />
- <listeners />
+ <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+ <option name="PROGRAM_PARAMETERS" />
+ <method />
+ </configuration>
+ <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
+ <method />
+ </configuration>
+ <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
 <method />
 </configuration>
 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+ <node-interpreter>project</node-interpreter>
 <node-options />
 <gulpfile />
 <tasks />
 <arguments />
 <pass-parent-envs>true</pass-parent-envs>
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
- <method />
- </configuration>
- <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
- <method />
 </configuration>
- <list size="1">
- <item index="0" itemvalue="Application.Main" />
- </list>
 <recent_temporary>
- <list size="1">
- <item index="0" itemvalue="Application.Main" />
+ <list>
+ <item itemvalue="Application.Start" />
 </list>
 </recent_temporary>
 </component>
- <component name="ShelveChangesManager" show_recycled="false" />
 <component name="SvnConfiguration">
 <configuration />
 </component>
@@ -479,6 +485,7 @@
 <changelist id="6124cc17-3d25-416b-a459-58a8a6096601" name="Default" comment="" />
 <created>1453816946069</created>
 <option name="number" value="Default" />
+ <option name="presentableId" value="Default" />
 <updated>1453816946069</updated>
 <workitem from="1453816947899" duration="203000" />
 <workitem from="1453817363876" duration="2615000" />
@@ -489,68 +496,77 @@
 <workitem from="1454042435927" duration="119000" />
 <workitem from="1454336962447" duration="92000" />
 <workitem from="1454485167451" duration="2427000" />
+ <workitem from="1540564218898" duration="18194000" />
 </task>
 <servers />
 </component>
 <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="72182000" />
+ <option name="totallyTimeSpent" value="90376000" />
 </component>
 <component name="ToolWindowManager">
- <frame x="0" y="27" height="1053" extended-state="6" />
- <editor active="false" />
+ <frame x="0" y="23" height="777" extended-state="0" />
+ <editor active="true" />
 <layout>
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32752994" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44973263" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3297062" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22036473" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32994652" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info anchor="right" id="Palette" order="5" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="bottom" id="Messages" order="7" weight="0.32752994" />
+ <window_info id="Palette&#9;" order="2" />
+ <window_info id="Image Layers" />
+ <window_info anchor="right" id="Capture Analysis" order="0" />
+ <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
+ <window_info anchor="right" id="Maven Projects" order="6" weight="0.13812602" />
+ <window_info anchor="bottom" id="Database Changes" order="0" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Run" order="12" weight="0.28529412" />
+ <window_info anchor="bottom" id="Version Control" order="10" weight="0.32941177" />
+ <window_info anchor="bottom" id="Terminal" order="11" weight="0.3297062" />
+ <window_info id="Capture Tool" />
+ <window_info anchor="right" id="Designer" order="7" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2197092" />
+ <window_info anchor="right" id="Database" order="8" weight="0.22455573" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
+ <window_info id="UI Designer" order="2" />
+ <window_info anchor="right" id="Theme Preview" order="1" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.2764706" />
+ <window_info id="Favorites" order="2" side_tool="true" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="2" type="SLIDING" weight="0.4" />
+ <window_info anchor="bottom" id="Application Servers" order="9" />
+ <window_info anchor="bottom" id="Message" order="1" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Find" order="2" />
 </layout>
 <layout-to-restore>
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32861805" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
- <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39825898" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16417113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info anchor="right" id="Palette" order="3" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="bottom" id="Version Control" order="10" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16417113" />
+ <window_info id="Structure" order="1" weight="0.25" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.39825898" />
+ <window_info anchor="bottom" id="Find" order="1" />
+ <window_info anchor="right" id="Designer" order="5" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="right" id="Database" order="6" />
+ <window_info id="Palette&#9;" order="2" />
+ <window_info anchor="bottom" id="Terminal" order="11" />
+ <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info id="UI Designer" order="3" />
+ <window_info anchor="bottom" id="Application Servers" order="9" />
+ <window_info anchor="bottom" id="Messages" order="7" weight="0.32861805" />
+ <window_info anchor="right" id="Maven Projects" order="4" />
+ <window_info id="Favorites" order="4" side_tool="true" />
 </layout-to-restore>
 </component>
+ <component name="TypeScriptGeneratedFilesManager">
+ <option name="version" value="1" />
+ </component>
 <component name="Vcs.Log.UiProperties">
 <option name="RECENTLY_FILTERED_USER_GROUPS">
 <collection />
@@ -564,26 +580,52 @@
 </component>
 <component name="XDebuggerManager">
 <breakpoint-manager>
- <option name="time" value="1" />
+ <option name="time" value="2" />
 </breakpoint-manager>
- <watches-manager />
 </component>
 <component name="antWorkspaceConfiguration">
 <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
 <option name="FILTER_TARGETS" value="false" />
 </component>
+ <component name="debuggerHistoryManager">
+ <expressions id="evaluateCodeFragment">
+ <expression>
+ <expression-string>byteArray.toByteArray()</expression-string>
+ <language-id>JAVA</language-id>
+ <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
+ </expression>
+ <expression>
+ <expression-string>content.length()</expression-string>
+ <language-id>JAVA</language-id>
+ <evaluation-mode>CODE_FRAGMENT</evaluation-mode>
+ </expression>
+ </expressions>
+ </component>
 <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-533">
+ <caret line="84" column="25" selection-start-line="84" selection-start-column="25" selection-end-line="84" selection-end-column="25" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="105">
+ <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="4" column="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
 <folding>
 <element signature="imports" expanded="true" />
@@ -594,47 +636,42 @@
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="8" column="44" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="38" column="41" selection-start-line="38" selection-start-column="41" selection-end-line="38" selection-end-column="41" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="59" column="77" selection-start-line="59" selection-start-column="77" selection-end-line="59" selection-end-column="77" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="74" column="7" selection-start-line="74" selection-start-column="7" selection-end-line="74" selection-end-column="7" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="4" column="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
 <folding>
 <element signature="imports" expanded="true" />
@@ -645,48 +682,42 @@
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="38" column="41" selection-start-line="38" selection-start-column="41" selection-end-line="38" selection-end-column="41" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="59" column="77" selection-start-line="59" selection-start-column="77" selection-end-line="59" selection-end-column="77" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="74" column="7" selection-start-line="74" selection-start-column="7" selection-end-line="74" selection-end-column="7" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state>
 <folding>
 <element signature="imports" expanded="true" />
 <element signature="e#269#278#0" expanded="true" />
@@ -696,48 +727,42 @@
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="38" column="41" selection-start-line="38" selection-start-column="41" selection-end-line="38" selection-end-column="41" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="59" column="77" selection-start-line="59" selection-start-column="77" selection-end-line="59" selection-end-column="77" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="74" column="7" selection-start-line="74" selection-start-column="7" selection-end-line="74" selection-end-column="7" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state>
 <folding>
 <element signature="imports" expanded="true" />
 <element signature="e#269#278#0" expanded="true" />
@@ -747,48 +772,43 @@
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="38" column="41" selection-start-line="38" selection-start-column="41" selection-end-line="38" selection-end-column="41" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="59" column="77" selection-start-line="59" selection-start-column="77" selection-end-line="59" selection-end-column="77" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="74" column="7" selection-start-line="74" selection-start-column="7" selection-end-line="74" selection-end-column="7" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="7" column="30" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
+ <state>
+ <caret line="94" selection-start-line="94" selection-end-line="94" />
 <folding>
 <element signature="imports" expanded="true" />
 <element signature="e#269#278#0" expanded="true" />
@@ -797,154 +817,134 @@
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="49" column="23" selection-start-line="49" selection-start-column="23" selection-end-line="49" selection-end-column="23" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="59" column="77" selection-start-line="59" selection-start-column="77" selection-end-line="59" selection-end-column="77" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="8" column="51" selection-start-line="8" selection-start-column="51" selection-end-line="8" selection-end-column="51" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state>
 <caret line="1" column="35" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
- <folding />
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="jar:///usr/local/jdk1.8.0_45/src.zip!/java/lang/String.java" />
+ <entry file="jar:///usr/local/jdk1.8.0_45/src.zip!/java/lang/StringBuilder.java" />
+ <entry file="jar:///usr/local/jdk1.8.0_45/src.zip!/java/net/Socket.java" />
+ <entry file="jar:///usr/local/jdk1.8.0_45/src.zip!/java/lang/Integer.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.35512966">
- <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
+ <state>
+ <caret line="74" column="7" selection-start-line="74" selection-start-column="7" selection-end-line="74" selection-end-column="7" />
 </state>
 </provider>
 </entry>
- <entry file="jar:///usr/local/jdk1.8.0_45/src.zip!/java/lang/String.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="2.8356164">
- <caret line="150" column="11" selection-start-line="150" selection-start-column="11" selection-end-line="150" selection-end-column="11" />
- <folding />
+ <state>
+ <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
 </state>
 </provider>
 </entry>
- <entry file="jar:///usr/local/jdk1.8.0_45/src.zip!/java/lang/StringBuilder.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.875">
- <caret line="75" column="19" selection-start-line="75" selection-start-column="19" selection-end-line="75" selection-end-column="19" />
+ <state>
+ <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
 </state>
 </provider>
 </entry>
- <entry file="jar:///usr/local/jdk1.8.0_45/src.zip!/java/net/Socket.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.3321918">
- <caret line="207" column="11" selection-start-line="207" selection-start-column="11" selection-end-line="207" selection-end-column="11" />
- <folding />
+ <state>
+ <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
 </state>
 </provider>
 </entry>
- <entry file="jar:///usr/local/jdk1.8.0_45/src.zip!/java/lang/Integer.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.3321918">
- <caret line="764" column="26" selection-start-line="764" selection-start-column="26" selection-end-line="764" selection-end-column="26" />
- <folding />
+ <state relative-caret-position="105">
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#269#278#0" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Test.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="74" column="7" selection-start-line="74" selection-start-column="7" selection-end-line="74" selection-end-column="7" />
- <folding />
+ <state relative-caret-position="3528">
+ <caret line="168" column="31" selection-start-line="168" selection-start-column="31" selection-end-line="168" selection-end-column="31" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/.gitignore">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="1037">
+ <caret line="59" column="77" selection-start-line="59" selection-start-column="77" selection-end-line="59" selection-end-column="77" />
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
- <folding />
+ <state relative-caret-position="168">
+ <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/Message.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/DouyuBarrageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="59" column="77" selection-start-line="59" selection-start-column="77" selection-end-line="59" selection-end-column="77" />
- <folding />
+ <state relative-caret-position="42">
+ <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
- <folding />
- </state>
- </provider>
+ <entry file="file://$PROJECT_DIR$/src/main/java/MessageType.java">
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Start.java">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="121" column="42" selection-start-line="121" selection-start-column="42" selection-end-line="121" selection-end-column="42" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#269#278#0" expanded="true" />
- </folding>
+ <state relative-caret-position="168">
+ <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
+ <entry file="file://$PROJECT_DIR$/.gitignore">
 <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.28668943">
- <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
- <folding />
+ <state relative-caret-position="21">
+ <caret line="1" column="5" selection-start-line="1" selection-start-column="5" selection-end-line="1" selection-end-column="5" />
 </state>
 </provider>
 </entry>
diff --git a/CrawlDouyuDanmu/CrawlDouyuDanmu.iml b/CrawlDouyuDanmu/CrawlDouyuDanmu.iml
index d9d2a51..8d8ffd9 100644
--- a/CrawlDouyuDanmu/CrawlDouyuDanmu.iml
+++ b/CrawlDouyuDanmu/CrawlDouyuDanmu.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
 <output url="file://$MODULE_DIR$/target/classes" />
 <output-test url="file://$MODULE_DIR$/target/test-classes" />
 <content url="file://$MODULE_DIR$">
@@ -11,6 +11,5 @@
 </content>
 <orderentry type="inheritedJdk" />
 <orderentry type="sourceFolder" forTests="false" />
- <orderentry type="library" name="Maven: org.jsoup:jsoup:1.8.3" level="project" />
 </component>
 </module>
\ No newline at end of file
diff --git a/CrawlDouyuDanmu/pom.xml b/CrawlDouyuDanmu/pom.xml
index 3c57cdd..556c1e8 100644
--- a/CrawlDouyuDanmu/pom.xml
+++ b/CrawlDouyuDanmu/pom.xml
@@ -8,12 +8,4 @@
 <artifactid>DouyuDanmu</artifactid>
 <version>1.0-SNAPSHOT</version>
 
- <dependencies>
- <dependency>
- <groupid>org.jsoup</groupid>
- <artifactid>jsoup</artifactid>
- <version>1.8.3</version>
- </dependency>
- </dependencies>
-
 </project>
\ No newline at end of file
diff --git a/CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java b/CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java
index ea8fbbb..8446fc6 100644
--- a/CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java
+++ b/CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java
@@ -4,7 +4,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-public class DouyuBarrageServerHandler {
+public class DouyuBarrageHandler {
 private static String host = "openbarrage.douyutv.com";
 
 private static int port = 8601;
@@ -13,7 +13,7 @@ public class DouyuBarrageServerHandler {
 
 private String roomId;
 
- public DouyuBarrageServerHandler(String roomId) {
+ public DouyuBarrageHandler(String roomId) {
 this.roomId = roomId;
 
 try {
diff --git a/CrawlDouyuDanmu/src/main/java/Start.java b/CrawlDouyuDanmu/src/main/java/Start.java
index 18b97da..01d4dc8 100644
--- a/CrawlDouyuDanmu/src/main/java/Start.java
+++ b/CrawlDouyuDanmu/src/main/java/Start.java
@@ -2,7 +2,7 @@
 
 public class Start {
 public static void main(String[] args) throws IOException, InterruptedException {
- DouyuBarrageServerHandler server = new DouyuBarrageServerHandler("288016");
+ DouyuBarrageHandler server = new DouyuBarrageHandler("288016");
 
 while (true) {
 System.out.println(server.read());
diff --git a/CrawlPandaDanmu/.idea/workspace.xml b/CrawlPandaDanmu/.idea/workspace.xml
index 3c7cf01..e2ae444 100644
--- a/CrawlPandaDanmu/.idea/workspace.xml
+++ b/CrawlPandaDanmu/.idea/workspace.xml
@@ -2,21 +2,23 @@
 <project version="4">
 <component name="ChangeListManager">
 <list default="true" id="0e05cc9e-cc9b-40f0-954d-baf2a713b145" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_44.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_17.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_8_0_beta0.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_8_0_beta0.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/log4j.properties" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20151123.xml" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CrawlPandaDanmu.iml" afterPath="$PROJECT_DIR$/CrawlPandaDanmu.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Crawl.java" afterPath="$PROJECT_DIR$/src/main/java/Crawl.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/MessageHandler.java" afterPath="$PROJECT_DIR$/src/main/java/MessageHandler.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/Utils.java" afterPath="$PROJECT_DIR$/src/main/java/Utils.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/config.properties" afterPath="$PROJECT_DIR$/src/main/resources/config.properties" />
+ <change afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/MessageType.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Start.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.gitignore" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/compiler.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/misc.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/CrawlDouyuDanmu.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/CrawlDouyuDanmu.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Crawl.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Main.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Message.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/MessageHandler.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Utils.java" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/resources/config.properties" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
 </list>
 <ignored path="CrawlPandaDanmu.iws" />
 <ignored path=".idea/workspace.xml" />
@@ -38,14 +40,11 @@
 </component>
 <component name="FileEditorManager">
 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="Crawl.java" pinned="false" current-in-tab="true">
+ <file leaf-file-name="Crawl.java" pinned="false" current-in-tab="false">
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-341">
- <caret line="108" column="12" lean-forward="false" selection-start-line="108" selection-start-column="12" selection-end-line="108" selection-end-column="12" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="168">
+ <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
 </state>
 </provider>
 </entry>
@@ -54,8 +53,7 @@
 <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="462">
- <caret line="25" column="34" lean-forward="false" selection-start-line="25" selection-start-column="34" selection-end-line="25" selection-end-column="34" />
- <folding />
+ <caret line="25" column="34" selection-start-line="25" selection-start-column="34" selection-end-line="25" selection-end-column="34" />
 </state>
 </provider>
 </entry>
@@ -63,9 +61,8 @@
 <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
 <entry file="file://$PROJECT_DIR$/pom.xml">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="533">
- <caret line="31" column="37" lean-forward="true" selection-start-line="31" selection-start-column="37" selection-end-line="31" selection-end-column="37" />
- <folding />
+ <state relative-caret-position="651">
+ <caret line="31" column="37" selection-start-line="31" selection-start-column="37" selection-end-line="31" selection-end-column="37" />
 </state>
 </provider>
 </entry>
@@ -74,11 +71,11 @@
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="567">
- <caret line="41" column="0" lean-forward="false" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
+ <caret line="41" selection-start-line="41" selection-end-line="41" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
@@ -88,8 +85,16 @@
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="105">
- <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
- <folding />
+ <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="config.properties" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="21">
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
@@ -114,23 +119,18 @@
 <component name="Git.Settings">
 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
 </component>
- <component name="GradleLocalSettings">
- <option name="externalProjectsViewState">
- <projects_view />
- </option>
- </component>
 <component name="IdeDocumentHistory">
 <option name="CHANGED_PATHS">
 <list>
 <option value="$PROJECT_DIR$/src/main/java/Main.java" />
 <option value="$PROJECT_DIR$/readme.md" />
- <option value="$PROJECT_DIR$/src/main/resources/config.properties" />
 <option value="$PROJECT_DIR$/src/main/java/Utils.java" />
 <option value="$PROJECT_DIR$/danmu.log" />
 <option value="$PROJECT_DIR$/src/main/resources/log4j.properties" />
 <option value="$PROJECT_DIR$/src/main/java/MessageHandler.java" />
 <option value="$PROJECT_DIR$/pom.xml" />
 <option value="$PROJECT_DIR$/src/main/java/Crawl.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/config.properties" />
 </list>
 </option>
 </component>
@@ -147,11 +147,13 @@
 </mavenimportingsettings>
 </option>
 </component>
- <component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="270" />
- <option name="y" value="-25" />
- <option name="1400" />
- <option name="1000" />
+ <component name="NodePackageJsonFileManager">
+ <packagejsonpaths />
+ </component>
+ <component name="ProjectFrameBounds" extendedState="1">
+ <option name="y" value="23" />
+ <option name="1280" />
+ <option name="777" />
 </component>
 <component name="ProjectInspectionProfilesVisibleTreeState">
 <entry key="Project Default">
@@ -171,22 +173,13 @@
 </component>
 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
 <component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="" version="1">
- <flattenpackages />
- <showmembers />
- <showmodules />
- <showlibrarycontents />
- <hideemptypackages />
- <abbreviatepackagenames />
- <autoscrolltosource />
- <autoscrollfromsource />
- <sortbytype />
- <manualorder />
+ <navigator proportions="" version="1">
 <foldersalwaysontop value="true" />
 </navigator>
 <panes>
- <pane id="Scope" />
 <pane id="PackagesPane" />
+ <pane id="AndroidView" />
+ <pane id="Scope" />
 <pane id="ProjectPane">
 <subpane>
 <expand>
@@ -227,7 +220,6 @@
 <select />
 </subpane>
 </pane>
- <pane id="AndroidView" />
 <pane id="Scratches" />
 </panes>
 </component>
@@ -263,24 +255,19 @@
 </list>
 </option>
 </component>
- <component name="RunManager" selected="Application.Main">
+ <component name="RunManager">
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ </configuration>
 <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
 <option name="MAIN_CLASS_NAME" value="Main" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
 <module name="CrawlPandaDanmu" />
- <envs />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application">
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
 </configuration>
 <configuration default="true" type="ArquillianJUnit" factoryName="">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
 <option name="arquillianRunConfiguration">
 <value>
 <option name="containerStateName" value="" />
@@ -295,33 +282,38 @@
 <option name="VM_PARAMETERS" />
 <option name="PARAMETERS" />
 <option name="WORKING_DIRECTORY" />
- <option name="ENV_VARIABLES" />
 <option name="PASS_PARENT_ENVS" value="true" />
 <option name="TEST_SEARCH_SCOPE">
 <value defaultName="singleModule" />
 </option>
- <envs />
 <patterns />
 </configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <option name="400" />
- <option name="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <module />
- </configuration>
- <configuration default="true" type="Application" factoryName="Application">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <configuration default="true" type="ArquillianTestNG" factoryName="">
+ <option name="arquillianRunConfiguration">
+ <value>
+ <option name="containerStateName" value="" />
+ </value>
+ </option>
 <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
 <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <option name="OUTPUT_DIRECTORY" />
 <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
+ <option name="PROPERTIES_FILE" />
+ <properties />
+ <listeners />
 </configuration>
 <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
 <option name="BCName" value="" />
@@ -379,18 +371,7 @@
 <setting name="depsClasspath" value="false" />
 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
 </configuration>
- <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
- <node-interpreter>project</node-interpreter>
- <node-options />
- <gulpfile />
- <tasks />
- <arguments />
- <pass-parent-envs>true</pass-parent-envs>
- <envs />
- </configuration>
 <configuration default="true" type="JUnit" factoryName="JUnit">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
 <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
 <option name="ALTERNATIVE_JRE_PATH" />
 <option name="PACKAGE_NAME" />
@@ -400,30 +381,13 @@
 <option name="VM_PARAMETERS" value="-ea" />
 <option name="PARAMETERS" />
 <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <option name="ENV_VARIABLES" />
 <option name="PASS_PARENT_ENVS" value="true" />
 <option name="TEST_SEARCH_SCOPE">
 <value defaultName="singleModule" />
 </option>
- <envs />
 <patterns />
 </configuration>
- <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
- <module name="" />
- <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
- <option name="PROGRAM_PARAMETERS" />
- <predefined_log_file id="idea.log" enabled="true" />
- </configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
 <configuration default="true" type="TestNG" factoryName="TestNG">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
 <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
 <option name="ALTERNATIVE_JRE_PATH" />
 <option name="SUITE_NAME" />
@@ -436,15 +400,12 @@
 <option name="PARAMETERS" />
 <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
 <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
 <option name="PASS_PARENT_ENVS" value="true" />
 <option name="TEST_SEARCH_SCOPE">
 <value defaultName="singleModule" />
 </option>
 <option name="USE_DEFAULT_REPORTERS" value="false" />
 <option name="PROPERTIES_FILE" />
- <envs />
 <properties />
 <listeners />
 </configuration>
@@ -504,39 +465,6 @@
 </profilers>
 <method />
 </configuration>
- <configuration default="true" type="ArquillianTestNG" factoryName="">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="arquillianRunConfiguration">
- <value>
- <option name="containerStateName" value="" />
- </value>
- </option>
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <envs />
- <properties />
- <listeners />
- <method />
- </configuration>
 <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
 <option name="myFilePath" />
@@ -621,12 +549,25 @@
 <envs />
 <method />
 </configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
 <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
 <module name="" />
 <envs />
 <method />
 </configuration>
+ <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+ <module name="" />
+ <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+ <option name="PROGRAM_PARAMETERS" />
+ <predefined_log_file id="idea.log" enabled="true" />
+ </configuration>
 <configuration default="true" type="js.build_tools.npm" factoryName="npm">
 <command value="run" />
 s />
@@ -640,9 +581,17 @@
 <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
 <method />
 </configuration>
+ <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+ <node-interpreter>project</node-interpreter>
+ <node-options />
+ <gulpfile />
+ <tasks />
+ <arguments />
+ <pass-parent-envs>true</pass-parent-envs>
+ </configuration>
 <recent_temporary>
- <list size="1">
- <item index="0" itemvalue="Application.Main" />
+ <list>
+ <item itemvalue="Application.Main" />
 </list>
 </recent_temporary>
 </component>
@@ -651,9 +600,6 @@
 <projects_view />
 </option>
 </component>
- <component name="ShelveChangesManager" show_recycled="false">
- <option name="remove_strategy" value="false" />
- </component>
 <component name="SvnConfiguration">
 <configuration />
 </component>
@@ -681,71 +627,94 @@
 <workitem from="1515863471791" duration="3328000" />
 <workitem from="1515867056783" duration="4345000" />
 <workitem from="1515871409383" duration="393000" />
+ <workitem from="1540563903449" duration="3872000" />
 </task>
 <servers />
 </component>
 <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="59769000" />
+ <option name="totallyTimeSpent" value="61131000" />
 </component>
 <component name="ToolWindowManager">
- <frame x="-8" y="-8" height="1056" extended-state="6" />
+ <frame x="0" y="23" height="777" extended-state="1" />
 <editor active="true" />
 <layout>
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2600653" sideWeight="0.51235586" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32948583" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20565833" sideWeight="0.48764417" order="11" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14179105" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39825898" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="9" side_tool="false" content_ui="combo" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+ <window_info anchor="right" id="Palette" order="0" />
+ <window_info anchor="bottom" id="TODO" order="10" />
+ <window_info anchor="bottom" auto_hide="true" id="Messages" order="2" sideWeight="0.51235586" weight="0.2600653" />
+ <window_info id="Palette&#9;" order="2" />
+ <window_info id="Image Layers" order="2" />
+ <window_info anchor="right" id="Capture Analysis" order="3" />
+ <window_info anchor="bottom" id="Event Log" order="0" side_tool="true" weight="0.32948583" />
+ <window_info anchor="right" id="Maven Projects" order="1" />
+ <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Run" order="11" sideWeight="0.48764417" weight="0.40294117" />
+ <window_info anchor="bottom" id="Version Control" order="3" />
+ <window_info anchor="bottom" id="Terminal" order="4" />
+ <window_info id="Capture Tool" order="2" />
+ <window_info anchor="right" id="Designer" order="2" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14378029" />
+ <window_info anchor="right" id="Database" order="4" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info anchor="right" id="Ant Build" order="8" weight="0.25" />
+ <window_info id="UI Designer" order="2" />
+ <window_info anchor="right" id="Theme Preview" order="5" />
+ <window_info anchor="bottom" id="Debug" order="7" weight="0.39825898" />
+ <window_info id="Favorites" order="2" side_tool="true" />
+ <window_info anchor="bottom" id="Message" order="5" />
+ <window_info anchor="bottom" id="Event Log" order="0" side_tool="true" weight="0.32948583" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14179105" />
+ <window_info id="Favorites" order="2" side_tool="true" />
+ <window_info anchor="right" id="Ant Build" order="8" weight="0.25" />
+ <window_info id="Nl-Palette" order="2" />
+ <window_info anchor="bottom" id="Terminal" order="4" />
+ <window_info anchor="bottom" id="Application Servers" order="1" />
+ <window_info anchor="right" id="Palette" order="0" />
+ <window_info id="Palette&#9;" order="2" />
+ <window_info anchor="right" id="Maven Projects" order="1" />
+ <window_info anchor="bottom" id="Debug" order="7" weight="0.39825898" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="9" weight="0.25" />
+ <window_info id="Image Layers" order="2" />
+ <window_info anchor="right" id="Theme Preview" order="5" />
+ <window_info id="Structure" order="1" weight="0.25" />
+ <window_info anchor="right" id="Database" order="4" />
+ <window_info id="Capture Tool" order="2" />
+ <window_info anchor="bottom" id="Version Control" order="3" />
+ <window_info anchor="right" id="Capture Analysis" order="3" />
+ <window_info anchor="bottom" id="TODO" order="10" />
+ <window_info anchor="bottom" id="Inspection" order="9" weight="0.4" />
+ <window_info anchor="right" id="Properties" order="6" />
+ <window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
+ <window_info id="UI Designer" order="2" />
+ <window_info anchor="bottom" id="Find" order="6" />
+ <window_info anchor="bottom" id="Run" order="11" sideWeight="0.48764417" visible="true" weight="0.20565833" />
+ <window_info anchor="bottom" auto_hide="true" id="Messages" order="2" sideWeight="0.51235586" weight="0.2600653" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="7" type="SLIDING" weight="0.4" />
+ <window_info anchor="right" id="Designer" order="2" />
 </layout>
 <layout-to-restore>
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
- <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2112462" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info anchor="right" id="Palette" order="0" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="6" weight="0.25" />
+ <window_info anchor="bottom" id="Version Control" order="2" />
+ <window_info anchor="right" id="Ant Build" order="5" weight="0.25" />
+ <window_info content_ui="combo" id="Project" order="3" visible="true" weight="0.2112462" />
+ <window_info id="Structure" order="4" weight="0.25" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="4" type="SLIDING" weight="0.4" />
+ <window_info anchor="bottom" id="TODO" order="10" />
+ <window_info anchor="bottom" id="Run" order="6" />
+ <window_info anchor="bottom" id="Find" order="5" />
+ <window_info anchor="right" id="Designer" order="2" />
+ <window_info anchor="bottom" id="Message" order="4" />
+ <window_info anchor="bottom" id="Inspection" order="9" weight="0.4" />
+ <window_info anchor="right" id="Database" order="3" />
+ <window_info id="Palette&#9;" order="0" />
+ <window_info anchor="bottom" id="Terminal" order="3" />
+ <window_info anchor="bottom" id="Event Log" order="0" side_tool="true" />
+ <window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
+ <window_info id="UI Designer" order="1" />
+ <window_info anchor="bottom" id="Application Servers" order="1" />
+ <window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
+ <window_info anchor="right" id="Maven Projects" order="1" />
+ <window_info id="Favorites" order="2" side_tool="true" />
 </layout-to-restore>
 </component>
 <component name="TypeScriptGeneratedFilesManager">
@@ -766,7 +735,6 @@
 <breakpoint-manager>
 <option name="time" value="9" />
 </breakpoint-manager>
- <watches-manager />
 </component>
 <component name="antWorkspaceConfiguration">
 <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -776,9 +744,7 @@
 <entry file="file://$PROJECT_DIR$/readme.md">
 <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
 <state split_layout="SPLIT">
- <first_editor relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </first_editor>
+ <first_editor />
 <second_editor />
 </state>
 </provider>
@@ -786,11 +752,11 @@
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="63">
- <caret line="3" column="23" lean-forward="false" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
+ <caret line="3" column="23" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
@@ -798,402 +764,322 @@
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="21">
- <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- <folding />
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 <entry file="file://$PROJECT_DIR$/readme.md">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="2" column="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
+ <state>
+ <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="56" column="77" lean-forward="false" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
+ <state>
+ <caret line="56" column="77" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- <folding />
+ <state>
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="107" column="64" lean-forward="false" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state>
+ <caret line="107" column="64" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/readme.md">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="2" column="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
+ <state>
+ <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="56" column="77" lean-forward="false" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
+ <state>
+ <caret line="56" column="77" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- <folding />
+ <state>
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 <entry file="file://$PROJECT_DIR$/readme.md">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="2" column="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
+ <state>
+ <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="56" column="77" lean-forward="false" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
+ <state>
+ <caret line="56" column="77" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- <folding />
+ <state>
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="107" column="64" lean-forward="false" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state>
+ <caret line="107" column="64" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="56" column="77" lean-forward="false" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
+ <state>
+ <caret line="56" column="77" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- <folding />
+ <state>
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="107" column="66" lean-forward="false" selection-start-line="107" selection-start-column="66" selection-end-line="107" selection-end-column="66" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state>
+ <caret line="107" column="66" selection-start-line="107" selection-start-column="66" selection-end-line="107" selection-end-column="66" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="56" column="77" lean-forward="false" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
+ <state>
+ <caret line="56" column="77" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- <folding />
+ <state>
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="107" column="64" lean-forward="false" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state>
+ <caret line="107" column="64" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="56" column="77" lean-forward="false" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
+ <state>
+ <caret line="56" column="77" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="107" column="64" lean-forward="false" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state>
+ <caret line="107" column="64" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="56" column="77" lean-forward="false" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
+ <state>
+ <caret line="56" column="77" selection-start-line="56" selection-start-column="77" selection-end-line="56" selection-end-column="77" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- <folding />
+ <state>
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="170" column="36" lean-forward="false" selection-start-line="170" selection-start-column="36" selection-end-line="170" selection-end-column="36" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state>
+ <caret line="170" column="36" selection-start-line="170" selection-start-column="36" selection-end-line="170" selection-end-column="36" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state>
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="11" lean-forward="false" selection-start-line="0" selection-start-column="11" selection-end-line="0" selection-end-column="11" />
- <folding />
+ <state>
+ <caret column="11" selection-start-column="11" selection-end-column="11" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="101" column="38" lean-forward="false" selection-start-line="101" selection-start-column="38" selection-end-line="101" selection-end-column="38" />
+ <state>
+ <caret line="101" column="38" selection-start-line="101" selection-start-column="38" selection-end-line="101" selection-end-column="38" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- <folding />
+ <state>
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="102" column="7" lean-forward="false" selection-start-line="102" selection-start-column="7" selection-end-line="102" selection-end-column="7" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state>
+ <caret line="102" column="7" selection-start-line="102" selection-start-column="7" selection-end-line="102" selection-end-column="7" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="9" column="11" lean-forward="false" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
+ <state>
+ <caret line="9" column="11" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="20" column="26" lean-forward="false" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
+ <state>
+ <caret line="20" column="26" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+ <state>
+ <caret line="1" selection-start-line="1" selection-end-line="1" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/CrawlPandaDanmu.iml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 <entry file="file://$PROJECT_DIR$/.gitignore">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
 </entry>
 <entry file="file://$PROJECT_DIR$/readme.md">
 <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
 <state split_layout="SPLIT">
- <first_editor relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </first_editor>
+ <first_editor />
 <second_editor />
 </state>
 </provider>
 <provider editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="2" column="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/json/json/20151123/json-20151123.jar!/org/json/JSONArray.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="126">
- <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+ <state>
+ <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
 </state>
 </provider>
 </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/json/json/20151123/json-20151123.jar!/org/json/JSONArray.class" />
 <entry file="file://$PROJECT_DIR$/danmu.log">
 <provider selected="true" editor-type-id="LogFileEditorProvider">
 <state relative-caret-position="10">
- <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+ <caret line="16" selection-start-line="16" selection-end-line="16" />
 </state>
 </provider>
 </entry>
 <entry file="jar://$APPLICATION_HOME_DIR$/plugins/maven/lib/maven.jar!/schemas/maven-4.0.0.xsd">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="-1413">
- <caret line="282" column="12" lean-forward="false" selection-start-line="282" selection-start-column="12" selection-end-line="282" selection-end-column="12" />
- <folding />
+ <caret line="282" column="12" selection-start-line="282" selection-start-column="12" selection-end-line="282" selection-end-column="12" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="21">
- <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- <folding />
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
 </state>
 </provider>
 </entry>
@@ -1201,53 +1087,46 @@
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="231">
 <caret line="11" column="83" lean-forward="true" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="83" />
- <folding />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/pom.xml">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="533">
- <caret line="31" column="37" lean-forward="true" selection-start-line="31" selection-start-column="37" selection-end-line="31" selection-end-column="37" />
- <folding />
+ <state relative-caret-position="651">
+ <caret line="31" column="37" selection-start-line="31" selection-start-column="37" selection-end-line="31" selection-end-column="37" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="105">
- <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
- <folding />
+ <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="462">
- <caret line="25" column="34" lean-forward="false" selection-start-line="25" selection-start-column="34" selection-end-line="25" selection-end-column="34" />
- <folding />
+ <caret line="25" column="34" selection-start-line="25" selection-start-column="34" selection-end-line="25" selection-end-column="34" />
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="567">
- <caret line="41" column="0" lean-forward="false" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
+ <caret line="41" selection-start-line="41" selection-end-line="41" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" expanded="false" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" expanded="false" />
- <element signature="method#close#0;class#MessageHandler#0" expanded="false" />
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
 </folding>
 </state>
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-341">
- <caret line="108" column="12" lean-forward="false" selection-start-line="108" selection-start-column="12" selection-end-line="108" selection-end-column="12" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="168">
+ <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
 </state>
 </provider>
 </entry>
From d15168eb344d42ff7ceab7ab36fcdab69a68f1d0 Mon Sep 17 00:00:00 2001
From: gaopu_dxm <gaopu@duxiaoman.com>
Date: 2018年10月27日 17:48:49 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=96=97=E9=B1=BC?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=8D=8F=E8=AE=AE=E6=9B=B4=E6=94=B9=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 CrawlDouyuDanmu/readme.md &#124; 4 ++--
 CrawlPandaDanmu/.idea/workspace.xml &#124; 16 +---------------
 2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/CrawlDouyuDanmu/readme.md b/CrawlDouyuDanmu/readme.md
index 28eb0c4..5860c1d 100644
--- a/CrawlDouyuDanmu/readme.md
+++ b/CrawlDouyuDanmu/readme.md
@@ -1,3 +1,3 @@
-DouyuTV弹幕抓取工具
+使用[斗鱼开放协议](http://dev-bbs.douyutv.com/forum.php?mod=viewthread&tid=399&extra=page%3D1)完成的DouyuTV弹幕抓取工具。
 
-直接运行main就行
\ No newline at end of file
+[www.douyu.com](www.douyu.com) barrage crawler, run with Start.java.
\ No newline at end of file
diff --git a/CrawlPandaDanmu/.idea/workspace.xml b/CrawlPandaDanmu/.idea/workspace.xml
index e2ae444..2e7c6ae 100644
--- a/CrawlPandaDanmu/.idea/workspace.xml
+++ b/CrawlPandaDanmu/.idea/workspace.xml
@@ -2,22 +2,8 @@
 <project version="4">
 <component name="ChangeListManager">
 <list default="true" id="0e05cc9e-cc9b-40f0-954d-baf2a713b145" name="Default" comment="">
- <change afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/DouyuBarrageHandler.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/MessageType.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Start.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.gitignore" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/compiler.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/misc.xml" afterDir="false" />
 <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/CrawlDouyuDanmu.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/CrawlDouyuDanmu.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Crawl.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Main.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Message.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/MessageHandler.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/java/Utils.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/src/main/resources/config.properties" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/readme.md" afterDir="false" />
 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
 </list>
 <ignored path="CrawlPandaDanmu.iws" />
From ed12b6c8cb2d0c9c414e2313cd86daa2c3f28d9e Mon Sep 17 00:00:00 2001
From: gaopu_dxm <gaopu@duxiaoman.com>
Date: 2018年10月27日 17:49:40 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=96=97=E9=B1=BC?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=8D=8F=E8=AE=AE=E6=9B=B4=E6=94=B9=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 CrawlDouyuDanmu/readme.md &#124; 2 +-
 CrawlPandaDanmu/.idea/workspace.xml &#124; 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/CrawlDouyuDanmu/readme.md b/CrawlDouyuDanmu/readme.md
index 5860c1d..3b5fb3f 100644
--- a/CrawlDouyuDanmu/readme.md
+++ b/CrawlDouyuDanmu/readme.md
@@ -1,3 +1,3 @@
 使用[斗鱼开放协议](http://dev-bbs.douyutv.com/forum.php?mod=viewthread&tid=399&extra=page%3D1)完成的DouyuTV弹幕抓取工具。
 
-[www.douyu.com](www.douyu.com) barrage crawler, run with Start.java.
\ No newline at end of file
+[www.douyu.com](https://www.douyu.com) barrage crawler, run with Start.java.
\ No newline at end of file
diff --git a/CrawlPandaDanmu/.idea/workspace.xml b/CrawlPandaDanmu/.idea/workspace.xml
index 2e7c6ae..a9cad95 100644
--- a/CrawlPandaDanmu/.idea/workspace.xml
+++ b/CrawlPandaDanmu/.idea/workspace.xml
@@ -4,7 +4,6 @@
 <list default="true" id="0e05cc9e-cc9b-40f0-954d-baf2a713b145" name="Default" comment="">
 <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/workspace.xml" afterDir="false" />
 <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/readme.md" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
 </list>
 <ignored path="CrawlPandaDanmu.iws" />
 <ignored path=".idea/workspace.xml" />
From 37af3f3f2ea76f6b993d79bebde74ab8f186d913 Mon Sep 17 00:00:00 2001
From: gaopu_dxm <gaopu@duxiaoman.com>
Date: 2018年10月27日 18:52:55 +0800
Subject: [PATCH 05/15] readme
---
 CrawlDouyuDanmu/.idea/workspace.xml &#124; 122 ++++-------------
 CrawlPandaDanmu/.gitignore &#124; 3 +-
 CrawlPandaDanmu/.idea/uiDesigner.xml &#124; 124 ++++++++++++++++++
 CrawlPandaDanmu/readme.md &#124; 4 +-
 .../src/main/java/{Main.java => Start.java} &#124; 2 +-
 5 files changed, 158 insertions(+), 97 deletions(-)
 create mode 100644 CrawlPandaDanmu/.idea/uiDesigner.xml
 rename CrawlPandaDanmu/src/main/java/{Main.java => Start.java} (90%)
diff --git a/CrawlDouyuDanmu/.idea/workspace.xml b/CrawlDouyuDanmu/.idea/workspace.xml
index f66b848..e68b687 100644
--- a/CrawlDouyuDanmu/.idea/workspace.xml
+++ b/CrawlDouyuDanmu/.idea/workspace.xml
@@ -2,23 +2,7 @@
 <project version="4">
 <component name="ChangeListManager">
 <list default="true" id="6124cc17-3d25-416b-a459-58a8a6096601" name="Default" comment="">
- <change afterPath="$PROJECT_DIR$/src/main/java/DouyuBarrageHandler.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/MessageType.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/Start.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/CrawlDouyuDanmu.iml" beforeDir="false" afterPath="$PROJECT_DIR$/CrawlDouyuDanmu.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/Crawl.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/Message.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/MessageHandler.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/Utils.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/config.properties" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlPandaDanmu/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlPandaDanmu/.idea/workspace.xml" afterDir="false" />
 </list>
 <ignored path="CrawlDouyuDanmu.iws" />
 <ignored path=".idea/workspace.xml" />
@@ -53,49 +37,7 @@
 <favorites_list name="CrawlDouyuDanmu" />
 </component>
 <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="Start.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/Start.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="168">
- <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="DouyuBarrageHandler.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/DouyuBarrageHandler.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="42">
- <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MessageType.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/MessageType.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- </file>
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="168">
- <caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/.gitignore">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="21">
- <caret line="1" column="5" selection-start-line="1" selection-start-column="5" selection-end-line="1" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
 </component>
 <component name="FileTemplateManagerImpl">
 <option name="RECENT_TEMPLATES">
@@ -129,6 +71,7 @@
 <option value="$PROJECT_DIR$/pom.xml" />
 <option value="$PROJECT_DIR$/src/main/java/Start.java" />
 <option value="$PROJECT_DIR$/.gitignore" />
+ <option value="$PROJECT_DIR$/readme.md" />
 </list>
 </option>
 </component>
@@ -185,11 +128,6 @@
 <item name="CrawlDouyuDanmu" type="b2602c69:ProjectViewProjectNode" />
 <item name="CrawlDouyuDanmu" type="462c0819:PsiDirectoryNode" />
 </path>
- <path>
- <item name="CrawlDouyuDanmu" type="b2602c69:ProjectViewProjectNode" />
- <item name="CrawlDouyuDanmu" type="462c0819:PsiDirectoryNode" />
- <item name=".idea" type="462c0819:PsiDirectoryNode" />
- </path>
 <path>
 <item name="CrawlDouyuDanmu" type="b2602c69:ProjectViewProjectNode" />
 <item name="CrawlDouyuDanmu" type="462c0819:PsiDirectoryNode" />
@@ -496,16 +434,15 @@
 <workitem from="1454042435927" duration="119000" />
 <workitem from="1454336962447" duration="92000" />
 <workitem from="1454485167451" duration="2427000" />
- <workitem from="1540564218898" duration="18194000" />
+ <workitem from="1540564218898" duration="20158000" />
 </task>
 <servers />
 </component>
 <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="90376000" />
+ <option name="totallyTimeSpent" value="92340000" />
 </component>
 <component name="ToolWindowManager">
 <frame x="0" y="23" height="777" extended-state="0" />
- <editor active="true" />
 <layout>
 <window_info anchor="right" id="Palette" order="5" />
 <window_info anchor="bottom" id="TODO" order="6" />
@@ -517,11 +454,11 @@
 <window_info anchor="right" id="Maven Projects" order="6" weight="0.13812602" />
 <window_info anchor="bottom" id="Database Changes" order="0" show_stripe_button="false" />
 <window_info anchor="bottom" id="Run" order="12" weight="0.28529412" />
- <window_info anchor="bottom" id="Version Control" order="10" weight="0.32941177" />
- <window_info anchor="bottom" id="Terminal" order="11" weight="0.3297062" />
+ <window_info anchor="bottom" id="Version Control" order="10" weight="0.24411765" />
+ <window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.32941177" />
 <window_info id="Capture Tool" />
 <window_info anchor="right" id="Designer" order="7" />
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2197092" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2197092" />
 <window_info anchor="right" id="Database" order="8" weight="0.22455573" />
 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
 <window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
@@ -602,20 +539,6 @@
 </expressions>
 </component>
 <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-533">
- <caret line="84" column="25" selection-start-line="84" selection-start-column="25" selection-end-line="84" selection-end-column="25" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
- </state>
- </provider>
- </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
 <provider selected="true" editor-type-id="text-editor">
 <state>
@@ -924,16 +847,19 @@
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/DouyuBarrageHandler.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/MessageType.java">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/CrawlDouyuDanmu.iml">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.gitignore">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="42">
- <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+ <state relative-caret-position="21">
+ <caret line="1" column="5" selection-start-line="1" selection-start-column="5" selection-end-line="1" selection-end-column="5" />
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/MessageType.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Start.java">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="168">
@@ -941,10 +867,20 @@
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/.gitignore">
+ <entry file="file://$PROJECT_DIR$/src/main/java/DouyuBarrageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="21">
- <caret line="1" column="5" selection-start-line="1" selection-start-column="5" selection-end-line="1" selection-end-column="5" />
+ <state relative-caret-position="168">
+ <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/readme.md">
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+ <state split_layout="SPLIT">
+ <first_editor relative-caret-position="42">
+ <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
+ </first_editor>
+ <second_editor />
 </state>
 </provider>
 </entry>
diff --git a/CrawlPandaDanmu/.gitignore b/CrawlPandaDanmu/.gitignore
index 1de5659..5bd05d6 100644
--- a/CrawlPandaDanmu/.gitignore
+++ b/CrawlPandaDanmu/.gitignore
@@ -1 +1,2 @@
-target
\ No newline at end of file
+target
+.idea
\ No newline at end of file
diff --git a/CrawlPandaDanmu/.idea/uiDesigner.xml b/CrawlPandaDanmu/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/CrawlPandaDanmu/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item tooltip- icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item tooltip- icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size height="-1" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size height="-1" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size height="-1" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size height="50" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size height="50" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size height="50" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size height="50" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size height="50" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size height="50" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size height="200" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size height="200" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size height="20" />
+ </default-constraints>
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
\ No newline at end of file
diff --git a/CrawlPandaDanmu/readme.md b/CrawlPandaDanmu/readme.md
index d9883ee..c5f9cd4 100644
--- a/CrawlPandaDanmu/readme.md
+++ b/CrawlPandaDanmu/readme.md
@@ -1,3 +1,3 @@
-PandaTV弹幕抓取工具
+PandaTV弹幕抓取工具,具体说明见[知乎](https://www.zhihu.com/question/38807641/answer/84007935)
 
-直接运行main就行
\ No newline at end of file
+[www.panda.tv](https://www.panda.tv/) barrage crawler, run with Start.java.
\ No newline at end of file
diff --git a/CrawlPandaDanmu/src/main/java/Main.java b/CrawlPandaDanmu/src/main/java/Start.java
similarity index 90%
rename from CrawlPandaDanmu/src/main/java/Main.java
rename to CrawlPandaDanmu/src/main/java/Start.java
index df23313..f198e93 100644
--- a/CrawlPandaDanmu/src/main/java/Main.java
+++ b/CrawlPandaDanmu/src/main/java/Start.java
@@ -3,7 +3,7 @@
 /**
 * Created by geekgao on 16-1-29.
 */
-public class Main {
+public class Start {
 public static void main(String[] args) throws IOException {
 Crawl c = new Crawl();
 c.start();
From fa799a9f304341be61d213818260f915b7f9f5c5 Mon Sep 17 00:00:00 2001
From: gaopu_dxm <gaopu@duxiaoman.com>
Date: 2018年10月27日 18:53:35 +0800
Subject: [PATCH 06/15] readme
---
 CrawlPandaDanmu/.idea/workspace.xml &#124; 201 ++++++++++++++++------------
 1 file changed, 112 insertions(+), 89 deletions(-)
diff --git a/CrawlPandaDanmu/.idea/workspace.xml b/CrawlPandaDanmu/.idea/workspace.xml
index a9cad95..0ec690d 100644
--- a/CrawlPandaDanmu/.idea/workspace.xml
+++ b/CrawlPandaDanmu/.idea/workspace.xml
@@ -2,8 +2,11 @@
 <project version="4">
 <component name="ChangeListManager">
 <list default="true" id="0e05cc9e-cc9b-40f0-954d-baf2a713b145" name="Default" comment="">
+ <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
 <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../CrawlDouyuDanmu/readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/../CrawlDouyuDanmu/readme.md" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/readme.md" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Start.java" afterDir="false" />
 </list>
 <ignored path="CrawlPandaDanmu.iws" />
 <ignored path=".idea/workspace.xml" />
@@ -28,35 +31,29 @@
 <file leaf-file-name="Crawl.java" pinned="false" current-in-tab="false">
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="168">
- <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Utils.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/Utils.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="462">
- <caret line="25" column="34" selection-start-line="25" selection-start-column="34" selection-end-line="25" selection-end-column="34" />
+ <state relative-caret-position="-2139">
+ <caret line="25" column="21" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="21" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
 </file>
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <file leaf-file-name="Start.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Start.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="651">
- <caret line="31" column="37" selection-start-line="31" selection-start-column="37" selection-end-line="31" selection-end-column="37" />
+ <state relative-caret-position="168">
+ <caret line="8" column="18" lean-forward="true" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
 </state>
 </provider>
 </entry>
 </file>
- <file leaf-file-name="MessageHandler.java" pinned="false" current-in-tab="false">
+ <file leaf-file-name="MessageHandler.java" pinned="false" current-in-tab="true">
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="567">
- <caret line="41" selection-start-line="41" selection-end-line="41" />
+ <state relative-caret-position="1197">
+ <caret line="71" column="37" lean-forward="true" selection-start-line="71" selection-start-column="37" selection-end-line="71" selection-end-column="37" />
 <folding>
 <element signature="docComment;class#MessageHandler#0" />
 <element signature="docComment;method#read#0;class#MessageHandler#0" />
@@ -66,24 +63,6 @@
 </provider>
 </entry>
 </file>
- <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="config.properties" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="21">
- <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
- </state>
- </provider>
- </entry>
- </file>
 </leaf>
 </component>
 <component name="FindInProjectRecents">
@@ -95,10 +74,10 @@
 <find>jsonObject2</find>
 <find>j</find>
 <find>dependency</find>
- <find />
 <find>printStackTrace</find>
 <find>out</find>
 <find>System.out</find>
+ <find>roomId</find>
 </findstrings>
 </component>
 <component name="Git.Settings">
@@ -107,8 +86,6 @@
 <component name="IdeDocumentHistory">
 <option name="CHANGED_PATHS">
 <list>
- <option value="$PROJECT_DIR$/src/main/java/Main.java" />
- <option value="$PROJECT_DIR$/readme.md" />
 <option value="$PROJECT_DIR$/src/main/java/Utils.java" />
 <option value="$PROJECT_DIR$/danmu.log" />
 <option value="$PROJECT_DIR$/src/main/resources/log4j.properties" />
@@ -116,6 +93,9 @@
 <option value="$PROJECT_DIR$/pom.xml" />
 <option value="$PROJECT_DIR$/src/main/java/Crawl.java" />
 <option value="$PROJECT_DIR$/src/main/resources/config.properties" />
+ <option value="$PROJECT_DIR$/readme.md" />
+ <option value="$PROJECT_DIR$/src/main/java/Main.java" />
+ <option value="$PROJECT_DIR$/src/main/java/Start.java" />
 </list>
 </option>
 </component>
@@ -135,7 +115,7 @@
 <component name="NodePackageJsonFileManager">
 <packagejsonpaths />
 </component>
- <component name="ProjectFrameBounds" extendedState="1">
+ <component name="ProjectFrameBounds">
 <option name="y" value="23" />
 <option name="1280" />
 <option name="777" />
@@ -244,8 +224,8 @@
 <configuration default="true" type="Applet" factoryName="Applet">
 <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
 </configuration>
- <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="Main" />
+ <configuration name="Start" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="Start" />
 <module name="CrawlPandaDanmu" />
 <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
 </configuration>
@@ -576,7 +556,7 @@
 </configuration>
 <recent_temporary>
 <list>
- <item itemvalue="Application.Main" />
+ <item itemvalue="Application.Start" />
 </list>
 </recent_temporary>
 </component>
@@ -612,15 +592,15 @@
 <workitem from="1515863471791" duration="3328000" />
 <workitem from="1515867056783" duration="4345000" />
 <workitem from="1515871409383" duration="393000" />
- <workitem from="1540563903449" duration="3872000" />
+ <workitem from="1540563903449" duration="4835000" />
 </task>
 <servers />
 </component>
 <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="61131000" />
+ <option name="totallyTimeSpent" value="62094000" />
 </component>
 <component name="ToolWindowManager">
- <frame x="0" y="23" height="777" extended-state="1" />
+ <frame x="0" y="23" height="777" extended-state="0" />
 <editor active="true" />
 <layout>
 <window_info anchor="right" id="Palette" order="0" />
@@ -637,7 +617,7 @@
 <window_info anchor="bottom" id="Terminal" order="4" />
 <window_info id="Capture Tool" order="2" />
 <window_info anchor="right" id="Designer" order="2" />
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14378029" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22455573" />
 <window_info anchor="right" id="Database" order="4" />
 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
 <window_info anchor="right" id="Ant Build" order="8" weight="0.25" />
@@ -726,14 +706,6 @@
 <option name="FILTER_TARGETS" value="false" />
 </component>
 <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/readme.md">
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
- <state split_layout="SPLIT">
- <first_editor />
- <second_editor />
- </state>
- </provider>
- </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
 <state relative-caret-position="63">
@@ -754,7 +726,13 @@
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
- <provider selected="true" editor-type-id="text-editor" />
+ <provider selected="true" editor-type-id="text-editor">
+ <state>
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/readme.md">
 <provider selected="true" editor-type-id="text-editor">
@@ -786,6 +764,9 @@
 <provider selected="true" editor-type-id="text-editor">
 <state>
 <caret line="107" column="64" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
@@ -816,7 +797,13 @@
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
- <provider selected="true" editor-type-id="text-editor" />
+ <provider selected="true" editor-type-id="text-editor">
+ <state>
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/readme.md">
 <provider selected="true" editor-type-id="text-editor">
@@ -848,6 +835,9 @@
 <provider selected="true" editor-type-id="text-editor">
 <state>
 <caret line="107" column="64" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
@@ -874,6 +864,9 @@
 <provider selected="true" editor-type-id="text-editor">
 <state>
 <caret line="107" column="66" selection-start-line="107" selection-start-column="66" selection-end-line="107" selection-end-column="66" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
@@ -900,6 +893,9 @@
 <provider selected="true" editor-type-id="text-editor">
 <state>
 <caret line="107" column="64" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
@@ -922,6 +918,9 @@
 <provider selected="true" editor-type-id="text-editor">
 <state>
 <caret line="107" column="64" selection-start-line="107" selection-start-column="64" selection-end-line="107" selection-end-column="64" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
@@ -948,6 +947,9 @@
 <provider selected="true" editor-type-id="text-editor">
 <state>
 <caret line="170" column="36" selection-start-line="170" selection-start-column="36" selection-end-line="170" selection-end-column="36" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
@@ -970,7 +972,13 @@
 </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
- <provider selected="true" editor-type-id="text-editor" />
+ <provider selected="true" editor-type-id="text-editor">
+ <state>
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
 </entry>
 <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
@@ -995,6 +1003,9 @@
 <provider selected="true" editor-type-id="text-editor">
 <state>
 <caret line="102" column="7" selection-start-line="102" selection-start-column="7" selection-end-line="102" selection-end-column="7" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
 </state>
 </provider>
 </entry>
@@ -1020,7 +1031,7 @@
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor" />
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Start.java">
 <provider selected="true" editor-type-id="text-editor">
 <state>
 <caret line="1" selection-start-line="1" selection-end-line="1" />
@@ -1033,19 +1044,6 @@
 <entry file="file://$PROJECT_DIR$/.gitignore">
 <provider selected="true" editor-type-id="text-editor" />
 </entry>
- <entry file="file://$PROJECT_DIR$/readme.md">
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
- <state split_layout="SPLIT">
- <first_editor />
- <second_editor />
- </state>
- </provider>
- <provider editor-type-id="text-editor">
- <state>
- <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
- </state>
- </provider>
- </entry>
 <entry file="jar://$MAVEN_REPOSITORY$/org/json/json/20151123/json-20151123.jar!/org/json/JSONArray.class" />
 <entry file="file://$PROJECT_DIR$/danmu.log">
 <provider selected="true" editor-type-id="LogFileEditorProvider">
@@ -1061,10 +1059,17 @@
 </state>
 </provider>
 </entry>
+ <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_171.jdk/Contents/Home/src.zip!/java/lang/Thread.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="218">
+ <caret line="698" column="29" selection-start-line="698" selection-start-column="29" selection-end-line="698" selection-end-column="29" />
+ </state>
+ </provider>
+ </entry>
 <entry file="file://$PROJECT_DIR$/src/main/resources/config.properties">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="21">
- <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+ <state>
+ <caret column="11" lean-forward="true" selection-start-column="11" selection-end-column="11" />
 </state>
 </provider>
 </entry>
@@ -1077,15 +1082,23 @@
 </entry>
 <entry file="file://$PROJECT_DIR$/pom.xml">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="651">
+ <state relative-caret-position="533">
 <caret line="31" column="37" selection-start-line="31" selection-start-column="37" selection-end-line="31" selection-end-column="37" />
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/Main.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+ <entry file="file://$PROJECT_DIR$/readme.md">
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+ <state split_layout="SPLIT">
+ <first_editor relative-caret-position="42">
+ <caret line="2" column="55" lean-forward="true" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="55" />
+ </first_editor>
+ <second_editor />
+ </state>
+ </provider>
+ <provider editor-type-id="text-editor">
+ <state>
+ <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
 </state>
 </provider>
 </entry>
@@ -1096,22 +1109,32 @@
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/Start.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="168">
+ <caret line="8" column="18" lean-forward="true" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="567">
- <caret line="41" selection-start-line="41" selection-end-line="41" />
+ <state relative-caret-position="-2139">
+ <caret line="25" column="21" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="21" />
 <folding>
- <element signature="docComment;class#MessageHandler#0" />
- <element signature="docComment;method#read#0;class#MessageHandler#0" />
- <element signature="method#close#0;class#MessageHandler#0" />
+ <element signature="imports" expanded="true" />
 </folding>
 </state>
 </provider>
 </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/Crawl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/MessageHandler.java">
 <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="168">
- <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
+ <state relative-caret-position="1197">
+ <caret line="71" column="37" lean-forward="true" selection-start-line="71" selection-start-column="37" selection-end-line="71" selection-end-column="37" />
+ <folding>
+ <element signature="docComment;class#MessageHandler#0" />
+ <element signature="docComment;method#read#0;class#MessageHandler#0" />
+ <element signature="method#close#0;class#MessageHandler#0" />
+ </folding>
 </state>
 </provider>
 </entry>
From 6bd95a1ffad25064cdb4eff4907e0b5c73a8cc78 Mon Sep 17 00:00:00 2001
From: gaopu <936302529@qq.com>
Date: 2019年12月15日 16:02:05 +0800
Subject: [PATCH 07/15] Create README.md
---
 README.md &#124; 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 README.md
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f9acbd6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+## 这个仓库内的代码是什么东西
+都是以前上大学时字节写的一些东西,有的为了交作业,有的为了玩😊。
+
+## 为什么很多份不相关的代码放在一个代码库
+因为当初还不会合理正确的使用github代码库🙉。
+
+## 值不值得star
+不值得(不过也感谢star了的朋友❤️)。
+
+## 最后
+我这里放一个阿里云私人推广链接,有需要搭建博客,搭建私人在线服务进行学习的朋友可以逛逛看,[www.aliyun.com](https://www.aliyun.com/minisite/goods?userCode=aj6ujyr6)😀。
From a3a7bc1d0829042cd984f8e2c3d180c04048d891 Mon Sep 17 00:00:00 2001
From: gaopu <936302529@qq.com>
Date: 2019年12月15日 16:03:05 +0800
Subject: [PATCH 08/15] Update README.md
---
 README.md &#124; 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f9acbd6..cf53652 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ## 这个仓库内的代码是什么东西
-都是以前上大学时字节写的一些东西,有的为了交作业,有的为了玩😊。
+都是以前上大学时自己写的一些东西,有的为了交作业,有的为了玩😊。
 
 ## 为什么很多份不相关的代码放在一个代码库
 因为当初还不会合理正确的使用github代码库🙉。
From 2ed62759c3afff4ec1d5a8b23349bcb326478ad9 Mon Sep 17 00:00:00 2001
From: gaopu <936302529@qq.com>
Date: Tue, 7 Jan 2020 12:03:01 +0800
Subject: [PATCH 09/15] Update README.md
---
 README.md &#124; 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index cf53652..e137209 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,4 @@
 不值得(不过也感谢star了的朋友❤️)。
 
 ## 最后
-我这里放一个阿里云私人推广链接,有需要搭建博客,搭建私人在线服务进行学习的朋友可以逛逛看,[www.aliyun.com](https://www.aliyun.com/minisite/goods?userCode=aj6ujyr6)😀。
+我这里放一个阿里云私人推广链接,有需要搭建博客,搭建私人在线服务进行学习的朋友可以逛逛看,[www.aliyun.com](https://www.aliyun.com/minisite/goods?userCode=aj6ujyr6)😀。我的私人博客就是用阿里云搭建的,欢迎大家访问并提出任何宝贵意见,[www.geekgao.cn](https://www.geekgao.cn)
From 5544deaefab035a42bab204b9e61c8e90541e65b Mon Sep 17 00:00:00 2001
From: gaopu <936302529@qq.com>
Date: 2020年3月21日 16:46:16 +0800
Subject: [PATCH 10/15] test
---
 README.md &#124; 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e137209..a979519 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## 这个仓库内的代码是什么东西
+## t这个仓库内的代码是什么东西
 都是以前上大学时自己写的一些东西,有的为了交作业,有的为了玩😊。
 
 ## 为什么很多份不相关的代码放在一个代码库
From 27848c116d7af87b841786ae4eed0fb8853ad5f3 Mon Sep 17 00:00:00 2001
From: gaopu <936302529@qq.com>
Date: 2020年3月21日 16:47:02 +0800
Subject: [PATCH 11/15] test
---
 README.md &#124; 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a979519..e137209 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## t这个仓库内的代码是什么东西
+## 这个仓库内的代码是什么东西
 都是以前上大学时自己写的一些东西,有的为了交作业,有的为了玩😊。
 
 ## 为什么很多份不相关的代码放在一个代码库
From 49f843dd81a80ff3747ec418341be6e6daef7171 Mon Sep 17 00:00:00 2001
From: gaopu <936302529@qq.com>
Date: Thu, 5 Nov 2020 16:07:41 +0800
Subject: [PATCH 12/15] Update README.md
---
 README.md &#124; 3 +++
 1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
index e137209..8a0e7d5 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+## Stargazers over time
+[![Stargazers over time](https://starchart.cc/gaopu/Java.svg)](https://starchart.cc/gaopu/Java)
+
 ## 这个仓库内的代码是什么东西
 都是以前上大学时自己写的一些东西,有的为了交作业,有的为了玩😊。
 
From 6762dcd4c43cfd56e6393dc83defeb7a02a38cbc Mon Sep 17 00:00:00 2001
From: gaopu <936302529@qq.com>
Date: 2021年2月22日 18:01:49 +0800
Subject: [PATCH 13/15] Update README.md
---
 README.md &#124; 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 8a0e7d5..c28e23b 100644
--- a/README.md
+++ b/README.md
@@ -11,4 +11,4 @@
 不值得(不过也感谢star了的朋友❤️)。
 
 ## 最后
-我这里放一个阿里云私人推广链接,有需要搭建博客,搭建私人在线服务进行学习的朋友可以逛逛看,[www.aliyun.com](https://www.aliyun.com/minisite/goods?userCode=aj6ujyr6)😀。我的私人博客就是用阿里云搭建的,欢迎大家访问并提出任何宝贵意见,[www.geekgao.cn](https://www.geekgao.cn)
+我这里放一个腾讯云私人推广链接,有需要搭建博客、搭建私人在线服务进行学习的朋友可以逛逛看,😀。我的私人博客是用[腾讯云](https://curl.qcloud.com/Kr4BAQsb)搭建的,我的是2核4G8M,最近免费给升级成4核8G8M。欢迎大家访问我的私人博客,[www.geekgao.cn](https://www.geekgao.cn)
From 550b1b75a2a08c7cd4e6baad1267b8dd9dc44744 Mon Sep 17 00:00:00 2001
From: gaopu_dxm <gaopu@duxiaoman.com>
Date: Sat, 7 May 2022 10:22:01 +0800
Subject: [PATCH 14/15] Update README.md
---
 README.md &#124; 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c28e23b..1dbd65b 100644
--- a/README.md
+++ b/README.md
@@ -11,4 +11,4 @@
 不值得(不过也感谢star了的朋友❤️)。
 
 ## 最后
-我这里放一个腾讯云私人推广链接,有需要搭建博客、搭建私人在线服务进行学习的朋友可以逛逛看,😀。我的私人博客是用[腾讯云](https://curl.qcloud.com/Kr4BAQsb)搭建的,我的是2核4G8M,最近免费给升级成4核8G8M。欢迎大家访问我的私人博客,[www.geekgao.cn](https://www.geekgao.cn)
+欢迎大家访问我的私人博客:[www.geekgao.cn](https://www.geekgao.cn)
From 40f269fbe8ca23fbb07ac642cd8cad9410cdd08d Mon Sep 17 00:00:00 2001
From: gaopu <936302529@qq.com>
Date: 2023年9月25日 20:27:59 +0800
Subject: [PATCH 15/15] Update README.md
---
 README.md &#124; 2 ++
 1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 1dbd65b..f730765 100644
--- a/README.md
+++ b/README.md
@@ -12,3 +12,5 @@
 
 ## 最后
 欢迎大家访问我的私人博客:[www.geekgao.cn](https://www.geekgao.cn)
+
+我的博客搭建在腾讯云,新用户有优惠:[优惠购买腾讯云](https://curl.qcloud.com/JNxboKJ3)(不是新用户用新的账号登陆,用老身份认证也能享受优惠,听说是可这么操作三次),我用的是2核4G5M的配置。
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/xiao289/Java/compare/master...gaopu:Java:master.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/xiao289/Java/compare/master...gaopu:Java:master.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>