diff --git a/server/api/v1/system/sys_captcha.go b/server/api/v1/system/sys_captcha.go
index f07587d5..8ca800e9 100644
--- a/server/api/v1/system/sys_captcha.go
+++ b/server/api/v1/system/sys_captcha.go
@@ -34,8 +34,9 @@ func (b *BaseApi) Captcha(c *gin.Context) {
response.FailWithMessage("验证码获取失败", c)
} else {
response.OkWithDetailed(systemRes.SysCaptchaResponse{
- CaptchaId: id,
- PicPath: b64s,
+ CaptchaId: id,
+ PicPath: b64s,
+ CaptchaLength: global.GVA_CONFIG.Captcha.KeyLong,
}, "验证码获取成功", c)
}
}
diff --git a/server/model/system/response/sys_captcha.go b/server/model/system/response/sys_captcha.go
index 9e78035a..4d482f9c 100644
--- a/server/model/system/response/sys_captcha.go
+++ b/server/model/system/response/sys_captcha.go
@@ -1,6 +1,7 @@
package response
type SysCaptchaResponse struct {
- CaptchaId string `json:"captchaId"`
- PicPath string `json:"picPath"`
+ CaptchaId string `json:"captchaId"`
+ PicPath string `json:"picPath"`
+ CaptchaLength int `json:"captchaLength""`
}
diff --git a/web/src/style/login.scss b/web/src/style/login.scss
deleted file mode 100644
index 3c037ec8..00000000
--- a/web/src/style/login.scss
+++ /dev/null
@@ -1,128 +0,0 @@
-.login-register-box {
- height: 100vh;
- .login-box {
- width: 40vw;
- position: absolute;
- left: 50%;
- margin-left: -22vw;
- top: 5vh;
- .logo {
- height: 35vh;
- width: 35vh;
- }
- }
-}
-
-.link-icon {
- width: 20px;
- min-width: 20px;
- height: 20px;
- border-radius: 10px;
-}
-
-.vPic {
- width: 33%;
- height: 38px;
- float: right !important;
- background: #ccc;
- img {
- cursor: pointer;
- vertical-align: middle;
- }
-}
-
-.logo_login {
- width: 100px;
-}
-
-#userLayout.user-layout-wrapper {
- height: 100%;
- position: relative;
- &.mobile {
- .container {
- .main {
- max-width: 368px;
- width: 98%;
- }
- }
- }
- .container {
- position: relative;
- overflow: auto;
- width: 100%;
- min-height: 100%;
- background: #f0f2f5 url(@/assets/background.svg) no-repeat 50%;
- background-size: 100%;
- padding: 110px 0 144px;
- a {
- text-decoration: none;
- }
- .top {
- text-align: center;
- margin-top: -40px;
- .header {
- height: 44px;
- line-height: 44px;
- margin-bottom: 30px;
- .badge {
- position: absolute;
- display: inline-block;
- line-height: 1;
- vertical-align: middle;
- margin-left: -12px;
- margin-top: -10px;
- opacity: 0.8;
- }
- .logo {
- height: 44px;
- vertical-align: top;
- margin-right: 16px;
- border-style: none;
- }
- .title {
- font-size: 33px;
- color: rgba(0, 0, 0, 0.85);
- font-family: Avenir, "Helvetica Neue", Arial, Helvetica, sans-serif;
- font-weight: 600;
- position: relative;
- top: 2px;
- }
- }
- .desc {
- font-size: 14px;
- color: rgba(0, 0, 0, 0.45);
- margin-top: 12px;
- }
- }
- .main {
- min-width: 260px;
- width: 368px;
- margin: 0 auto;
- }
- .footer {
- position: relative;
- width: 100%;
- padding: 0 20px;
- margin: 40px 0 10px;
- text-align: center;
- .links {
- margin-bottom: 8px;
- font-size: 14px;
- width: 330px;
- display: inline-flex;
- flex-direction: row;
- justify-content: space-between;
- padding-right: 40px;
- a {
- color: rgba(0, 0, 0, 0.45);
- transition: all 0.3s;
- }
- }
- .copyright {
- color: rgba(0, 0, 0, 0.45);
- font-size: 14px;
- padding-right: 40px;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue
index 0369d437..080698be 100644
--- a/web/src/view/login/index.vue
+++ b/web/src/view/login/index.vue
@@ -7,7 +7,7 @@
class="login_panle_form_title_logo"
:src="$GIN_VUE_ADMIN.appLogo"
alt
- />
+ >
{{ $GIN_VUE_ADMIN.appName }}
+ >
- 前往初始化
+ 前往初始化
登 录
+ >登 录
@@ -70,16 +71,16 @@
+ 
+ 
+ 
+