From 15e3fc0c54376fb2afad5ef9b2b022a46b7ab5fe Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud>
Date: Sat, 20 Feb 2021 10:41:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/application.properties |  4 ++--
 backend/src/main/resources/logback.xml            | 10 +++++-----
 frontend/package.json                             |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 983bcdd3a2..ac1943006c 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -23,7 +23,7 @@ mybatis.configuration.auto-mapping-behavior=full
 mybatis.configuration.default-statement-timeout=25000
 mybatis.configuration.map-underscore-to-camel-case=true
 
-logging.file.path=/opt/metersphere/logs/${spring.application.name}
+logging.file.path=/opt/dataease/logs/${spring.application.name}
 
 # view
 spring.resources.static-locations=classpath:/templates/,classpath:/static/
@@ -42,7 +42,7 @@ spring.messages.basename=i18n/messages
 
 # quartz
 quartz.enabled=true
-quartz.scheduler-name=msServerJob
+quartz.scheduler-name=deServerJob
 # file upload
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
diff --git a/backend/src/main/resources/logback.xml b/backend/src/main/resources/logback.xml
index 0f3cef9423..a7f897c8c8 100644
--- a/backend/src/main/resources/logback.xml
+++ b/backend/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
 	<property resource="application.properties"/>
-	<property file="/opt/metersphere/conf/metersphere.properties"/>
+	<property file="/opt/dataease/conf/dataease.properties"/>
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
 			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
@@ -146,22 +146,22 @@
 		<appender-ref ref="console"/>
 	</root>
 
-	<logger name="io.metersphere" additivity="false">
+	<logger name="io.dataease" additivity="false">
 		<level value="${logger.level:INFO}"/>
 		<appender-ref ref="infoAsyncAppender"/>
 		<appender-ref ref="warnAsyncAppender"/>
 		<appender-ref ref="errorAsyncAppender"/>
 	</logger>
 
-	<logger name="io.metersphere.base.mapper" level="${logger.sql.level}">
+	<logger name="io.dataease.base.mapper" level="${logger.sql.level}">
 		<appender-ref ref="console"/>
 	</logger>
 
-	<logger name="io.metersphere.Application" additivity="false" level="${logger.level:INFO}">
+	<logger name="io.dataease.Application" additivity="false" level="${logger.level:INFO}">
 		<appender-ref ref="infoAsyncAppender"/>
 	</logger>
 
 	<!--	<logger name="com.alibaba.nacos.naming.client.listener" additivity="false" level="ERROR"/>-->
 	<!--	<logger name="org.apache.dubbo" additivity="false" level="ERROR"/>-->
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/frontend/package.json b/frontend/package.json
index f0813079bd..56c59e3a8b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,6 +21,7 @@
     "echarts": "^4.6.0",
     "el-table-infinite-scroll": "^1.0.10",
     "element-ui": "^2.13.0",
+    "fit2cloud-ui": "^0.1.2",
     "generate-schema": "^2.6.0",
     "html2canvas": "^1.0.0-rc.7",
     "js-base64": "^3.4.4",