update project path
This commit is contained in:
1 parent
26acdbd0d1
commit
e027e6a259
76 files changed
+2562
-106
No files matched your search
+5
-7
@@ -1,8 +1,6 @@
|
||||
.idea
|
||||
src/goadmin/config/settings.yml
|
||||
src/goadmin/static/uploadfile
|
||||
src/goadmin/main.exe
|
||||
src/goadmin/temp/logs/log.txt
|
||||
src/goadmin/goadmin
|
||||
src/goadmin/config/settings.dev.yml
|
||||
src/goadmin/vendor
|
||||
static/uploadfile
|
||||
main.exe
|
||||
temp/logs/log.txt
|
||||
vendor
|
||||
config/settings.dev.yml
|
||||
@@ -89,7 +89,7 @@ settings:
|
||||
readtimeout: 50
|
||||
```
|
||||
|
||||
2. file path go-admin/src/goadmin/config/settings.yml
|
||||
2. file path go-admin/src/go-admin/config/settings.yml
|
||||
|
||||
|
||||
## 📦 evelopment
|
||||
@@ -102,7 +102,7 @@ First start instructions
|
||||
git clone https://github.com/wenjianzhang/go-admin.git
|
||||
|
||||
# Enter working path
|
||||
cd ./goadmin/src/goadmin
|
||||
cd ./go-admin/src/go-admin
|
||||
|
||||
# Build the project
|
||||
go build
|
||||
@@ -118,7 +118,7 @@ vi ./config/setting.yml (Note: Change isinit and database connection)
|
||||
|
||||
|
||||
# Start the project or debug with the IDE
|
||||
./goadmin
|
||||
./go-admin
|
||||
|
||||
# See also instructions in WIKI
|
||||
```
|
||||
|
||||
+3
-3
@@ -89,7 +89,7 @@ settings:
|
||||
readtimeout: 50
|
||||
```
|
||||
|
||||
2. 文件路径 go-admin/src/goadmin/config/settings.yml
|
||||
2. 文件路径 go-admin/src/go-admin/config/settings.yml
|
||||
|
||||
|
||||
## 📦 本地开发
|
||||
@@ -101,7 +101,7 @@ settings:
|
||||
git clone https://github.com/wenjianzhang/go-admin.git
|
||||
|
||||
# 进入工作路径
|
||||
cd ./goadmin/src/goadmin
|
||||
cd ./go-admin/src/go-admin
|
||||
|
||||
# 编译项目
|
||||
go build
|
||||
@@ -117,7 +117,7 @@ vi ./config/setting.yml (更改isinit和数据库连接)
|
||||
|
||||
|
||||
# 启动项目,也可以用IDE进行调试
|
||||
./goadmin
|
||||
./go-admin
|
||||
|
||||
# 也可以在WIKI中查看说明
|
||||
```
|
||||
|
||||
File renamed without changes.
File renamed without changes.
@@ -3,9 +3,9 @@ package apis
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
@@ -3,9 +3,9 @@ package apis
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
"strconv"
|
||||
)
|
||||
@@ -3,9 +3,9 @@ package apis
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
@@ -3,9 +3,9 @@ package apis
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
"strconv"
|
||||
)
|
||||
@@ -2,9 +2,9 @@ package apis
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
@@ -3,9 +3,9 @@ package apis
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
"strconv"
|
||||
)
|
||||
@@ -3,9 +3,9 @@ package apis
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
"strconv"
|
||||
)
|
||||
@@ -3,9 +3,9 @@ package apis
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
"strconv"
|
||||
)
|
||||
@@ -2,9 +2,9 @@ package apis
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
"strconv"
|
||||
)
|
||||
@@ -3,9 +3,9 @@ package apis
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"net/http"
|
||||
"strconv"
|
||||
)
|
||||
@@ -3,7 +3,7 @@ package apis
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"goadmin/models"
|
||||
"go-admin/models"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
@@ -4,9 +4,9 @@ import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"github.com/google/uuid"
|
||||
"goadmin/models"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
"go-admin/models"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -5,7 +5,7 @@ import (
|
||||
"fmt"
|
||||
_ "github.com/go-sql-driver/mysql" //加载mysql
|
||||
"github.com/jinzhu/gorm"
|
||||
config2 "goadmin/config"
|
||||
config2 "go-admin/config"
|
||||
"log"
|
||||
"strconv"
|
||||
)
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,4 +1,4 @@
|
||||
module goadmin
|
||||
module go-admin
|
||||
|
||||
go 1.12
|
||||
|
||||
File renamed without changes.
@@ -4,9 +4,9 @@ import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/mojocn/base64Captcha"
|
||||
"github.com/mssola/user_agent"
|
||||
. "goadmin/models"
|
||||
jwt "goadmin/pkg/jwtauth"
|
||||
"goadmin/utils"
|
||||
. "go-admin/models"
|
||||
jwt "go-admin/pkg/jwtauth"
|
||||
"go-admin/utils"
|
||||
"log"
|
||||
"net/http"
|
||||
)
|
||||
File renamed without changes.
@@ -2,7 +2,7 @@ package handler
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
jwt "goadmin/pkg/jwtauth"
|
||||
jwt "go-admin/pkg/jwtauth"
|
||||
"log"
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@ package handler
|
||||
|
||||
import (
|
||||
"github.com/go-redis/redis"
|
||||
"goadmin/config"
|
||||
"go-admin/config"
|
||||
)
|
||||
|
||||
var RedisClient = new(redis.Client)
|
||||
File renamed without changes.
@@ -2,10 +2,10 @@ package main
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"goadmin/config"
|
||||
orm "goadmin/database"
|
||||
"goadmin/models"
|
||||
"goadmin/router"
|
||||
"go-admin/config"
|
||||
orm "go-admin/database"
|
||||
"go-admin/models"
|
||||
"go-admin/router"
|
||||
"log"
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"github.com/shopspring/decimal"
|
||||
orm "goadmin/database"
|
||||
orm "go-admin/database"
|
||||
_ "log"
|
||||
"time"
|
||||
)
|
||||
File renamed without changes.
@@ -1,8 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
orm "goadmin/database"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"github.com/jinzhu/gorm"
|
||||
"goadmin/utils"
|
||||
"go-admin/utils"
|
||||
)
|
||||
|
||||
type DataPermission struct {
|
||||
@@ -1,8 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
orm "goadmin/database"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
)
|
||||
|
||||
type Dept struct {
|
||||
@@ -1,8 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
orm "goadmin/database"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
orm "goadmin/database"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
orm "goadmin/database"
|
||||
orm "go-admin/database"
|
||||
"io/ioutil"
|
||||
"strings"
|
||||
)
|
||||
@@ -1,8 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
orm "goadmin/database"
|
||||
"goadmin/pkg"
|
||||
orm "go-admin/database"
|
||||
"go-admin/pkg"
|
||||
"log"
|
||||
"strings"
|
||||
)
|
||||
@@ -1,8 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
orm "goadmin/database"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -2,8 +2,8 @@ package models
|
||||
|
||||
import (
|
||||
"errors"
|
||||
orm "goadmin/database"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
orm "goadmin/database"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
)
|
||||
|
||||
//sys_operlog
|
||||
@@ -1,8 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
orm "goadmin/database"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
)
|
||||
|
||||
type Post struct {
|
||||
File renamed without changes.
@@ -1,8 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
orm "goadmin/database"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
orm "goadmin/database"
|
||||
orm "go-admin/database"
|
||||
)
|
||||
|
||||
//sys_role_dept
|
||||
@@ -2,7 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
orm "goadmin/database"
|
||||
orm "go-admin/database"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
@@ -2,9 +2,9 @@ package models
|
||||
|
||||
import (
|
||||
"errors"
|
||||
orm "goadmin/database"
|
||||
"goadmin/pkg"
|
||||
"goadmin/utils"
|
||||
orm "go-admin/database"
|
||||
"go-admin/pkg"
|
||||
"go-admin/utils"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
"log"
|
||||
"strings"
|
||||
@@ -6,8 +6,8 @@ import (
|
||||
gormadapter "github.com/casbin/gorm-adapter/v2"
|
||||
"github.com/go-kit/kit/endpoint"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"goadmin/config"
|
||||
"goadmin/utils"
|
||||
"go-admin/config"
|
||||
"go-admin/utils"
|
||||
)
|
||||
|
||||
var Em endpoint.Middleware
|
||||
File renamed without changes.
File renamed without changes.
@@ -1,9 +1,9 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
config2 "goadmin/config"
|
||||
"goadmin/handler"
|
||||
jwt "goadmin/pkg/jwtauth"
|
||||
config2 "go-admin/config"
|
||||
"go-admin/handler"
|
||||
jwt "go-admin/pkg/jwtauth"
|
||||
"time"
|
||||
)
|
||||
|
||||
File renamed without changes.
@@ -2,7 +2,7 @@ package middleware
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"goadmin/config"
|
||||
"go-admin/config"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
File renamed without changes.
@@ -4,9 +4,9 @@ import (
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/sirupsen/logrus"
|
||||
"goadmin/config"
|
||||
"goadmin/models"
|
||||
"goadmin/utils"
|
||||
"go-admin/config"
|
||||
"go-admin/models"
|
||||
"go-admin/utils"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -2,9 +2,9 @@ package middleware
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
mycasbin "goadmin/pkg/casbin"
|
||||
"goadmin/pkg/jwtauth"
|
||||
_ "goadmin/pkg/jwtauth"
|
||||
mycasbin "go-admin/pkg/casbin"
|
||||
"go-admin/pkg/jwtauth"
|
||||
_ "go-admin/pkg/jwtauth"
|
||||
"log"
|
||||
"net/http"
|
||||
)
|
||||
File renamed without changes.
@@ -6,12 +6,12 @@ import (
|
||||
"github.com/spf13/viper"
|
||||
"github.com/swaggo/gin-swagger"
|
||||
"github.com/swaggo/gin-swagger/swaggerFiles"
|
||||
. "goadmin/apis"
|
||||
_ "goadmin/docs"
|
||||
"goadmin/handler"
|
||||
"goadmin/handler/sd"
|
||||
_ "goadmin/pkg/jwtauth"
|
||||
"goadmin/router/middleware"
|
||||
. "go-admin/apis"
|
||||
_ "go-admin/docs"
|
||||
"go-admin/handler"
|
||||
"go-admin/handler/sd"
|
||||
_ "go-admin/pkg/jwtauth"
|
||||
"go-admin/router/middleware"
|
||||
"log"
|
||||
)
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 60 KiB |
Whitespace-only changes.
+2458
File diff suppressed because it is too large.
Load diff
@@ -2,7 +2,7 @@ package test
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"goadmin/models"
|
||||
"go-admin/models"
|
||||
"testing"
|
||||
)
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -3,7 +3,7 @@ package utils
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
jwt "goadmin/pkg/jwtauth"
|
||||
jwt "go-admin/pkg/jwtauth"
|
||||
)
|
||||
|
||||
func ExtractClaims(c *gin.Context) jwt.MapClaims {
|
||||
Reference in new issue
Block a user