data/sql/twelvet_seata.sql

@@ -4,21 +4,25 @@
 -- Table structure for branch_table
 -- ----------------------------
 DROP TABLE IF EXISTS `branch_table`;
-CREATE TABLE `branch_table`  (
-  `branch_id` bigint(20) NOT NULL,
-  `xid` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `transaction_id` bigint(20) NULL DEFAULT NULL,
-  `resource_group_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `resource_id` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `branch_type` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `status` tinyint(4) NULL DEFAULT NULL,
-  `client_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `application_data` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `gmt_create` datetime(6) NULL DEFAULT NULL,
-  `gmt_modified` datetime(6) NULL DEFAULT NULL,
-  PRIMARY KEY (`branch_id`) USING BTREE,
-  INDEX `idx_xid`(`xid`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+CREATE TABLE `branch_table`
+(
+    `branch_id`         bigint(20)                                                     NOT NULL,
+    `xid`               varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL,
+    `transaction_id`    bigint(20)                                                     NULL DEFAULT NULL,
+    `resource_group_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci   NULL DEFAULT NULL,
+    `resource_id`       varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL,
+    `branch_type`       varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci    NULL DEFAULT NULL,
+    `status`            tinyint(4)                                                     NULL DEFAULT NULL,
+    `client_id`         varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci   NULL DEFAULT NULL,
+    `application_data`  varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+    `gmt_create`        datetime(6)                                                    NULL DEFAULT NULL,
+    `gmt_modified`      datetime(6)                                                    NULL DEFAULT NULL,
+    PRIMARY KEY (`branch_id`) USING BTREE,
+    INDEX `idx_xid` (`xid`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_general_ci
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of branch_table
@@ -28,22 +32,26 @@ CREATE TABLE `branch_table`  (
 -- Table structure for global_table
 -- ----------------------------
 DROP TABLE IF EXISTS `global_table`;
-CREATE TABLE `global_table`  (
-  `xid` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `transaction_id` bigint(20) NULL DEFAULT NULL,
-  `status` tinyint(4) NOT NULL,
-  `application_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `transaction_service_group` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `transaction_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `timeout` int(11) NULL DEFAULT NULL,
-  `begin_time` bigint(20) NULL DEFAULT NULL,
-  `application_data` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `gmt_create` datetime(0) NULL DEFAULT NULL,
-  `gmt_modified` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`xid`) USING BTREE,
-  INDEX `idx_gmt_modified_status`(`gmt_modified`, `status`) USING BTREE,
-  INDEX `idx_transaction_id`(`transaction_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+CREATE TABLE `global_table`
+(
+    `xid`                       varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL,
+    `transaction_id`            bigint(20)                                                     NULL DEFAULT NULL,
+    `status`                    tinyint(4)                                                     NOT NULL,
+    `application_id`            varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci   NULL DEFAULT NULL,
+    `transaction_service_group` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci   NULL DEFAULT NULL,
+    `transaction_name`          varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL,
+    `timeout`                   int(11)                                                        NULL DEFAULT NULL,
+    `begin_time`                bigint(20)                                                     NULL DEFAULT NULL,
+    `application_data`          varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+    `gmt_create`                datetime(0)                                                    NULL DEFAULT NULL,
+    `gmt_modified`              datetime(0)                                                    NULL DEFAULT NULL,
+    PRIMARY KEY (`xid`) USING BTREE,
+    INDEX `idx_gmt_modified_status` (`gmt_modified`, `status`) USING BTREE,
+    INDEX `idx_transaction_id` (`transaction_id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_general_ci
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of global_table
@@ -53,19 +61,23 @@ CREATE TABLE `global_table`  (
 -- Table structure for lock_table
 -- ----------------------------
 DROP TABLE IF EXISTS `lock_table`;
-CREATE TABLE `lock_table`  (
-  `row_key` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `xid` varchar(96) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `transaction_id` bigint(20) NULL DEFAULT NULL,
-  `branch_id` bigint(20) NOT NULL,
-  `resource_id` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `table_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `pk` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `gmt_create` datetime(0) NULL DEFAULT NULL,
-  `gmt_modified` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`row_key`) USING BTREE,
-  INDEX `idx_branch_id`(`branch_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+CREATE TABLE `lock_table`
+(
+    `row_key`        varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `xid`            varchar(96) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL,
+    `transaction_id` bigint(20)                                                    NULL DEFAULT NULL,
+    `branch_id`      bigint(20)                                                    NOT NULL,
+    `resource_id`    varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+    `table_name`     varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL,
+    `pk`             varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL,
+    `gmt_create`     datetime(0)                                                   NULL DEFAULT NULL,
+    `gmt_modified`   datetime(0)                                                   NULL DEFAULT NULL,
+    PRIMARY KEY (`row_key`) USING BTREE,
+    INDEX `idx_branch_id` (`branch_id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_general_ci
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of lock_table
@@ -75,19 +87,24 @@ CREATE TABLE `lock_table`  (
 -- Table structure for undo_log
 -- ----------------------------
 DROP TABLE IF EXISTS `undo_log`;
-CREATE TABLE `undo_log`  (
-  `branch_id` bigint(20) NOT NULL COMMENT 'branch transaction id',
-  `xid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'global transaction id',
-  `context` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'undo_log context,such as serialization',
-  `rollback_info` longblob NOT NULL COMMENT 'rollback info',
-  `log_status` int(11) NOT NULL COMMENT '0:normal status,1:defense status',
-  `log_created` datetime(6) NOT NULL COMMENT 'create datetime',
-  `log_modified` datetime(6) NOT NULL COMMENT 'modify datetime',
-  UNIQUE INDEX `ux_undo_log`(`xid`, `branch_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'AT transaction mode undo table' ROW_FORMAT = Dynamic;
+CREATE TABLE `undo_log`
+(
+    `branch_id`     bigint(20)                                                    NOT NULL COMMENT 'branch transaction id',
+    `xid`           varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'global transaction id',
+    `context`       varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'undo_log context,such as serialization',
+    `rollback_info` longblob                                                      NOT NULL COMMENT 'rollback info',
+    `log_status`    int(11)                                                       NOT NULL COMMENT '0:normal status,1:defense status',
+    `log_created`   datetime(6)                                                   NOT NULL COMMENT 'create datetime',
+    `log_modified`  datetime(6)                                                   NOT NULL COMMENT 'modify datetime',
+    UNIQUE INDEX `ux_undo_log` (`xid`, `branch_id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT = 'AT transaction mode undo table'
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of undo_log
 -- ----------------------------
 
-SET FOREIGN_KEY_CHECKS = 1;
+SET
+    FOREIGN_KEY_CHECKS = 1;

pom.xml

@@ -42,7 +42,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
-        <spring-boot-dependencies.version>2.7.13</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.7.14</spring-boot-dependencies.version>
         <spring-cloud.version>2021.0.8</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
         <io.seata.version>1.4.2</io.seata.version>

twelvet-server/twelvet-server-gen/src/main/resources/vm/java/controller.java.vm

@@ -47,7 +47,7 @@ public class ${ClassName}Controller extends TWTController
  * 查询${functionName}列表
  */
 @Operation(summary = "查询${functionName}列表")
-@PreAuthorize("@role.hasPermi('{permissionPrefix}:list')")
+@PreAuthorize("@role.hasPermi('${permissionPrefix}:list')")
 @GetMapping("/list")
     #if($table.crud || $table.sub)
     public JsonResult<TableDataInfo> list(${ClassName} ${className})
@@ -68,7 +68,7 @@ public class ${ClassName}Controller extends TWTController
      * 导出${functionName}列表
      */
     @Operation(summary = "导出${functionName}列表")
-    @PreAuthorize("@role.hasPermi('{permissionPrefix}:export')")
+    @PreAuthorize("@role.hasPermi('${permissionPrefix}:export')")
     @Log(service = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ${ClassName} ${className})
@@ -82,7 +82,7 @@ public class ${ClassName}Controller extends TWTController
      * 获取${functionName}详细信息
      */
     @Operation(summary = "获取${functionName}详细信息")
-    @PreAuthorize("@role.hasPermi('{permissionPrefix}:query')")
+    @PreAuthorize("@role.hasPermi('${permissionPrefix}:query')")
     @GetMapping(value = "/{${pkColumn.javaField}}")
     public JsonResult<${ClassName}> getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
     {