From f5b527bc49e9d0a7e4ead7826c0ecb2b97970cc5 Mon Sep 17 00:00:00 2001
From: storezhang <storezhang@gmail.com>
Date: Thu, 15 Dec 2016 12:03:49 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=8C=81=E7=BB=AD?=
 =?UTF-8?q?=E9=9B=86=E6=88=90=E9=85=8D=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 51 +++++++++++++++++++++++++++------------------
 .travis.yml         |  8 ++++++-
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c1e82a5..092c324 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="4b2cb0bb-899e-4618-937f-434733724c11" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/spring-boot-starter-fastjson/src/test/java/com/ruijc/fastjson/FastjsonTest.java" afterPath="$PROJECT_DIR$/spring-boot-starter-fastjson/src/test/java/com/ruijc/fastjson/FastjsonTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.travis.yml" afterPath="$PROJECT_DIR$/.travis.yml" />
     </list>
     <ignored path="utils.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -64,7 +64,7 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="JSON Fragment (FastjsonTest.java:1733).json" pinned="false" current-in-tab="true">
+          <file leaf-file-name="JSON Fragment (FastjsonTest.java:1733).json" pinned="false" current-in-tab="false">
             <entry file="mock:///JSON Fragment (FastjsonTest.java:1733).json">
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="0">
@@ -74,6 +74,16 @@
               </provider>
             </entry>
           </file>
+          <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/.travis.yml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="342">
+                  <caret line="18" column="19" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -117,7 +127,6 @@
         <option value="$PROJECT_DIR$/spring-boot-starter-mybatis/src/test/resources/application.yml" />
         <option value="$PROJECT_DIR$/base/src/main/java/com/ruijc/BaseTest.java" />
         <option value="$PROJECT_DIR$/spring-boot-starter-mybatis/src/test/java/com/ruijc/mybatis/BaseTest.java" />
-        <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/spring-boot-starter-mybatis/src/test/java/com/ruijc/mybatis/MybatisTest.java" />
         <option value="$PROJECT_DIR$/apt/src/main/java/com/ruijc/apt/PrintMe.java" />
         <option value="$PROJECT_DIR$/apt/src/main/java/com/ruijc/apt/PrintMeProcessor.java" />
@@ -160,6 +169,7 @@
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="/JSON Fragment (FastjsonTest.java:1733).json" />
+        <option value="$PROJECT_DIR$/.travis.yml" />
       </list>
     </option>
   </component>
@@ -981,14 +991,7 @@
       <workItem from="1481595109172" duration="4544000" />
       <workItem from="1481600845633" duration="10901000" />
       <workItem from="1481697836805" duration="78000" />
-      <workItem from="1481705105996" duration="11288000" />
-    </task>
-    <task id="LOCAL-00031" summary="1、测试JSONP；">
-      <created>1481081672567</created>
-      <option name="number" value="00031" />
-      <option name="presentableId" value="LOCAL-00031" />
-      <option name="project" value="LOCAL" />
-      <updated>1481081672567</updated>
+      <workItem from="1481705105996" duration="11416000" />
     </task>
     <task id="LOCAL-00032" summary="1、测试JSONP；">
       <created>1481081840925</created>
@@ -1326,7 +1329,14 @@
       <option name="project" value="LOCAL" />
       <updated>1481774317008</updated>
     </task>
-    <option name="localTasksCounter" value="80" />
+    <task id="LOCAL-00080" summary="1、去掉不需要的代码；&#10;2、全面测试Fastjson；">
+      <created>1481774492331</created>
+      <option name="number" value="00080" />
+      <option name="presentableId" value="LOCAL-00080" />
+      <option name="project" value="LOCAL" />
+      <updated>1481774492331</updated>
+    </task>
+    <option name="localTasksCounter" value="81" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1362,7 +1372,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="174793000" />
+    <option name="totallyTimeSpent" value="174921000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="54" y="-8" width="1874" height="1096" extended-state="6" />
@@ -1462,13 +1472,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/spring-boot-starter-mybatis/src/main/java/com/ruijc/mybatis/RedisMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="10" column="5" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.1/mybatis-3.4.1.jar!/org/apache/ibatis/annotations/Mapper.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="190">
@@ -1927,6 +1930,14 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="18" column="19" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/.travis.yml b/.travis.yml
index db0262a..aecf3db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,10 @@ before_script:
 after_success:
   - chmod -R 777 .travis/deploy-to-sonatype.sh
   - .travis/deploy-to-sonatype.sh
-  - mvn clean cobertura:cobertura coveralls:report --settings .travis/settings.xml
\ No newline at end of file
+  - mvn clean cobertura:cobertura coveralls:report --settings .travis/settings.xml
+
+notifications:
+  email:
+    - admin@ruijc.com
+  on_success: never
+  on_failure: always
\ No newline at end of file