Merge pull request #1244 from scottsut/master

feat: 1.0.0-beta.3 release

Author: scottsut

.gitignore

@@ -1,4 +1,7 @@
+
+# IDE
 .idea
+.DS_Store
 
 /static
 

config/datart.conf

@@ -15,3 +15,13 @@ server.address=0.0.0.0
 datart.address=http://127.0.0.1
 datart.send-mail=false
 datart.webdriver-path=http://127.0.0.1:4444/wd/hub
+datart.user.register=true
+# 注册邮件有效期/小时, 默认48小时
+datart.register.expire-hours=
+# 邀请邮件有效期/小时, 默认48小时
+datart.invite.expire-hours=
+# 租户管理模式：platform-平台(默认)，team-团队
+datart.tenant-management-mode=platform
+# 团队模式初始组织拥有者用户名/密码: 仅团队模式且两者都不为空时重置
+datart.admin.username=
+datart.admin.password=

config/profiles/application-config.yml

@@ -30,6 +30,14 @@ spring:
 #             name: "attributes.name"
 #             avatar: "attributes.avatar"
 
+# ldap config
+
+# ldap:
+#   urls: ldap://{IP}:{PORT}
+#   base: xxx
+#   username: {username}
+#   password: {password}
+
 # mail config
 
 # mail:
@@ -62,19 +70,31 @@ spring:
 server:
   port: ${server.port:8080}
   address: ${server.ip:0.0.0.0}
-  ssl.enabled: false
-  ssl.key-store: keystore.p12 # Absolute path
-  ssl.key-store-password: password
-  ssl.keyStoreType: PKCS12
-  ssl.keyAlias: tomcat
+  ssl:
+    enabled: false
+    key-store: keystore.p12 # Absolute path
+    key-store-password: password
+    keyStoreType: PKCS12
+    keyAlias: tomcat
 
 datart:
   server:
     address: ${datart.address:http://127.0.0.1:8080}
 
+  # 租户管理模式：platform-平台(默认)，team-团队
+  tenant-management-mode: platform
+  # 团队管理员用户名/密码: 仅team模式且两者都不为空时重置
+  admin:
+    username:
+    password:
+
   user:
+    register: true # 是否允许注册
     active:
       send-mail: ${datart.send-mail:false}  # 注册用户时是否需要邮件验证激活
+      expire-hours: ${datart.register.expire-hours:48} # 注册邮件有效期/小时
+    invite:
+      expire-hours: ${datart.invite.expire-hours:48} # 邀请邮件有效期/小时
 
   security:
     token:

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-beta.2</version>
+        <version>1.0.0-beta.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/src/main/java/datart/core/base/consts/AttachmentType.java

@@ -2,8 +2,23 @@
 
 public enum AttachmentType {
 
-    EXCEL,
+    EXCEL(".xlsx"),
 
-    IMAGE
+    IMAGE(".png"),
 
+    PDF(".pdf");
+
+    private String suffix;
+
+    AttachmentType(String suffix) {
+        this.suffix = suffix;
+    }
+
+    public void setSuffix(String suffix) {
+        this.suffix = suffix;
+    }
+
+    public String getSuffix() {
+        return suffix;
+    }
 }

core/src/main/java/datart/core/base/consts/Const.java

@@ -59,8 +59,7 @@ public class Const {
     /**
      * 权限变量
      */
-//    //管理员权限，拥有所有数据的权限
-//    public static final String ALL_PERMISSION = "@ALL_PERMISSION@";
+    public static final String ALL_PERMISSION = "@DATART_ALL_PERMISSION@";
 
     /**
      * Token Key
@@ -101,4 +100,6 @@ public class Const {
 
     public static final String ENCRYPT_FLAG = "_encrypted_";
 
+    public static final String USER_DEFAULT_PSW = "123456";
+
 }

core/src/main/java/datart/core/base/consts/FileOwner.java

@@ -14,7 +14,9 @@ public enum FileOwner {
 
     SCHEDULE("schedule/files/"),
 
-    DOWNLOAD("download/");
+    DOWNLOAD("download/"),
+
+    EXPORT("export/");
 
     private final String path;
 

…a/datart/core/base/consts/ShareType.java …base/consts/ShareAuthenticationMode.javacore/src/main/java/datart/core/base/consts/ShareType.java renamed to core/src/main/java/datart/core/base/consts/ShareAuthenticationMode.java core/src/main/java/datart/core/base/consts/ShareType.java renamed to core/src/main/java/datart/core/base/consts/ShareAuthenticationMode.java

@@ -18,11 +18,12 @@
 
 package datart.core.base.consts;
 
-public enum ShareType {
+public enum ShareAuthenticationMode {
 
-    TOKEN_SHARE,
+    NONE,
 
-    PASSWORD_SHARE,
+    CODE,
+
+    LOGIN
 
-    AUTH_SHARE
 }

core/src/main/java/datart/core/base/consts/SharePermission.java

@@ -0,0 +1,10 @@
+package datart.core.base.consts;
+
+public enum ShareRowPermissionBy {
+
+    // use share creator's permission
+    CREATOR,
+    // use visitor's permission
+    VISITOR
+
+}