Skip to content

Commit 92864e9

Browse files
committedFeb 27, 2022
Merge branch '2.x' into dev
# Conflicts: # README.md # magic-api-spring-boot-starter/pom.xml # magic-api/pom.xml # magic-api/src/main/java/org/ssssssss/magicapi/controller/MagicGroupController.java # magic-api/src/main/java/org/ssssssss/magicapi/model/JsonCodeConstants.java # magic-api/src/main/java/org/ssssssss/magicapi/provider/impl/MagicDatabaseBackupService.java # magic-editor/pom.xml # magic-editor/src/console/package.json # magic-editor/src/console/src/scripts/parsing/ast.js # magic-editor/src/console/src/scripts/parsing/parser.js # pom.xml
2 parents 6249077 + f61d975 commit 92864e9

File tree

395 files changed

+8240
-30831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

395 files changed

+8240
-30831
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ magic-api 是一个基于Java的接口快速开发框架,编写接口将通过
5252
<dependency>
5353
<groupId>org.ssssssss</groupId>
5454
<artifactId>magic-api-spring-boot-starter</artifactId>
55-
<version>1.7.5</version>
55+
<version>2.0.0-beta.1</version>
5656
</dependency>
5757
```
5858
## 修改application.properties

‎db/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
> 0.7.x版本之后仅需要一张表两个字段,建表语句如下:
22
```sql
3-
CREATE TABLE `magic_api_file` (
3+
CREATE TABLE `magic_api_file_v2` (
44
`file_path` varchar(512) NOT NULL,
55
`file_content` mediumtext,
66
PRIMARY KEY (`file_path`)
77
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
88
```
99
### 备份表建表语句
1010
```sql
11-
CREATE TABLE `magic_api_backup` (
11+
CREATE TABLE `magic_backup_record_v2` (
1212
`id` varchar(32) NOT NULL COMMENT '原对象ID',
1313
`create_date` bigint(13) NOT NULL COMMENT '备份时间',
1414
`tag` varchar(32) DEFAULT NULL COMMENT '标签',
1515
`type` varchar(32) DEFAULT NULL COMMENT '类型',
1616
`name` varchar(64) DEFAULT NULL COMMENT '原名称',
17-
`content` mediumtext COMMENT '备份内容',
17+
`content` blob COMMENT '备份内容',
1818
`create_by` varchar(64) DEFAULT NULL COMMENT '操作人',
1919
PRIMARY KEY (`id`,`create_date`)
2020
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
21-
```
21+
```

0 commit comments

Comments
 (0)
Please sign in to comment.