异常修改

Gene_point_Service/.idea/workspace.xml

@@ -5,7 +5,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/main.go" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -21,8 +21,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3473">
-              <caret line="203" column="1" selection-start-line="203" selection-start-column="1" selection-end-line="203" selection-end-column="1" />
+            <state relative-caret-position="184">
+              <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
             </state>
           </provider>
         </entry>
@@ -30,29 +30,29 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://E:/DASHOO/base_go/src/github.com/gorilla/websocket/conn.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="258">
+            <state relative-caret-position="213">
               <caret line="1023" column="15" selection-start-line="1023" selection-start-column="15" selection-end-line="1023" selection-end-column="15" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
+        <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="768">
-              <caret line="106" column="53" selection-start-line="106" selection-start-column="53" selection-end-line="106" selection-end-column="53" />
-              <folding>
-                <element signature="e#18#192#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="1932">
+              <caret line="93" column="34" selection-start-line="93" selection-start-column="34" selection-end-line="93" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
+        <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1377">
-              <caret line="61" column="14" selection-start-line="61" selection-start-column="14" selection-end-line="61" selection-end-column="14" />
+            <state relative-caret-position="169">
+              <caret line="148" column="39" selection-start-line="148" selection-start-column="39" selection-end-line="148" selection-end-column="39" />
+              <folding>
+                <element signature="e#18#199#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -60,8 +60,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1239">
-              <caret line="494" column="38" lean-forward="true" selection-start-line="494" selection-start-column="38" selection-end-line="494" selection-end-column="38" />
+            <state relative-caret-position="905">
+              <caret line="529" column="38" selection-start-line="529" selection-start-column="33" selection-end-line="529" selection-end-column="38" />
               <folding>
                 <element signature="e#25#144#0" expanded="true" />
               </folding>
@@ -69,15 +69,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/db/serviceBase.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="84" column="22" selection-start-line="84" selection-start-column="22" selection-end-line="84" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -97,6 +88,7 @@
       <find>ListenToSendMsg</find>
       <find>TransferPosition</find>
       <find>Hierarchy</find>
+      <find>sampleapply</find>
     </findStrings>
   </component>
   <component name="GOROOT" path="D:\Development\GO" />
@@ -123,14 +115,14 @@
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/base.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/routers/router.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/conf/app.conf" />
-        <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" />
-        <option value="$PROJECT_DIR$/src/dashoo.cn/api/main.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/main.go" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="1">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="2869" />
     <option name="y" value="133" />
     <option name="width" value="864" />
@@ -279,8 +271,8 @@
     </configuration>
     <list>
       <item itemvalue="Go Build.go build api/" />
-      <item itemvalue="Go Build.go build dashoo.cn/api" />
       <item itemvalue="Go Build.GENEPOINT_SERVICE" />
+      <item itemvalue="Go Build.go build dashoo.cn/api" />
     </list>
     <recent_temporary>
       <list>
@@ -300,14 +292,15 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="2576" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.07637232" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.12529834" />
       <window_info id="Structure" order="1" sideWeight="0.50233644" side_tool="true" weight="0.14701195" />
       <window_info id="Favorites" order="2" sideWeight="0.50233644" side_tool="true" weight="0.14701195" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49960256" weight="0.0" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.61915886" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" visible="true" weight="0.3630058" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" visible="true" weight="0.21965317" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32943925" />
@@ -349,6 +342,38 @@
   <component name="UnknownFeatures">
     <option featureType="com.intellij.fileTypeFactory" implementationName="*.conf" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService_test.go" />
     <entry file="file://E:/DASHOO/base_go/src/github.com/go-xorm/xorm/session_insert.go">
@@ -625,58 +650,58 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/conf/app.conf">
+    <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/db/serviceBase.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="17" column="14" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
+        <state relative-caret-position="248">
+          <caret line="85" column="50" selection-start-line="85" selection-start-column="50" selection-end-line="85" selection-end-column="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/DASHOO/base_go/src/github.com/gorilla/websocket/conn.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/conf/app.conf">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="1023" column="15" selection-start-line="1023" selection-start-column="15" selection-end-line="1023" selection-end-column="15" />
+        <state relative-caret-position="115">
+          <caret line="17" column="14" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1377">
-          <caret line="61" column="14" selection-start-line="61" selection-start-column="14" selection-end-line="61" selection-end-column="14" />
+        <state relative-caret-position="905">
+          <caret line="529" column="38" selection-start-line="529" selection-start-column="33" selection-end-line="529" selection-end-column="38" />
+          <folding>
+            <element signature="e#25#144#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1239">
-          <caret line="494" column="38" lean-forward="true" selection-start-line="494" selection-start-column="38" selection-end-line="494" selection-end-column="38" />
+        <state relative-caret-position="169">
+          <caret line="148" column="39" selection-start-line="148" selection-start-column="39" selection-end-line="148" selection-end-column="39" />
           <folding>
-            <element signature="e#25#144#0" expanded="true" />
+            <element signature="e#18#199#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/db/serviceBase.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="84" column="22" selection-start-line="84" selection-start-column="22" selection-end-line="84" selection-end-column="22" />
+        <state relative-caret-position="1932">
+          <caret line="93" column="34" selection-start-line="93" selection-start-column="34" selection-end-line="93" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
+    <entry file="file://E:/DASHOO/base_go/src/github.com/gorilla/websocket/conn.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="768">
-          <caret line="106" column="53" selection-start-line="106" selection-start-column="53" selection-end-line="106" selection-end-column="53" />
-          <folding>
-            <element signature="e#18#192#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="213">
+          <caret line="1023" column="15" selection-start-line="1023" selection-start-column="15" selection-end-line="1023" selection-end-column="15" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3473">
-          <caret line="203" column="1" selection-start-line="203" selection-start-column="1" selection-end-line="203" selection-end-column="1" />
+        <state relative-caret-position="184">
+          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
         </state>
       </provider>
     </entry>

Gene_point_Service/src/dashoo.cn/api/business/converseService/converse.go

@@ -90,12 +90,12 @@ type Single struct {
 }
 
 type Cause struct {
-	Cu 		int		`json:"cu,omitempty"`
-	Reason	int		`json:"reason,omitempty"`
+	Cu 		int		`json:"cu"`
+	Reason	int		`json:"reason"`
 }
 
 type Exception struct {
-	Cu 		int		`json:"cu,omitempty"`
+	Cu 		int		`json:"cu"`
 	Codes 	[]int	`json:"codes,omitempty"`
 }
 

Gene_point_Service/src/dashoo.cn/api/business/converseService/converseService.go

@@ -527,7 +527,7 @@ func GetReason(cause Cause) string{
 	}
 
 	if cause.Cu != 0 {
-		reasonStr = string(cause.Cu)+"号设备," + reasonStr
+		reasonStr = strconv.Itoa(cause.Cu)+"号设备," + reasonStr
 	}
 	return reasonStr
 }