Merge pull request #458 from JackChen0810/dev-1.0.1

fix bug #448
WeBankFinTech · Dec 24, 2021 · 4d9747b · 4d9747b
2 parents babdeec + ab8aa9b
commit 4d9747b
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 4 deletions.
diff --git a/...gin/appconn/AppConnEngineConnPlugin.scala → ...gin/appconn/AppConnEngineConnPlugin.scala b/...gin/appconn/AppConnEngineConnPlugin.scala → ...gin/appconn/AppConnEngineConnPlugin.scala
diff --git a/...conf/AppConnEngineConnConfiguration.scala → ...conf/AppConnEngineConnConfiguration.scala b/...conf/AppConnEngineConnConfiguration.scala → ...conf/AppConnEngineConnConfiguration.scala
diff --git a/...ption/AppConnExecuteFailedException.scala → ...ption/AppConnExecuteFailedException.scala b/...ption/AppConnExecuteFailedException.scala → ...ption/AppConnExecuteFailedException.scala
diff --git a/.../AbstractExecutionRequestRefContext.scala → .../AbstractExecutionRequestRefContext.scala b/.../AbstractExecutionRequestRefContext.scala → .../AbstractExecutionRequestRefContext.scala
diff --git a/.../executor/AppConnEngineConnExecutor.scala → .../executor/AppConnEngineConnExecutor.scala b/.../executor/AppConnEngineConnExecutor.scala → .../executor/AppConnEngineConnExecutor.scala
@@ -139,9 +139,9 @@ class AppConnEngineConnExecutor(val id: Int) extends ComputationExecutor {
 
   override def executeCompletely(engineExecutorContext: EngineExecutionContext, code: String, completedLine: String): ExecuteResponse = null
 
-  override def progress(): Float = 0
+  override def progress(taskID: String): Float = 0
 
-  override def getProgressInfo: Array[JobProgressInfo] = Array.empty
+  override def getProgressInfo(taskID: String): Array[JobProgressInfo] = Array.empty
 
   override def supportCallBackLogs(): Boolean = false
 

diff --git a/.../executor/CommonExecutionRequestRef.scala → .../executor/CommonExecutionRequestRef.scala b/.../executor/CommonExecutionRequestRef.scala → .../executor/CommonExecutionRequestRef.scala
diff --git a/...utor/ExecutionRequestRefContextImpl.scala → ...utor/ExecutionRequestRefContextImpl.scala b/...utor/ExecutionRequestRefContextImpl.scala → ...utor/ExecutionRequestRefContextImpl.scala
diff --git a/...nn/factory/AppConnEngineConnFactory.scala → ...nn/factory/AppConnEngineConnFactory.scala b/...nn/factory/AppConnEngineConnFactory.scala → ...nn/factory/AppConnEngineConnFactory.scala
diff --git a/...pConnProcessEngineConnLaunchBuilder.scala → ...pConnProcessEngineConnLaunchBuilder.scala b/...pConnProcessEngineConnLaunchBuilder.scala → ...pConnProcessEngineConnLaunchBuilder.scala
diff --git a/...r/AppConnEngineExecutionLogListener.scala → ...r/AppConnEngineExecutionLogListener.scala b/...r/AppConnEngineExecutionLogListener.scala → ...r/AppConnEngineExecutionLogListener.scala
diff --git a/...ppConnEngineExecutionResultListener.scala → ...ppConnEngineExecutionResultListener.scala b/...ppConnEngineExecutionResultListener.scala → ...ppConnEngineExecutionResultListener.scala
diff --git a/web/.env b/web/.env
@@ -1,4 +1,5 @@
 VUE_APP_HOST=
 VUE_APP_MN_CONFIG_PREFIX=
 VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
-NODE_ENV=pro
+NODE_ENV=pro
+VUE_APP_VERSION=v1.0.1
diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dataspherestudio",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve",