+ Updated to v2.5.7.

+ Updated vue i18n library.
flipped-aurora · Sep 14, 2023 · c8e6366 · c8e6366
2 parents cd6756b + 536433e
commit c8e6366
Show file tree

Hide file tree

Showing 105 changed files with 1,749 additions and 3,003 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -111,7 +111,7 @@ jobs:
           go-version: ${{ matrix.go-version }}
       - name: Build-go
         run: |
-          cd server/ && go mod tidy && go build && mkdir ../web/ser && mv server ../web/ser/ && cd ../web/ser/ && ls -s 
+          cd server/ && go mod tidy && CGO_ENABLED=0 go build && mkdir ../web/ser && mv server ../web/ser/ && cd ../web/ser/ && ls -s 
       - name: restart
         env:
           KEY: ${{ secrets.KEY }}
@@ -220,7 +220,7 @@ jobs:
           go-version: ${{ matrix.go-version }}
       - name: Build-go
         run: |
-          cd server/ && go mod tidy && go build && mkdir ../web/ser && mv server ../web/ser/ && cd ../web/ser/ && ls -s 
+          cd server/ && go mod tidy && CGO_ENABLED=0 go build && mkdir ../web/ser && mv server ../web/ser/ && cd ../web/ser/ && ls -s 
       - name: restart
         env:
           KEY: ${{ secrets.KEY }}

diff --git a/README-en.md b/README-en.md
@@ -3,11 +3,11 @@
 <img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
 </div>
 <div align=center>
-<img src="https://img.shields.io/badge/golang-1.16-blue"/>
-<img src="https://img.shields.io/badge/gin-1.7.0-lightBlue"/>
-<img src="https://img.shields.io/badge/vue-3.2.25-brightgreen"/>
-<img src="https://img.shields.io/badge/element--plus-2.0.1-green"/>
-<img src="https://img.shields.io/badge/gorm-1.22.5-red"/>
+<img src="https://img.shields.io/badge/golang-1.18-blue"/>
+<img src="https://img.shields.io/badge/gin-1.9.1-lightBlue"/>
+<img src="https://img.shields.io/badge/vue-3.3.4-brightgreen"/>
+<img src="https://img.shields.io/badge/element--plus-2.3.8-green"/>
+<img src="https://img.shields.io/badge/gorm-1.25.2-red"/>
 </div>
 
 English | [简体中文](./README.md)

diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@
 <img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
 </div>
 <div align=center>
-<img src="https://img.shields.io/badge/golang-1.16-blue"/>
-<img src="https://img.shields.io/badge/gin-1.7.0-lightBlue"/>
-<img src="https://img.shields.io/badge/vue-3.2.25-brightgreen"/>
-<img src="https://img.shields.io/badge/element--plus-2.0.1-green"/>
-<img src="https://img.shields.io/badge/gorm-1.22.5-red"/>
+<img src="https://img.shields.io/badge/golang-1.18-blue"/>
+<img src="https://img.shields.io/badge/gin-1.9.1-lightBlue"/>
+<img src="https://img.shields.io/badge/vue-3.3.4-brightgreen"/>
+<img src="https://img.shields.io/badge/element--plus-2.3.8-green"/>
+<img src="https://img.shields.io/badge/gorm-1.25.2-red"/>
 </div>
 
 [English](./README-en.md) | 简体中文

diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
@@ -13,7 +13,7 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 	"go.uber.org/zap"
 )
 
@@ -49,7 +49,7 @@ func (b *BaseApi) Login(c *gin.Context) {
 
 	var oc bool = openCaptcha == 0 || openCaptcha < interfaceToInt(v)
 
-	if !oc || store.Verify(l.CaptchaId, l.Captcha, true) {
+	if !oc || (l.CaptchaId != "" && l.Captcha != "" && store.Verify(l.CaptchaId, l.Captcha, true)) {
 		u := &system.SysUser{Username: l.Username, Password: l.Password}
 		user, err := userService.Login(u)
 		if err != nil {