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

1.删除关于选项 2.删除数据源，只保留mysql 3.修改关键字

Browse Source
master
wuguolin 4 years ago
parent 83348bb59e
commit dc4d880242
13 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File

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 = "Smart BI"; private static final String product = "JingCheng Data";
/*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("Smart BI") // .title("JingCheng Data")
// .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 = "Smart BI"; private static final String product = "JingCheng Data";
@Resource @Resource
private DefaultLicenseService defaultLicenseService; private DefaultLicenseService defaultLicenseService;

4
backend/src/main/resources/db/migration/V3__init_data.sql
Unescape Escape View File

@ -27,8 +27,8 @@ INSERT INTO `sys_menu` VALUES (52, 0, 0, 1, '关于', 'about', 'system/about/ind
COMMIT; COMMIT;
BEGIN; BEGIN;
INSERT INTO `sys_user` VALUES (1, 0, 'admin', '管理员', '男', NULL, 'admin@fit2cloud.com', '40b8893ea9ebc2d631c4bb42bb1e8996', b'1', 1, NULL, NULL, NULL, NULL, 1615184951534, 'zh_CN'); INSERT INTO `sys_user` VALUES (1, 0, 'admin', '管理员', '男', NULL, 'admin@163com', '40b8893ea9ebc2d631c4bb42bb1e8996', b'1', 1, NULL, NULL, NULL, NULL, 1615184951534, 'zh_CN');
INSERT INTO `sys_user` VALUES (2, 1, 'demo', 'demo', '男', NULL, 'demo@fit2cloud.com', '40b8893ea9ebc2d631c4bb42bb1e8996', b'0', 1, NULL, NULL, NULL, 1619086036234, 1622533509697, 'zh_CN'); INSERT INTO `sys_user` VALUES (2, 1, 'demo', 'demo', '男', NULL, 'demo@163.com', '40b8893ea9ebc2d631c4bb42bb1e8996', b'0', 1, NULL, NULL, NULL, 1619086036234, 1622533509697, 'zh_CN');
COMMIT; COMMIT;

1
conf/smartbi.properties
Unescape Escape View File

@ -1,5 +1,4 @@
# 数据库配置 # 数据库配置
、、
spring.datasource.url=jdbc:mysql://localhost:3306/smartbi?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false spring.datasource.url=jdbc:mysql://localhost:3306/smartbi?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=123456

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>Smart BI</title> <title>JingCheng Data</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>Smart BI</title> <title>JingCheng Data</title>
</head> </head>
<body style="height: 100%;"> <body style="height: 100%;">
<div id="nolic"></div> <div id="nolic"></div>

8
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>Smart BI</span> <span>JingCheng Data</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>
@ -54,9 +54,9 @@
<el-dropdown-item>{{ $t('user.change_password') }}</el-dropdown-item> <el-dropdown-item>{{ $t('user.change_password') }}</el-dropdown-item>
</router-link> </router-link>
<router-link to="/about/index"> <!-- <router-link to="/about/index">-->
<el-dropdown-item>{{ $t('commons.about_us') }}</el-dropdown-item> <!-- <el-dropdown-item>{{ $t('commons.about_us') }}</el-dropdown-item>-->
</router-link> <!-- </router-link>-->
<el-dropdown-item divided @click.native="logout"> <el-dropdown-item divided @click.native="logout">
<span style="display:block;">{{ $t('commons.exit_system') }}</span> <span style="display:block;">{{ $t('commons.exit_system') }}</span>
</el-dropdown-item> </el-dropdown-item>

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: 'Smart BI', title: 'JingCheng Data',
/* 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": "Smart BI", "name": "JingCheng Data",
"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 || ' Smart BI') }} {{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || ' JingCheng Data') }}
</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">

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

@ -146,7 +146,7 @@ export default {
}) })
}, },
support() { support() {
const url = 'https://support.fit2cloud.com/' const url = '#'
window.open(url, '_blank') window.open(url, '_blank')
}, },
beforeUpload(file) { beforeUpload(file) {

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

@ -161,13 +161,13 @@ 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: '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: '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: '' }
], ],
schemas: [], schemas: [],
canEdit: false, canEdit: false,

Write Preview
Loading…
Cancel
Save