From 50690b7dce294ffdc8646b08d09d020dcfe58c46 Mon Sep 17 00:00:00 2001 From: wuguolin Date: Fri, 12 Nov 2021 21:33:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97;2.=E9=9A=90=E8=97=8F=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 ++- .../license/DefaultLicenseService.java | 2 +- .../dataease/config/Knife4jConfiguration.java | 2 +- .../io/dataease/service/AboutService.java | 2 +- .../src/main/resources/application.properties | 4 +- dataease-server.iml1 | 12 +++ frontend/public/link.html | 2 +- frontend/public/nolic.html | 2 +- frontend/src/layout/components/Topbar.vue | 2 +- frontend/src/settings.js | 2 +- frontend/src/styles/deicon/iconfont.json | 2 +- frontend/src/views/login/index.vue | 2 +- frontend/src/views/panel/list/PanelList.vue | 52 ++++++------- frontend/src/views/panel/list/PanelMain.vue | 16 ++-- .../src/views/panel/list/PanelViewShow.vue | 74 +++++++++---------- frontend/src/views/system/datasource/form.vue | 4 +- 16 files changed, 106 insertions(+), 85 deletions(-) create mode 100644 dataease-server.iml1 diff --git a/README.md b/README.md index c46b486..4b016d7 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,13 @@ create database smartbi 3.修改/opt/smartbi/conf/smartbi.properties文件 ``` -- 运行起来后，到数据源页面修改默认数据源信息 \ No newline at end of file +- 运行起来后，到数据源页面修改默认数据源信息 + + + +# 20211112 变更 +```aidl +//变更系统管理菜单显示权限 +update sys_menu set hidden=1 where menu_id=40; +update sys_menu set hidden=1 where menu_id=58; +``` 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 cda873f..c22ecf7 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 = "JingCheng Data"; + private static final String product = "Ipsos VIA BIBoard"; /*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 1f623e4..2f3befa 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("JingCheng Data") + // .title("Ipsos VIA BIBoard") // .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 eed5dd5..c76dbb8 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 = "JingCheng Data"; + private static final String product = "Ipsos VIA BIBoard"; @Resource private DefaultLicenseService defaultLicenseService; diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 8b27c36..9b4d413 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -1,6 +1,6 @@ spring.application.name=dataease -server.port=8081 +server.port=19527 # Hikari 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-request-size=500MB # actuator -management.server.port=8083 +management.server.port=19528 management.endpoints.web.exposure.include=* #spring.freemarker.checkTemplateLocation=false #RSA非对称加密参数：私钥 diff --git a/dataease-server.iml1 b/dataease-server.iml1 new file mode 100644 index 0000000..f409c0e --- /dev/null +++ b/dataease-server.iml1 @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/public/link.html b/frontend/public/link.html index a32024c..bf51a33 100644 --- a/frontend/public/link.html +++ b/frontend/public/link.html @@ -5,7 +5,7 @@ - JingCheng Data + Ipsos VIA BIBoard diff --git a/frontend/public/nolic.html b/frontend/public/nolic.html index 94cdb70..aafff59 100644 --- a/frontend/public/nolic.html +++ b/frontend/public/nolic.html @@ -5,7 +5,7 @@ - JingCheng Data + Ipsos VIA BIBoard
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index 2655dce..d3f08d0 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -1,7 +1,7 @@