Merge pull request #1316 from RichardShan/master

Beta8 merge from dev

assembly/src/main/assembly/assembly.xml

@@ -20,7 +20,7 @@
 
 
 <assembly>
-    <id>dist-beta.7</id>
+    <id>dist-beta.8</id>
     <formats>
         <format>zip</format>
     </formats>

bin/davinci.sql

@@ -19,7 +19,7 @@ CREATE TABLE `cron_job`
     `description`     varchar(255) COLLATE utf8_unicode_ci         DEFAULT NULL,
     `exec_log`        text COLLATE utf8_unicode_ci,
     `create_by`       bigint(20)                          NOT NULL,
-    `create_time`     timestamp                           NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `create_time`     timestamp                           NOT NULL DEFAULT CURRENT_TIMESTAMP,
     `update_by`       varchar(20) COLLATE utf8_unicode_ci          DEFAULT NULL,
     `update_time`     timestamp                           NULL     DEFAULT NULL,
     `parent_id`       bigint(20)                                   DEFAULT NULL,
@@ -216,7 +216,7 @@ CREATE TABLE `organization`
     `role_num`             int(20)               DEFAULT '0',
     `allow_create_project` tinyint(1)            DEFAULT '1',
     `member_permission`    smallint(1)  NOT NULL DEFAULT '0',
-    `create_time`          timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `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',
@@ -510,7 +510,7 @@ CREATE TABLE `user`
     `description` varchar(255)          DEFAULT NULL,
     `department`  varchar(255)          DEFAULT NULL,
     `avatar`      varchar(255)          DEFAULT NULL,
-    `create_time` timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `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',

bin/migration/beta8/README.md

@@ -0,0 +1,13 @@
+### 注意！
+
+1. **升级前请务必备份数据！！！, 升级前请务必备份数据！！！, 升级前请务必备份数据！！！**
+2. 本次升级只针对 davinci0.3 beta.7 升级至 beta.8， 其他版本请不要执行！
+3. 已安装 beta.8 及之后版本无须执行此脚本；
+4. 本次升级默认读取 config 下 application.yml 中配置的 davinci 数据源，也可通过参数指定，更多信息请执行 ‘upgrade -help’ 查看；
+5. 升级脚本为二进制文件，不同平台执行相应脚本即可，无须重复执行：
+
+   | 平台 | 对应脚本 |
+   | --- | --- |
+   |Windows | upgrade.exe |
+   |Mac OS  |  upgrade_darwin |
+   |Linux   |  upgrade_linux |

bin/patch/003_beta8.sql

@@ -0,0 +1,10 @@
+ALTER TABLE `cron_job`
+MODIFY COLUMN `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `create_by`;
+
+
+ALTER TABLE `organization`
+MODIFY COLUMN `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `member_permission`;
+
+
+ALTER TABLE `user`
+MODIFY COLUMN `create_time` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `avatar`;

config/application.yml.example

@@ -99,6 +99,7 @@ spring:
     host:
     port:
     username:
+    fromAddress:
     password:
     nickname:
 

config/logback.xml

@@ -29,6 +29,7 @@
     <property name="USER" value="user"/>
 
     <property name="SQL" value="sql"/>
+    <property name="SCHEDULE" value="schedule"/>
     <property name="OPT" value="opt"/>
 
     <property name="LOG_HOME_PATH" value="${DAVINCI3_HOME}/logs"/>
@@ -42,6 +43,9 @@
     <property name="BUSINESS_OPERATION_LOG_PATTERN"
               value="${BUSINESS_OPERATION_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} --- %file:%line : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
+    <property name="BUSINESS_SCHEDULE_LOG_PATTERN"
+              value="${BUSINESS_SCHEDULE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} --- %file:%line : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
     <appender name="SYS_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -95,12 +99,35 @@
     </appender>
 
 
+    <appender name="BUSINESS_SCHEDULE_LOG_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME_PATH}/${USER}/${SCHEDULE}/%d{yyyy-MM-dd}.log</FileNamePattern>
+            <MaxHistory>10</MaxHistory>
+        </rollingPolicy>
+
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>${BUSINESS_SCHEDULE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+
     <logger name="BUSINESS_SQL" additivity="false" level="INFO">
         <appender-ref ref="BUSINESS_SQL_LOG_APPENDER"/>
     </logger>
     <logger name="BUSINESS_OPERATION" additivity="false" level="INFO">
         <appender-ref ref="BUSINESS_OPERATION_LOG_APPENDER"/>
     </logger>
+    <logger name="BUSINESS_SCHEDULE" additivity="false" level="INFO">
+        <appender-ref ref="BUSINESS_SCHEDULE_LOG_APPENDER"/>
+    </logger>
 
 
     <root level="INFO">

davinci-ui/.htaccess.bin

@@ -0,0 +1,52 @@
+<ifModule mod_rewrite.c>
+
+
+  #######################################################################
+  # GENERAL                                                             #
+  #######################################################################
+
+  # Make apache follow sym links to files
+  Options +FollowSymLinks
+  # If somebody opens a folder, hide all files from the resulting folder list
+  IndexIgnore */*
+
+
+  #######################################################################
+  # REWRITING                                                           #
+  #######################################################################
+
+  # Enable rewriting
+  RewriteEngine On
+
+  # If its not HTTPS
+  RewriteCond %{HTTPS} off
+
+  # Comment out the RewriteCond above, and uncomment the RewriteCond below if you're using a load balancer (e.g. CloudFlare) for SSL
+  # RewriteCond %{HTTP:X-Forwarded-Proto} !https
+
+  # Redirect to the same URL with https://, ignoring all further rules if this one is in effect
+  RewriteRule ^(.*) https://%{HTTP_HOST}/$1 [R,L]
+
+  # If we get to here, it means we are on https://
+
+  # If the file with the specified name in the browser doesn't exist
+  RewriteCond %{REQUEST_FILENAME} !-f
+
+  # and the directory with the specified name in the browser doesn't exist
+  RewriteCond %{REQUEST_FILENAME} !-d
+
+  # and we are not opening the root already (otherwise we get a redirect loop)
+  RewriteCond %{REQUEST_FILENAME} !\/$
+
+  # Rewrite all requests to the root
+  RewriteRule ^(.*) /
+
+</ifModule>
+
+<IfModule mod_headers.c>
+  # Do not cache sw.js, required for offline-first updates.
+  <FilesMatch "sw\.js$">
+    Header set Cache-Control "private, no-cache, no-store, proxy-revalidate, no-transform"
+    Header set Pragma "no-cache"
+  </FilesMatch>
+</IfModule>