feat(web): 适配jdk17

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,11 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="47" name="Java" />
+      </Languages>
+    </inspection_tool>
     <inspection_tool class="HttpUrlsUsage" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
   </profile>
 </component>

.idea/jarRepositories.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="mavenCentral" />
       <option name="name" value="mavenCentral" />

.idea/misc.xml

@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="ProjectType">

gringotts-configuration/pom.xml

@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <artifactId>sa-token-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.retry</groupId>

gringotts-forest/pom.xml

@@ -18,7 +18,7 @@
         </dependency>
         <dependency>
             <groupId>com.dtflys.forest</groupId>
-            <artifactId>forest-spring-boot-starter</artifactId>
+            <artifactId>forest-spring-boot3-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

gringotts-frontend/components/constants.js

@@ -104,7 +104,14 @@ export function inputFileFormItemCommonOptions(accept = '*', maxSize = size5MB)
     }
 }
 
-export function copyField(field, tips = '复制', ignoreLength = 0, extra = undefined) {
+/**
+ * @param {string} field
+ * @param {string} label
+ * @param {string} tips
+ * @param {number} ignoreLength
+ * @param {{}} extra
+ */
+export function copyField(field, label, tips = '复制', ignoreLength = 0, extra = undefined) {
     let tpl = ignoreLength === 0 ? `\${${field}}` : `\${TRUNCATE(${field}, ${ignoreLength})}`
     let content = extra
         ? {
@@ -121,8 +128,10 @@ export function copyField(field, tips = '复制', ignoreLength = 0, extra = unde
             tpl: tpl,
         }
     return {
+        name: field,
         type: 'wrapper',
         size: 'none',
+        className: 'nowrap',
         body: [
             content,
             {
@@ -139,7 +148,68 @@ export function copyField(field, tips = '复制', ignoreLength = 0, extra = unde
     }
 }
 
-export function mappingField(field, mapping) {
+/**
+ * @param {string} label
+ * @param {number} width
+ * @param {Array} buttons
+ */
+export function operationField(label, width = 100, buttons = []) {
+    return {
+        label: label,
+        width: width,
+        type: 'operation',
+        fixed: 'right',
+        className: 'nowrap',
+        buttons: buttons,
+    }
+}
+
+/**
+ * @param {string} field
+ * @param {string} label
+ * @param {number} width
+ */
+export function timeField(field, label, width = 150) {
+    return {
+        label: label,
+        width: width,
+        align: 'center',
+        type: 'tpl',
+        tpl: `\${IF(${field}, DATETOSTR(${field}), '-')}`
+    }
+}
+
+export function stringWrapField(field, label, width = undefined) {
+    return stringField(field, label, width, true)
+}
+
+/**
+ * @param {string} field
+ * @param {string} label
+ * @param {number} width
+ * @param {boolean} wrap
+ */
+export function stringField(field, label, width = undefined, wrap = false) {
+    let data = {
+        name: field,
+        label: label,
+    }
+    if (width) {
+        data['width'] = width
+    }
+    if (wrap) {
+        data['className'] = 'nowrap'
+    }
+    return data
+}
+
+/**
+ * @param {string} field
+ * @param {string} label
+ * @param {[{label: *, value: *, color: string}]} mapping
+ * @param {number} width
+ */
+export function mappingField(field, label, mapping, width = 80) {
     let mapData = {
         '*': `<span class='label bg-gray-300'>\${${field}}</span>`,
     }
@@ -147,8 +217,11 @@ export function mappingField(field, mapping) {
         mapData[item['value']] = `<span class='label ${item['color']}'>${item['label']}</span>`
     })
     return {
+        label: label,
         type: 'mapping',
+        width: width,
         value: `\${${field}}`,
+        align: 'center',
         map: mapData,
     }
 }

gringotts-frontend/components/user/dialog-user-check.js

@@ -16,22 +16,8 @@ const dialogBody = [
     {
         type: 'group',
         body: [
-            {
+            mappingField('role', '角色', userRoleMapping),
-                type: 'control',
+            mappingField('state', '账号状态', userStateMapping),
-                name: 'role',
-                label: '角色',
-                body: [
-                    mappingField('role', userRoleMapping),
-                ]
-            },
-            {
-                type: 'control',
-                name: 'state',
-                label: '账号状态',
-                body: [
-                    mappingField('state', userStateMapping)
-                ]
-            },
         ]
     },
     ...formCreatedUserAndModifiedUser(),

gringotts-frontend/pages/index/tab-check.js

@@ -4,7 +4,10 @@ import {
     checkOverMapping,
     checkTypeMapping,
     crudCommonOptions,
-    mappingField
+    mappingField,
+    operationField,
+    stringField,
+    timeField,
 } from "../../components/constants.js";
 import {permissionDetailDialog} from "../../components/permission/dialog-permission.js";
 
@@ -16,6 +19,7 @@ export function tabCheck() {
         reload: true,
         body: [
             {
+                name: 'check_order_list',
                 type: 'crud',
                 api: apiGet('${base}/check_order/list'),
                 ...crudCommonOptions(),
@@ -23,29 +27,14 @@ export function tabCheck() {
                     'reload',
                 ],
                 columns: [
-                    {
+                    stringField('description', '描述'),
-                        name: 'description',
+                    mappingField('type', '类型', checkTypeMapping),
-                        label: '描述',
+                    mappingField('over', '状态', checkOverMapping),
-                    },
+                    timeField('createdTime', '创建时间'),
-                    {
+                    stringField('createdUsername', '创建人', 100),
-                        label: '类型',
+                    timeField('modifiedTime', '最后修改时间'),
-                        width: 80,
+                    stringField('modifiedUsername', '最后操作人', 100),
-                        align: 'center',
+                    operationField('操作', undefined, [
-                        ...mappingField('type', checkTypeMapping)
-                    },
-                    {
-                        label: '状态',
-                        width: 80,
-                        align: 'center',
-                        ...mappingField('over', checkOverMapping)
-                    },
-                    {
-                        label: '操作',
-                        width: 100,
-                        type: 'operation',
-                        fixed: 'right',
-                        className: 'nowrap',
-                        buttons: [
                         {
                             visibleOn: '${!over}',
                             type: 'action',
@@ -58,21 +47,31 @@ export function tabCheck() {
                                         type: 'action',
                                         label: '同意',
                                         actionType: 'ajax',
-                                            api: apiGet('${base}/check_order/operation/${checkOrderId}/APPLY')
+                                        close: true,
+                                        api: apiGet('${base}/check_order/operation/${checkOrderId}/APPLY'),
+                                        reload: 'check_order_list',
                                     },
                                     {
                                         type: 'action',
                                         label: '拒绝',
                                         actionType: 'ajax',
-                                            api: apiGet('${base}/check_order/operation/${checkOrderId}/REJECT')
+                                        close: true,
-                                        }
+                                        api: apiGet('${base}/check_order/operation/${checkOrderId}/REJECT'),
-                                    ]
+                                        reload: 'check_order_list',
+                                    },
+                                ],
                             ),
                         },
-                        ]
+                        {
-                    }
+                            visibleOn: '${over}',
-                ]
+                            type: 'action',
-            }
+                            label: '查看',
-        ]
+                            level: 'link',
+                            ...permissionDetailDialog('parameters.confirmationId'),
+                        },
+                    ]),
+                ],
+            },
+        ],
     }
 }

gringotts-frontend/pages/index/tab-data.js

@@ -11,6 +11,8 @@ import {
     confirmationStateMapping,
     crudCommonOptions,
     mappingField,
+    operationField,
+    timeField,
     userOnly
 } from "../../components/constants.js";
 
@@ -38,26 +40,9 @@ export function resourceList() {
                 label: '描述',
                 name: 'description',
             },
-            {
+            mappingField('confirmationState', '确权状态', confirmationStateMapping),
-                label: '确权状态',
+            timeField('createdTime', '创建时间'),
-                width: 80,
+            operationField('操作', undefined, [
-                align: 'center',
-                ...mappingField('confirmationState', confirmationStateMapping)
-            },
-            {
-                label: '创建时间',
-                width: 150,
-                align: 'center',
-                type: 'tpl',
-                tpl: "${IF(createdTime, DATETOSTR(createdTime), '-')}"
-            },
-            {
-                label: '操作',
-                width: 100,
-                type: 'operation',
-                fixed: 'right',
-                className: 'nowrap',
-                buttons: [
                 {
                     type: 'action',
                     label: '详情',
@@ -93,8 +78,7 @@ export function resourceList() {
                         },
                     ]
                 },
-                ]
+            ]),
-            },
         ]
     }
 }

gringotts-frontend/pages/index/tab-permissions.js

@@ -3,13 +3,17 @@ import {
     confirmationStateMapping,
     crudCommonOptions,
     mappingField,
+    operationField,
     providerOnly,
-    userOnly
+    stringField,
+    stringWrapField,
+    timeField,
+    userOnly,
 } from "../../components/constants.js";
 import {
     permissionAddDialog,
     permissionDetailDialog,
-    permissionEditeDialog
+    permissionEditeDialog,
 } from "../../components/permission/dialog-permission.js";
 
 export function tabPermissions() {
@@ -40,35 +44,11 @@ export function tabPermissions() {
                             },
                         ],
                         columns: [
-                            {
+                            stringField('name', '名称', 200),
-                                label: '名称',
+                            stringWrapField('description', '描述'),
-                                name: 'name',
+                            mappingField('state', '状态', confirmationStateMapping),
-                                width: 200,
+                            timeField('createdTime', '创建时间'),
-                            },
+                            operationField('操作', undefined, [
-                            {
-                                label: '描述',
-                                name: 'description',
-                            },
-                            {
-                                label: '状态',
-                                width: 80,
-                                align: 'center',
-                                ...mappingField('state', confirmationStateMapping)
-                            },
-                            {
-                                label: '创建时间',
-                                width: 150,
-                                align: 'center',
-                                type: 'tpl',
-                                tpl: "${IF(createdTime, DATETOSTR(createdTime), '-')}"
-                            },
-                            {
-                                label: '操作',
-                                width: 100,
-                                type: 'operation',
-                                fixed: 'right',
-                                className: 'nowrap',
-                                buttons: [
                                 {
                                     type: 'action',
                                     label: '查看',
@@ -103,7 +83,7 @@ export function tabPermissions() {
                                     trigger: 'hover',
                                     buttons: [
                                         {
-                                                disabledOn: "${state === 'CHECKING'}",
+                                            disabledOn: "${state !== 'DRAFT'}",
                                             type: 'action',
                                             label: '编辑',
                                             level: 'link',
@@ -114,14 +94,13 @@ export function tabPermissions() {
                                             type: 'action',
                                             label: "删除",
                                             confirmTitle: '确认删除',
-                                                confirmText: '确认删除名称为「${name}」的确权申请吗？',
+                                            confirmText: '确认删除名称为「${name}」的确权申请吗？删除后对应的数据资源处于未确权状态。',
                                             actionType: 'ajax',
                                             api: apiGet('${base}/confirmation/remove/${id}'),
                                         },
                                     ]
                                 },
-                                ]
+                            ]),
-                            },
                         ]
                     }
                 },

gringotts-frontend/pages/index/tab-user.js

@@ -4,6 +4,8 @@ import {
     copyField,
     crudCommonOptions,
     mappingField,
+    operationField,
+    timeField,
     userRoleMapping,
     userStateMapping
 } from '../../components/constants.js'
@@ -31,49 +33,18 @@ export function tabUser() {
                     },
                 ],
                 columns: [
-                    {
+                    copyField(
-                        name: 'username',
-                        label: '邮箱',
-                        ...copyField(
                         'username',
+                        '邮箱',
                         undefined,
                         undefined,
                         userDetailDialog(),
-                        )
+                    ),
-                    },
+                    mappingField('role', '角色', userRoleMapping, 120),
-                    {
+                    mappingField('state', '账号状态', userStateMapping),
-                        label: '角色',
+                    timeField('createdTime', '创建时间'),
-                        width: 120,
+                    timeField('lastLoginTime', '上次登陆时间'),
-                        align: 'center',
+                    operationField('操作', undefined, [
-                        ...mappingField('role', userRoleMapping)
-                    },
-                    {
-                        label: '账号状态',
-                        width: 80,
-                        align: 'center',
-                        ...mappingField('state', userStateMapping)
-                    },
-                    {
-                        label: '创建时间',
-                        width: 150,
-                        align: 'center',
-                        type: 'tpl',
-                        tpl: "${IF(createdTime, DATETOSTR(createdTime), '-')}"
-                    },
-                    {
-                        label: '上次登陆时间',
-                        width: 150,
-                        align: 'center',
-                        type: 'tpl',
-                        tpl: "${IF(lastLoginTime, DATETOSTR(lastLoginTime), '-')}"
-                    },
-                    {
-                        label: '操作',
-                        width: 100,
-                        type: 'operation',
-                        fixed: 'right',
-                        className: 'nowrap',
-                        buttons: [
                         {
                             visibleOn: "${state === 'CHECKING'}",
                             label: '审核',
@@ -104,8 +75,7 @@ export function tabUser() {
                             actionType: 'ajax',
                             api: apiGet('${base}/user_management/enable/${username}'),
                         }
-                        ]
+                    ]),
-                    },
                 ]
             }
         ]

gringotts-web/pom.xml

@@ -19,6 +19,12 @@
         <dependency>
             <groupId>com.eshore</groupId>
             <artifactId>gringotts-forest</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/entity/Authentication.java

@@ -1,26 +1,23 @@
 package com.eshore.gringotts.web.domain.authentication.entity;
 
 import com.eshore.gringotts.core.Constants;
-import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
+import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
 import com.eshore.gringotts.web.domain.resource.entity.DataResource;
 import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedAttributeNode;
+import jakarta.persistence.NamedEntityGraph;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -50,43 +47,12 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
         @NamedAttributeNode(value = "createdUser"),
         @NamedAttributeNode(value = "modifiedUser"),
 })
-public class Authentication extends SimpleEntity {
+public class Authentication extends CheckingNeededEntity {
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private DataResource target;
-    private String description;
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @ToString.Exclude
     private Set<DataFile> evidences;
-    @Column(nullable = false)
-    @Enumerated(EnumType.STRING)
-    private State state = State.DRAFT;
-
-    public enum State {
-        /**
-         * 无确权
-         */
-        NONE,
-        /**
-         * 草稿
-         */
-        DRAFT,
-        /**
-         * 属主审查中
-         */
-        OWNER_CHECKING,
-        /**
-         * 审查中
-         */
-        CHECKING,
-        /**
-         * 正常
-         */
-        NORMAL,
-        /**
-         * 驳回
-         */
-        REJECT,
-    }
 }

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/CheckingNeededEntity.java

@@ -0,0 +1,47 @@
+package com.eshore.gringotts.web.domain.base.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@Getter
+@Setter
+@ToString
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public class CheckingNeededEntity extends LogicDeleteEntity {
+    private String description;
+
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private State state = State.DRAFT;
+
+    public enum State {
+        /**
+         * 无确权
+         */
+        NONE,
+        /**
+         * 草稿
+         */
+        DRAFT,
+        /**
+         * 审查中
+         */
+        CHECKING,
+        /**
+         * 正常
+         */
+        NORMAL,
+        /**
+         * 驳回
+         */
+        REJECT,
+    }
+}

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/DatetimeOnlyEntity.java

@@ -1,29 +0,0 @@
-package com.eshore.gringotts.web.domain.base.entity;
-
-import java.time.LocalDateTime;
-import javax.persistence.EntityListeners;
-import javax.persistence.MappedSuperclass;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-/**
- * 实体类公共字段
- *
- * @author lanyuanxiaoyao
- * @date 2024-11-20
- */
-@Getter
-@Setter
-@ToString
-@MappedSuperclass
-@EntityListeners(AuditingEntityListener.class)
-public class DatetimeOnlyEntity extends IdOnlyEntity {
-    @CreatedDate
-    private LocalDateTime createdTime;
-    @LastModifiedDate
-    private LocalDateTime modifiedTime;
-}

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/IdOnlyEntity.java

@@ -1,9 +1,9 @@
 package com.eshore.gringotts.web.domain.base.entity;
 
-import javax.persistence.EntityListeners;
+import jakarta.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.MappedSuperclass;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/LogicDeleteEntity.java

@@ -0,0 +1,27 @@
+package com.eshore.gringotts.web.domain.base.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.annotations.SoftDelete;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+/**
+ * 实体类公共字段
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-11-20
+ */
+@Getter
+@Setter
+@ToString(callSuper = true)
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+@SoftDelete(columnName = "delete")
+public class LogicDeleteEntity extends SimpleEntity {
+    @Column(nullable = false)
+    private Boolean deleted = false;
+}

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/LogicDeleteIdOnlyEntity.java

@@ -0,0 +1,27 @@
+package com.eshore.gringotts.web.domain.base.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.annotations.SoftDelete;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+/**
+ * 实体类公共字段
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-11-20
+ */
+@Getter
+@Setter
+@ToString(callSuper = true)
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+@SoftDelete(columnName = "delete")
+public class LogicDeleteIdOnlyEntity extends IdOnlyEntity {
+    @Column(nullable = false)
+    private Boolean deleted = false;
+}

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/SimpleEntity.java

@@ -1,14 +1,14 @@
 package com.eshore.gringotts.web.domain.base.entity;
 
 import com.eshore.gringotts.web.domain.user.entity.User;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.OneToOne;
 import java.time.LocalDateTime;
-import javax.persistence.ConstraintMode;
-import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToOne;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/LogicDeleteService.java

@@ -0,0 +1,50 @@
+package com.eshore.gringotts.web.domain.base.service;
+
+import cn.hutool.core.util.ClassUtil;
+import cn.hutool.core.util.StrUtil;
+import com.eshore.gringotts.web.domain.base.entity.LogicDeleteEntity;
+import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
+import com.eshore.gringotts.web.domain.user.service.UserService;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.transaction.Transactional;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.list.ImmutableList;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-21
+ */
+@Slf4j
+public abstract class LogicDeleteService<ENTITY extends LogicDeleteEntity> extends SimpleServiceSupport<ENTITY> {
+    private final EntityManager manager;
+
+    public LogicDeleteService(SimpleRepository<ENTITY, Long> repository, UserService userService, EntityManager manager) {
+        super(repository, userService);
+        this.manager = manager;
+    }
+
+    @Override
+    protected ImmutableList<Predicate> extraListPredicates(Root<ENTITY> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+        return Lists.immutable.of(builder.equal(root.get("deleted"), false));
+    }
+
+    @Override
+    protected ImmutableList<Predicate> extraDetailPredicates(Root<ENTITY> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+        return Lists.immutable.of(builder.equal(root.get("deleted"), false));
+    }
+
+    @Transactional(rollbackOn = Throwable.class)
+    @Override
+    public void remove(Long id) {
+        String entityName = ClassUtil.getTypeArgument(this.getClass()).getSimpleName();
+        Query query = manager.createQuery(StrUtil.format("update {} entity set deleted=true where id=?1", entityName));
+        query.setParameter(1, id);
+        query.executeUpdate();
+    }
+}

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/SimpleServiceSupport.java

@@ -8,9 +8,12 @@ import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
 import com.eshore.gringotts.web.domain.user.entity.User;
 import com.eshore.gringotts.web.domain.user.service.UserService;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.transaction.Transactional;
 import java.util.Optional;
-import javax.persistence.criteria.Predicate;
-import javax.transaction.Transactional;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.ImmutableList;
@@ -24,8 +27,8 @@ import org.springframework.data.domain.Sort;
  */
 @Slf4j
 public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implements SimpleService<ENTITY> {
-    private final SimpleRepository<ENTITY, Long> repository;
+    protected final SimpleRepository<ENTITY, Long> repository;
-    private final UserService userService;
+    protected final UserService userService;
 
     public SimpleServiceSupport(SimpleRepository<ENTITY, Long> repository, UserService userService) {
         this.repository = repository;
@@ -64,6 +67,7 @@ public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implemen
                     if (User.isNotAdministrator(user)) {
                         predicates.add(builder.equal(root.get("createdUser"), user));
                     }
+                    predicates.addAllIterable(extraListPredicates(root, query, builder));
                     return builder.and(predicates.toArray(new Predicate[predicates.size()]));
                 },
                 Sort.by("createdTime").descending()
@@ -81,12 +85,17 @@ public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implemen
                     if (User.isNotAdministrator(user)) {
                         predicates.add(builder.equal(root.get("createdUser"), user));
                     }
+                    predicates.addAllIterable(extraListPredicates(root, query, builder));
                     return builder.and(predicates.toArray(new Predicate[predicates.size()]));
                 },
                 Sort.by("createdTime").descending()
         ));
     }
 
+    protected ImmutableList<Predicate> extraListPredicates(Root<ENTITY> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+        return Lists.immutable.empty();
+    }
+
     @Override
     public Optional<ENTITY> detailOptional(Long id) {
         if (ObjectUtil.isNull(id)) {
@@ -101,11 +110,16 @@ public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implemen
                     if (User.isNotAdministrator(user)) {
                         predicates.add(builder.equal(root.get("createdUser"), user));
                     }
+                    predicates.addAllIterable(extraDetailPredicates(root, query, builder));
                     return builder.and(predicates.toArray(new Predicate[predicates.size()]));
                 }
         );
     }
 
+    protected ImmutableList<Predicate> extraDetailPredicates(Root<ENTITY> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+        return Lists.immutable.empty();
+    }
+
     @Override
     public ENTITY detail(Long id) {
         return detailOrNull(id);

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckOrderController.java

@@ -7,6 +7,7 @@ import com.eshore.gringotts.web.domain.check.service.CheckOrderService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -27,18 +28,18 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("check_order")
-public class CheckController implements ListController<CheckController.ListItem> {
+public class CheckOrderController implements ListController<CheckOrderController.ListItem> {
     private final CheckOrderService checkOrderService;
     private final ObjectMapper mapper;
 
-    public CheckController(CheckOrderService checkOrderService, Jackson2ObjectMapperBuilder builder) {
+    public CheckOrderController(CheckOrderService checkOrderService, Jackson2ObjectMapperBuilder builder) {
         this.checkOrderService = checkOrderService;
         this.mapper = builder.build();
     }
 
     @GetMapping("/list")
     @Override
-    public AmisResponse<ImmutableList<CheckController.ListItem>> list() throws Exception {
+    public AmisResponse<ImmutableList<CheckOrderController.ListItem>> list() throws Exception {
         return AmisResponse.responseSuccess(checkOrderService.list().collect(this::toListItem));
     }
 
@@ -50,6 +51,10 @@ public class CheckController implements ListController<CheckController.ListItem>
         item.setType(order.getType());
         item.setParameters(mapper.readValue(order.getParameters(), new TypeReference<>() {}));
         item.setOver(order.getOver());
+        item.setCreatedUsername(order.getCreatedUser().getUsername());
+        item.setCreatedTime(order.getCreatedTime());
+        item.setModifiedUsername(order.getModifiedUser().getUsername());
+        item.setModifiedTime(order.getModifiedTime());
         return item;
     }
 
@@ -67,5 +72,9 @@ public class CheckController implements ListController<CheckController.ListItem>
         private CheckOrder.Type type;
         private ImmutableMap<String, Object> parameters;
         private Boolean over;
+        private LocalDateTime createdTime;
+        private String createdUsername;
+        private LocalDateTime modifiedTime;
+        private String modifiedUsername;
     }
 }

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java

@@ -3,19 +3,19 @@ package com.eshore.gringotts.web.domain.check.entity;
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
 import com.eshore.gringotts.web.domain.user.entity.User;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.ConstraintMode;
+import jakarta.persistence.ConstraintMode;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.EntityListeners;
+import jakarta.persistence.EntityListeners;
-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
-import javax.persistence.Enumerated;
+import jakarta.persistence.Enumerated;
-import javax.persistence.FetchType;
+import jakarta.persistence.FetchType;
-import javax.persistence.ForeignKey;
+import jakarta.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.JoinColumn;
-import javax.persistence.NamedAttributeNode;
+import jakarta.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
+import jakarta.persistence.NamedEntityGraph;
-import javax.persistence.OneToOne;
+import jakarta.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -36,6 +36,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @Table(name = Constants.TABLE_PREFIX + "check_order")
 @NamedEntityGraph(name = "check_order.list", attributeNodes = {
         @NamedAttributeNode(value = "createdUser"),
+        @NamedAttributeNode(value = "modifiedUser"),
 })
 @NamedEntityGraph(name = "check_order.detail", attributeNodes = {
         @NamedAttributeNode(value = "createdUser"),
@@ -44,7 +45,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @NoArgsConstructor
 public class CheckOrder extends SimpleEntity {
     @Column(nullable = false)
-    private String key;
+    private String keyword;
     @Column(nullable = false)
     private String description;
     @Column(nullable = false)
@@ -72,14 +73,14 @@ public class CheckOrder extends SimpleEntity {
     private Boolean over = false;
 
     public CheckOrder(
-            String key,
+            String keyword,
             String description,
             Type type,
             String parameters,
             String targetClass,
             User targetUser
     ) {
-        this.key = key;
+        this.keyword = keyword;
         this.description = description;
         this.type = type;
         this.parameters = parameters;
@@ -89,14 +90,14 @@ public class CheckOrder extends SimpleEntity {
     }
 
     public CheckOrder(
-            String key,
+            String keyword,
             String description,
             Type type,
             String parameters,
             String targetClass,
             User.Role targetRole
     ) {
-        this.key = key;
+        this.keyword = keyword;
         this.description = description;
         this.type = type;
         this.parameters = parameters;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/repository/CheckOrderRepository.java

@@ -3,9 +3,9 @@ package com.eshore.gringotts.web.domain.check.repository;
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
 import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
 import com.eshore.gringotts.web.domain.user.entity.User;
+import jakarta.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
-import javax.transaction.Transactional;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/entity/Confirmation.java

@@ -1,26 +1,23 @@
 package com.eshore.gringotts.web.domain.confirmation.entity;
 
 import com.eshore.gringotts.core.Constants;
-import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
+import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
 import com.eshore.gringotts.web.domain.resource.entity.DataResource;
 import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.NamedAttributeNode;
+import jakarta.persistence.NamedEntityGraph;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -50,39 +47,12 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
         @NamedAttributeNode(value = "createdUser"),
         @NamedAttributeNode(value = "modifiedUser"),
 })
-public class Confirmation extends SimpleEntity {
+public class Confirmation extends CheckingNeededEntity {
     @OneToOne(fetch = FetchType.EAGER)
     @JoinColumn(nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private DataResource target;
-    private String description;
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     @JoinTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @ToString.Exclude
     private Set<DataFile> evidences;
-    @Column(nullable = false)
-    @Enumerated(EnumType.STRING)
-    private State state = State.DRAFT;
-
-    public enum State {
-        /**
-         * 无确权
-         */
-        NONE,
-        /**
-         * 草稿
-         */
-        DRAFT,
-        /**
-         * 审查中
-         */
-        CHECKING,
-        /**
-         * 正常
-         */
-        NORMAL,
-        /**
-         * 驳回
-         */
-        REJECT,
-    }
 }

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/repository/ConfirmationRepository.java

@@ -3,9 +3,9 @@ package com.eshore.gringotts.web.domain.confirmation.repository;
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
 import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
 import com.eshore.gringotts.web.domain.user.entity.User;
+import jakarta.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
-import javax.transaction.Transactional;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java

@@ -12,7 +12,7 @@ import com.eshore.gringotts.web.domain.user.entity.User;
 import com.eshore.gringotts.web.domain.user.service.UserService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.collections.api.factory.Maps;
 import org.eclipse.collections.api.map.ImmutableMap;
@@ -69,7 +69,7 @@ public class ConfirmationService extends SimpleServiceSupport<Confirmation> impl
 
     @Override
     public void onChecked(CheckOrder order, CheckOrder.Operation operation, ImmutableMap<String, Object> parameters) {
-        if (StrUtil.equals(order.getKey(), "confirmation_check")) {
+        if (StrUtil.equals(order.getKeyword(), "confirmation_check")) {
             Long id = (Long) parameters.get("confirmationId");
             switch (operation) {
                 case APPLY:

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/DataResource.java

@@ -2,25 +2,25 @@ package com.eshore.gringotts.web.domain.resource.entity;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.authentication.entity.Authentication;
-import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
+import com.eshore.gringotts.web.domain.base.entity.LogicDeleteEntity;
 import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
 import com.eshore.gringotts.web.domain.resource.entity.format.ResourceFormat;
 import com.eshore.gringotts.web.domain.resource.entity.type.ResourceType;
 import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedAttributeNode;
+import jakarta.persistence.NamedEntityGraph;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -48,19 +48,19 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
         @NamedAttributeNode(value = "createdUser"),
         @NamedAttributeNode(value = "modifiedUser"),
 })
-public class DataResource extends SimpleEntity {
+public class DataResource extends LogicDeleteEntity {
     @Column(nullable = false)
     private String name;
     private String description;
-    @OneToOne(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY)
+    @OneToOne(cascade = CascadeType.REMOVE)
     @JoinColumn(nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @ToString.Exclude
     private ResourceType type;
-    @OneToOne(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY)
+    @OneToOne(cascade = CascadeType.REMOVE)
     @JoinColumn(nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @ToString.Exclude
     private ResourceFormat format;
-    @OneToOne(fetch = FetchType.LAZY)
+    @OneToOne(cascade = CascadeType.REMOVE)
     @JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @ToString.Exclude
     private DataFile example;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/CsvResourceFormat.java

@@ -1,7 +1,7 @@
 package com.eshore.gringotts.web.domain.resource.entity.format;
 
-import javax.persistence.DiscriminatorValue;
+import jakarta.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/JsonLineResourceFormat.java

@@ -1,7 +1,7 @@
 package com.eshore.gringotts.web.domain.resource.entity.format;
 
-import javax.persistence.DiscriminatorValue;
+import jakarta.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/JsonResourceFormat.java

@@ -1,7 +1,7 @@
 package com.eshore.gringotts.web.domain.resource.entity.format;
 
-import javax.persistence.DiscriminatorValue;
+import jakarta.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/LineResourceFormat.java

@@ -1,7 +1,7 @@
 package com.eshore.gringotts.web.domain.resource.entity.format;
 
-import javax.persistence.DiscriminatorValue;
+import jakarta.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/NoneResourceFormat.java

@@ -1,7 +1,7 @@
 package com.eshore.gringotts.web.domain.resource.entity.format;
 
-import javax.persistence.DiscriminatorValue;
+import jakarta.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/ResourceFormat.java

@@ -1,13 +1,11 @@
 package com.eshore.gringotts.web.domain.resource.entity.format;
 
 import com.eshore.gringotts.core.Constants;
-import com.eshore.gringotts.web.domain.base.entity.IdOnlyEntity;
+import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
-import javax.persistence.DiscriminatorColumn;
+import jakarta.persistence.Entity;
-import javax.persistence.DiscriminatorType;
+import jakarta.persistence.Inheritance;
-import javax.persistence.Entity;
+import jakarta.persistence.InheritanceType;
-import javax.persistence.Inheritance;
+import jakarta.persistence.Table;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -24,8 +22,7 @@ import lombok.ToString;
 @Entity
 @Table(name = Constants.TABLE_PREFIX + "resource_format")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING)
+public abstract class ResourceFormat extends LogicDeleteIdOnlyEntity {
-public abstract class ResourceFormat extends IdOnlyEntity {
     public enum Type {
         NONE,
         LINE,

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/ApiResourceType.java

@@ -1,9 +1,9 @@
 package com.eshore.gringotts.web.domain.resource.entity.type;
 
 import com.eshore.gringotts.core.Constants;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/DatabaseResourceType.java

@@ -1,11 +1,11 @@
 package com.eshore.gringotts.web.domain.resource.entity.type;
 
 import com.eshore.gringotts.core.Constants;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
-import javax.persistence.Enumerated;
+import jakarta.persistence.Enumerated;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/FileResourceType.java

@@ -2,14 +2,12 @@ package com.eshore.gringotts.web.domain.resource.entity.type;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.upload.entity.DataFile;
-import javax.persistence.ConstraintMode;
+import jakarta.persistence.ConstraintMode;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.ForeignKey;
+import jakarta.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.JoinColumn;
-import javax.persistence.NamedAttributeNode;
+import jakarta.persistence.OneToOne;
-import javax.persistence.NamedEntityGraph;
+import jakarta.persistence.Table;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -23,9 +21,6 @@ import lombok.ToString;
 @NoArgsConstructor
 @Entity
 @Table(name = Constants.TABLE_PREFIX + "resource_type_file")
-@NamedEntityGraph(name = "file_resource_type.detail", attributeNodes = {
-        @NamedAttributeNode(value = "file")
-})
 public class FileResourceType extends ResourceType {
     @OneToOne
     @JoinColumn(nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/FtpResourceType.java

@@ -1,9 +1,9 @@
 package com.eshore.gringotts.web.domain.resource.entity.type;
 
 import com.eshore.gringotts.core.Constants;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/HDFSResourceType.java

@@ -2,14 +2,12 @@ package com.eshore.gringotts.web.domain.resource.entity.type;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.upload.entity.DataFile;
-import javax.persistence.ConstraintMode;
+import jakarta.persistence.ConstraintMode;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.ForeignKey;
+import jakarta.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.JoinColumn;
-import javax.persistence.NamedAttributeNode;
+import jakarta.persistence.OneToOne;
-import javax.persistence.NamedEntityGraph;
+import jakarta.persistence.Table;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -23,10 +21,6 @@ import lombok.ToString;
 @NoArgsConstructor
 @Entity
 @Table(name = Constants.TABLE_PREFIX + "resource_type_hdfs")
-@NamedEntityGraph(name = "hdfs_resource_type.detail", attributeNodes = {
-        @NamedAttributeNode(value = "coreSite"),
-        @NamedAttributeNode(value = "hdfsSite"),
-})
 public class HDFSResourceType extends ResourceType {
     @OneToOne
     @JoinColumn(nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/ResourceType.java

@@ -1,11 +1,11 @@
 package com.eshore.gringotts.web.domain.resource.entity.type;
 
 import com.eshore.gringotts.core.Constants;
-import com.eshore.gringotts.web.domain.base.entity.IdOnlyEntity;
+import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Inheritance;
+import jakarta.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+import jakarta.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -21,8 +21,8 @@ import lombok.ToString;
 @ToString
 @Entity
 @Table(name = Constants.TABLE_PREFIX + "resource_type")
-@Inheritance(strategy = InheritanceType.JOINED)
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-public abstract class ResourceType extends IdOnlyEntity {
+public abstract class ResourceType extends LogicDeleteIdOnlyEntity {
     public abstract Type getResourceType();
 
     public enum Type {

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/entity/DataFile.java

@@ -1,9 +1,9 @@
 package com.eshore.gringotts.web.domain.upload.entity;
 
 import com.eshore.gringotts.core.Constants;
-import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
+import com.eshore.gringotts.web.domain.base.entity.LogicDeleteEntity;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -21,7 +21,7 @@ import org.hibernate.annotations.DynamicUpdate;
 @Entity
 @DynamicUpdate
 @Table(name = Constants.TABLE_PREFIX + "data_file")
-public class DataFile extends SimpleEntity {
+public class DataFile extends LogicDeleteEntity {
     private String filename;
     private Long size;
     private String md5;

gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/entity/User.java

@@ -2,19 +2,19 @@ package com.eshore.gringotts.web.domain.user.entity;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedAttributeNode;
+import jakarta.persistence.NamedEntityGraph;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.time.LocalDateTime;
-import javax.persistence.Column;
-import javax.persistence.ConstraintMode;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

pom.xml

@@ -19,12 +19,12 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-boot.version>2.6.15</spring-boot.version>
+        <spring-boot.version>3.2.1</spring-boot.version>
-        <spring-cloud.version>2021.0.9</spring-cloud.version>
+        <spring-cloud.version>2023.0.4</spring-cloud.version>
 
         <hutool.version>5.8.32</hutool.version>
         <fisco.sdk.version>2.10.0</fisco.sdk.version>
@@ -75,7 +75,7 @@
             </dependency>
             <dependency>
                 <groupId>com.dtflys.forest</groupId>
-                <artifactId>forest-spring-boot-starter</artifactId>
+                <artifactId>forest-spring-boot3-starter</artifactId>
                 <version>1.5.36</version>
             </dependency>
             <dependency>
@@ -95,13 +95,13 @@
             </dependency>
             <dependency>
                 <groupId>cn.dev33</groupId>
-                <artifactId>sa-token-spring-boot-starter</artifactId>
+                <artifactId>sa-token-spring-boot3-starter</artifactId>
                 <version>1.39.0</version>
             </dependency>
             <dependency>
                 <groupId>com.blinkfox</groupId>
                 <artifactId>fenix-spring-boot-starter</artifactId>
-                <version>2.7.0</version>
+                <version>3.0.0</version>
             </dependency>
 
             <!-- Others -->