Skip to content

Commit 0813455

Browse files
committed
update groups
1 parent 6f4c328 commit 0813455

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

ddl.sql

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CREATE DATABASE IF NOT EXISTS `auth-service`;
22
USE `auth-service`;
33
CREATE TABLE IF NOT EXISTS gender_lang (
4-
id UUID PRIMARY KEY NOT null,
4+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
55
gender TINYINT(1) NOT NULL,
66
lang VARCHAR(20) NOT NULL,
77
`name` VARCHAR(100) NOT NULL,
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS gender_lang (
1111
modified_by VARCHAR(255) NULL
1212
);
1313
CREATE TABLE IF NOT EXISTS auth_user (
14-
id UUID PRIMARY KEY NOT null,
14+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
1515
full_name VARCHAR(255) NOT null,
1616
email VARCHAR(100) NOT null,
1717
username VARCHAR(100) not null,
@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS auth_user (
2727
);
2828

2929
CREATE TABLE IF NOT EXISTS auth_group (
30-
id UUID PRIMARY KEY NOT null,
30+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
3131
`name` VARCHAR(255) NOT NULL,
3232
description TEXT,
3333
created_at DATETIME not NULL DEFAULT UNIX_TIMESTAMP(),
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS auth_group (
3737
);
3838

3939
CREATE TABLE IF NOT EXISTS auth_user_group (
40-
id UUID PRIMARY KEY NOT null,
40+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
4141
user_id UUID NOT null,
4242
group_id UUID NOT null,
4343
created_at DATETIME not NULL DEFAULT UNIX_TIMESTAMP(),
@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS auth_user_group (
5050

5151

5252
CREATE TABLE IF NOT EXISTS auth_portal (
53-
id UUID PRIMARY KEY NOT null,
53+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
5454
`order` INT(3) NOT NULL,
5555
path VARCHAR(255) NOT NULL,
5656
icon VARCHAR(255) null,
@@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS auth_portal (
6161
modified_by VARCHAR(255) NULL
6262
);
6363
CREATE TABLE IF NOT EXISTS auth_portal_lang (
64-
id UUID PRIMARY KEY NOT null,
64+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
6565
portal_id UUID NOT null,
6666
`name` VARCHAR(255) NOT null,
6767
description TEXT null,
@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS auth_portal_lang (
7373
FOREIGN KEY (portal_id) REFERENCES auth_portal(id) ON DELETE CASCADE
7474
);
7575
CREATE TABLE IF NOT EXISTS auth_function (
76-
id UUID PRIMARY KEY NOT null,
76+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
7777
portal_id UUID NOT null,
7878
parent_id UUID null,
7979
method ENUM("GET", "POST", "PUT", "DELETE", "PATCH") NOT NULL DEFAULT "GET",
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS auth_function (
9393
);
9494

9595
CREATE TABLE IF NOT EXISTS auth_function_lang (
96-
id UUID PRIMARY KEY NOT null,
96+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
9797
function_id UUID NOT null,
9898
`name` VARCHAR(255) NOT null,
9999
lang VARCHAR(20) NOT null,
@@ -106,7 +106,7 @@ CREATE TABLE IF NOT EXISTS auth_function_lang (
106106
);
107107

108108
CREATE TABLE IF NOT EXISTS auth_permission (
109-
id UUID PRIMARY KEY NOT null,
109+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
110110
group_id UUID NOT null,
111111
function_id UUID NOT null,
112112
grand_create TINYINT(1) NOT NULL DEFAULT 0,
@@ -121,7 +121,7 @@ CREATE TABLE IF NOT EXISTS auth_permission (
121121
FOREIGN KEY (function_id) REFERENCES auth_function(id) ON DELETE CASCADE
122122
);
123123
CREATE TABLE IF NOT EXISTS auth_refresh_tokens (
124-
id UUID PRIMARY KEY DEFAULT (uuid()),
124+
BINARY(36) PRIMARY KEY NOT NULL DEFAULT (UUID()),
125125
user_id UUID NOT NULL,
126126
token TEXT NOT NULL UNIQUE,
127127
expires_at TIMESTAMP NOT NULL,

dto/userDto.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import (
55
)
66

77
type UserDto struct {
8-
ID *uuid.UUID `json:"id"`
9-
GroupID uuid.UUID `json:"groupId" validate:"required"`
10-
Gender int `json:"gender" validate:"required"`
11-
FullName string `json:"fullName" validate:"required,min=2"`
12-
Email string `json:"email" validate:"required,email"`
13-
Username string `json:"userName" validate:"required,min=3"`
14-
Password string `json:"password" validate:"required,min=8"`
15-
Telephone *string `json:"telephone" validate:"omitempty"`
16-
Picture *string `json:"picture" validate:"omitempty"`
8+
ID *uuid.UUID `json:"id"`
9+
GroupIDs []uuid.UUID `json:"groupIds" validate:"required"`
10+
Gender int `json:"gender" validate:"required"`
11+
FullName string `json:"fullName" validate:"required,min=2"`
12+
Email string `json:"email" validate:"required,email"`
13+
Username string `json:"userName" validate:"required,min=3"`
14+
Password string `json:"password" validate:"required,min=8"`
15+
Telephone *string `json:"telephone" validate:"omitempty"`
16+
Picture *string `json:"picture" validate:"omitempty"`
1717
}
1818

1919
type UserPagination struct {

0 commit comments

Comments
 (0)