移除没实现的限制多端登录

admin/package.json

@@ -42,7 +42,7 @@
     "devDependencies": {
         "@rushstack/eslint-patch": "^1.7.2",
         "@types/lodash-es": "^4.17.12",
-        "@types/node": "^20.11.25",
+        "@types/node": "^20.11.27",
         "@types/nprogress": "^0.2.3",
         "@vitejs/plugin-vue": "^5.0.4",
         "@vitejs/plugin-vue-jsx": "^3.1.0",
@@ -51,18 +51,18 @@
         "@vue/tsconfig": "^0.5.1",
         "autoprefixer": "^10.4.18",
         "eslint": "^8.57.0",
-        "eslint-plugin-vue": "^9.22.0",
+        "eslint-plugin-vue": "^9.23.0",
         "execa": "^8.0.1",
         "fs-extra": "^11.2.0",
         "postcss": "^8.4.35",
         "prettier": "^3.2.5",
         "rollup-plugin-visualizer": "^5.12.0",
-        "sass": "^1.71.1",
+        "sass": "^1.72.0",
         "tailwindcss": "^3.4.1",
         "typescript": "~5.4.2",
         "unplugin-auto-import": "^0.17.5",
         "unplugin-vue-components": "^0.26.0",
-        "vite": "^5.1.5",
+        "vite": "^5.1.6",
         "vite-plugin-compression": "^0.5.1",
         "vite-plugin-style-import": "^2.0.0",
         "vite-plugin-svg-icons": "^2.0.1",

admin/src/views/setting/permission/admin/edit.vue

@@ -103,17 +103,6 @@
                 <el-form-item label="管理员状态" v-if="!isRoot">
                     <el-switch v-model="formData.isDisable" :active-value="0" :inactive-value="1" />
                 </el-form-item>
-
-                <el-form-item label="多处登录">
-                    <div>
-                        <el-switch
-                            v-model="formData.isMultipoint"
-                            :active-value="1"
-                            :inactive-value="0"
-                        />
-                        <div class="form-tips">允许多人同时在线登录</div>
-                    </div>
-                </el-form-item>
             </el-form>
         </popup>
     </div>
@@ -146,7 +135,6 @@ const formData = reactive({
     password: '',
     passwordConfirm: '',
     isDisable: 0,
-    isMultipoint: 1,
     //服务端为必传参数，先给默认值
     sort: 1
 })

server.code-workspace

@@ -9,6 +9,5 @@
 		{
 			"path": "docs"
 		}
-	],
+	]
-	"settings": {}
 }

server/admin/common/captcha/captcha_ctl.go

@@ -1,7 +1,6 @@
 package captcha
 
 import (
-	"fmt"
 	"image/color"
 	"x_admin/config"
 
@@ -58,7 +57,7 @@ func init() {
 
 	// //注册自定义配置redis数据库
 	opt, _ := redis.ParseURL(config.Config.RedisUrl)
-	fmt.Printf("%#v", opt)
+	// fmt.Printf("%#v", opt)
 	factory.RegisterCache(constant.RedisCacheKey, service.NewConfigRedisCacheService([]string{opt.Addr}, opt.Username, opt.Password, false, 0))
 
 	// 注册了两种验证码服务 可以自行实现更多的验证

server/admin/system/admin/schema.go

@@ -16,31 +16,30 @@ type SystemAuthAdminDetailReq struct {
 
 //SystemAuthAdminAddReq 管理员新增参数
 type SystemAuthAdminAddReq struct {
-	DeptId       uint   `form:"deptId" binding:"required,gt=0"`           // 部门ID
+	DeptId    uint   `form:"deptId" binding:"required,gt=0"`           // 部门ID
-	PostId       uint   `form:"postId" binding:"required,gt=0"`           // 岗位ID
+	PostId    uint   `form:"postId" binding:"required,gt=0"`           // 岗位ID
-	Username     string `form:"username" binding:"required,min=2,max=20"` // 账号
+	Username  string `form:"username" binding:"required,min=2,max=20"` // 账号
-	Nickname     string `form:"nickname" binding:"required,min=2,max=30"` // 昵称
+	Nickname  string `form:"nickname" binding:"required,min=2,max=30"` // 昵称
-	Password     string `form:"password" binding:"required"`              // 密码
+	Password  string `form:"password" binding:"required"`              // 密码
-	Avatar       string `form:"avatar" binding:"required"`                // 头像
+	Avatar    string `form:"avatar" binding:"required"`                // 头像
-	Role         uint   `form:"role" binding:"gte=0"`                     // 角色
+	Role      uint   `form:"role" binding:"gte=0"`                     // 角色
-	Sort         int    `form:"sort" binding:"gte=0"`                     // 排序
+	Sort      int    `form:"sort" binding:"gte=0"`                     // 排序
-	IsDisable    uint8  `form:"isDisable" binding:"oneof=0 1"`            // 是否禁用: [0=否, 1=是]
+	IsDisable uint8  `form:"isDisable" binding:"oneof=0 1"`            // 是否禁用: [0=否, 1=是]
-	IsMultipoint uint8  `form:"isMultipoint" binding:"oneof=0 1"`         // 多端登录: [0=否, 1=是]
+
 }
 
 //SystemAuthAdminEditReq 管理员编辑参数
 type SystemAuthAdminEditReq struct {
-	ID           uint   `form:"id" binding:"required,gt=0"`               // 主键
+	ID        uint   `form:"id" binding:"required,gt=0"`               // 主键
-	DeptId       uint   `form:"deptId" binding:"required,gt=0"`           // 部门ID
+	DeptId    uint   `form:"deptId" binding:"required,gt=0"`           // 部门ID
-	PostId       uint   `form:"postId" binding:"required,gt=0"`           // 岗位ID
+	PostId    uint   `form:"postId" binding:"required,gt=0"`           // 岗位ID
-	Username     string `form:"username" binding:"required,min=2,max=20"` // 账号
+	Username  string `form:"username" binding:"required,min=2,max=20"` // 账号
-	Nickname     string `form:"nickname" binding:"required,min=2,max=30"` // 昵称
+	Nickname  string `form:"nickname" binding:"required,min=2,max=30"` // 昵称
-	Password     string `form:"password"`                                 // 密码
+	Password  string `form:"password"`                                 // 密码
-	Avatar       string `form:"avatar"`                                   // 头像
+	Avatar    string `form:"avatar"`                                   // 头像
-	Role         uint   `form:"role" binding:"gte=0"`                     // 角色
+	Role      uint   `form:"role" binding:"gte=0"`                     // 角色
-	Sort         int    `form:"sort" binding:"gte=0"`                     // 排序
+	Sort      int    `form:"sort" binding:"gte=0"`                     // 排序
-	IsDisable    uint8  `form:"isDisable" binding:"oneof=0 1"`            // 是否禁用: [0=否, 1=是]
+	IsDisable uint8  `form:"isDisable" binding:"oneof=0 1"`            // 是否禁用: [0=否, 1=是]
-	IsMultipoint uint8  `form:"isMultipoint" binding:"oneof=0 1"`         // 多端登录: [0=否, 1=是]
 }
 
 //SystemAuthAdminUpdateReq 管理员更新参数
@@ -71,7 +70,6 @@ type SystemAuthAdminResp struct {
 	DeptId        uint        `json:"deptId" structs:"deptId" excel:"name:部门ID;"`                 // 部门ID
 	PostId        uint        `json:"postId" structs:"postId" excel:"name:岗位ID;"`                 // 岗位ID
 	Dept          string      `json:"dept" structs:"dept" excel:"name:部门;"`                       // 部门
-	IsMultipoint  uint8       `json:"isMultipoint" structs:"isMultipoint" excel:"name:多端登录;"`     // 多端登录: [0=否, 1=是]
 	IsDisable     uint8       `json:"isDisable" structs:"isDisable" excel:"name:是否禁用;"`           // 是否禁用: [0=否, 1=是]
 	LastLoginIp   string      `json:"lastLoginIp" structs:"lastLoginIp" excel:"name:最后登录IP;"`     // 最后登录IP
 	LastLoginTime core.TsTime `json:"lastLoginTime" structs:"lastLoginTime" excel:"name:最后登录时间;"` // 最后登录时间
@@ -87,7 +85,6 @@ type SystemAuthAdminSelfOneResp struct {
 	Avatar        string      `json:"avatar" structs:"avatar"`               // 头像
 	Role          string      `json:"role" structs:"role"`                   // 角色
 	Dept          string      `json:"dept" structs:"dept"`                   // 部门
-	IsMultipoint  uint8       `json:"isMultipoint" structs:"isMultipoint"`   // 多端登录: [0=否, 1=是]
 	IsDisable     uint8       `json:"isDisable" structs:"isDisable"`         // 是否禁用: [0=否, 1=是]
 	LastLoginIp   string      `json:"lastLoginIp" structs:"lastLoginIp"`     // 最后登录IP
 	LastLoginTime core.TsTime `json:"lastLoginTime" structs:"lastLoginTime"` // 最后登录时间

server/admin/system/login/service.go

@@ -91,21 +91,6 @@ func (loginSrv systemLoginService) Login(c *gin.Context, req *SystemLoginReq) (r
 	token := util.ToolsUtil.MakeToken()
 	adminIdStr := strconv.FormatUint(uint64(sysAdmin.ID), 10)
 
-	//非多处登录
-	if sysAdmin.IsMultipoint == 0 {
-		sysAdminSetKey := config.AdminConfig.BackstageTokenSet + adminIdStr
-		ts := util.RedisUtil.SGet(sysAdminSetKey)
-		if len(ts) > 0 {
-			var keys []string
-			for _, t := range ts {
-				keys = append(keys, t)
-			}
-			util.RedisUtil.Del(keys...)
-		}
-		util.RedisUtil.Del(sysAdminSetKey)
-		util.RedisUtil.SSet(sysAdminSetKey, token)
-	}
-
 	// 缓存登录信息
 	util.RedisUtil.Set(config.AdminConfig.BackstageTokenKey+token, adminIdStr, 7200)
 	admin.Service.CacheAdminUserByUid(sysAdmin.ID)

server/model/system_model/system.go

@@ -22,7 +22,6 @@ type SystemAuthAdmin struct {
 	Role          string `gorm:"not null;default:'';comment:'角色主键'"`
 	Salt          string `gorm:"not null;default:'';comment:'加密盐巴'"`
 	Sort          uint16 `gorm:"not null;default:0;comment:'排序编号'"`
-	IsMultipoint  uint8  `gorm:"not null;default:0;comment:'多端登录: 0=否, 1=是''"`
 	IsDisable     uint8  `gorm:"not null;default:0;comment:'是否禁用: 0=否, 1=是'"`
 	IsDelete      uint8  `gorm:"not null;default:0;comment:'是否删除: 0=否, 1=是'"`
 	LastLoginIp   string `gorm:"not null;default:'';comment:'最后登录IP'"`

server/util/aj-captcha-go/config/config.go

@@ -85,7 +85,6 @@ func BuildConfig(cacheType, resourcePath string, waterConfig *WatermarkConfig, c
 	} else if strings.Compare(cacheType, constant.MemCacheKey) != 0 &&
 		strings.Compare(cacheType, constant.RedisCacheKey) != 0 {
 		panic(errors.New("cache type not support"))
-		return nil
 	}
 	if cacheExpireSec == 0 {
 		cacheExpireSec = 2 * 60

server/util/aj-captcha-go/util/font_util.go

@@ -1,11 +1,12 @@
 package util
 
 import (
+	"log"
+	"os"
+	"unicode"
+
 	"github.com/golang/freetype"
 	"github.com/golang/freetype/truetype"
-	"io/ioutil"
-	"log"
-	"unicode"
 )
 
 type FontUtil struct {
@@ -19,7 +20,7 @@ func NewFontUtil(src string) *FontUtil {
 
 // GetFont 获取一个字体对象
 func (f *FontUtil) GetFont() *truetype.Font {
-	fontSourceBytes, err := ioutil.ReadFile(f.Src)
+	fontSourceBytes, err := os.ReadFile(f.Src)
 	if err != nil {
 		log.Println("读取字体失败:", err)
 	}