diff --git a/ruoyi-ui/public/favicon.ico b/ruoyi-ui/public/favicon.ico
index 121ffe20..e2ca5a3f 100644
Binary files a/ruoyi-ui/public/favicon.ico and b/ruoyi-ui/public/favicon.ico differ
diff --git a/ruoyi-ui/src/assets/logo/logo.png b/ruoyi-ui/src/assets/logo/logo.png
index 121ffe20..389b9ebd 100644
Binary files a/ruoyi-ui/src/assets/logo/logo.png and b/ruoyi-ui/src/assets/logo/logo.png differ
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 57a7a03d..46962787 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -193,6 +193,7 @@ export default {
         this.forecastWeatherData = res.data
         this.loading = false;
       })
+      this.getNowWeather()
 
     },
 
@@ -272,8 +273,8 @@ export default {
 
 <style lang="scss" scoped>
 .weather {
-  width: 120px;
-  margin-right: 10px;
+  width: 125px;
+  margin-right: 2px;
   cursor: pointer;
 }
 
@@ -359,7 +360,7 @@ export default {
 
     .right-menu-item {
       display: inline-block;
-      padding: 0 8px;
+      padding: 0 6px;
       height: 100%;
       font-size: 18px;
       color: #5a5e66;
diff --git a/ruoyi-ui/src/views/business/english/word/collect.vue b/ruoyi-ui/src/views/business/english/word/collect.vue
index 56668138..9ce0b687 100644
--- a/ruoyi-ui/src/views/business/english/word/collect.vue
+++ b/ruoyi-ui/src/views/business/english/word/collect.vue
@@ -48,6 +48,7 @@
 import {collectWord, getWordRPC} from "@/api/business/english/word";
 
 export default {
+  name: "Collect",
   data() {
     return {
       loading: false,
diff --git a/ruoyi-ui/src/views/business/log/apilog/index.vue b/ruoyi-ui/src/views/business/log/apilog/index.vue
index 08f79bb2..4f3443fd 100644
--- a/ruoyi-ui/src/views/business/log/apilog/index.vue
+++ b/ruoyi-ui/src/views/business/log/apilog/index.vue
@@ -124,7 +124,7 @@
 import {listLog, getLog, delLog} from "@/api/business/log/apilog";
 
 export default {
-  name: "Log",
+  name: "Apilog",
   data() {
     return {
       // 遮罩层
diff --git a/ruoyi-ui/src/views/business/monitor/performance/index.vue b/ruoyi-ui/src/views/business/monitor/performance/index.vue
index a78deb6b..d95d6897 100644
--- a/ruoyi-ui/src/views/business/monitor/performance/index.vue
+++ b/ruoyi-ui/src/views/business/monitor/performance/index.vue
@@ -140,7 +140,7 @@ import 'echarts/lib/chart/line'
 import 'echarts/lib/component/polar'
 import { getPerformance } from '@/api/business/monitor/performance/performancemonitor'
 export default {
-  name: 'Index',
+  name: 'Performance',
   components: {
     'v-chart': ECharts
   },
diff --git a/ruoyi-ui/src/views/business/monitor/redis/index.vue b/ruoyi-ui/src/views/business/monitor/redis/index.vue
index dedf897b..fd5a13b9 100644
--- a/ruoyi-ui/src/views/business/monitor/redis/index.vue
+++ b/ruoyi-ui/src/views/business/monitor/redis/index.vue
@@ -71,7 +71,7 @@ import { getRedisCache } from "@/api/business/monitor/redis/cache";
 import echarts from "echarts";
 
 export default {
-  name: "Index",
+  name: "Redis",
   data() {
     return {
       // 统计命令信息
diff --git a/ruoyi-ui/src/views/business/monitor/service/index.vue b/ruoyi-ui/src/views/business/monitor/service/index.vue
index bad5a657..6fc18f61 100644
--- a/ruoyi-ui/src/views/business/monitor/service/index.vue
+++ b/ruoyi-ui/src/views/business/monitor/service/index.vue
@@ -98,7 +98,7 @@
 import {getServiceMonitor} from "@/api/business/monitor/service/monitorservice";
 
 export default {
-  name: "Online",
+  name: "Service",
   data() {
     return {
       //遮罩层
diff --git a/ruoyi-ui/src/views/business/openapi/topsearch/index.vue b/ruoyi-ui/src/views/business/openapi/topsearch/index.vue
index 6e6a14b1..32404d43 100644
--- a/ruoyi-ui/src/views/business/openapi/topsearch/index.vue
+++ b/ruoyi-ui/src/views/business/openapi/topsearch/index.vue
@@ -71,7 +71,7 @@
 import {getTopsearch} from "@/api/business/openapi/topsearch";
 
 export default {
-  name: "index",
+  name: "Topsearch",
   data() {
     return {
       //遮罩层
diff --git a/ruoyi-ui/src/views/business/openapi/translation/index.vue b/ruoyi-ui/src/views/business/openapi/translation/index.vue
index ba86610e..0bb9f203 100644
--- a/ruoyi-ui/src/views/business/openapi/translation/index.vue
+++ b/ruoyi-ui/src/views/business/openapi/translation/index.vue
@@ -112,7 +112,7 @@ import Aword from "@/views/business/openapi/aword";
 export default {
   components: {Aword},
   dicts: ['translation_type'],
-  name: "Log",
+  name: "Translation",
   data() {
     return {
       // 遮罩层
@@ -162,11 +162,26 @@ export default {
           }
         ],
       },
+
+
+
     }
   },
   created() {
     this.getCopyWriting()
     this.getApiAWord()
+
+
+
+    //下拉框默认选中
+  },
+
+  watch: {
+    'dict.type.translation_type'(newVal) {
+      if (newVal[0]) {
+        this.translationData.translationType= newVal[0].value
+      }
+    }
   },
   methods: {
     //随机获取一条每日一句
diff --git a/ruoyi-ui/src/views/business/tools/apitools/index.vue b/ruoyi-ui/src/views/business/tools/apitools/index.vue
index 54b19c16..4a41c48b 100644
--- a/ruoyi-ui/src/views/business/tools/apitools/index.vue
+++ b/ruoyi-ui/src/views/business/tools/apitools/index.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  name: "index"
+  name: "Apitools"
 }
 </script>
 
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 3e05a981..baf82617 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -89,7 +89,7 @@ export default {
       },
       loading: false,
       // 验证码开关
-      captchaOnOff: true,
+      captchaOnOff: false,
       // 注册开关
       register: true,
       redirect: undefined
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java
index bc1b24ab..f984bbdb 100644
--- a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java
@@ -7,15 +7,15 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
+ * mp配置类
  * @author xiejs
- * @desc
- * @create 2021-12-31
+ * @since  2021-12-31
  */
 @Configuration
 public class MybatisPlusConfig {
 
     /**
-     *  mysql分页插件
+     *  mp分页插件
      * @return MybatisPlusInterceptor
      */
     @Bean
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyHandlerInterceptor.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyHandlerInterceptor.java
index cb5c9fd1..d34e85ea 100644
--- a/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyHandlerInterceptor.java
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyHandlerInterceptor.java
@@ -12,10 +12,33 @@ import javax.servlet.http.HttpServletResponse;
  * @since 2022-01-13
  */
 public class MyHandlerInterceptor implements HandlerInterceptor {
+
+    /**
+     * 会在handler方法业务逻辑执行之后尚未跳转页面之前执行
+     * @param request 请求参数
+     * @param response 响应参数
+     * @param handler 处理方法
+     * @param modelAndView 封装了视图数据
+     * @throws Exception e
+     */
     @Override
     public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
 
         //System.out.println("handler1"+handler);
 
     }
+
+
+    /**
+     * 会在handler方法业务逻辑执行之前执行
+     * @param request 请求参数
+     * @param response 响应参数
+     * @param handler 处理方法
+     * @return boolean  true放行 false阻止
+     * @throws Exception e
+     */
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        return HandlerInterceptor.super.preHandle(request, response, handler);
+    }
 }