feat: manually revert back

This commit is contained in:
Paul Pan 2022-10-20 16:50:19 +08:00
parent cb79b2090a
commit b77c968409
42 changed files with 38 additions and 38 deletions

View File

@ -1,8 +1,8 @@
package main package main
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/app" "github.com/WHUPRJ/woj-server/internal/app"
"github.com/WHUPRJ/woj-server/internal/global"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"math/rand" "math/rand"
"time" "time"

View File

@ -1,7 +1,7 @@
package debug package debug
import ( import (
"github.com/WHUPRJ/woj-server/global" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -1,7 +1,7 @@
package problem package problem
import ( import (
"github.com/WHUPRJ/woj-server/global" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/service/problem" "github.com/WHUPRJ/woj-server/internal/service/problem"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"

View File

@ -1,9 +1,9 @@
package problem package problem
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/model"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View File

@ -1,8 +1,8 @@
package user package user
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/service/user" "github.com/WHUPRJ/woj-server/internal/service/user"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View File

@ -1,7 +1,7 @@
package user package user
import ( import (
"github.com/WHUPRJ/woj-server/global" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/service/user" "github.com/WHUPRJ/woj-server/internal/service/user"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"

View File

@ -1,9 +1,9 @@
package user package user
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/model"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View File

@ -1,8 +1,8 @@
package user package user
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/internal/global"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View File

@ -1,9 +1,9 @@
package user package user
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/model"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View File

@ -3,11 +3,11 @@ package app
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/WHUPRJ/woj-server/global" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/repo/postgresql"
"github.com/WHUPRJ/woj-server/internal/repo/redis"
"github.com/WHUPRJ/woj-server/internal/router" "github.com/WHUPRJ/woj-server/internal/router"
"github.com/WHUPRJ/woj-server/internal/service/jwt" "github.com/WHUPRJ/woj-server/internal/service/jwt"
"github.com/WHUPRJ/woj-server/repo/postgresql"
"github.com/WHUPRJ/woj-server/repo/redis"
"go.uber.org/zap" "go.uber.org/zap"
"net/http" "net/http"
"os" "os"

View File

@ -2,7 +2,7 @@ package global
import ( import (
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/golang-jwt/jwt/v4" "github.com/golang-jwt/jwt/v4"
) )

View File

@ -4,8 +4,8 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"fmt" "fmt"
"github.com/WHUPRJ/woj-server/global" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/driver/postgres" "gorm.io/driver/postgres"
"gorm.io/gorm" "gorm.io/gorm"

View File

@ -2,7 +2,7 @@ package redis
import ( import (
"context" "context"
"github.com/WHUPRJ/woj-server/global" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -1,10 +1,10 @@
package router package router
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/api/debug" "github.com/WHUPRJ/woj-server/internal/api/debug"
"github.com/WHUPRJ/woj-server/internal/api/problem" "github.com/WHUPRJ/woj-server/internal/api/problem"
"github.com/WHUPRJ/woj-server/internal/api/user" "github.com/WHUPRJ/woj-server/internal/api/user"
"github.com/WHUPRJ/woj-server/internal/global"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View File

@ -1,7 +1,7 @@
package router package router
import ( import (
"github.com/WHUPRJ/woj-server/global" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/pkg/metrics" "github.com/WHUPRJ/woj-server/internal/pkg/metrics"
_ "github.com/WHUPRJ/woj-server/internal/router/docs" _ "github.com/WHUPRJ/woj-server/internal/router/docs"
"github.com/WHUPRJ/woj-server/pkg/utils" "github.com/WHUPRJ/woj-server/pkg/utils"

View File

@ -1,7 +1,7 @@
package jwt package jwt
import ( import (
"github.com/WHUPRJ/woj-server/global" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -3,8 +3,8 @@ package jwt
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/pkg/utils" "github.com/WHUPRJ/woj-server/pkg/utils"
"github.com/golang-jwt/jwt/v4" "github.com/golang-jwt/jwt/v4"
"go.uber.org/zap" "go.uber.org/zap"

View File

@ -2,7 +2,7 @@ package problem
import ( import (
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -3,7 +3,7 @@ package problem
import ( import (
"errors" "errors"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"github.com/WHUPRJ/woj-server/pkg/utils" "github.com/WHUPRJ/woj-server/pkg/utils"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"

View File

@ -3,7 +3,7 @@ package problem
import ( import (
"errors" "errors"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
) )

View File

@ -1,9 +1,9 @@
package problem package problem
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/model"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"
) )

View File

@ -2,7 +2,7 @@ package problem
import ( import (
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
) )

View File

@ -3,7 +3,7 @@ package task
import ( import (
"encoding/json" "encoding/json"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -3,7 +3,7 @@ package task
import ( import (
"encoding/json" "encoding/json"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -1,9 +1,9 @@
package task package task
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/model"
"github.com/hibiken/asynq" "github.com/hibiken/asynq"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -2,7 +2,7 @@ package user
import ( import (
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"go.uber.org/zap" "go.uber.org/zap"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
"strings" "strings"

View File

@ -3,7 +3,7 @@ package user
import ( import (
"errors" "errors"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
"gorm.io/gorm" "gorm.io/gorm"
) )

View File

@ -3,7 +3,7 @@ package user
import ( import (
"errors" "errors"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/model"
"gorm.io/gorm" "gorm.io/gorm"
) )

View File

@ -1,9 +1,9 @@
package user package user
import ( import (
"github.com/WHUPRJ/woj-server/global"
"github.com/WHUPRJ/woj-server/internal/e" "github.com/WHUPRJ/woj-server/internal/e"
"github.com/WHUPRJ/woj-server/model" "github.com/WHUPRJ/woj-server/internal/global"
"github.com/WHUPRJ/woj-server/internal/model"
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"