Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

server/api/v1/sys_authority.go

@@ -28,7 +28,7 @@ func CreateAuthority(c *gin.Context) {
 	}
 	if err, authBack := service.CreateAuthority(authority); err != nil {
 		global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
-		response.FailWithMessage("创建失败", c)
+		response.FailWithMessage("创建失败"+err.Error(), c)
 	} else {
 		response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "创建成功", c)
 	}
@@ -55,7 +55,7 @@ func CopyAuthority(c *gin.Context) {
 	}
 	if err, authBack := service.CopyAuthority(copyInfo); err != nil {
 		global.GVA_LOG.Error("拷贝失败!", zap.Any("err", err))
-		response.FailWithMessage("拷贝失败", c)
+		response.FailWithMessage("拷贝失败"+err.Error(), c)
 	} else {
 		response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "拷贝成功", c)
 	}
@@ -78,7 +78,7 @@ func DeleteAuthority(c *gin.Context) {
 	}
 	if err := service.DeleteAuthority(&authority); err != nil { // 删除角色之前需要判断是否有用户正在使用此角色
 		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败", c)
+		response.FailWithMessage("删除失败"+err.Error(), c)
 	} else {
 		response.OkWithMessage("删除成功", c)
 	}
@@ -101,7 +101,7 @@ func UpdateAuthority(c *gin.Context) {
 	}
 	if err, authority := service.UpdateAuthority(auth); err != nil {
 		global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
-		response.FailWithMessage("更新失败", c)
+		response.FailWithMessage("更新失败"+err.Error(), c)
 	} else {
 		response.OkWithDetailed(response.SysAuthorityResponse{Authority: authority}, "更新成功", c)
 	}
@@ -124,7 +124,7 @@ func GetAuthorityList(c *gin.Context) {
 	}
 	if err, list, total := service.GetAuthorityInfoList(pageInfo); err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
+		response.FailWithMessage("获取失败"+err.Error(), c)
 	} else {
 		response.OkWithDetailed(response.PageResult{
 			List:     list,
@@ -152,7 +152,7 @@ func SetDataAuthority(c *gin.Context) {
 	}
 	if err := service.SetDataAuthority(auth); err != nil {
 		global.GVA_LOG.Error("设置失败!", zap.Any("err", err))
-		response.FailWithMessage("设置失败", c)
+		response.FailWithMessage("设置失败"+err.Error(), c)
 	} else {
 		response.OkWithMessage("设置成功", c)
 	}

server/api/v1/sys_system.go

@@ -72,7 +72,7 @@ func GetServerInfo(c *gin.Context) {
 		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
 		response.FailWithMessage("获取失败", c)
 		return
-	}else {
+	} else {
 		response.OkWithDetailed(gin.H{"server": server}, "获取成功", c)
 	}
 

server/api/v1/sys_user.go

@@ -32,7 +32,7 @@ func Login(c *gin.Context) {
 		U := &model.SysUser{Username: L.Username, Password: L.Password}
 		if err, user := service.Login(U); err != nil {
 			global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误", zap.Any("err", err))
-			response.FailWithMessage("登陆失败!", c)
+			response.FailWithMessage("用户名不存在或者密码错误", c)
 		} else {
 			tokenNext(c, *user)
 		}

server/model/sys_base_menu.go

@@ -29,7 +29,7 @@ type Meta struct {
 type SysBaseMenuParameter struct {
 	global.GVA_MODEL
 	SysBaseMenuID uint
-	Type          string `json:"type" gorm:"commit:'地址栏携带参数为params还是query'"`
-	Key           string `json:"key" gorm:"commit:'地址栏携带参数的key'"`
-	Value         string `json:"value" gorm:"commit:'地址栏携带参数的值'"`
+	Type          string `json:"type" gorm:"comment:地址栏携带参数为params还是query"`
+	Key           string `json:"key" gorm:"comment:地址栏携带参数的key"`
+	Value         string `json:"value" gorm:"comment:地址栏携带参数的值"`
 }

server/service/sys_api.go

@@ -46,7 +46,7 @@ func AutoCreateApi(api model.SysApi) (err error) {
 		fxErr := tx.Where("path = ? AND method = ?", api.Path, api.Method).First(&fApi).Error
 		if errors.Is(fxErr, gorm.ErrRecordNotFound) {
 			txErr = tx.Create(&api).Error
-			if txErr != nil{
+			if txErr != nil {
 				return txErr
 			}
 		}

server/service/sys_base_menu.go

@@ -58,26 +58,26 @@ func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
 				return errors.New("存在相同name修改失败")
 			}
 		}
-		err = tx.Delete(&model.SysBaseMenuParameter{}, "sys_base_menu_id = ?", menu.ID).Error
-		if err != nil {
-			global.GVA_LOG.Debug(err.Error())
-			return err
+		txErr := tx.Unscoped().Delete(&model.SysBaseMenuParameter{}, "sys_base_menu_id = ?", menu.ID).Error
+		if txErr != nil {
+			global.GVA_LOG.Debug(txErr.Error())
+			return txErr
 		}
 		if len(menu.Parameters) > 0 {
 			for k, _ := range menu.Parameters {
 				menu.Parameters[k].SysBaseMenuID = menu.ID
 			}
-			err = tx.Create(&menu.Parameters).Error
-			if err != nil {
-				global.GVA_LOG.Debug(err.Error())
-				return err
+			txErr = tx.Create(&menu.Parameters).Error
+			if txErr != nil {
+				global.GVA_LOG.Debug(txErr.Error())
+				return txErr
 			}
 		}
 
-		err = db.Updates(upDateMap).Error
-		if err != nil {
-			global.GVA_LOG.Debug(err.Error())
-			return err
+		txErr = db.Updates(upDateMap).Error
+		if txErr != nil {
+			global.GVA_LOG.Debug(txErr.Error())
+			return txErr
 		}
 		return nil
 	})

web/debug.log

@@ -0,0 +1 @@
+[1110/113210.377:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

web/src/style/basics.scss

@@ -4,12 +4,20 @@ $icon-size:17px;
 $active-color:#1890ff;
 $bg-main:#f0f2f5;
 $border-color: #f4f4f4;
-
+$white-bg:#fff;
+$el-icon-small:30px;
+$el-icon-mini:24px;
 // aside
+$width-aside:220px; 
+$width-hideside-aside:54px;
+$width-mobile-aside:210px;
 $color-aside:rgba(255, 255, 255,.9);
 $icon-arrow-size-aside:12px;
 $width-submenu-aside:55px;
 $bg-aside:#191a23;
+$height-aside-tilte:64px;
+$height-aside-img:30px;
+$width-aside-img:30px;
 // header
 $height-header: 60px;
 // nav-scroll
@@ -22,3 +30,5 @@ $border-color-table:#ededed;
 $height-table-cell:45px;
 $color-table-tbody:#595959;
 $color-table-thead:#262626;
+// dashboard
+$height-car:68px;

web/src/view/dashboard/index.vue

@@ -6,7 +6,7 @@
                     <span class="card-img"> <img :src="userInfo.headerImg"  alt="" > </span>   
                     <div class="text"><h4>早安，管理员， 请开始您一天的工作吧！</h4>
                         <p class="tips-text">
-                            <i class="el-icon-sunny"></i>
+                            <i class="el-icon-sunny el-icon"></i>
                             <span>今日晴，0℃ - 10℃，天气寒冷，注意添加衣物。</span>
                         </p>
                     </div>

web/src/view/example/simpleUploader/simpleUploader.vue

@@ -147,7 +147,7 @@ export default {
 .uploader-example {
   width: 880px;
   padding: 15px;
-  margin: 40px auto 0;
+  margin: 115px 15px 20px;
   font-size: 12px;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
 }