From f0e65253e6644a3e2695763d2a6ff82059f9685a Mon Sep 17 00:00:00 2001
From: mispower <mispower@zto.com>
Date: Sun, 5 Dec 2021 08:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E9=80=82=E9=85=8Ddoris=E5=92=8Ckettle,?=
 =?UTF-8?q?=E9=9A=90=E8=97=8Fexcel=E8=BF=BD=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.properties |  3 +--
 conf/ipsos.properties                         | 18 ++++++-------
 frontend/src/views/dataset/data/ViewTable.vue | 26 +++++++++----------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 84ad43b..2a82630 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -75,8 +75,7 @@ spring.cache.ehcache.config=classpath:/ehcache/ehcache.xml
 #logging.level.org.springframework.boot.web=trace
 #spring.mvc.log-request-details=true
 pagehelper.PageRowBounds=true
-#excel等用户上传文件路径
-upload.file.path=conf/ipsos/data/kettle/
+
 
 dataease.sqlinjection.whitelists=/dataset/table/sqlPreview,/dataset/table/update
 
diff --git a/conf/ipsos.properties b/conf/ipsos.properties
index 75ccced..211cb6a 100644
--- a/conf/ipsos.properties
+++ b/conf/ipsos.properties
@@ -3,21 +3,21 @@ spring.datasource.url=jdbc:mysql://49.235.142.162:3306/smartbi?autoReconnect=fal
 spring.datasource.username=root
 spring.datasource.password=qinziyepao666!
 
-carte.host=kettle
+carte.host=172.19.0.2
 carte.port=18080
 carte.user=cluster
 carte.passwd=cluster
 
-doris.db=dataease
+doris.db=ipsosbi
 doris.user=root
-doris.password=Password123@doris
-doris.host=doris-fe
+doris.password=123456
+doris.host=172.19.0.198
 doris.port=9030
 doris.httpPort=8030
 
-#新建用户初始密码
-dataease.init_password=123456
-#登录超时时间单位min  如果不设置 默认8小时也就是480
-dataease.login_timeout=480
+#excel等用户上传文件路径
+upload.file.path=/opt/ipsos/data/kettle/
+
+
+logger.level=INFO
 
-logger.level=INFO
\ No newline at end of file
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 675416e..9b6bb3e 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -15,19 +15,19 @@
         </span>
       </el-popover>
       <el-row v-if="hasDataPermission('manage',param.privileges)" style="float: right">
-        <el-dropdown v-if="table.type ==='excel'" style="margin-right: 10px;" size="small" trigger="click" @command="clickEditExcel">
-          <el-button size="mini">
-            {{ $t('dataset.edit_excel') }}
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :command="beforeEditExcel('0')">
-              {{ $t('dataset.excel_replace') }}
-            </el-dropdown-item>
-            <el-dropdown-item :command="beforeEditExcel('1')">
-              {{ $t('dataset.excel_add') }}
-            </el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+<!--        <el-dropdown v-if="table.type ==='excel'" style="margin-right: 10px;" size="small" trigger="click" @command="clickEditExcel">-->
+<!--          <el-button size="mini">-->
+<!--            {{ $t('dataset.edit_excel') }}-->
+<!--          </el-button>-->
+<!--          <el-dropdown-menu slot="dropdown">-->
+<!--            <el-dropdown-item :command="beforeEditExcel('0')">-->
+<!--              {{ $t('dataset.excel_replace') }}-->
+<!--            </el-dropdown-item>-->
+<!--            <el-dropdown-item :command="beforeEditExcel('1')">-->
+<!--              {{ $t('dataset.excel_add') }}-->
+<!--            </el-dropdown-item>-->
+<!--          </el-dropdown-menu>-->
+<!--        </el-dropdown>-->
         <el-button v-if="table.type ==='custom'" size="mini" @click="editCustom">
           {{ $t('dataset.edit_custom_table') }}
         </el-button>