Skip to content

Commit 1fe19d1

Browse files
wenjianzhangwenjianzhang
authored
patch🚑: dev merge
patch🚑: dev merge
2 parents 72391f0 + 1508e85 commit 1fe19d1

File tree

19 files changed

+364
-70
lines changed

19 files changed

+364
-70
lines changed

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 wenjianzhang
3+
Copyright (c) 2020 go-admin-team
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.Zh-cn.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474

7575
### 轻松实现go-admin写出第一个应用 - 文档教程
7676

77-
[步骤一 - 基础内容介绍](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html)
77+
[步骤一 - 基础内容介绍](https://doc.zhangwj.com/guide/intro/tutorial01.html)
7878

79-
[步骤二 - 实际应用 - 编写增删改查](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html)
79+
[步骤二 - 实际应用 - 编写增删改查](https://doc.zhangwj.com/guide/intro/tutorial02.html)
8080

8181
### 手把手教你从入门到放弃 - 视频教程
8282

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ At the same time, a series of tutorials including videos and documents are provi
6868

6969
### Easily implement go-admin to write the first application-documentation tutorial
7070

71-
[Step 1 - basic content introduction](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html)
71+
[Step 1 - basic content introduction](https://doc.zhangwj.com/guide/intro/tutorial01.html)
7272

73-
[Step 2 - Practical application - writing database operations](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html)
73+
[Step 2 - Practical application - writing database operations](https://doc.zhangwj.com/guide/intro/tutorial02.html)
7474

7575
### Teach you from getting started to giving up-video tutorial
7676

‎app/admin/apis/sys_user.go‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package apis
22

33
import (
44
"github.com/gin-gonic/gin/binding"
5+
"github.com/go-admin-team/go-admin-core/sdk/config"
56
"go-admin/app/admin/models"
67
"net/http"
78

@@ -30,7 +31,7 @@ type SysUser struct {
3031
// @Security Bearer
3132
func (e SysUser) GetPage(c *gin.Context) {
3233
s := service.SysUser{}
33-
req :=dto.SysUserGetPageReq{}
34+
req := dto.SysUserGetPageReq{}
3435
err := e.MakeContext(c).
3536
MakeOrm().
3637
Bind(&req).
@@ -67,7 +68,7 @@ func (e SysUser) GetPage(c *gin.Context) {
6768
// @Security Bearer
6869
func (e SysUser) Get(c *gin.Context) {
6970
s := service.SysUser{}
70-
req :=dto.SysUserById{}
71+
req := dto.SysUserById{}
7172
err := e.MakeContext(c).
7273
MakeOrm().
7374
Bind(&req, nil).
@@ -101,7 +102,7 @@ func (e SysUser) Get(c *gin.Context) {
101102
// @Security Bearer
102103
func (e SysUser) Insert(c *gin.Context) {
103104
s := service.SysUser{}
104-
req :=dto.SysUserInsertReq{}
105+
req := dto.SysUserInsertReq{}
105106
err := e.MakeContext(c).
106107
MakeOrm().
107108
Bind(&req, binding.JSON).
@@ -136,7 +137,7 @@ func (e SysUser) Insert(c *gin.Context) {
136137
// @Security Bearer
137138
func (e SysUser) Update(c *gin.Context) {
138139
s := service.SysUser{}
139-
req :=dto.SysUserUpdateReq{}
140+
req := dto.SysUserUpdateReq{}
140141
err := e.MakeContext(c).
141142
MakeOrm().
142143
Bind(&req).
@@ -171,7 +172,7 @@ func (e SysUser) Update(c *gin.Context) {
171172
// @Security Bearer
172173
func (e SysUser) Delete(c *gin.Context) {
173174
s := service.SysUser{}
174-
req :=dto.SysUserById{}
175+
req := dto.SysUserById{}
175176
err := e.MakeContext(c).
176177
MakeOrm().
177178
Bind(&req, binding.JSON).
@@ -208,7 +209,7 @@ func (e SysUser) Delete(c *gin.Context) {
208209
// @Security Bearer
209210
func (e SysUser) InsetAvatar(c *gin.Context) {
210211
s := service.SysUser{}
211-
req :=dto.UpdateSysUserAvatarReq{}
212+
req := dto.UpdateSysUserAvatarReq{}
212213
err := e.MakeContext(c).
213214
MakeOrm().
214215
MakeService(&s.Service).
@@ -257,7 +258,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
257258
// @Security Bearer
258259
func (e SysUser) UpdateStatus(c *gin.Context) {
259260
s := service.SysUser{}
260-
req :=dto.UpdateSysUserStatusReq{}
261+
req := dto.UpdateSysUserStatusReq{}
261262
err := e.MakeContext(c).
262263
MakeOrm().
263264
Bind(&req, binding.JSON, nil).
@@ -294,7 +295,7 @@ func (e SysUser) UpdateStatus(c *gin.Context) {
294295
// @Security Bearer
295296
func (e SysUser) ResetPwd(c *gin.Context) {
296297
s := service.SysUser{}
297-
req :=dto.ResetSysUserPwdReq{}
298+
req := dto.ResetSysUserPwdReq{}
298299
err := e.MakeContext(c).
299300
MakeOrm().
300301
Bind(&req, binding.JSON).
@@ -311,16 +312,23 @@ func (e SysUser) ResetPwd(c *gin.Context) {
311312
//数据权限检查
312313
p := actions.GetPermissionFromContext(c)
313314

315+
if req.UserId == 1 && config.ApplicationConfig.Mode == "demo" {
316+
req.Password = "123456"
317+
}
314318
err = s.ResetPwd(&req, p)
315319
if err != nil {
316320
e.Logger.Error(err)
317321
return
318322
}
319-
e.OK(req.GetId(), "更新成功")
323+
if req.UserId == 1 && config.ApplicationConfig.Mode == "demo" {
324+
e.OK(req.GetId(), "admin:现在使用的预览环境，休想改掉我！否则会影响其他朋友体验的哦！可以创建其他用户体验该功能！")
325+
} else {
326+
e.OK(req.GetId(), "更新成功")
327+
}
320328
}
321329

322330
// UpdatePwd
323-
// @Summary 重置密码
331+
// @Summary 修改密码
324332
// @Description 获取JSON
325333
// @Tags 用户
326334
// @Accept application/json
@@ -331,7 +339,7 @@ func (e SysUser) ResetPwd(c *gin.Context) {
331339
// @Security Bearer
332340
func (e SysUser) UpdatePwd(c *gin.Context) {
333341
s := service.SysUser{}
334-
req :=dto.PassWord{}
342+
req := dto.PassWord{}
335343
err := e.MakeContext(c).
336344
MakeOrm().
337345
Bind(&req).
@@ -345,14 +353,20 @@ func (e SysUser) UpdatePwd(c *gin.Context) {
345353

346354
// 数据权限检查
347355
p := actions.GetPermissionFromContext(c)
348-
356+
if user.GetUserId(c) == 1 && config.ApplicationConfig.Mode == "demo" {
357+
req.NewPassword = "123456"
358+
}
349359
err = s.UpdatePwd(user.GetUserId(c), req.OldPassword, req.NewPassword, p)
350360
if err != nil {
351361
e.Logger.Error(err)
352362
e.Error(http.StatusForbidden, err, "密码修改失败")
353363
return
354364
}
355-
e.OK(nil, "密码修改成功")
365+
if user.GetUserId(c) == 1 && config.ApplicationConfig.Mode == "demo" {
366+
e.OK(nil, "admin:现在使用的预览环境，休想改掉我！否则会影响其他朋友体验的哦！可以创建其他用户体验该功能！")
367+
} else {
368+
e.OK(nil, "密码修改成功")
369+
}
356370
}
357371

358372
// GetProfile
@@ -364,7 +378,7 @@ func (e SysUser) UpdatePwd(c *gin.Context) {
364378
// @Security Bearer
365379
func (e SysUser) GetProfile(c *gin.Context) {
366380
s := service.SysUser{}
367-
req :=dto.SysUserById{}
381+
req := dto.SysUserById{}
368382
err := e.MakeContext(c).
369383
MakeOrm().
370384
MakeService(&s.Service).
@@ -401,7 +415,7 @@ func (e SysUser) GetProfile(c *gin.Context) {
401415
// @Router /api/v1/getinfo [get]
402416
// @Security Bearer
403417
func (e SysUser) GetInfo(c *gin.Context) {
404-
req :=dto.SysUserById{}
418+
req := dto.SysUserById{}
405419
s := service.SysUser{}
406420
r := service.SysRole{}
407421
err := e.MakeContext(c).
@@ -450,4 +464,4 @@ func (e SysUser) GetInfo(c *gin.Context) {
450464
mp["name"] = sysUser.NickName
451465
mp["code"] = 200
452466
e.OK(mp, "")
453-
}
467+
}

‎app/admin/service/sys_role.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
227227
var dlist = make([]models.SysDept, 0)
228228
var model = models.SysRole{}
229229
tx.Preload("SysDept").First(&model, c.RoleId)
230-
tx.Where("id in ?", c.DeptIds).Find(&dlist)
230+
tx.Where("dept_id in ?", c.DeptIds).Find(&dlist)
231231
err = tx.Model(&model).Association("SysDept").Delete(model.SysDept)
232232
if err != nil {
233233
e.Log.Errorf("delete SysDept error:%s", err)

‎app/admin/service/sys_user.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ func (e *SysUser) UpdateAvatar(c *dto.UpdateSysUserAvatarReq, p *actions.DataPer
127127
return errors.New("无权更新该数据")
128128

129129
}
130-
c.Generate(&model)
131-
err = e.Orm.Save(&model).Error
130+
err = e.Orm.Table(model.TableName()).Where("user_id =? ", c.UserId).Updates(c).Error
132131
if err != nil {
133132
e.Log.Errorf("Service UpdateSysUser error: %s", err)
134133
return err
@@ -151,8 +150,7 @@ func (e *SysUser) UpdateStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPer
151150
return errors.New("无权更新该数据")
152151

153152
}
154-
c.Generate(&model)
155-
err = e.Orm.Save(&model).Error
153+
err = e.Orm.Table(model.TableName()).Where("user_id =? ", c.UserId).Updates(c).Error
156154
if err != nil {
157155
e.Log.Errorf("Service UpdateSysUser error: %s", err)
158156
return err
@@ -174,8 +172,7 @@ func (e *SysUser) ResetPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPermission)
174172
if db.RowsAffected == 0 {
175173
return errors.New("无权更新该数据")
176174
}
177-
c.Generate(&model)
178-
err = e.Orm.Save(&model).Error
175+
err = e.Orm.Table(model.TableName()).Where("user_id =? ", c.UserId).Updates(c).Error
179176
if err != nil {
180177
e.Log.Errorf("At Service ResetSysUserPwd error: %s", err)
181178
return err

‎common/file_store/initialize.go‎

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,45 @@
11
package file_store
22

3-
type FileStore struct {
3+
import "fmt"
4+
5+
type OXS struct {
6+
// Endpoint 访问域名
7+
Endpoint string
8+
// AccessKeyID AK
9+
AccessKeyID string
10+
// AccessKeySecret AKS
11+
AccessKeySecret string
12+
// BucketName 桶名称
13+
BucketName string
414
}
515

6-
// Setup 配置数据库
7-
func (e *FileStore) Setup(driver string) {
8-
//fileStoreType := driver
9-
//if fileStoreType == "ALiYunOSS" {
10-
// var store = new(ALiYunOSS)
11-
// store.Setup()
12-
//}
16+
// Setup 配置文件存储driver
17+
func (e *OXS) Setup(driver DriverType, options ...ClientOption) FileStoreType {
18+
fileStoreType := driver
19+
var fileStore FileStoreType
20+
switch fileStoreType {
21+
case AliYunOSS:
22+
fileStore = new(ALiYunOSS)
23+
err := fileStore.Setup(e.Endpoint, e.AccessKeyID, e.AccessKeySecret, e.BucketName)
24+
if err != nil {
25+
fmt.Println(err)
26+
}
27+
return fileStore
28+
case HuaweiOBS:
29+
fileStore = new(HuaWeiOBS)
30+
err := fileStore.Setup(e.Endpoint, e.AccessKeyID, e.AccessKeySecret, e.BucketName)
31+
if err != nil {
32+
fmt.Println(err)
33+
}
34+
return fileStore
35+
case QiNiuKodo:
36+
fileStore = new(QiNiuKODO)
37+
err := fileStore.Setup(e.Endpoint, e.AccessKeyID, e.AccessKeySecret, e.BucketName)
38+
if err != nil {
39+
fmt.Println(err)
40+
}
41+
return fileStore
42+
}
43+
44+
return nil
1345
}

‎common/file_store/interface.go‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
package file_store
22

3+
// DriverType 驱动类型
4+
type DriverType string
5+
6+
const (
7+
// HuaweiOBS 华为云OBS
8+
HuaweiOBS DriverType = "HuaweiOBS"
9+
// AliYunOSS 阿里云OSS
10+
AliYunOSS DriverType = "AliYunOSS"
11+
// QiNiuKodo 七牛云kodo
12+
QiNiuKodo DriverType = "QiNiuKodo"
13+
)
14+
15+
type ClientOption map[string]interface{}
16+
17+
// TODO: FileStoreType名称待定
18+
19+
// FileStoreType OXS
320
type FileStoreType interface {
4-
Setup() error
5-
UpLoad(yourObjectName string, localFile string) error
21+
// Setup 装载 endpoint sss
22+
Setup(endpoint, accessKeyID, accessKeySecret, BucketName string, options ...ClientOption) error
23+
// UpLoad 上传
24+
UpLoad(yourObjectName string, localFile interface{}) error
25+
// GetTempToken 获取临时Token
26+
GetTempToken() (string, error)
627
}

0 commit comments

Comments
 (0)