Merge branch 'dev-0.3'

dance-show · Oct 29, 2020 · c3518da · c3518da
2 parents 53e77be + 80bb036
commit c3518da
Show file tree

Hide file tree

Showing 1,015 changed files with 49,847 additions and 51,687 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,4 +32,5 @@ userfiles/
 .vscode
 *yarn.lock
 bin/upgrade.go
-bin/upgrade
+bin/upgrade
+.history/
diff --git a/CONTRIBUTING-CH.md b/CONTRIBUTING-CH.md
@@ -24,7 +24,7 @@ Davinci 用户手册文档在 docs/ 目录下，我们使用了 [jekyll](https:/
 ### 分支结构
 Davinci 源码可能会产生一些临时分支，但真正有明确意义的只有以下三个分支：
 
-- dev-0.3: 默认分支，主要开发分支；
+- dev-0.3: 默认分支，主要开发分支，**需要注意，dev-0.3分支代码不保证可用性，请谨慎使用到生产**；
 - master: 最近一次稳定 release 的源码，偶尔会多几次 hotfix 提交；
 - dev-0.2: 0.2 版本源码，目前 0.2 版本已经停止更新，如有 0.2 版本使用者或是需要进行二次开发的用户可以参考此分支。
 
@@ -97,7 +97,6 @@ npm run build
   ├── davinci.sql           # 完整系统数据库脚本（包含所有补丁）
   ├── initdb.bat            # 针对 Windows 环境的初始化数据库批处理脚本
   ├── initdb.sh             # 针对 Linux、Mac 环境的初始化数据库 Shell 脚本
-  ├── phantom.js            # 截图脚本（未来版本将不再使用）
   ├── restart-server.sh     # 针对 Linux、Mac 环境的重启服务脚本
   ├── run.bat               # 针对	Windows 环境的服务启停核心脚本						
   ├── start.bat             # 针对 Windows 环境的服务启动脚本

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>davinci-parent_3.01</artifactId>
+        <artifactId>davinci-parent_0.3.1</artifactId>
         <groupId>edp.davinci</groupId>
         <version>0.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>davinci-assembly_3.0.1</artifactId>
+    <artifactId>davinci-assembly_0.3.1</artifactId>
     <packaging>pom</packaging>
 
     <licenses>
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>edp.davinci</groupId>
-            <artifactId>davinci-server_3.01</artifactId>
+            <artifactId>davinci-server_0.3.1</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml
@@ -58,7 +58,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ${project.parent.basedir}/userfiles
+                ${project.parent.basedir}
             </directory>
             <outputDirectory>userfiles</outputDirectory>
             <excludes>
@@ -67,27 +67,28 @@
         </fileSet>
         <fileSet>
             <directory>
-                ${project.parent.basedir}/logs
+                ${project.parent.basedir}
             </directory>
-            <outputDirectory>logs</outputDirectory>
-            <includes>
-                <include>sys</include>
-                <include>user</include>
-            </includes>
+            <outputDirectory>logs/sys</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}
+            </directory>
+            <outputDirectory>logs/user</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>
                 ${project.parent.basedir}/davinci-ui
             </directory>
             <outputDirectory>davinci-ui</outputDirectory>
         </fileSet>
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--${project.parent.basedir}/swagger-ui-->
-            <!--</directory>-->
-            <!--<outputDirectory>swagger-ui</outputDirectory>-->
-        <!--</fileSet>-->
-
     </fileSets>
 
     <dependencySets>
@@ -99,11 +100,4 @@
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
     </dependencySets>
-
-    <!--<files>
-        <file>
-            <source>${project.parent.basedir}/server/target/davinci-server_2.11-${project.parent.version}-jar-with-dependencies.jar</source>
-            <outputDirectory>plugin</outputDirectory>
-        </file>
-    </files>-->
 </assembly>
diff --git a/bin/davinci.sql b/bin/davinci.sql
@@ -20,7 +20,7 @@ CREATE TABLE `cron_job`
     `exec_log`        text COLLATE utf8_unicode_ci,
     `create_by`       bigint(20)                          NOT NULL,
     `create_time`     timestamp                           NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `update_by`       bigint(20)                                  DEFAULT NULL,
+    `update_by`       bigint(20)                                   DEFAULT NULL,
     `update_time`     timestamp                           NULL     DEFAULT NULL,
     `parent_id`       bigint(20)                                   DEFAULT NULL,
     `full_parent_id`  varchar(255) COLLATE utf8_unicode_ci         DEFAULT NULL,
@@ -158,6 +158,7 @@ DROP TABLE IF EXISTS `mem_dashboard_widget`;
 CREATE TABLE `mem_dashboard_widget`
 (
     `id`           bigint(20) NOT NULL AUTO_INCREMENT,
+    `alias`        varchar(30) NULL,
     `dashboard_id` bigint(20) NOT NULL,
     `widget_Id`    bigint(20)          DEFAULT NULL,
     `x`            int(12)    NOT NULL,
@@ -219,8 +220,8 @@ CREATE TABLE `organization`
     `member_permission`    smallint(1)  NOT NULL DEFAULT '0',
     `create_time`          timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
     `create_by`            bigint(20)   NOT NULL DEFAULT '0',
-    `update_time`          timestamp    NULL     DEFAULT NULL,
-    `update_by`            bigint(20)            DEFAULT '0',
+    `update_time`          timestamp    NULL,
+    `update_by`            bigint(20)            DEFAULT NULL,
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8;
@@ -517,8 +518,8 @@ CREATE TABLE `user`
     `avatar`      varchar(255)          DEFAULT NULL,
     `create_time` timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
     `create_by`   bigint(20)   NOT NULL DEFAULT '0',
-    `update_time` timestamp    NOT NULL DEFAULT '1970-01-01 08:00:01',
-    `update_by`   bigint(20)   NOT NULL DEFAULT '0',
+    `update_time` timestamp    NULL,
+    `update_by`   bigint(20)            DEFAULT NULL,
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8;
@@ -685,3 +686,13 @@ CREATE TABLE `share_download_record` (
 
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+
+INSERT INTO `user` (`id`, `email`, `username`, `password`, `admin`, `active`, `name`, `description`, `department`, `avatar`, `create_time`, `create_by`, `update_by`, `update_time`)
+VALUES (1, 'guest@davinci.cn', 'guest', '$2a$10$RJKb4jhMgRYnGPlVRV036erxQ3oGZ8NnxZrlrrBJJha9376cAuTRO', 1, 1, NULL, NULL, NULL, NULL, '2020-01-01 00:00:00', 0, NULL, NULL);
+
+INSERT INTO `organization` (`id`, `name`, `description`, `avatar`, `user_id`, `project_num`, `member_num`, `role_num`, `allow_create_project`, `member_permission`, `create_time`, `create_by`, `update_time`, `update_by`)
+VALUES (1, 'guest\'s Organization', NULL, NULL, 1, 0, 1, 0, 1, 1, '2020-01-01 00:00:00', 1, NULL, NULL);
+
+INSERT INTO `rel_user_organization` (`id`, `org_id`, `user_id`, `role`, `create_by`, `create_time`, `update_by`, `update_time`)
+VALUES (1, 1, 1, 1, 1, '2020-01-01 00:00:00', NULL, NULL);
diff --git a/bin/patch/005_rc.sql b/bin/patch/005_rc.sql
@@ -0,0 +1,20 @@
+/*
+ * <<
+ *  Davinci
+ *  ==
+ *  Copyright (C) 2016 - 2020 EDP
+ *  ==
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *  >>
+ */
+
+ALTER TABLE `mem_dashboard_widget`
+ADD COLUMN `alias` varchar(30) NULL AFTER `id`;
diff --git a/bin/phantom.js b/bin/phantom.js
diff --git a/config/application.yml.example b/config/application.yml.example
@@ -23,7 +23,7 @@ server:
   servlet:
     context-path: /
 
-  # Userd for mail and download services, can be empty, careful configuration
+  # Used for mail and download services, can be empty, careful configuration
   # By default, 'server.address' and 'server.port' is used as the string value.
   # access:
   #  address:
@@ -38,16 +38,24 @@ jwtToken:
   algorithm: HS512
 
 
-##your datasouce config
+## your datasource config
 source:
-  initial-size: 2
+  initial-size: 1
   min-idle: 1
-  max-wait: 6000
+  max-wait: 30000
   max-active: 10
   break-after-acquire-failure: true
-  connection-error-retry-attempts: 0
-  query-timeout: 600000
-  validationQueryTimeout: 30000
+  connection-error-retry-attempts: 1
+  time-between-eviction-runs-millis: 2000
+  min-evictable-idle-time-millis: 600000
+  max-evictable-idle-time-millis: 900000
+  test-while-idle: true
+  test-on-borrow: false
+  test-on-return: false
+  validation-query: select 1
+  validation-query-timeout: 10
+  keep-alive: false
+  filters: stat
 
   enable-query-log: false
   result-limit: 1000000
@@ -57,17 +65,35 @@ spring:
   mvc:
     async:
       request-timeout: 30s
+  rest:
+    proxy-host:
+    proxy-port:
+    proxy-ignore:
 
-  ## davinci datasouce config
+
+  ## davinci datasource config
   datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
     url: jdbc:mysql://localhost:3306/davinci0.3?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
     username: root
     password: root
     driver-class-name: com.mysql.jdbc.Driver
-    initial-size: 2
+    initial-size: 1
     min-idle: 1
-    max-wait: 60000
+    max-wait: 30000
     max-active: 10
+    break-after-acquire-failure: true
+    connection-error-retry-attempts: 1
+    time-between-eviction-runs-millis: 2000
+    min-evictable-idle-time-millis: 600000
+    max-evictable-idle-time-millis: 900000
+    test-while-idle: true
+    test-on-borrow: false
+    test-on-return: false
+    validation-query: select 1
+    validation-query-timeout: 10
+    keep-alive: false
+    filters: stat
 
   ## redis config
   ## please choose either of the two ways
@@ -119,13 +145,38 @@ spring:
     username:
     password:
     base:
-    domainName:    # domainName 指 企业邮箱后缀，如企业邮箱为：xxx@example.com, 这里值为 '@example.com'
+    domainName:    # domainName 指 企业邮箱后缀，如企业邮箱为：xxx@example.com，这里值为 '@example.com'
+
+  security:
+    oauth2:
+      enable: false
+#      client:
+#        registration:
+#          cas:
+#            provider: cas
+#            client-id: "xxxxx"
+#            client-name: "Sign in with XXX"
+#            client-secret: "xxxxx"
+#            authorization-grant-type: authorization_code
+#            client-authentication-method: post
+#            redirect-uri-template: "{baseUrl}/login/oauth2/code/{registrationId}"
+#            scope: userinfo
+#        provider:
+#          cas:
+#            authorization-uri: https://cas.xxxxx.cn/cas/oauth2.0/authorize
+#            token-uri: https://cas.xxxxx.cn/cas/oauth2.0/accessToken
+#            user-info-uri: https://cas.xxxxx.cn/cas/oauth2.0/profile
+#            user-name-attribute: id
+#            userMapping:
+#              email: "attributes.Email"
+#              name: "attributes.CnName1"
+#              avatar: "attributes.Avatar"
 
 screenshot:
-  default_browser: PHANTOMJS                    # PHANTOMJS or CHROME
+  default_browser: CHROME
   timeout_second: 600
-  phantomjs_path: $your_phantomjs_path$
   chromedriver_path: $your_chromedriver_path$
+  remote_webdriver_url: $your_remote_webdriver_url$
 
 data-auth-center:
   channels:
@@ -151,4 +202,8 @@ statistic:
   kafka.topic:
   java.security.krb5.conf:
   java.security.keytab:
-  java.security.principal:
+  java.security.principal:
+
+encryption:
+  maxEncryptSize: 1024
+  type: Off # Off is to turn off encryption, to enable encryption, please select AES or RSA
diff --git a/config/datasource_driver.yml.example b/config/datasource_driver.yml.example
@@ -40,7 +40,7 @@
 ##     2. add the corresponding dependency file (jar) in lib package,
 ##     3. restart your Davinci server
 ##  In theory, all databases with jdbc drivers are supported,
-##  if you have problems during useing, please with contact us.
+##  if you have problems during using, please with contact us.
 
 ## Configuration is as follows: