sleepyocean
/
smartbi2
forked from wuguolin/smartbi2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.修改相关关键字;2.隐藏相关功能

Browse Source
master
wuguolin 4 years ago
parent dc4d880242
commit 50690b7dce
16 changed files with 106 additions and 85 deletions
Show Stats Download Patch File Download Diff File

11
README.md
Unescape Escape View File

@ -14,4 +14,13 @@ create database smartbi
3.修改/opt/smartbi/conf/smartbi.properties文件 3.修改/opt/smartbi/conf/smartbi.properties文件
``` ```
- 运行起来后，到数据源页面修改默认数据源信息 - 运行起来后，到数据源页面修改默认数据源信息
# 20211112 变更
```aidl
//变更系统管理菜单显示权限
update sys_menu set hidden=1 where menu_id=40;
update sys_menu set hidden=1 where menu_id=58;
```

2
backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java
Unescape Escape View File

@ -22,7 +22,7 @@ public class DefaultLicenseService {
private static final String LICENSE_ID = "fit2cloud_license"; private static final String LICENSE_ID = "fit2cloud_license";
private static final String validatorUtil = "/usr/bin/validator"; private static final String validatorUtil = "/usr/bin/validator";
private static final String product = "JingCheng Data"; private static final String product = "Ipsos VIA BIBoard";
/*private static final String[] NO_PLU_LIMIT_MODULES = new String[]{"dashboard", "gateway"};*/ /*private static final String[] NO_PLU_LIMIT_MODULES = new String[]{"dashboard", "gateway"};*/
public F2CLicenseResponse validateLicense(String product, String licenseKey){ public F2CLicenseResponse validateLicense(String product, String licenseKey){

2
backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
Unescape Escape View File

@ -74,7 +74,7 @@ public class Knife4jConfiguration {
private ApiInfo apiInfo(){ private ApiInfo apiInfo(){
return null; return null;
// return new ApiInfoBuilder() // return new ApiInfoBuilder()
// .title("JingCheng Data") // .title("Ipsos VIA BIBoard")
// .description("人人可用的开源数据可视化分析工具") // .description("人人可用的开源数据可视化分析工具")
// .termsOfServiceUrl("https://dataease.io") // .termsOfServiceUrl("https://dataease.io")
// .contact(new Contact("fit2cloud","https://www.fit2cloud.com/dataease/index.html","dataease@fit2cloud.com")) // .contact(new Contact("fit2cloud","https://www.fit2cloud.com/dataease/index.html","dataease@fit2cloud.com"))

2
backend/src/main/java/io/dataease/service/AboutService.java
Unescape Escape View File

@ -19,7 +19,7 @@ import java.util.Optional;
@Service @Service
public class AboutService { public class AboutService {
private static final String BUILD_VERSION = "/opt/dataease/conf/version"; private static final String BUILD_VERSION = "/opt/dataease/conf/version";
private static final String product = "JingCheng Data"; private static final String product = "Ipsos VIA BIBoard";
@Resource @Resource
private DefaultLicenseService defaultLicenseService; private DefaultLicenseService defaultLicenseService;

4
backend/src/main/resources/application.properties
Unescape Escape View File

@ -1,6 +1,6 @@
spring.application.name=dataease spring.application.name=dataease
server.port=8081 server.port=19527
# Hikari # Hikari
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
@ -60,7 +60,7 @@ quartz.scheduler-name=deServerJob
spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB spring.servlet.multipart.max-request-size=500MB
# actuator # actuator
management.server.port=8083 management.server.port=19528
management.endpoints.web.exposure.include=* management.endpoints.web.exposure.include=*
#spring.freemarker.checkTemplateLocation=false #spring.freemarker.checkTemplateLocation=false
#RSA非对称加密参数：私钥 #RSA非对称加密参数：私钥

12
dataease-server.iml1
Unescape Escape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

2
frontend/public/link.html
Unescape Escape View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico"> <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
<title>JingCheng Data</title> <title>Ipsos VIA BIBoard</title>
</head> </head>
<body style="height: 100%;"> <body style="height: 100%;">
<div id="link"></div> <div id="link"></div>

2
frontend/public/nolic.html
Unescape Escape View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico"> <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
<title>JingCheng Data</title> <title>Ipsos VIA BIBoard</title>
</head> </head>
<body style="height: 100%;"> <body style="height: 100%;">
<div id="nolic"></div> <div id="nolic"></div>

2
frontend/src/layout/components/Topbar.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div class="top-nav"> <div class="top-nav">
<div v-loading="!axiosFinished" class="log"> <div v-loading="!axiosFinished" class="log">
<span>JingCheng Data</span> <span>Ipsos VIA BIBoard</span>
<!-- <svg-icon v-if="!logoUrl && axiosFinished" icon-class="DataEase" custom-class="top-nav-logo-icon" />--> <!-- <svg-icon v-if="!logoUrl && axiosFinished" icon-class="DataEase" custom-class="top-nav-logo-icon" />-->
<!-- <img v-if="logoUrl && axiosFinished" :src="logoUrl" width="140" alt="" style="padding-top: 10px;">--> <!-- <img v-if="logoUrl && axiosFinished" :src="logoUrl" width="140" alt="" style="padding-top: 10px;">-->
</div> </div>

2
frontend/src/settings.js
Unescape Escape View File

@ -2,7 +2,7 @@ module.exports = {
TokenKey: 'Authorization', TokenKey: 'Authorization',
RefreshTokenKey: 'refreshauthorization', RefreshTokenKey: 'refreshauthorization',
LinkTokenKey: 'LINK-PWD-TOKEN', LinkTokenKey: 'LINK-PWD-TOKEN',
title: 'JingCheng Data', title: 'Ipsos VIA BIBoard',
/* for sso */ /* for sso */
IdTokenKey: 'IdToken', IdTokenKey: 'IdToken',
AccessTokenKey: 'AccessToken', AccessTokenKey: 'AccessToken',

2
frontend/src/styles/deicon/iconfont.json
Unescape Escape View File

@ -1,6 +1,6 @@
{ {
"id": "2459092", "id": "2459092",
"name": "JingCheng Data", "name": "Ipsos VIA BIBoard",
"font_family": "iconfont", "font_family": "iconfont",
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "", "description": "",

2
frontend/src/views/login/index.vue
Unescape Escape View File

@ -12,7 +12,7 @@
{{ uiInfo['ui.loginTitle'].paramValue }} {{ uiInfo['ui.loginTitle'].paramValue }}
</div> </div>
<div v-else class="login-welcome"> <div v-else class="login-welcome">
{{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || ' JingCheng Data') }} {{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || ' Ipsos VIA BIBoard') }}
</div> </div>
<div class="login-form"> <div class="login-form">
<el-form-item v-if="loginTypes.length > 1"> <el-form-item v-if="loginTypes.length > 1">

52
frontend/src/views/panel/list/PanelList.vue
Unescape Escape View File

@ -140,32 +140,32 @@
size="small" size="small"
/> />
</span> </span>
<el-dropdown-menu slot="dropdown"> <!-- <el-dropdown-menu slot="dropdown">-->
<el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-edit" :command="beforeClickMore('edit',data,node)"> <!-- <el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-edit" :command="beforeClickMore('edit',data,node)">-->
{{ $t('panel.edit') }} <!-- {{ $t('panel.edit') }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-share" :command="beforeClickMore('share',data,node)"> <!-- <el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-share" :command="beforeClickMore('share',data,node)">-->
{{ $t('panel.share') }} <!-- {{ $t('panel.share') }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-document-copy" :command="beforeClickMore('copy',data,node)"> <!-- <el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-document-copy" :command="beforeClickMore('copy',data,node)">-->
{{ $t('panel.copy') }} <!-- {{ $t('panel.copy') }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item icon="el-icon-right" :command="beforeClickMore('move',data,node)"> <!-- <el-dropdown-item icon="el-icon-right" :command="beforeClickMore('move',data,node)">-->
{{ $t('dataset.move_to') }} <!-- {{ $t('dataset.move_to') }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-paperclip" :command="beforeClickMore('link',data,node)"> <!-- <el-dropdown-item v-if="data.nodeType==='panel'" icon="el-icon-paperclip" :command="beforeClickMore('link',data,node)">-->
{{ $t('panel.create_public_links') }} <!-- {{ $t('panel.create_public_links') }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item v-if="data.nodeType==='panel'" :disabled="data.isDefault" icon="el-icon-copy-document" :command="beforeClickMore('toDefaultPanel',data,node)"> <!-- <el-dropdown-item v-if="data.nodeType==='panel'" :disabled="data.isDefault" icon="el-icon-copy-document" :command="beforeClickMore('toDefaultPanel',data,node)">-->
{{ $t('panel.to_default_panel') }} <!-- {{ $t('panel.to_default_panel') }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item icon="el-icon-edit-outline" :command="beforeClickMore('rename',data,node)"> <!-- <el-dropdown-item icon="el-icon-edit-outline" :command="beforeClickMore('rename',data,node)">-->
{{ $t('panel.rename') }} <!-- {{ $t('panel.rename') }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item icon="el-icon-delete" :command="beforeClickMore('delete',data,node)"> <!-- <el-dropdown-item icon="el-icon-delete" :command="beforeClickMore('delete',data,node)">-->
{{ $t('panel.delete') }} <!-- {{ $t('panel.delete') }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</el-dropdown-menu> <!-- </el-dropdown-menu>-->
</el-dropdown> </el-dropdown>
</span> </span>
</span> </span>

16
frontend/src/views/panel/list/PanelMain.vue
Unescape Escape View File

@ -6,14 +6,14 @@
<span slot="label"><i class="el-icon-document" />{{ $t('panel.panel_list') }}</span> <span slot="label"><i class="el-icon-document" />{{ $t('panel.panel_list') }}</span>
<panel-list v-if="activeName==='PanelList'" /> <panel-list v-if="activeName==='PanelList'" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane name="panels_star" :lazy="true"> <!-- <el-tab-pane name="panels_star" :lazy="true">-->
<span slot="label"><i class="el-icon-star-off" />{{ $t('panel.store') }}</span> <!-- <span slot="label"><i class="el-icon-star-off" />{{ $t('panel.store') }}</span>-->
<enshrine v-if="activeName==='panels_star'" /> <!-- <enshrine v-if="activeName==='panels_star'" />-->
</el-tab-pane> <!-- </el-tab-pane>-->
<el-tab-pane name="panels_share" :lazy="true"> <!-- <el-tab-pane name="panels_share" :lazy="true">-->
<span slot="label"><i class="el-icon-share" />{{ $t('panel.share') }}</span> <!-- <span slot="label"><i class="el-icon-share" />{{ $t('panel.share') }}</span>-->
<share-tree v-if="showShare" ref="share_tree" :msg-panel-ids="msgPanelIds" /> <!-- <share-tree v-if="showShare" ref="share_tree" :msg-panel-ids="msgPanelIds" />-->
</el-tab-pane> <!-- </el-tab-pane>-->
</el-tabs> </el-tabs>
</de-aside-container> </de-aside-container>
<de-main-container> <de-main-container>

74
frontend/src/views/panel/list/PanelViewShow.vue
Unescape Escape View File

@ -10,46 +10,46 @@
<span v-if="panelInfo.isDefault" style="color: green;font-size: 12px">({{ $t('panel.default_panel_name') }}:{{ panelInfo.defaultPanelName }})</span> <span v-if="panelInfo.isDefault" style="color: green;font-size: 12px">({{ $t('panel.default_panel_name') }}:{{ panelInfo.defaultPanelName }})</span>
<span v-if="panelInfo.sourcePanelName" style="color: green;font-size: 12px">({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }})</span> <span v-if="panelInfo.sourcePanelName" style="color: green;font-size: 12px">({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }})</span>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">-->
<span v-if="hasDataPermission('export',panelInfo.privileges)" style="float: right;margin-right: 10px"> <!-- <span v-if="hasDataPermission('export',panelInfo.privileges)" style="float: right;margin-right: 10px">-->
<el-tooltip :content="$t('panel.save_to_panel')"> <!-- <el-tooltip :content="$t('panel.save_to_panel')">-->
<el-button class="el-icon-folder-checked" size="mini" circle @click="saveToTemplate" /> <!-- <el-button class="el-icon-folder-checked" size="mini" circle @click="saveToTemplate" />-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
<span v-if="hasDataPermission('export',panelInfo.privileges)" style="float: right;margin-right: 10px"> <!-- <span v-if="hasDataPermission('export',panelInfo.privileges)" style="float: right;margin-right: 10px">-->
<el-tooltip :content="$t('panel.export_to_panel')"> <!-- <el-tooltip :content="$t('panel.export_to_panel')">-->
<el-button class="el-icon-download" size="mini" circle @click="downloadToTemplate" /> <!-- <el-button class="el-icon-download" size="mini" circle @click="downloadToTemplate" />-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
<span v-if="hasDataPermission('export',panelInfo.privileges)" style="float: right;margin-right: 10px"> <!-- <span v-if="hasDataPermission('export',panelInfo.privileges)" style="float: right;margin-right: 10px">-->
<el-tooltip :content="$t('panel.export_to_pdf')"> <!-- <el-tooltip :content="$t('panel.export_to_pdf')">-->
<el-button class="el-icon-notebook-2" size="mini" circle @click="downloadAsPDF" /> <!-- <el-button class="el-icon-notebook-2" size="mini" circle @click="downloadAsPDF" />-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
<span style="float: right;margin-right: 10px"> <!-- <span style="float: right;margin-right: 10px">-->
<el-tooltip :content="$t('panel.fullscreen_preview')"> <!-- <el-tooltip :content="$t('panel.fullscreen_preview')">-->
<el-button class="el-icon-view" size="mini" circle @click="clickFullscreen" /> <!-- <el-button class="el-icon-view" size="mini" circle @click="clickFullscreen" />-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
<span style="float: right;margin-right: 10px"> <!-- <span style="float: right;margin-right: 10px">-->
<el-tooltip :content="$t('panel.new_tab_preview')"> <!-- <el-tooltip :content="$t('panel.new_tab_preview')">-->
<el-button class="el-icon-data-analysis" size="mini" circle @click="newTab" /> <!-- <el-button class="el-icon-data-analysis" size="mini" circle @click="newTab" />-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
<span v-if="!hasStar && panelInfo && !isShare" style="float: right;margin-right: 10px"> <!-- <span v-if="!hasStar && panelInfo && !isShare" style="float: right;margin-right: 10px">-->
<el-tooltip :content="$t('panel.store')"> <!-- <el-tooltip :content="$t('panel.store')">-->
<el-button class="el-icon-star-off" size="mini" circle @click="star" /> <!-- <el-button class="el-icon-star-off" size="mini" circle @click="star" />-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
<span v-if="hasStar && panelInfo && !isShare" style="float: right;margin-right: 10px"> <!-- <span v-if="hasStar && panelInfo && !isShare" style="float: right;margin-right: 10px">-->
<el-tooltip :content="$t('commons.cancel')"> <!-- <el-tooltip :content="$t('commons.cancel')">-->
<el-button class="el-icon-star-on" size="mini" circle @click="unstar" /> <!-- <el-button class="el-icon-star-on" size="mini" circle @click="unstar" />-->
</el-tooltip> <!-- </el-tooltip>-->
</span> <!-- </span>-->
</el-col> <!-- </el-col>-->
</div> </div>
</el-row> </el-row>
<!-- 仪表板预览区域--> <!-- 仪表板预览区域-->

4
frontend/src/views/system/datasource/form.vue
Unescape Escape View File

@ -162,12 +162,12 @@ export default {
allTypes: [ allTypes: [
{ name: 'mysql', label: 'MySQL', type: 'jdbc', extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true'}, { name: 'mysql', label: 'MySQL', type: 'jdbc', extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true'},
// { name: 'oracle', label: 'Oracle', type: 'jdbc'}, // { name: 'oracle', label: 'Oracle', type: 'jdbc'},
// { name: 'sqlServer', label: 'SQL Server', type: 'jdbc', extraParams: ''},
// { name: 'pg', label: 'PostgreSQL', type: 'jdbc', extraParams: '' }, // { name: 'pg', label: 'PostgreSQL', type: 'jdbc', extraParams: '' },
// { name: 'es', label: 'Elasticsearch', type: 'es' }, // { name: 'es', label: 'Elasticsearch', type: 'es' },
// { name: 'mariadb', label: 'MariaDB', type: 'jdbc', extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true' },
// { name: 'ds_doris', label: 'Doris', type: 'jdbc', extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true' }, // { name: 'ds_doris', label: 'Doris', type: 'jdbc', extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true' },
// { name: 'ck', label: 'ClickHouse', type: 'jdbc', extraParams: '' } // { name: 'ck', label: 'ClickHouse', type: 'jdbc', extraParams: '' }
{ name: 'mariadb', label: 'MariaDB', type: 'jdbc', extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true' },
{ name: 'sqlServer', label: 'SQL Server', type: 'jdbc', extraParams: ''}
], ],
schemas: [], schemas: [],
canEdit: false, canEdit: false,

Write Preview
Loading…
Cancel
Save