Open-CT
/
OpenPBL
1
0
Fork 1
Code Issues Pull Requests 3 Projects Releases Wiki Activity

refactor: update casdoor

This commit is contained in:
lbaf23 2021-08-07 20:21:25 +08:00
parent 37f1d9bccc
commit 9ab7da834c
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/auth.go
View File

@ -2,7 +2,6 @@ package controllers
import (
"OpenPBL/util"
"fmt"
"github.com/astaxie/beego"
"github.com/casdoor/casdoor-go-sdk/auth"
)
@ -82,9 +81,6 @@ func (c *AuthController) Login() {
return
}
fmt.Println(claims.StandardClaims)
claims.AccessToken = token.AccessToken
c.SetSessionUser(claims)
resp := &Response{

2
controllers/chapter.go
View File

@ -32,7 +32,7 @@ func (p *ProjectController) GetProjectChapters() {
uid := ""
show := false
if user.Tag == "student" {
uid = user.Username
uid = user.Name
show = true
}
if user.Tag == "teacher" {

2
controllers/message.go
View File

@ -63,7 +63,7 @@ func (m *MessageController) GetUserMessages() {
size = 10
}
t := m.GetString(":type")
uid := user.Username
uid := util.GetUserId(user)
var messages []models.Message
var rows int64

6
controllers/project.go
View File

@ -56,7 +56,7 @@ func (p *ProjectController) GetProjectDetail() {
p.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
var err error
var project models.ProjectDetail
if user.Tag == "student" {
@ -108,7 +108,7 @@ func (p *ProjectController) CreateProject() {
p.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
project := &models.Project{
TeacherId: uid,
}
@ -158,7 +158,7 @@ func (p *ProjectController) UpdateProject() {
p.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
pid, err := p.GetInt64(":id")
if err != nil {
resp = Response{

2
controllers/projectList.go
View File

@ -82,7 +82,7 @@ func (pl *ProjectListController) GetUserProjectList() {
pl.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
var projects []models.ProjectDetail
var count int64

10
controllers/student.go
View File

@ -57,7 +57,7 @@ func (u *StudentController) LearnProject() {
u.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
l := &models.LearnProject{
Avatar: user.Avatar,
@ -112,7 +112,7 @@ func (u *StudentController) ExitProject() {
u.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
l := &models.LearnProject{
StudentId: uid,
@ -185,7 +185,7 @@ func (u *StudentController) GetLearnSection() {
u.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
sid, err := u.GetInt64(":sectionId")
projectId, err := u.GetInt64(":projectId")
l, err := models.GetLearnSection(sid, uid, projectId)
@ -231,7 +231,7 @@ func (u *StudentController) UpdateLearnSection() {
u.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
sid, err := u.GetInt64(":sectionId")
m, err := u.GetInt("learnMinute")
s, err := u.GetInt("learnSecond")
@ -283,7 +283,7 @@ func (u *StudentController) GetLastLearnSection() {
u.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
projectId := u.GetString(":projectId")
l, err := models.GetLastLearnSection(uid, projectId)
if err != nil {

5
controllers/submit.go
View File

@ -2,6 +2,7 @@ package controllers
import (
"OpenPBL/models"
"OpenPBL/util"
"encoding/json"
"strconv"
"time"
@ -35,7 +36,7 @@ func (p *ProjectController) CreateSubmit() {
p.ServeJSON()
return
}
uid := user.Username
uid := util.GetUserId(user)
tid, err := p.GetInt64(":taskId")
pid, err := p.GetInt64(":projectId")
@ -97,7 +98,7 @@ func (p *ProjectController) UpdateSubmit() {
}
var uid string
if user.Tag == "student" {
uid = user.Username
uid = util.GetUserId(user)
}
tid, err := p.GetInt64(":taskId")
sid, err := p.GetInt64(":submitId")

5
controllers/task.go
View File

@ -2,6 +2,7 @@ package controllers
import (
"OpenPBL/models"
"OpenPBL/util"
"strconv"
)
@ -44,7 +45,7 @@ func (p *ProjectController) GetSectionTasksDetail() {
if user.Tag == "teacher" {
showCount = true
}
uid := user.Username
uid := util.GetUserId(user)
pid := p.GetString(":projectId")
learning = models.IsLearningProject(pid, uid)
tasks, err := models.GetSectionTasks(sid, uid, learning)
@ -130,7 +131,7 @@ func (p *ProjectController) GetProjectTasksDetail() {
showSubmit := false
teacherScore := false
uid := user.Username
uid := util.GetUserId(user)
editable := true
showCount := false
pid := p.GetString(":projectId")

2
go.mod
View File

@ -4,7 +4,7 @@ go 1.16
require (
github.com/astaxie/beego v1.12.3
github.com/casdoor/casdoor-go-sdk v0.0.1
github.com/casdoor/casdoor-go-sdk v0.0.2
github.com/go-sql-driver/mysql v1.6.0
github.com/smartystreets/goconvey v1.6.4
xorm.io/xorm v1.1.2

9
go.sum
View File

@ -52,8 +52,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
github.com/casdoor/casdoor-go-sdk v0.0.1 h1:zTmejxbl22rKFH4KOJv64oRjB6eE88Ae8vMiz7x3fGE=
github.com/casdoor/casdoor-go-sdk v0.0.1/go.mod h1:PlKduZO7RV1E/Gcpfk5Y1LuzROl5ZELn0PCYPGRF6o8=
github.com/casdoor/casdoor-go-sdk v0.0.2 h1:g5wT27AXhJOZy02la1uD8DH/bSYcQMO3crNQPC/MEdU=
github.com/casdoor/casdoor-go-sdk v0.0.2/go.mod h1:PlKduZO7RV1E/Gcpfk5Y1LuzROl5ZELn0PCYPGRF6o8=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@ -73,7 +73,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
@ -83,7 +82,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@ -552,7 +550,6 @@ modernc.org/cc/v3 v3.31.5-0.20210308123301-7a3e9dab9009 h1:u0oCo5b9wyLr++HF3AN9J
modernc.org/cc/v3 v3.31.5-0.20210308123301-7a3e9dab9009/go.mod h1:0R6jl1aZlIl2avnYfbfHBS1QB6/f+16mihBObaBC878=
modernc.org/ccgo/v3 v3.9.0 h1:JbcEIqjw4Agf+0g3Tc85YvfYqkkFOv6xBwS4zkfqSoA=
modernc.org/ccgo/v3 v3.9.0/go.mod h1:nQbgkn8mwzPdp4mm6BT6+p85ugQ7FrGgIcYaE7nSrpY=
modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
modernc.org/libc v1.7.13-0.20210308123627-12f642a52bb8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
modernc.org/libc v1.8.0 h1:Pp4uv9g0csgBMpGPABKtkieF6O5MGhfGo6ZiOdlYfR8=
@ -568,12 +565,10 @@ modernc.org/sqlite v1.10.1-0.20210314190707-798bbeb9bb84 h1:rgEUzE849tFlHSoeCrKy
modernc.org/sqlite v1.10.1-0.20210314190707-798bbeb9bb84/go.mod h1:PGzq6qlhyYjL6uVbSgS6WoF7ZopTW/sI7+7p+mb4ZVU=
modernc.org/strutil v1.1.0 h1:+1/yCzZxY2pZwwrsbH+4T7BQMoLQ9QiBshRC9eicYsc=
modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
modernc.org/tcl v1.5.0 h1:euZSUNfE0Fd4W8VqXI1Ly1v7fqDJoBuAV88Ea+SnaSs=
modernc.org/tcl v1.5.0/go.mod h1:gb57hj4pO8fRrK54zveIfFXBaMHK3SKJNWcmRw1cRzc=
modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
modernc.org/z v1.0.1-0.20210308123920-1f282aa71362/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
modernc.org/z v1.0.1 h1:WyIDpEpAIx4Hel6q/Pcgj/VhaQV5XPJ2I6ryIYbjnpc=
modernc.org/z v1.0.1/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

7
util/user.go Normal file
View File

@ -0,0 +1,7 @@
package util
import "github.com/casdoor/casdoor-go-sdk/auth"
func GetUserId(claims *auth.Claims) (id string) {
return claims.Name
}