v1.2.0: back: use gorm in code
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
0695062ad7
commit
a2288ec90a
2 changed files with 7 additions and 7 deletions
|
|
@ -9,6 +9,7 @@ import (
|
||||||
echoSwagger "github.com/swaggo/echo-swagger"
|
echoSwagger "github.com/swaggo/echo-swagger"
|
||||||
logins "gitlab.g3e.fr/h6n/users/internal"
|
logins "gitlab.g3e.fr/h6n/users/internal"
|
||||||
"gitlab.g3e.fr/h6n/users/lib"
|
"gitlab.g3e.fr/h6n/users/lib"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
|
||||||
"database/sql"
|
"database/sql"
|
||||||
|
|
||||||
|
|
@ -17,6 +18,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var db *sql.DB = nil
|
var db *sql.DB = nil
|
||||||
|
var dbGor *gorm.DB = nil
|
||||||
|
|
||||||
// Logout
|
// Logout
|
||||||
// @Tags auth
|
// @Tags auth
|
||||||
|
|
@ -49,6 +51,11 @@ func init_database() {
|
||||||
|
|
||||||
connStr := "postgres://acc:totor@postgres:5432/accounts?sslmode=disable"
|
connStr := "postgres://acc:totor@postgres:5432/accounts?sslmode=disable"
|
||||||
|
|
||||||
|
dbGor, err = logins.Init_database(connStr)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
}
|
||||||
|
|
||||||
db, err = sql.Open("postgres", connStr)
|
db, err = sql.Open("postgres", connStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
|
|
@ -92,7 +99,6 @@ func skip_log(c echo.Context) bool {
|
||||||
// @description Enter the token with the `Bearer: ` prefix, e.g. "Bearer abcde12345".
|
// @description Enter the token with the `Bearer: ` prefix, e.g. "Bearer abcde12345".
|
||||||
func main() {
|
func main() {
|
||||||
init_database()
|
init_database()
|
||||||
logins.Init_database()
|
|
||||||
if err := lib.InitLoginBiscuit(); err != nil {
|
if err := lib.InitLoginBiscuit(); err != nil {
|
||||||
fmt.Println("error : ", err)
|
fmt.Println("error : ", err)
|
||||||
return
|
return
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1 @@
|
||||||
CREATE TABLE users (
|
|
||||||
username TEXT PRIMARY KEY,
|
|
||||||
email TEXT UNIQUE NOT NULL,
|
|
||||||
password TEXT NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO users(username, email, password) VALUES('0000000023', 'root@root.fr', '$2a$14$FU8FKR7pUq4akLThraD9kOu0zY0BuUFASo0xakgWEWbYF2gz20DuG');
|
INSERT INTO users(username, email, password) VALUES('0000000023', 'root@root.fr', '$2a$14$FU8FKR7pUq4akLThraD9kOu0zY0BuUFASo0xakgWEWbYF2gz20DuG');
|
||||||
Loading…
Add table
Add a link
Reference in a new issue