update 同步 ruoyi

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -79,9 +79,9 @@ public class CaptchaController {
     @GetMapping("/captchaImage")
     public R<Map<String, Object>> getCode() {
         Map<String, Object> ajax = new HashMap<>();
-        boolean captchaOnOff = configService.selectCaptchaOnOff();
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
-        ajax.put("captchaOnOff", captchaOnOff);
+        ajax.put("captchaEnabled", captchaEnabled);
-        if (!captchaOnOff) {
+        if (!captchaEnabled) {
             return R.ok(ajax);
         }
         // 保存验证码信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -87,8 +87,8 @@ public class CacheController {
     @SaCheckPermission("monitor:cache:list")
     @GetMapping("/getKeys/{cacheName}")
     public R<Collection<String>> getCacheKeys(@PathVariable String cacheName) {
-        Collection<String> cacheKyes = RedisUtils.keys(cacheName + "*");
+        Collection<String> cacheKeys = RedisUtils.keys(cacheName + "*");
-        return R.ok(cacheKyes);
+        return R.ok(cacheKeys);
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java

@@ -1,52 +1,52 @@
-package com.ruoyi.common.exception;
+package com.ruoyi.common.exception;
-
+
-/**
+/**
- * 全局异常
+ * 全局异常
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class GlobalException extends RuntimeException {
+public class GlobalException extends RuntimeException {
-
+
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
-
+
-    /**
+    /**
-     * 错误提示
+     * 错误提示
-     */
+     */
-    private String message;
+    private String message;
-
+
-    /**
+    /**
-     * 错误明细，内部调试错误
+     * 错误明细，内部调试错误
-     * <p>
+     * <p>
-     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
-     */
+     */
-    private String detailMessage;
+    private String detailMessage;
-
+
-    /**
+    /**
-     * 空构造方法，避免反序列化问题
+     * 空构造方法，避免反序列化问题
-     */
+     */
-    public GlobalException() {
+    public GlobalException() {
-    }
+    }
-
+
-    public GlobalException(String message) {
+    public GlobalException(String message) {
-        this.message = message;
+        this.message = message;
-    }
+    }
-
+
-    public String getDetailMessage() {
+    public String getDetailMessage() {
-        return detailMessage;
+        return detailMessage;
-    }
+    }
-
+
-    public GlobalException setDetailMessage(String detailMessage) {
+    public GlobalException setDetailMessage(String detailMessage) {
-        this.detailMessage = detailMessage;
+        this.detailMessage = detailMessage;
-        return this;
+        return this;
-    }
+    }
-
+
-    @Override
+    @Override
-    public String getMessage() {
+    public String getMessage() {
-        return message;
+        return message;
-    }
+    }
-
+
-    public GlobalException setMessage(String message) {
+    public GlobalException setMessage(String message) {
-        this.message = message;
+        this.message = message;
-        return this;
+        return this;
-    }
+    }
-}
+}

ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java

@@ -1,65 +1,65 @@
-package com.ruoyi.common.exception;
+package com.ruoyi.common.exception;
-
+
-/**
+/**
- * 业务异常
+ * 业务异常
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public final class ServiceException extends RuntimeException {
+public final class ServiceException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
-
+
-    /**
+    /**
-     * 错误码
+     * 错误码
-     */
+     */
-    private Integer code;
+    private Integer code;
-
+
-    /**
+    /**
-     * 错误提示
+     * 错误提示
-     */
+     */
-    private String message;
+    private String message;
-
+
-    /**
+    /**
-     * 错误明细，内部调试错误
+     * 错误明细，内部调试错误
-     * <p>
+     * <p>
-     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
-     */
+     */
-    private String detailMessage;
+    private String detailMessage;
-
+
-    /**
+    /**
-     * 空构造方法，避免反序列化问题
+     * 空构造方法，避免反序列化问题
-     */
+     */
-    public ServiceException() {
+    public ServiceException() {
-    }
+    }
-
+
-    public ServiceException(String message) {
+    public ServiceException(String message) {
-        this.message = message;
+        this.message = message;
-    }
+    }
-
+
-    public ServiceException(String message, Integer code) {
+    public ServiceException(String message, Integer code) {
-        this.message = message;
+        this.message = message;
-        this.code = code;
+        this.code = code;
-    }
+    }
-
+
-    public String getDetailMessage() {
+    public String getDetailMessage() {
-        return detailMessage;
+        return detailMessage;
-    }
+    }
-
+
-    @Override
+    @Override
-    public String getMessage() {
+    public String getMessage() {
-        return message;
+        return message;
-    }
+    }
-
+
-    public Integer getCode() {
+    public Integer getCode() {
-        return code;
+        return code;
-    }
+    }
-
+
-    public ServiceException setMessage(String message) {
+    public ServiceException setMessage(String message) {
-        this.message = message;
+        this.message = message;
-        return this;
+        return this;
-    }
+    }
-
+
-    public ServiceException setDetailMessage(String detailMessage) {
+    public ServiceException setDetailMessage(String detailMessage) {
-        this.detailMessage = detailMessage;
+        this.detailMessage = detailMessage;
-        return this;
+        return this;
-    }
+    }
-}
+}

ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm

@@ -492,8 +492,8 @@ function handleAdd() {
 function handleUpdate(row) {
   loading.value = true
   reset();
-  const ${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
+  const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
-  get${BusinessName}(${pkColumn.javaField}).then(response => {
+  get${BusinessName}(_${pkColumn.javaField}).then(response => {
     loading.value = false;
     form.value = response.data;
 #foreach ($column in $columns)
@@ -545,10 +545,10 @@ function submitForm() {
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const ${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
+  const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
   proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
     loading.value = true;
-    return del${BusinessName}(${pkColumn.javaField}s);
+    return del${BusinessName}(_${pkColumn.javaField}s);
   }).then(() => {
     loading.value = true;
     getList();

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -37,7 +37,7 @@ public interface ISysConfigService {
      *
      * @return true开启，false关闭
      */
-    boolean selectCaptchaOnOff();
+    boolean selectCaptchaEnabled();
 
     /**
      * 查询参数配置列表

ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

@@ -59,9 +59,9 @@ public class SysLoginService {
      */
     public String login(String username, String password, String code, String uuid) {
         HttpServletRequest request = ServletUtils.getRequest();
-        boolean captchaOnOff = configService.selectCaptchaOnOff();
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
         // 验证码开关
-        if (captchaOnOff) {
+        if (captchaEnabled) {
             validateCaptcha(username, code, uuid, request);
         }
         SysUser user = loadUserByUsername(username);

ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java

@@ -43,9 +43,9 @@ public class SysRegisterService {
         // 校验用户类型是否存在
         String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
 
-        boolean captchaOnOff = configService.selectCaptchaOnOff();
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
         // 验证码开关
-        if (captchaOnOff) {
+        if (captchaEnabled) {
             validateCaptcha(username, registerBody.getCode(), registerBody.getUuid(), request);
         }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -87,12 +87,12 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      * @return true开启，false关闭
      */
     @Override
-    public boolean selectCaptchaOnOff() {
+    public boolean selectCaptchaEnabled() {
-        String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
+        String captchaEnabled = selectConfigByKey("sys.account.captchaEnabled");
-        if (StringUtils.isEmpty(captchaOnOff)) {
+        if (StringUtils.isEmpty(captchaEnabled)) {
             return true;
         }
-        return Convert.toBool(captchaOnOff);
+        return Convert.toBool(captchaEnabled);
     }
 
     /**

ruoyi-ui/src/components/DictData/index.js

@@ -1,7 +1,23 @@
 import Vue from 'vue'
+import store from '@/store'
 import DataDict from '@/utils/dict'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 
+function searchDictByKey(dict, key) {
+  if (key == null && key == "") {
+    return null
+  }
+  try {
+    for (let i = 0; i < dict.length; i++) {
+      if (dict[i].key == key) {
+        return dict[i].value
+      }
+    }
+  } catch (e) {
+    return null
+  }
+}
+
 function install() {
   Vue.use(DataDict, {
     metas: {
@@ -9,7 +25,19 @@ function install() {
         labelField: 'dictLabel',
         valueField: 'dictValue',
         request(dictMeta) {
-          return getDicts(dictMeta.type).then(res => res.data)
+          const storeDict = searchDictByKey(store.getters.dict, dictMeta.type)
+          if (storeDict) {
+            return new Promise(resolve => { resolve(storeDict) })
+          } else {
+            return new Promise((resolve, reject) => {
+              getDicts(dictMeta.type).then(res => {
+                store.dispatch('dict/setDict', { key: dictMeta.type, value: res.data })
+                resolve(res.data)
+              }).catch(error => {
+                reject(error)
+              })
+            })
+          }
         },
       },
     },

ruoyi-ui/src/components/RightPanel/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="rightPanel" :class="{show:show}" class="rightPanel-container">
+  <div ref="rightPanel" class="rightPanel-container">
     <div class="rightPanel-background" />
     <div class="rightPanel">
       <div class="rightPanel-items">
@@ -10,18 +10,12 @@
 </template>
 
 <script>
-import { addClass, removeClass } from '@/utils'
-
 export default {
   name: 'RightPanel',
   props: {
     clickNotClose: {
       default: false,
       type: Boolean
-    },
-    buttonTop: {
-      default: 250,
-      type: Number
     }
   },
   computed: {
@@ -35,21 +29,13 @@ export default {
           value: val
         })
       }
-    },
+    }
-    theme() {
-      return this.$store.state.settings.theme
-    },
   },
   watch: {
     show(value) {
       if (value && !this.clickNotClose) {
         this.addEventClick()
       }
-      if (value) {
-        addClass(document.body, 'showRightPanel')
-      } else {
-        removeClass(document.body, 'showRightPanel')
-      }
     }
   },
   mounted() {
@@ -65,7 +51,7 @@ export default {
       window.addEventListener('click', this.closeSidebar)
     },
     closeSidebar(evt) {
-      const parent = evt.target.closest('.rightPanel')
+      const parent = evt.target.closest('.el-drawer__body')
       if (!parent) {
         this.show = false
         window.removeEventListener('click', this.closeSidebar)
@@ -80,14 +66,6 @@ export default {
 }
 </script>
 
-<style>
-.showRightPanel {
-  overflow: hidden;
-  position: relative;
-  width: calc(100% - 15px);
-}
-</style>
-
 <style lang="scss" scoped>
 .rightPanel-background {
   position: fixed;
@@ -113,21 +91,6 @@ export default {
   z-index: 40000;
 }
 
-.show {
-  transition: all .3s cubic-bezier(.7, .3, .1, 1);
-
-  .rightPanel-background {
-    z-index: 20000;
-    opacity: 1;
-    width: 100%;
-    height: 100%;
-  }
-
-  .rightPanel {
-    transform: translate(0);
-  }
-}
-
 .handle-button {
   width: 48px;
   height: 48px;

ruoyi-ui/src/layout/components/Settings/index.vue

@@ -1,78 +1,76 @@
 <template>
-  <div class="drawer-container">
+  <el-drawer size="280px" :visible="visible" :with-header="false" :append-to-body="true" :show-close="false">
-    <div>
+    <div class="drawer-container">
-      <div class="setting-drawer-content">
+      <div>
-        <div class="setting-drawer-title">
+        <div class="setting-drawer-content">
-          <h3 class="drawer-title">主题风格设置</h3>
+          <div class="setting-drawer-title">
+            <h3 class="drawer-title">主题风格设置</h3>
+          </div>
+          <div class="setting-drawer-block-checbox">
+            <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
+              <img src="@/assets/images/dark.svg" alt="dark">
+              <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+                <i aria-label="图标: check" class="anticon anticon-check">
+                  <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">
+                    <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
+                  </svg>
+                </i>
+              </div>
+            </div>
+            <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
+              <img src="@/assets/images/light.svg" alt="light">
+              <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+                <i aria-label="图标: check" class="anticon anticon-check">
+                  <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">
+                    <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
+                  </svg>
+                </i>
+              </div>
+            </div>
+          </div>
+
+          <div class="drawer-item">
+            <span>主题颜色</span>
+            <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
+          </div>
         </div>
-        <div class="setting-drawer-block-checbox">
+
-          <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
+        <el-divider/>
-            <img src="@/assets/images/dark.svg" alt="dark">
+
-            <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+        <h3 class="drawer-title">系统布局配置</h3>
-              <i aria-label="图标: check" class="anticon anticon-check">
+
-                <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true"
+        <div class="drawer-item">
-                     focusable="false" class="">
+          <span>开启 TopNav</span>
-                  <path
+          <el-switch v-model="topNav" class="drawer-switch" />
-                    d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
-                </svg>
-              </i>
-            </div>
-          </div>
-          <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
-            <img src="@/assets/images/light.svg" alt="light">
-            <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
-              <i aria-label="图标: check" class="anticon anticon-check">
-                <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true"
-                     focusable="false" class="">
-                  <path
-                    d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
-                </svg>
-              </i>
-            </div>
-          </div>
         </div>
 
         <div class="drawer-item">
-          <span>主题颜色</span>
+          <span>开启 Tags-Views</span>
-          <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
+          <el-switch v-model="tagsView" class="drawer-switch" />
         </div>
+
+        <div class="drawer-item">
+          <span>固定 Header</span>
+          <el-switch v-model="fixedHeader" class="drawer-switch" />
+        </div>
+
+        <div class="drawer-item">
+          <span>显示 Logo</span>
+          <el-switch v-model="sidebarLogo" class="drawer-switch" />
+        </div>
+
+        <div class="drawer-item">
+          <span>动态标题</span>
+          <el-switch v-model="dynamicTitle" class="drawer-switch" />
+        </div>
+
+        <el-divider/>
+
+        <el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">保存配置</el-button>
+        <el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">重置配置</el-button>
       </div>
-
-      <el-divider/>
-
-      <h3 class="drawer-title">系统布局配置</h3>
-
-      <div class="drawer-item">
-        <span>开启 TopNav</span>
-        <el-switch v-model="topNav" class="drawer-switch" />
-      </div>
-
-      <div class="drawer-item">
-        <span>开启 Tags-Views</span>
-        <el-switch v-model="tagsView" class="drawer-switch" />
-      </div>
-
-      <div class="drawer-item">
-        <span>固定 Header</span>
-        <el-switch v-model="fixedHeader" class="drawer-switch" />
-      </div>
-
-      <div class="drawer-item">
-        <span>显示 Logo</span>
-        <el-switch v-model="sidebarLogo" class="drawer-switch" />
-      </div>
-
-      <div class="drawer-item">
-        <span>动态标题</span>
-        <el-switch v-model="dynamicTitle" class="drawer-switch" />
-      </div>
-
-      <el-divider/>
-
-      <el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">保存配置</el-button>
-      <el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">重置配置</el-button>
     </div>
-  </div>
+  </el-drawer>
 </template>
 
 <script>
@@ -87,6 +85,11 @@ export default {
     };
   },
   computed: {
+    visible: {
+      get() {
+        return this.$store.state.settings.showSettings
+      }
+    },
     fixedHeader: {
       get() {
         return this.$store.state.settings.fixedHeader
@@ -232,7 +235,7 @@ export default {
   }
 
   .drawer-container {
-    padding: 24px;
+    padding: 20px;
     font-size: 14px;
     line-height: 1.5;
     word-wrap: break-word;

ruoyi-ui/src/store/getters.js

@@ -2,6 +2,7 @@ const getters = {
   sidebar: state => state.app.sidebar,
   size: state => state.app.size,
   device: state => state.app.device,
+  dict: state => state.dict.dict,
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,

ruoyi-ui/src/store/index.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import app from './modules/app'
+import dict from './modules/dict'
 import user from './modules/user'
 import tagsView from './modules/tagsView'
 import permission from './modules/permission'
@@ -12,6 +13,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   modules: {
     app,
+    dict,
     user,
     tagsView,
     permission,

ruoyi-ui/src/store/modules/dict.js

@@ -0,0 +1,50 @@
+const state = {
+  dict: new Array()
+}
+const mutations = {
+  SET_DICT: (state, { key, value }) => {
+    if (key !== null && key !== "") {
+      state.dict.push({
+        key: key,
+        value: value
+      })
+    }
+  },
+  REMOVE_DICT: (state, key) => {
+    try {
+      for (let i = 0; i < state.dict.length; i++) {
+        if (state.dict[i].key == key) {
+          state.dict.splice(i, i)
+          return true
+        }
+      }
+    } catch (e) {
+    }
+  },
+  CLEAN_DICT: (state) => {
+    state.dict = new Array()
+  }
+}
+
+const actions = {
+  // 设置字典
+  setDict({ commit }, data) {
+    commit('SET_DICT', data)
+  },
+  // 删除字典
+  removeDict({ commit }, key) {
+    commit('REMOVE_DICT', key)
+  },
+  // 清空字典
+  cleanDict({ commit }) {
+    commit('CLEAN_DICT')
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+

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 @@ export default {
       },
       loading: false,
       // 验证码开关
-      captchaOnOff: true,
+      captchaEnabled: true,
       // 注册开关
       register: false,
       redirect: undefined
@@ -110,8 +110,8 @@ export default {
   methods: {
     getCode() {
       getCodeImg().then(res => {
-        this.captchaOnOff = res.data.captchaOnOff === undefined ? true : res.data.captchaOnOff;
+        this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
-        if (this.captchaOnOff) {
+        if (this.captchaEnabled) {
           this.codeUrl = "data:image/gif;base64," + res.data.img;
           this.loginForm.uuid = res.data.uuid;
         }
@@ -144,7 +144,7 @@ export default {
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
           }).catch(() => {
             this.loading = false;
-            if (this.captchaOnOff) {
+            if (this.captchaEnabled) {
               this.getCode();
             }
           });

ruoyi-ui/src/views/register.vue

@@ -29,7 +29,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="registerForm.code"
           auto-complete="off"
@@ -105,7 +105,7 @@ export default {
         code: [{ required: true, trigger: "change", message: "请输入验证码" }]
       },
       loading: false,
-      captchaOnOff: true
+      captchaEnabled: true
     };
   },
   created() {
@@ -114,8 +114,8 @@ export default {
   methods: {
     getCode() {
       getCodeImg().then(res => {
-        this.captchaOnOff = res.data.captchaOnOff === undefined ? true : res.data.captchaOnOff;
+        this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
-        if (this.captchaOnOff) {
+        if (this.captchaEnabled) {
           this.codeUrl = "data:image/gif;base64," + res.data.img;
           this.registerForm.uuid = res.data.uuid;
         }
@@ -137,7 +137,7 @@ export default {
             }).catch(() => {});
           }).catch(() => {
             this.loading = false;
-            if (this.captchaOnOff) {
+            if (this.captchaEnabled) {
               this.getCode();
             }
           })

ruoyi-ui/src/views/system/dict/data.vue

@@ -364,12 +364,14 @@ export default {
         if (valid) {
           if (this.form.dictCode != undefined) {
             updateData(this.form).then(response => {
+              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addData(this.form).then(response => {
+              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -386,6 +388,7 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
+        this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ruoyi-ui/src/views/system/dict/index.vue

@@ -339,6 +339,7 @@ export default {
     handleRefreshCache() {
       refreshCache().then(() => {
         this.$modal.msgSuccess("刷新成功");
+        this.$store.dispatch('dict/cleanDict');
       });
     }
   }

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>

script/sql/oracle/oracle_ry_vue_4.X.sql

@@ -682,12 +682,12 @@ comment on column sys_config.update_by     is '更新者';
 comment on column sys_config.update_time   is '更新时间';
 comment on column sys_config.remark        is '备注';
 
-insert into sys_config values(1, '主框架页-默认皮肤样式名称',     'sys.index.skinName',            'skin-blue',     'Y', 'admin', sysdate, '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
+insert into sys_config values(1, '主框架页-默认皮肤样式名称',      'sys.index.skinName',            'skin-blue',     'Y', 'admin', sysdate, '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
 insert into sys_config values(2, '用户管理-账号初始密码',         'sys.user.initPassword',         '123456',        'Y', 'admin', sysdate, '', null, '初始化密码 123456' );
 insert into sys_config values(3, '主框架页-侧边栏主题',           'sys.index.sideTheme',           'theme-dark',    'Y', 'admin', sysdate, '', null, '深色主题theme-dark，浅色主题theme-light' );
-insert into sys_config values(4, '账号自助-验证码开关',           'sys.account.captchaOnOff',      'true',          'Y', 'admin', sysdate, '', null, '是否开启验证码功能（true开启，false关闭）');
+insert into sys_config values(4, '账号自助-验证码开关',           'sys.account.captchaEnabled',    'true',          'Y', 'admin', sysdate, '', null, '是否开启验证码功能（true开启，false关闭）');
-insert into sys_config values(5, '账号自助-是否开启用户注册功能', 'sys.account.registerUser',      'false',         'Y', 'admin', sysdate, '', null, '是否开启注册用户功能（true开启，false关闭）');
+insert into sys_config values(5, '账号自助-是否开启用户注册功能',   'sys.account.registerUser',      'false',         'Y', 'admin', sysdate, '', null, '是否开启注册用户功能（true开启，false关闭）');
-insert into sys_config values(11, 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 'admin', sysdate, '', null, 'true:开启, false:关闭');
+insert into sys_config values(11, 'OSS预览列表资源开关',          'sys.oss.previewListResource',   'true',          'Y', 'admin', sysdate, '', null, 'true:开启, false:关闭');
 
 
 -- ----------------------------

script/sql/postgres/postgres_ry_vue_4.X.sql

@@ -695,7 +695,7 @@ comment on column sys_config.remark is '备注';
 insert into sys_config values(1, '主框架页-默认皮肤样式名称',     'sys.index.skinName',            'skin-blue',     'Y', 'admin', now(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
 insert into sys_config values(2, '用户管理-账号初始密码',         'sys.user.initPassword',         '123456',        'Y', 'admin', now(), '', null, '初始化密码 123456' );
 insert into sys_config values(3, '主框架页-侧边栏主题',           'sys.index.sideTheme',           'theme-dark',    'Y', 'admin', now(), '', null, '深色主题theme-dark，浅色主题theme-light' );
-insert into sys_config values(4, '账号自助-验证码开关',           'sys.account.captchaOnOff',      'true',          'Y', 'admin', now(), '', null, '是否开启验证码功能（true开启，false关闭）');
+insert into sys_config values(4, '账号自助-验证码开关',           'sys.account.captchaEnabled',    'true',          'Y', 'admin', now(), '', null, '是否开启验证码功能（true开启，false关闭）');
 insert into sys_config values(5, '账号自助-是否开启用户注册功能',   'sys.account.registerUser',      'false',         'Y', 'admin', now(), '', null, '是否开启注册用户功能（true开启，false关闭）');
 insert into sys_config values(11, 'OSS预览列表资源开关',          'sys.oss.previewListResource',   'true',          'Y', 'admin', now(), '', null, 'true:开启, false:关闭');
 

script/sql/ry_vue_4.X.sql

@@ -3,7 +3,7 @@
 -- ----------------------------
 drop table if exists sys_dept;
 create table sys_dept (
-  dept_id           bigint(20)      not null     comment '部门id',
+  dept_id           bigint(20)      not null                   comment '部门id',
   parent_id         bigint(20)      default 0                  comment '父部门id',
   ancestors         varchar(500)    default ''                 comment '祖级列表',
   dept_name         varchar(30)     default ''                 comment '部门名称',
@@ -529,11 +529,11 @@ create table sys_config (
 ) engine=innodb comment = '参数配置表';
 
 insert into sys_config values(1, '主框架页-默认皮肤样式名称',     'sys.index.skinName',            'skin-blue',     'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
-insert into sys_config values(2, '用户管理-账号初始密码',         'sys.user.initPassword',         '123456',        'Y', 'admin', sysdate(), '', null, '初始化密码 123456' );
+insert into sys_config values(2, '用户管理-账号初始密码',        'sys.user.initPassword',         '123456',        'Y', 'admin', sysdate(), '', null, '初始化密码 123456' );
-insert into sys_config values(3, '主框架页-侧边栏主题',           'sys.index.sideTheme',           'theme-dark',    'Y', 'admin', sysdate(), '', null, '深色主题theme-dark，浅色主题theme-light' );
+insert into sys_config values(3, '主框架页-侧边栏主题',          'sys.index.sideTheme',           'theme-dark',    'Y', 'admin', sysdate(), '', null, '深色主题theme-dark，浅色主题theme-light' );
-insert into sys_config values(4, '账号自助-验证码开关',           'sys.account.captchaOnOff',      'true',          'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，false关闭）');
+insert into sys_config values(4, '账号自助-验证码开关',          'sys.account.captchaEnabled',    'true',          'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，false关闭）');
-insert into sys_config values(5, '账号自助-是否开启用户注册功能', 'sys.account.registerUser',      'false',         'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）');
+insert into sys_config values(5, '账号自助-是否开启用户注册功能',  'sys.account.registerUser',      'false',         'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）');
-insert into sys_config values(11, 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 'admin', sysdate(), '', null, 'true:开启, false:关闭');
+insert into sys_config values(11, 'OSS预览列表资源开关',         'sys.oss.previewListResource',   'true',          'Y', 'admin', sysdate(), '', null, 'true:开启, false:关闭');
 
 
 -- ----------------------------

script/sql/sqlserver/sqlserver_ry_vue_4.X.sql

@@ -414,7 +414,7 @@ INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [
 GO
 INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [config_type], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (3, N'主框架页-侧边栏主题', N'sys.index.sideTheme', N'theme-dark', N'Y', N'admin', getdate(), N'', NULL, N'深色主题theme-dark，浅色主题theme-light')
 GO
-INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [config_type], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (4, N'账号自助-验证码开关', N'sys.account.captchaOnOff', N'true', N'Y', N'admin', getdate(), N'', NULL, N'是否开启验证码功能（true开启，false关闭）')
+INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [config_type], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (4, N'账号自助-验证码开关', N'sys.account.captchaEnabled', N'true', N'Y', N'admin', getdate(), N'', NULL, N'是否开启验证码功能（true开启，false关闭）')
 GO
 INSERT [sys_config] ([config_id], [config_name], [config_key], [config_value], [config_type], [create_by], [create_time], [update_by], [update_time], [remark]) VALUES (5, N'账号自助-是否开启用户注册功能', N'sys.account.registerUser', N'false', N'Y', N'admin', getdate(), N'', NULL, N'是否开启注册用户功能（true开启，false关闭）')
 GO