Merge branch 'dev-1.3.1' into dev-1.3.1-elasticsearch--errorcode

# Conflicts:
#	linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.scala
#	linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ResponseHandlerImpl.scala

linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.scala

@@ -19,15 +19,24 @@ package org.apache.linkis.engineplugin.elasticsearch.executor.client.impl
 
 import org.apache.linkis.common.utils.Utils
 import org.apache.linkis.engineplugin.elasticsearch.conf.ElasticSearchConfiguration
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.{
+import org.apache.linkis.engineplugin.elasticsearch.exception.EsConvertResponseException
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.{
   ElasticSearchErrorResponse,
   ElasticSearchExecutor,
   ElasticSearchResponse,
   EsClient,
   EsClientFactory,
   ResponseHandler
 }
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.ResponseHandler
 import org.apache.linkis.protocol.constants.TaskConstant
+import org.apache.linkis.scheduler.executer.{
+  AliasOutputExecuteResponse,
+  ErrorExecuteResponse,
+  ExecuteResponse,
+  SuccessExecuteResponse
+}
+import org.apache.linkis.server.JMap
 import org.apache.linkis.storage.utils.StorageUtils
 
 import java.util

linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ResponseHandlerImpl.scala

@@ -18,15 +18,15 @@
 package org.apache.linkis.engineplugin.elasticsearch.executor.client.impl
 
 import org.apache.linkis.common.utils.Utils
-import org.apache.linkis.engineplugin.elasticsearch.errorcode.EasticsearchErrorCodeSummary.RESPONSE_FAIL_IS_EMPTY
 import org.apache.linkis.engineplugin.elasticsearch.exception.EsConvertResponseException
 import org.apache.linkis.engineplugin.elasticsearch.executor.client.{
   ElasticSearchJsonResponse,
   ElasticSearchResponse,
   ElasticSearchTableResponse,
   ResponseHandler
 }
-import org.apache.linkis.engineplugin.elasticsearch.executer.client.ResponseHandler._
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.ResponseHandler
+import org.apache.linkis.engineplugin.elasticsearch.executor.client.ResponseHandler._
 import org.apache.linkis.storage.domain._
 import org.apache.linkis.storage.resultset.table.TableRecord
 
@@ -53,7 +53,9 @@ class ResponseHandlerImpl extends ResponseHandler {
     val contentBytes = EntityUtils.toByteArray(response.getEntity)
 
     if (contentBytes == null || contentBytes.isEmpty) {
-      throw EsConvertResponseException(RESPONSE_FAIL_IS_EMPTY.getErrorDesc)
+      throw EsConvertResponseException(
+        "EsEngineExecutor convert response fail, response content is empty."
+      )
     }
 
     val jsonNode = Utils.tryCatch {