1

237ebe9b · haoyanbin · 2439602a · 237ebe9b · 237ebe9b · 237ebe9b
Commit 237ebe9b authored Dec 23, 2021 by haoyanbin
10 changed files
--- a/app/mobile/apis/org_league.go
+++ b/app/mobile/apis/org_league.go
@@ -8,9 +8,9 @@ import (
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"

-	"go-admin/app/admin/models"
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
+	"go-admin/app/operate/models"
+	"go-admin/app/operate/service"
+	"go-admin/app/operate/service/dto"
 	"go-admin/common/actions"
 )


--- a/app/mobile/router/org_league.go
+++ b/app/mobile/router/org_league.go
@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"

-	"go-admin/app/admin/apis"
+	"go-admin/app/operate/apis"
 )

 func init() {

--- a/app/mobile/service/dto/org_league.go
+++ b/app/mobile/service/dto/org_league.go
 package dto

 import (
-	"go-admin/app/admin/models"
+	"go-admin/app/operate/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
 	"time"

--- a/app/mobile/service/org_league.go
+++ b/app/mobile/service/org_league.go
@@ -6,8 +6,8 @@ import (
    "github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"

-	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/dto"
+	"go-admin/app/operate/models"
+	"go-admin/app/operate/service/dto"
 	"go-admin/common/actions"
 	cDto "go-admin/common/dto"
 )

--- a/app/operate/models/datascope.go
+++ b/app/operate/models/datascope.go
-package models
-
-import (
-	"errors"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"gorm.io/gorm"
-
-	log "github.com/go-admin-team/go-admin-core/logger"
-	"github.com/go-admin-team/go-admin-core/sdk/config"
-)
-
-type DataPermission struct {
-	DataScope string
-	UserId    int
-	DeptId    int
-	RoleId    int
-}
-
-func (e *DataPermission) GetDataScope(tableName string, db *gorm.DB) (*gorm.DB, error) {
-
-	if !config.ApplicationConfig.EnableDP {
-		usageStr := `数据权限已经为您` + pkg.Green(`关闭`) + `，如需开启请参考配置文件字段说明`
-		log.Debug("%s\n", usageStr)
-		return db, nil
-	}
-	user := new(SysUser)
-	role := new(SysRole)
-	err := db.Find(user, e.UserId).Error
-	if err != nil {
-		return nil, errors.New("获取用户数据出错 msg:" + err.Error())
-	}
-	err = db.Find(role, user.RoleId).Error
-	if err != nil {
-		return nil, errors.New("获取用户数据出错 msg:" + err.Error())
-	}
-	if role.DataScope == "2" {
-		db = db.Where(tableName+".create_by in (select sys_user.user_id from sys_role_dept left join sys_user on sys_user.dept_id=sys_role_dept.dept_id where sys_role_dept.role_id = ?)", user.RoleId)
-	}
-	if role.DataScope == "3" {
-		db = db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId)
-	}
-	if role.DataScope == "4" {
-		db = db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(user.DeptId)+"%")
-	}
-	if role.DataScope == "5" || role.DataScope == "" {
-		db = db.Where(tableName+".create_by = ?", e.UserId)
-	}
-
-	return db, nil
-}
-
-//func DataScopes(tableName string, userId int) func(db *gorm.DB) *gorm.DB {
-//	return func(db *gorm.DB) *gorm.DB {
-//		user := new(SysUser)
-//		role := new(SysRole)
-//		user.UserId = userId
-//		err := db.Find(user, userId).Error
-//		if err != nil {
-//			db.Error = errors.New("获取用户数据出错 msg:" + err.Error())
-//			return db
-//		}
-//		err = db.Find(role, user.RoleId).Error
-//		if err != nil {
-//			db.Error = errors.New("获取用户数据出错 msg:" + err.Error())
-//			return db
-//		}
-//		if role.DataScope == "2" {
-//			return db.Where(tableName+".create_by in (select sys_user.user_id from sys_role_dept left join sys_user on sys_user.dept_id=sys_role_dept.dept_id where sys_role_dept.role_id = ?)", user.RoleId)
-//		}
-//		if role.DataScope == "3" {
-//			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId)
-//		}
-//		if role.DataScope == "4" {
-//			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(user.DeptId)+"%")
-//		}
-//		if role.DataScope == "5" || role.DataScope == "" {
-//			return db.Where(tableName+".create_by = ?", userId)
-//		}
-//		return db
-//	}
-//}
--- a/app/operate/models/initdb.go
+++ b/app/operate/models/initdb.go
-package models
-
-import (
-	"fmt"
-	"go-admin/common/global"
-	"gorm.io/gorm"
-	"io/ioutil"
-	"log"
-	"strings"
-)
-
-func InitDb(db *gorm.DB) (err error) {
-	filePath := "config/db.sql"
-	err = ExecSql(db, filePath)
-	if global.Driver == "postgres" {
-		filePath = "config/pg.sql"
-		err = ExecSql(db, filePath)
-	}
-	return err
-}
-
-func ExecSql(db *gorm.DB, filePath string) error {
-	sql, err := Ioutil(filePath)
-	if err != nil {
-		fmt.Println("数据库基础数据初始化脚本读取失败！原因:", err.Error())
-		return err
-	}
-	sqlList := strings.Split(sql, ";")
-	for i := 0; i < len(sqlList)-1; i++ {
-		if strings.Contains(sqlList[i], "--") {
-			fmt.Println(sqlList[i])
-			continue
-		}
-		sql := strings.Replace(sqlList[i]+";", "\n", "", 0)
-		sql = strings.TrimSpace(sql)
-		if err = db.Exec(sql).Error; err != nil {
-			log.Printf("error sql: %s", sql)
-			if !strings.Contains(err.Error(), "Query was empty") {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func Ioutil(filePath string) (string, error) {
-	if contents, err := ioutil.ReadFile(filePath); err == nil {
-		//因为contents是[]byte类型，直接转换成string类型后会多一行空格,需要使用strings.Replace替换换行符
-		result := strings.Replace(string(contents), "\n", "", 1)
-		fmt.Println("Use ioutil.ReadFile to read a file:", result)
-		return result, nil
-	} else {
-		return "", err
-	}
-}
--- a/app/operate/models/model.go
+++ b/app/operate/models/model.go
-package models
-
-import (
-	"time"
-)
-
-type BaseModel struct {
-	CreatedAt time.Time  `json:"createdAt"`
-	UpdatedAt time.Time  `json:"updatedAt"`
-	DeletedAt *time.Time `json:"deletedAt"`
-}
--- a/app/operate/models/org_ad.go
+++ b/app/operate/models/org_ad.go
@@ -4,6 +4,7 @@ import (
   // "gorm.io/gorm"

 	"go-admin/common/models"
+	"time"
 )

 type OrgAd struct {

--- a/app/operate/router/init_router.go
+++ b/app/operate/router/init_router.go
@@ -31,9 +31,6 @@ func InitRouter() {
 		log.Fatalf("JWT Init Error, %s", err.Error())
 	}

-	// 注册系统路由
-	InitSysRouter(r, authMiddleware)
-
 	// 注册业务路由
 	// TODO: 这里可存放业务路由，里边并无实际路由只有演示代码
 	InitExamplesRouter(r, authMiddleware)

--- a/cmd/api/operate.go
+++ b/cmd/api/operate.go
+package api
+
+import "go-admin/app/operate/router"
+
+func init() {
+	//注册路由 fixme 其他应用的路由，在本目录新建文件放在init方法
+	AppRouters = append(AppRouters, router.InitRouter)
+}