发布 v2.5.1 针对 v2.5.0 版本新特性bug修复

ruoyi-ui/src/views/index.vue

@@ -91,6 +91,18 @@
             <span>更新日志</span>
           </div>
           <el-collapse accordion>
+            <el-collapse-item title="v2.5.1 - 2021-7-13">
+              <ol>
+                <li>update 验证码开关 转移到表 参数管理 内</li>
+                <li>update 使用hutool重构 判断是否url</li>
+                <li>fix 修复 docker业务集群部署与文件上传的问题</li>
+                <li>fix 修复代码生成同步表结构id冲突问题</li>
+                <li>fix 修复代码生成选择字典 无法取消问题</li>
+                <li>fix 修复代码生成字典为null问题</li>
+                <li>fix 图片上传 多图时无法删除相应图片修复</li>
+                <li>remove 删除富文本video事件</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v2.5.0 - 2021-7-12">
               <ol>
                 <li>update springboot 2.4.7 => 2.4.8</li>

ruoyi-ui/src/views/login.vue

@@ -18,7 +18,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="captchaEnabled">
+      <el-form-item prop="code" v-if="captchaOnOff">
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
@@ -81,8 +81,8 @@ export default {
         code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
       },
       loading: false,
-      redirect: undefined,
-      captchaEnabled:false
+      captchaOnOff: true,
+      redirect: undefined
     };
   },
   watch: {
@@ -100,8 +100,8 @@ export default {
   methods: {
     getCode() {
       getCodeImg().then(res => {
-        this.captchaEnabled = res.data.enabled;
-        if(res.data.enabled){
+        this.captchaOnOff = res.data.captchaOnOff === undefined ? true : res.data.captchaOnOff;
+        if (this.captchaOnOff) {
           this.codeUrl = "data:image/gif;base64," + res.data.img;
           this.loginForm.uuid = res.data.uuid;
         }
@@ -134,7 +134,9 @@ export default {
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
           }).catch(() => {
             this.loading = false;
-            this.getCode();
+            if (this.captchaOnOff) {
+              this.getCode();
+            }
           });
         }
       });