update project path

This commit is contained in:
zhangwenjian committed 2020-03-18 23:09:37 +08:00
1 parent 26acdbd0d1
commit e027e6a259
76 files changed
+2562 -106

No files matched your search

+5 -7
View File
@@ -1,8 +1,6 @@
.idea .idea
src/goadmin/config/settings.yml static/uploadfile
src/goadmin/static/uploadfile main.exe
src/goadmin/main.exe temp/logs/log.txt
src/goadmin/temp/logs/log.txt vendor
src/goadmin/goadmin config/settings.dev.yml
src/goadmin/config/settings.dev.yml
src/goadmin/vendor
+3 -3
View File
@@ -89,7 +89,7 @@ settings:
readtimeout: 50 readtimeout: 50
``` ```
2. file path go-admin/src/goadmin/config/settings.yml 2. file path go-admin/src/go-admin/config/settings.yml
## 📦 evelopment ## 📦 evelopment
@@ -102,7 +102,7 @@ First start instructions
git clone https://github.com/wenjianzhang/go-admin.git git clone https://github.com/wenjianzhang/go-admin.git
# Enter working path # Enter working path
cd ./goadmin/src/goadmin cd ./go-admin/src/go-admin
# Build the project # Build the project
go build go build
@@ -118,7 +118,7 @@ vi ./config/setting.yml (Note: Change isinit and database connection)
# Start the project or debug with the IDE # Start the project or debug with the IDE
./goadmin ./go-admin
# See also instructions in WIKI # See also instructions in WIKI
``` ```
+3 -3
View File
@@ -89,7 +89,7 @@ settings:
readtimeout: 50 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 git clone https://github.com/wenjianzhang/go-admin.git
# 进入工作路径 # 进入工作路径
cd ./goadmin/src/goadmin cd ./go-admin/src/go-admin
# 编译项目 # 编译项目
go build go build
@@ -117,7 +117,7 @@ vi ./config/setting.yml (更改isinit和数据库连接)
# 启动项目,也可以用IDE进行调试 # 启动项目,也可以用IDE进行调试
./goadmin ./go-admin
# 也可以在WIKI中查看说明 # 也可以在WIKI中查看说明
``` ```
File renamed without changes.
File renamed without changes.
@@ -3,9 +3,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
) )
+3 -3
View File
@@ -3,9 +3,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
"strconv" "strconv"
) )
@@ -3,9 +3,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
) )
@@ -3,9 +3,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
"strconv" "strconv"
) )
+3 -3
View File
@@ -2,9 +2,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
) )
@@ -3,9 +3,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
"strconv" "strconv"
) )
+3 -3
View File
@@ -3,9 +3,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
"strconv" "strconv"
) )
@@ -3,9 +3,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
"strconv" "strconv"
) )
+3 -3
View File
@@ -2,9 +2,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
"strconv" "strconv"
) )
+3 -3
View File
@@ -3,9 +3,9 @@ package apis
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"net/http" "net/http"
"strconv" "strconv"
) )
@@ -3,7 +3,7 @@ package apis
import ( import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"goadmin/models" "go-admin/models"
"net/http" "net/http"
) )
@@ -4,9 +4,9 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"github.com/google/uuid" "github.com/google/uuid"
"goadmin/models" "go-admin/models"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"log" "log"
"net/http" "net/http"
"strconv" "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" "fmt"
_ "github.com/go-sql-driver/mysql" //加载mysql _ "github.com/go-sql-driver/mysql" //加载mysql
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
config2 "goadmin/config" config2 "go-admin/config"
"log" "log"
"strconv" "strconv"
) )
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1 -1
View File
@@ -1,4 +1,4 @@
module goadmin module go-admin
go 1.12 go 1.12
View File
File renamed without changes.
@@ -4,9 +4,9 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/mojocn/base64Captcha" "github.com/mojocn/base64Captcha"
"github.com/mssola/user_agent" "github.com/mssola/user_agent"
. "goadmin/models" . "go-admin/models"
jwt "goadmin/pkg/jwtauth" jwt "go-admin/pkg/jwtauth"
"goadmin/utils" "go-admin/utils"
"log" "log"
"net/http" "net/http"
) )
File renamed without changes.
@@ -2,7 +2,7 @@ package handler
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
jwt "goadmin/pkg/jwtauth" jwt "go-admin/pkg/jwtauth"
"log" "log"
) )
@@ -2,7 +2,7 @@ package handler
import ( import (
"github.com/go-redis/redis" "github.com/go-redis/redis"
"goadmin/config" "go-admin/config"
) )
var RedisClient = new(redis.Client) var RedisClient = new(redis.Client)
File renamed without changes.
+4 -4
View File
@@ -2,10 +2,10 @@ package main
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"goadmin/config" "go-admin/config"
orm "goadmin/database" orm "go-admin/database"
"goadmin/models" "go-admin/models"
"goadmin/router" "go-admin/router"
"log" "log"
) )
@@ -2,7 +2,7 @@ package models
import ( import (
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
orm "goadmin/database" orm "go-admin/database"
_ "log" _ "log"
"time" "time"
) )
File renamed without changes.
@@ -1,8 +1,8 @@
package models package models
import ( import (
orm "goadmin/database" orm "go-admin/database"
"goadmin/utils" "go-admin/utils"
"time" "time"
) )
@@ -2,7 +2,7 @@ package models
import ( import (
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"goadmin/utils" "go-admin/utils"
) )
type DataPermission struct { type DataPermission struct {
@@ -1,8 +1,8 @@
package models package models
import ( import (
orm "goadmin/database" orm "go-admin/database"
"goadmin/utils" "go-admin/utils"
) )
type Dept struct { type Dept struct {
@@ -1,8 +1,8 @@
package models package models
import ( import (
orm "goadmin/database" orm "go-admin/database"
"goadmin/utils" "go-admin/utils"
"time" "time"
) )
@@ -1,8 +1,8 @@
package models package models
import ( import (
orm "goadmin/database" orm "go-admin/database"
"goadmin/utils" "go-admin/utils"
"time" "time"
) )
@@ -2,7 +2,7 @@ package models
import ( import (
"fmt" "fmt"
orm "goadmin/database" orm "go-admin/database"
"io/ioutil" "io/ioutil"
"strings" "strings"
) )
@@ -1,8 +1,8 @@
package models package models
import ( import (
orm "goadmin/database" orm "go-admin/database"
"goadmin/pkg" "go-admin/pkg"
"log" "log"
"strings" "strings"
) )
@@ -1,8 +1,8 @@
package models package models
import ( import (
orm "goadmin/database" orm "go-admin/database"
"goadmin/utils" "go-admin/utils"
"time" "time"
) )
@@ -2,8 +2,8 @@ package models
import ( import (
"errors" "errors"
orm "goadmin/database" orm "go-admin/database"
"goadmin/utils" "go-admin/utils"
"time" "time"
) )
@@ -1,8 +1,8 @@
package models package models
import ( import (
orm "goadmin/database" orm "go-admin/database"
"goadmin/utils" "go-admin/utils"
) )
//sys_operlog //sys_operlog
@@ -1,8 +1,8 @@
package models package models
import ( import (
orm "goadmin/database" orm "go-admin/database"
"goadmin/utils" "go-admin/utils"
) )
type Post struct { type Post struct {
File renamed without changes.
@@ -1,8 +1,8 @@
package models package models
import ( import (
orm "goadmin/database" orm "go-admin/database"
"goadmin/utils" "go-admin/utils"
"time" "time"
) )
@@ -2,7 +2,7 @@ package models
import ( import (
"fmt" "fmt"
orm "goadmin/database" orm "go-admin/database"
) )
//sys_role_dept //sys_role_dept
@@ -2,7 +2,7 @@ package models
import ( import (
"fmt" "fmt"
orm "goadmin/database" orm "go-admin/database"
"strconv" "strconv"
) )
@@ -2,9 +2,9 @@ package models
import ( import (
"errors" "errors"
orm "goadmin/database" orm "go-admin/database"
"goadmin/pkg" "go-admin/pkg"
"goadmin/utils" "go-admin/utils"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
"log" "log"
"strings" "strings"
@@ -6,8 +6,8 @@ import (
gormadapter "github.com/casbin/gorm-adapter/v2" gormadapter "github.com/casbin/gorm-adapter/v2"
"github.com/go-kit/kit/endpoint" "github.com/go-kit/kit/endpoint"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"goadmin/config" "go-admin/config"
"goadmin/utils" "go-admin/utils"
) )
var Em endpoint.Middleware var Em endpoint.Middleware
File renamed without changes.
File renamed without changes.
@@ -1,9 +1,9 @@
package middleware package middleware
import ( import (
config2 "goadmin/config" config2 "go-admin/config"
"goadmin/handler" "go-admin/handler"
jwt "goadmin/pkg/jwtauth" jwt "go-admin/pkg/jwtauth"
"time" "time"
) )
@@ -2,7 +2,7 @@ package middleware
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"goadmin/config" "go-admin/config"
"net/http" "net/http"
) )
File renamed without changes.
@@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"goadmin/config" "go-admin/config"
"goadmin/models" "go-admin/models"
"goadmin/utils" "go-admin/utils"
"os" "os"
"strings" "strings"
"time" "time"
@@ -2,9 +2,9 @@ package middleware
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
mycasbin "goadmin/pkg/casbin" mycasbin "go-admin/pkg/casbin"
"goadmin/pkg/jwtauth" "go-admin/pkg/jwtauth"
_ "goadmin/pkg/jwtauth" _ "go-admin/pkg/jwtauth"
"log" "log"
"net/http" "net/http"
) )
File renamed without changes.
@@ -6,12 +6,12 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger"
"github.com/swaggo/gin-swagger/swaggerFiles" "github.com/swaggo/gin-swagger/swaggerFiles"
. "goadmin/apis" . "go-admin/apis"
_ "goadmin/docs" _ "go-admin/docs"
"goadmin/handler" "go-admin/handler"
"goadmin/handler/sd" "go-admin/handler/sd"
_ "goadmin/pkg/jwtauth" _ "go-admin/pkg/jwtauth"
"goadmin/router/middleware" "go-admin/router/middleware"
"log" "log"
) )
Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View File
Whitespace-only changes.
+2458
View File
File diff suppressed because it is too large. Load diff
@@ -2,7 +2,7 @@ package test
import ( import (
"fmt" "fmt"
"goadmin/models" "go-admin/models"
"testing" "testing"
) )
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1 -1
View File
@@ -3,7 +3,7 @@ package utils
import ( import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
jwt "goadmin/pkg/jwtauth" jwt "go-admin/pkg/jwtauth"
) )
func ExtractClaims(c *gin.Context) jwt.MapClaims { func ExtractClaims(c *gin.Context) jwt.MapClaims {