修改验证码开关变量名

RuoYi

2022-07-12 4b1351ef214707351d9e95a0024c6241c2f19010

修改验证码开关变量名

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -46,9 +46,9 @@
    public AjaxResult createCaptcha() throws IOException, CaptchaException

    {

        AjaxResult ajax = AjaxResult.success();

        boolean captchaOnOff = captchaProperties.getEnabled();

        ajax.put("captchaOnOff", captchaOnOff);

        if (!captchaOnOff)

        boolean captchaEnabled = captchaProperties.getEnabled();

        ajax.put("captchaEnabled", captchaEnabled);

        if (!captchaEnabled)

        {

            return ajax;

        }


 ruoyi-ui/src/views/login.vue

@@ -23,7 +23,7 @@
          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />

        </el-input>

      </el-form-item>

      <el-form-item prop="code" v-if="captchaOnOff">

      <el-form-item prop="code" v-if="captchaEnabled">

        <el-input

          v-model="loginForm.code"

          auto-complete="off"

@@ -89,7 +89,7 @@
      },

      loading: false,

      // 验证码开关

      captchaOnOff: true,

      captchaEnabled: true,

      // 注册开关

      register: false,

      redirect: undefined

@@ -110,8 +110,8 @@
  methods: {

    getCode() {

      getCodeImg().then(res => {

        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;

        if (this.captchaOnOff) {

        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;

        if (this.captchaEnabled) {

          this.codeUrl = "data:image/gif;base64," + res.img;

          this.loginForm.uuid = res.uuid;

        }

@@ -144,7 +144,7 @@
            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});

          }).catch(() => {

            this.loading = false;

            if (this.captchaOnOff) {

            if (this.captchaEnabled) {

              this.getCode();

            }

          });


 ruoyi-ui/src/views/system/user/profile/resetPwd.vue

@@ -7,7 +7,7 @@
      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>

    </el-form-item>

    <el-form-item label="确认密码" prop="confirmPassword">

      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>

      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>

    </el-form-item>

    <el-form-item>

      <el-button type="primary" size="mini" @click="submit">保存</el-button>