小改

Gene_point_Service/.idea/workspace.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="83c812bd-fdcd-4344-b866-5ecaac02b490" name="Default Changelist" comment="">
-      <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/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>
@@ -20,8 +19,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="303">
-              <caret line="97" column="17" lean-forward="true" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="17" />
+            <state relative-caret-position="161">
+              <caret line="16" selection-start-line="16" selection-end-line="16" />
               <folding>
                 <element signature="e#14#173#0" expanded="true" />
               </folding>
@@ -29,20 +28,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://D:/Development/GO/src/runtime/panic.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="334">
-              <caret line="696" column="9" selection-start-line="696" selection-start-column="9" selection-end-line="698" selection-end-column="48" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <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="736">
-              <caret line="50" column="63" selection-start-line="50" selection-start-column="45" selection-end-line="50" selection-end-column="63" />
+            <state relative-caret-position="2139">
+              <caret line="102" column="51" selection-start-line="102" selection-start-column="51" selection-end-line="102" selection-end-column="51" />
             </state>
           </provider>
         </entry>
@@ -238,7 +228,7 @@
       <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.35260117" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" visible="true" weight="0.32716763" />
       <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" />
@@ -538,13 +528,6 @@
         </state>
       </provider>
     </entry>
-    <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="736">
-          <caret line="50" column="63" selection-start-line="50" selection-start-column="45" selection-end-line="50" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://D:/Development/GO/src/io/ioutil/ioutil.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="257">
@@ -559,13 +542,6 @@
         </state>
       </provider>
     </entry>
-    <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="303">
-          <caret line="1029" column="22" lean-forward="true" selection-start-line="1029" selection-start-column="22" selection-end-line="1029" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://D:/Development/GO/src/log/log.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1683">
@@ -580,10 +556,24 @@
         </state>
       </provider>
     </entry>
+    <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="180">
+          <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/controllers/converse/converse.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2139">
+          <caret line="102" column="51" selection-start-line="102" selection-start-column="51" selection-end-line="102" selection-end-column="51" />
+        </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="303">
-          <caret line="97" column="17" lean-forward="true" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="17" />
+        <state relative-caret-position="161">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
           <folding>
             <element signature="e#14#173#0" expanded="true" />
           </folding>

Gene_point_Service/src/dashoo.cn/api/controllers/converse/converse.go

@@ -92,7 +92,6 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 	var res converseService.ResponseEntity
 	json.Unmarshal(message,&res)
 	log.Println("res:",&res)
-	log.Println("n:",n)
 	result := res.Result
 	taskId := res.Data.Task_id
 	isEnd := res.Data.Is_end
@@ -101,7 +100,7 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 	//如果正常响应且任务执行成功则修改任务状态为成功
 	if result == 200 && res.Data.Abnormal_data == nil {
 		if isEnd && res.Data.Abnormal_data == nil{
-			log.Println("---------修改成功状态-----------")
+			log.Println(">>>>>>>>>>修改成功状态>>>>>>>>>>")
 			//todo or link to biobank
 			err = this.StatusModify(SUCCESS,taskId)
 		}else if taskType == "task_active" {

Gene_point_Service/src/dashoo.cn/api/main.go

@@ -12,9 +12,9 @@ import (
 )
 
 //const gpServiceUrl = "ws://39.105.83.226:22225/socket"
-const gpServiceUrl = "ws://39.105.83.226:22368/socket"
+//const gpServiceUrl = "ws://39.105.83.226:22368/socket"
 //const gpServiceUrl = "ws://fdgfghfg.oicp.net:48681/socket"
-//const gpServiceUrl = "ws://fdgfghfg.oicp.net:23248/socket"
+const gpServiceUrl = "ws://fdgfghfg.oicp.net:23248/socket"
 
 //var conn *websocket.Conn
 var err error
@@ -40,7 +40,6 @@ func main() {
 	if conn != nil {
 		defer conn.Close()
 		ctrl.GetConnection(conn)
-
 		//发送请求
 		go ListenToSendMsg(conn)
 		//监听消息
@@ -76,7 +75,7 @@ func main() {
 			}
 			select {
 				case <-done:
-				case <-time.After(time.Second*10):
+				case <-time.After(time.Second*30):
 
 			}
 			//return
@@ -91,14 +90,15 @@ func main() {
 						ctrl.GetConnection(conn)
 						go ListenToSendMsg(conn)
 						go ListenToReadMsg(done, conn)
-						break
+						goto label
 					}
 					log.Println("连接失败, 等待重新连接........")
-					break
 				}
 
 			}
+
 		}
+	label:
 	}
 
 	log.Println("===============Service_down==============")
@@ -158,7 +158,7 @@ func ListenToSendMsg(conn *websocket.Conn){
 
 //定期清理任务表已完成信息
 func ClearSuccessfulTask() {
-	log.Println("定期清理任务>>>>>>>>>>>>>>>>>>>")
+	log.Println("清理任务定时任务启动>>>>>>>>>>>>>>>>>>>")
 	cron := cron.New()
 	//每天0时清除任务表
 	tick := "0 0 0 * * ?"
@@ -172,6 +172,6 @@ func ClearSuccessfulTask() {
 }
 
 func SetDisconnect(){
-	log.Println("写入连接断开")
+	log.Println("设置连接断开状态")
 	disconnect <- true
 }