Skip to content

Commit 294fe98

Browse files
committed
Merge branch 'dev'
# Conflicts: # README.md # README.zh-CN.md
2 parents 4d2ed6e + 8f91df0 commit 294fe98

19 files changed

Lines changed: 732 additions & 542 deletions

.gitpod.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ ports:
1111

1212
tasks:
1313
- init: |
14-
mv cmd/config.yaml.example cmd/config.yaml
14+
mv demo/todo/config.yaml.example demo/todo/config.yaml
1515
mysql -e "CREATE DATABASE my_apijson;"
16-
mysql -p my_apijson < cmd/test/test.sql
16+
mysql -p my_apijson < demo/todo/todo/todo.sql
1717
mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'yourpassword';"
1818
1919
command: |
2020
go mod tidy
21-
go run cmd/main.go
21+
# go run cmd/main.go
2222
2323
vscode:
2424
extensions:

cmd/test/test.http

Lines changed: 0 additions & 119 deletions
This file was deleted.

0 commit comments

Comments
 (0)