From dc4d88024248018921d8eb033cf3804b6de56712 Mon Sep 17 00:00:00 2001 From: wuguolin Date: Fri, 12 Nov 2021 02:11:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E5=85=B3=E4=BA=8E=E9=80=89?= =?UTF-8?q?=E9=A1=B9=202.=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E4=BF=9D=E7=95=99mysql=203.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/license/DefaultLicenseService.java | 2 +- .../io/dataease/config/Knife4jConfiguration.java | 2 +- .../java/io/dataease/service/AboutService.java | 2 +- .../main/resources/db/migration/V3__init_data.sql | 4 ++-- conf/smartbi.properties | 1 - frontend/public/link.html | 2 +- frontend/public/nolic.html | 2 +- frontend/src/layout/components/Topbar.vue | 8 ++++---- frontend/src/settings.js | 2 +- frontend/src/styles/deicon/iconfont.json | 2 +- frontend/src/views/login/index.vue | 2 +- frontend/src/views/system/about/index.vue | 2 +- frontend/src/views/system/datasource/form.vue | 14 +++++++------- 13 files changed, 22 insertions(+), 23 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java b/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java index c9ab1da..cda873f 100644 --- a/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java +++ b/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java @@ -22,7 +22,7 @@ public class DefaultLicenseService { private static final String LICENSE_ID = "fit2cloud_license"; 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"};*/ public F2CLicenseResponse validateLicense(String product, String licenseKey){ diff --git a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java index d6db1bc..1f623e4 100644 --- a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java +++ b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java @@ -74,7 +74,7 @@ public class Knife4jConfiguration { private ApiInfo apiInfo(){ return null; // return new ApiInfoBuilder() - // .title("Smart BI") + // .title("JingCheng Data") // .description("人人可用的开源数据可视化分析工具") // .termsOfServiceUrl("https://dataease.io") // .contact(new Contact("fit2cloud","https://www.fit2cloud.com/dataease/index.html","dataease@fit2cloud.com")) diff --git a/backend/src/main/java/io/dataease/service/AboutService.java b/backend/src/main/java/io/dataease/service/AboutService.java index 50a785a..eed5dd5 100644 --- a/backend/src/main/java/io/dataease/service/AboutService.java +++ b/backend/src/main/java/io/dataease/service/AboutService.java @@ -19,7 +19,7 @@ import java.util.Optional; @Service public class AboutService { 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 private DefaultLicenseService defaultLicenseService; diff --git a/backend/src/main/resources/db/migration/V3__init_data.sql b/backend/src/main/resources/db/migration/V3__init_data.sql index 896f347..aa73274 100644 --- a/backend/src/main/resources/db/migration/V3__init_data.sql +++ b/backend/src/main/resources/db/migration/V3__init_data.sql @@ -27,8 +27,8 @@ INSERT INTO `sys_menu` VALUES (52, 0, 0, 1, '关于', 'about', 'system/about/ind COMMIT; 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 (2, 1, 'demo', 'demo', '男', NULL, 'demo@fit2cloud.com', '40b8893ea9ebc2d631c4bb42bb1e8996', b'0', 1, NULL, NULL, NULL, 1619086036234, 1622533509697, '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@163.com', '40b8893ea9ebc2d631c4bb42bb1e8996', b'0', 1, NULL, NULL, NULL, 1619086036234, 1622533509697, 'zh_CN'); COMMIT; diff --git a/conf/smartbi.properties b/conf/smartbi.properties index 3257ba1..784dc70 100644 --- a/conf/smartbi.properties +++ b/conf/smartbi.properties @@ -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.username=root spring.datasource.password=123456 diff --git a/frontend/public/link.html b/frontend/public/link.html index caa150d..a32024c 100644 --- a/frontend/public/link.html +++ b/frontend/public/link.html @@ -5,7 +5,7 @@ - Smart BI + JingCheng Data diff --git a/frontend/public/nolic.html b/frontend/public/nolic.html index 32f26f2..94cdb70 100644 --- a/frontend/public/nolic.html +++ b/frontend/public/nolic.html @@ -5,7 +5,7 @@ - Smart BI + JingCheng Data
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index dc9b761..2655dce 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -1,7 +1,7 @@