推送测试

.idea/workspace.xml

@@ -6,7 +6,10 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="853de74d-d764-48df-9f5d-3bb92a346680" name="Default" comment="" />
+    <list default="true" id="853de74d-d764-48df-9f5d-3bb92a346680" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -20,11 +23,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="54">
-              <caret line="8" selection-start-line="8" selection-end-line="26" selection-end-column="3" />
+            <state relative-caret-position="351">
+              <caret line="76" selection-start-line="76" selection-end-line="76" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -32,83 +35,15 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="electricEnergyV2.iml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/electricEnergyV2.iml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file leaf-file-name="MANIFEST.MF" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/META-INF/MANIFEST.MF">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="81">
-              <caret line="3" selection-start-line="3" selection-end-line="3" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TCPClient.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="TCPClient.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/tcpunit/TCPClient.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
+            <state relative-caret-position="-480">
               <caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TCPServer.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/tcpunit/TCPServer.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2079">
-              <caret line="94" column="48" selection-start-line="94" selection-start-column="48" selection-end-line="94" selection-end-column="48" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="JSONObject.class" pinned="false" current-in-tab="false">
-        <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="25083">
-              <caret line="964" column="11" selection-start-line="964" selection-start-column="11" selection-end-line="964" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ElectricMsg.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/tcpunit/ElectricMsg.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="432">
-              <caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Payload.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/tcpunit/Payload.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Parser.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/tcpunit/Parser.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="432">
-              <caret line="16" column="27" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="HttpClient.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/tcpunit/HttpClient.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -118,6 +53,9 @@
       </list>
     </option>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
@@ -148,78 +86,32 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-3714" />
-    <option name="y" value="34" />
-    <option name="width" value="1741" />
-    <option name="height" value="971" />
+    <option name="x" value="92" />
+    <option name="y" value="255" />
+    <option name="width" value="3047" />
+    <option name="height" value="1588" />
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
+              <item name="electric-energy" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electric-energy" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
-              <item name="artifacts" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
-              <item name="artifacts" type="462c0819:PsiDirectoryNode" />
-              <item name="electricEnergyV2_jar" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
-              <item name="production" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
-              <item name="production" type="462c0819:PsiDirectoryNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
-              <item name="production" type="462c0819:PsiDirectoryNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-              <item name="META-INF" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
+              <item name="electric-energy" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electric-energy" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="META-INF" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="electricEnergyV2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="electricEnergyV2" type="462c0819:PsiDirectoryNode" />
+              <item name="electric-energy" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electric-energy" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="tcpunit" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -227,7 +119,9 @@
           <select />
         </subPane>
       </pane>
+      <pane id="AndroidView" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -287,31 +181,33 @@
       <workItem from="1631580618551" duration="476000" />
       <workItem from="1631581192426" duration="2896000" />
       <workItem from="1631586202989" duration="5422000" />
+      <workItem from="1631613447043" duration="173000" />
+      <workItem from="1631667355275" duration="491000" />
+      <workItem from="1631718512403" duration="47000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="17245000" />
+    <option name="totallyTimeSpent" value="17956000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-3714" y="34" width="1741" height="971" extended-state="0" />
+    <frame x="53" y="146" width="1741" height="907" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" order="7" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.12637681" />
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.12623046" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.38200936" />
-      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.34134007" />
+      <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13913043" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13839027" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -325,6 +221,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32943678" />
+      <window_info anchor="bottom" id="Messages" order="7" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -379,13 +276,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26028">
-          <caret line="964" column="11" selection-start-line="964" selection-start-column="11" selection-end-line="964" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class" />
     <entry file="file://$PROJECT_DIR$/src/tcpunit/ElectricMsg.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
@@ -445,13 +336,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26028">
-          <caret line="964" column="11" selection-start-line="964" selection-start-column="11" selection-end-line="964" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class" />
     <entry file="file://$PROJECT_DIR$/src/tcpunit/ElectricMsg.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
@@ -511,13 +396,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26028">
-          <caret line="964" column="11" selection-start-line="964" selection-start-column="11" selection-end-line="964" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class" />
     <entry file="file://$PROJECT_DIR$/src/tcpunit/ElectricMsg.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
@@ -577,13 +456,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26028">
-          <caret line="964" column="11" selection-start-line="964" selection-start-column="11" selection-end-line="964" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class" />
     <entry file="file://$PROJECT_DIR$/src/tcpunit/ElectricMsg.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
@@ -641,20 +514,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="25083">
-          <caret line="964" column="11" selection-start-line="964" selection-start-column="11" selection-end-line="964" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/tcpunit/TCPClient.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://H:/study/Json/JSONObject所必须的6个包/json-lib-2.1-jdk15.jar!/net/sf/json/JSONObject.class" />
     <entry file="file://$PROJECT_DIR$/src/tcpunit/HttpClient.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
@@ -681,21 +541,28 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/tcpunit/TCPServer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2079">
+        <state relative-caret-position="2241">
           <caret line="94" column="48" selection-start-line="94" selection-start-column="48" selection-end-line="94" selection-end-column="48" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="8" selection-start-line="8" selection-end-line="26" selection-end-column="3" />
+        <state relative-caret-position="351">
+          <caret line="76" selection-start-line="76" selection-end-line="76" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/tcpunit/TCPClient.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-480">
+          <caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/Main.java

@@ -83,7 +83,7 @@ public class Main {
      */
     private static String upLoadData(String code, Double currentAggr) {
         Date dNow = new Date( );
-        SimpleDateFormat ft = new SimpleDateFormat ("yyyy-MM-dd hh:mm:ss");
+        SimpleDateFormat ft = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
         String dataStr = "{\"buildCode\":\""+code+"\",\"currentAggr\":\""+String.valueOf(currentAggr)+"\",\"energyType\":1,\"updateTime\":\""+ft.format(dNow)+"\"}";
         System.out.println(dataStr);
         return dataStr;