Skip to content

Commit 022c190

Browse files
xz1220xz1220
committed
Doc:formating code
1 parent eeda124 commit 022c190

10 files changed

Lines changed: 73 additions & 68 deletions

File tree

‎front-end/package-lock.json‎

Lines changed: 9 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎front-end/src/models/Login.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ function logout(account) {
33
return ajax("/api/logout",account);
44
}
55
function login(username, password) {
6-
return ajaxPost("/api/login", `username=${username}&password=${password}`);
7-
// var login = {'username':username,'password':password};
8-
// return ajaxPost("/api/login", login);
6+
// return ajaxPost("/api/login", `username=${username}&password=${password}`);
7+
var login = {'username':username,'password':password};
8+
return ajaxPost("/api/login", login);
99
}
1010
export {login, logout };

‎front-end/src/models/Service.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
//const HOST = "http://121.48.165.37:8887";
33
//const HOST = "http://47.100.254.133:23333";
44
//const HOST="http://47.95.0.117:8887";
5-
const HOST = "http://47.95.0.117:8887";
5+
// const HOST = "http://47.95.0.117:8887";
6+
const HOST="http://127.0.0.1:9996";
67
//upload image files(*.png,*.jpe?g)
78
const AppendFileAPI = HOST + "/api/appendFile";
89
//upload compressed file(*.zip)
@@ -20,8 +21,8 @@ function ajaxPost(path, body, noCode) {
2021
method: "POST",
2122
credentials: "include",
2223
headers,
23-
body: path == "/api/login" ? body : JSON.stringify(body)
24-
// body:JSON.stringify(body)
24+
// body: path == "/api/login" ? body : JSON.stringify(body)
25+
body:JSON.stringify(body)
2526
})
2627
.then(response => {
2728
console.log(response)

‎server/server-golang/README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# labelproject-back
22

3-
### 2020-3-21
4-
- 项目初始化
5-
- 连接mysql、redis
6-
- 实现登录功能
3+
## Reconstruction
4+
Aim:

‎server/server-golang/controller/AdminUser.go‎

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,27 @@ import (
88
"labelproject-back/model"
99
"labelproject-back/util"
1010
"log"
11-
"net/http"
1211
"strconv"
1312
"strings"
1413
"time"
1514

1615
"github.com/gin-gonic/gin"
1716
)
1817

19-
func Login(ctx *gin.Context) {
18+
type userDto struct {
19+
Username string `json:"username"`
20+
UserID int64 `json:"userId"`
21+
Authorities string `json:"authorities"`
22+
}
2023

21-
type userDto struct {
22-
Username string `json:"username"`
23-
UserID int64 `json:"userId"`
24-
Authorities string `json:"authorities"`
25-
}
24+
// Login check the username & password. If everything is right, writing successful message to context.
25+
func Login(ctx *gin.Context) {
2626

27-
db := common.GetDB()
28-
cache := common.GetCache()
29-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
27+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
28+
redisUtilInstance := util.RedisUtilInstance(common.GetCache())
3029

31-
//使用结构体
3230
var requestMap = model.User{}
33-
json.NewDecoder(ctx.Request.Body).Decode(&requestMap) //其中一种
31+
json.NewDecoder(ctx.Request.Body).Decode(&requestMap)
3432

3533
user, err := adminUserReposityInstance.FindByUserName(requestMap.Username)
3634
if err != nil {
@@ -42,38 +40,35 @@ func Login(ctx *gin.Context) {
4240
util.ManagerInstance.FailWithoutData(ctx, "密码错误")
4341
return
4442
}
45-
//TOKEN
46-
token, err := middleware.ReleaseToken(ctx, user) //发放token
43+
44+
token, err := middleware.ReleaseToken(ctx, user)
4745
if err != nil {
4846
util.ManagerInstance.FailWithoutData(ctx, "系统异常")
4947
return
5048
}
5149

52-
cookie := http.Cookie{Name: "request_token", Value: "6MIhycayVQizGoweGhRvUFVARhAARiTyJ1NS6YNfiuQJ1ZHU", Expires: time.Now().AddDate(0, 0, 1)}
53-
http.SetCookie(ctx.Writer, &cookie)
50+
// cookie := http.Cookie{Name: "request_token", Value: "6MIhycayVQizGoweGhRvUFVARhAARiTyJ1NS6YNfiuQJ1ZHU", Expires: time.Now().AddDate(0, 0, 1)}
51+
// http.SetCookie(ctx.Writer, &cookie)
5452

55-
redisUtilInstance := util.RedisUtilInstance(cache)
56-
log.Println(ctx.Request.RemoteAddr)
5753
err = redisUtilInstance.AddTokenTORedis(token, requestMap.Username, ctx.Request.RemoteAddr)
58-
//返回结果
54+
if err != nil {
55+
util.ManagerInstance.FailWithoutData(ctx, "add token to redis error")
56+
return
57+
}
5958

60-
// util.Success(ctx, gin.H{"user": model.ToUserDto(user), "token": token}, "SUCCESS")
6159
util.Success(ctx, gin.H{"user": userDto{
6260
Username: user.Username,
6361
UserID: user.UserID,
6462
Authorities: user.Authorities,
6563
}, "token": token}, "SUCCESS")
66-
// util.Success(ctx, gin.H{"token": token}, "SUCCESS")
6764

6865
log.Println("登录成功！")
69-
7066
}
7167

7268
func Logout(ctx *gin.Context) {
73-
Authorization := ctx.GetHeader("Authorization")
7469

75-
cache := common.GetCache()
76-
redisUtilInstance := util.RedisUtilInstance(cache)
70+
Authorization := ctx.GetHeader("Authorization")
71+
redisUtilInstance := util.RedisUtilInstance(common.GetCache())
7772

7873
if Authorization != "" && strings.HasPrefix(Authorization, "Bearer ") {
7974
authToken := strings.TrimLeft(Authorization, "Bearer ")
@@ -84,8 +79,7 @@ func Logout(ctx *gin.Context) {
8479
}
8580

8681
func GetCount(ctx *gin.Context) {
87-
db := common.GetDB()
88-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
82+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
8983
taskCout, _ := adminUserReposityInstance.GetTaskCount()
9084
reviewerCount, _ := adminUserReposityInstance.GetReviewerCount()
9185
userCount, _ := adminUserReposityInstance.GetUserCount()
@@ -95,8 +89,7 @@ func GetCount(ctx *gin.Context) {
9589

9690
// GetUserList
9791
func GetUserList(ctx *gin.Context) {
98-
db := common.GetDB()
99-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
92+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
10093
users, _ := adminUserReposityInstance.GetUserList()
10194
util.Success(ctx, gin.H{"userList": users}, "SUCCESS")
10295
}
@@ -111,8 +104,7 @@ func EditUser(ctx *gin.Context) {
111104
}
112105
log.Println("User Information: ", user.Username)
113106

114-
db := common.GetDB()
115-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
107+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
116108
err := adminUserReposityInstance.EditUser(user)
117109
if err != nil {
118110
util.ManagerInstance.FailWithoutData(ctx, "Edit User Error!!!")
@@ -134,8 +126,7 @@ func AddUser(ctx *gin.Context) {
134126
}
135127
log.Println("User Information: ", user.Username)
136128

137-
db := common.GetDB()
138-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
129+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
139130
err := adminUserReposityInstance.AddUser(user)
140131
if err != nil {
141132
util.ManagerInstance.FailWithoutData(ctx, "Add User Error!!!")
@@ -158,8 +149,7 @@ func DeleteUser(ctx *gin.Context) {
158149
util.ManagerInstance.FailWithoutData(ctx, "Parameter Error : Bind User Wrong!!")
159150
return
160151
}
161-
db := common.GetDB()
162-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
152+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
163153
user, err := adminUserReposityInstance.GetUserByID(tempuser.UserID)
164154
if err != nil {
165155
util.ManagerInstance.FailWithoutData(ctx, "Parameter Error : Can't Find the User By ID!!")
@@ -192,8 +182,7 @@ func GetPendingUserList(ctx *gin.Context) {
192182
return
193183
}
194184

195-
db := common.GetDB()
196-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
185+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
197186
users, err := adminUserReposityInstance.GetPendingUserList(imageID)
198187
if err != nil {
199188
util.ManagerInstance.FailWithoutData(ctx, "Get PendingUser List Error!!!")
@@ -218,8 +207,7 @@ func GetVideoPendingUserList(ctx *gin.Context) {
218207
return
219208
}
220209

221-
db := common.GetDB()
222-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
210+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
223211
users, err := adminUserReposityInstance.GetVideoPendingUserList(imageID)
224212
if err != nil {
225213
util.ManagerInstance.FailWithoutData(ctx, "Get VideoPendingUser List Error!!!")
@@ -233,8 +221,7 @@ func GetVideoPendingUserList(ctx *gin.Context) {
233221
func GetListUser(ctx *gin.Context) {
234222
log.Println("Get List User")
235223

236-
db := common.GetDB()
237-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
224+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
238225
users, err := adminUserReposityInstance.GetListUser()
239226
if err != nil {
240227
util.ManagerInstance.FailWithoutData(ctx, "Get List User Error!!!")
@@ -248,8 +235,7 @@ func GetListUser(ctx *gin.Context) {
248235
func GetListReviewer(ctx *gin.Context) {
249236
log.Println("Get List User")
250237

251-
db := common.GetDB()
252-
adminUserReposityInstance := repository.AdminUserReposityInstance(db)
238+
adminUserReposityInstance := repository.AdminUserReposityInstance(common.GetDB())
253239
users, err := adminUserReposityInstance.GetListReviewer()
254240
if err != nil {
255241
util.ManagerInstance.FailWithoutData(ctx, "Get List User Error!!!")

‎server/server-golang/labelproject-golang.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
extnetwork-2:
1010
ipv4_address: 172.24.0.2
1111
volumes:
12-
- "/home/xingzheng/data/mysql/data2:/var/lib/mysql:rw"
12+
- "/home/xingzheng/data/mysql/data:/var/lib/mysql:rw"
1313
ports:
1414
- 3307:3306
1515

@@ -27,7 +27,7 @@ services:
2727
extnetwork-2:
2828
ipv4_address: 172.24.0.4
2929
volumes:
30-
- "/home/xingzheng/data/labelproject/home2:/home"
30+
- "/home/xingzheng/data/labelproject/home:/home"
3131
ports:
3232
- 9996:5556
3333
# web-fore:

‎server/server-golang/main.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ func CollectRoute(r *gin.Engine, foreIP string) *gin.Engine {
2525
r.Use(middleware.CORSMiddleware(foreIP)).POST("/api/login", controller.Login)
2626
r.Use(middleware.CORSMiddleware(foreIP)).GET("/api/logout", controller.Logout)
2727

28-
admin := r.Group("/api/admin").Use(middleware.CORSMiddleware(foreIP)).Use(middleware.JwtAuth())
28+
// admin := r.Group("/api/admin").Use(middleware.CORSMiddleware(foreIP)).Use(middleware.JwtAuth())
29+
admin := r.Group("/api/admin").Use(middleware.CORSMiddleware(foreIP))
2930
{
3031
admin.GET("/getCount", controller.GetCount)
3132
admin.GET("/getUserList", controller.GetUserList)
@@ -70,7 +71,8 @@ func CollectRoute(r *gin.Engine, foreIP string) *gin.Engine {
7071

7172
//ReviewerController
7273

73-
reviewer := r.Group("/api/reviewer").Use(middleware.CORSMiddleware(foreIP)).Use(middleware.JwtAuth())
74+
// reviewer := r.Group("/api/reviewer").Use(middleware.CORSMiddleware(foreIP)).Use(middleware.JwtAuth())
75+
reviewer := r.Group("/api/reviewer").Use(middleware.CORSMiddleware(foreIP))
7476
{
7577
reviewer.POST("/taskList", controller.TaskListReviewer)
7678
reviewer.POST("/getImgList", controller.GetImageListReviewer)
@@ -80,7 +82,8 @@ func CollectRoute(r *gin.Engine, foreIP string) *gin.Engine {
8082
reviewer.POST("/setFinalVersion", controller.SetFinalVersionReviewer)
8183
}
8284

83-
user := r.Group("/api/user").Use(middleware.CORSMiddleware(foreIP)).Use(middleware.JwtAuth())
85+
// user := r.Group("/api/user").Use(middleware.CORSMiddleware(foreIP)).Use(middleware.JwtAuth())
86+
user := r.Group("/api/user").Use(middleware.CORSMiddleware(foreIP))
8487
{
8588
user.POST("/taskList", controller.TaskListUser)
8689
user.POST("/getImgList", controller.GetImgListUser)

‎server/server-golang/middleware/jwt.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ func TokenIsExpiration(expirationTime string) (bool, error) {
8282
return now.After(Oldtime), nil
8383
}
8484

85+
// JwtAuth:
86+
// TODO: There are some issues that fuction
8587
func JwtAuth() gin.HandlerFunc {
8688
return func(c *gin.Context) {
8789

‎server/server-golang/util/RedisUtil.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ func RedisUtilInstance(cache *redis.Client) RedisUtil {
3232
return redisUtilInstance
3333
}
3434

35+
// AddTokenTORedis add tokens to redis.
36+
// It returns err when error occurs in github.com/go-redis/redis.
3537
func (Redis *redisUtil) AddTokenTORedis(token string, userName string, ip string) error {
3638

3739
err := Redis.HSetWithExpirationTime(token, "tokenValidTime", time.Now().AddDate(0, 0, 7).String(), time.Duration(time.Hour*24*7))

‎server/server-golang/vim‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"registry-mirrors" : [
3+
"http://ovfftd6p.mirror.aliyuncs.com",
4+
"http://registry.docker-cn.com",
5+
"http://docker.mirrors.ustc.edu.cn",
6+
"http://hub-mirror.c.163.com"
7+
],
8+
"insecure-registries" : [
9+
"registry.docker-cn.com",
10+
"docker.mirrors.ustc.edu.cn"
11+
],
12+
"debug" : true,
13+
"experimental" : true
14+
}

0 commit comments

Comments
 (0)