Merge branch 'dev-1.2.0_k8s' of https://10.30.90.89:39999/luban/dataspherestudio into dev-1.2.0_k8s

Author: 张晨曦

.gitignore

@@ -46,6 +46,7 @@ dss-framework/framework-plugins/dss-framework-release-server/target
 dss-framework/dss-framework-admin/target
 dss-framework/dss-framework-sql-template/target
 dss-framework/dss-framework-dbapi-server/target
+dss-framework/dss-framework-ctyun-service/target
 
 
 # dss-orchestrator

conf/dss-flow-execution-server.properties

@@ -51,5 +51,5 @@ wds.linkis.server.component.exclude.packages=org.apache.linkis.entrance.restful.
 spring.spring.main.allow-bean-definition-overriding=true
 
 wds.linkis.entrance.config.log.path=file:///appcom/tmp/dss/
-wds.linkis.spark.engine.version=3.1.2
+wds.linkis.spark.engine.version=3.0.3
 wds.linkis.hive.engine.version=3.1.2

conf/dss.properties

@@ -28,10 +28,11 @@ wds.dss.esb.appid=
 wds.dss.esb.token=
 
 wds.dss.appconn.scheduler.job.label=dev
-wds.dss.ds.token=c755550dacfd980bca1fc9ec30449b18
+wds.dss.ds.admin.token=c755550dacfd980bca1fc9ec30449b18
 
 
 wds.linkis.reflect.scan.package=org.apache.linkis,com.webank.wedatasphere.dss
 spring.spring.mvc.servlet.path=/api/rest_j/v1
 spring.spring.servlet.multipart.max-file-size=200MB
-spring.spring.servlet.multipart.max-request-size=200MB
+spring.spring.servlet.multipart.max-request-size=200MB
+wds.dss.project.strict.mode=true

db/dss_ddl.sql

@@ -1291,7 +1291,6 @@ alter table dss_orchestrator_version_info  add  context_id varchar(200) DEFAULT
 
 ALTER TABLE dss_onestop_user_favorites  ADD COLUMN `type`  varchar(20) comment '类型,区分收藏和盯一盯';
 
-
 /**
  * 鲁班产品及文档 dss-guide
  */
@@ -1328,6 +1327,17 @@ CREATE TABLE IF NOT EXISTS `dss_guide_content` (
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='用户向导页面内容详情';
 
+DROP TABLE IF EXISTS `dss_download_audit`;
+CREATE TABLE `dss_download_audit`  (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `creator` varchar(255)  COMMENT '创建者',
+  `tenant` varchar(255)  COMMENT '租户',
+	`path` varchar(255)  COMMENT '文件路径',
+	`sql` varchar(3000)  COMMENT '执行sql脚本',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+	 PRIMARY KEY (`id`)
+) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = '文件下载审计';
 
 DROP TABLE IF EXISTS `dss_guide_catalog`;
 CREATE TABLE IF NOT EXISTS `dss_guide_catalog` (