|
@@ -80,7 +80,7 @@ func ExecPythonCode(edbCode, reqCode string) (dataMap models.EdbDataFromPython,
|
|
|
return
|
|
|
}
|
|
|
defer func() {
|
|
|
- os.Remove(pythonFile)
|
|
|
+ //os.Remove(pythonFile)
|
|
|
}()
|
|
|
_, err = fileHandle.Write([]byte(pthonCodeStr))
|
|
|
if err != nil {
|
|
@@ -92,15 +92,20 @@ func ExecPythonCode(edbCode, reqCode string) (dataMap models.EdbDataFromPython,
|
|
|
var out, errMsgOut bytes.Buffer
|
|
|
cmd.Stdout = &out
|
|
|
cmd.Stderr = &errMsgOut
|
|
|
- err = cmd.Start()
|
|
|
- if err != nil {
|
|
|
- errMsg = errMsgOut.String()
|
|
|
- }
|
|
|
- err = cmd.Wait()
|
|
|
+ err = cmd.Run()
|
|
|
if err != nil {
|
|
|
errMsg = errMsgOut.String()
|
|
|
return
|
|
|
}
|
|
|
+ //err = cmd.Start()
|
|
|
+ //if err != nil {
|
|
|
+ // errMsg = errMsgOut.String()
|
|
|
+ //}
|
|
|
+ //err = cmd.Wait()
|
|
|
+ //if err != nil {
|
|
|
+ // errMsg = errMsgOut.String()
|
|
|
+ // return
|
|
|
+ //}
|
|
|
|
|
|
outputByte := out.String()
|
|
|
if err != nil {
|
|
@@ -173,7 +178,7 @@ func getPythonFrontStr() string {
|
|
|
return str
|
|
|
}
|
|
|
|
|
|
-// getPythonFrontStr 获取python结尾的代码
|
|
|
+// getPythonLaterStr 获取python结尾的代码
|
|
|
func getPythonLaterStr() string {
|
|
|
return "\n\nprint(\"result=\", result.to_json())\ndb.close()"
|
|
|
}
|