Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-framework/src/main/java/com/zkqy/framework/sso_oauth2/controller/OauthController.java

@@ -73,8 +73,9 @@ public class OauthController {
         String verifyKey =
                 CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
         String captcha = redisCache.getCacheObject(verifyKey);
-//        if (captcha == null || !captcha.equals(code))
-        if (false) {
+        if (captcha == null || !captcha.equals(code))
+        // if (false)
+        {
             return AjaxResult.warn("验证码错误");
         } else {
             redisCache.deleteObject(verifyKey);

zkqy-ui/src/layout/index.vue

@@ -6,7 +6,7 @@
         <el-col :span="12">
           <div class="logo-title">
             <!-- <img src="../assets/images/mes412.png" alt="" class="imgg" /> -->
-            <img :src="logo" alt="" class="imgg" />
+            <img :src="logo" alt="" class="imgg"/>
             <span class="title">{{ title }}</span>
             <!-- <img src="../assets/images/comlo.png" alt="" class="imgg" /> -->
           </div>
@@ -20,7 +20,7 @@
               <span style="">
                 <span class="jianbiase">{{ username || "默认用户" }}</span>
               </span>
-              <img :src="avatar" class="user-avatar" />
+              <img :src="avatar" class="user-avatar"/>
               <!-- <i class="el-icon-caret-bottom" /> -->
             </div>
             <el-dropdown-menu slot="dropdown" style="margin-top: -20px">
@@ -61,11 +61,11 @@
       >
         <div :class="{ 'fixed-header': fixedHeader }">
           <!-- <navbar /> -->
-          <tags-view v-if="needTagsView" />
+          <tags-view v-if="needTagsView"/>
         </div>
-        <app-main />
+        <app-main/>
         <right-panel>
-          <settings />
+          <settings/>
         </right-panel>
       </div>
     </div>
@@ -73,17 +73,17 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 import RightPanel from "@/components/RightPanel";
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from "./components";
+import {AppMain, Navbar, Settings, Sidebar, TagsView} from "./components";
 import ResizeMixin from "./mixin/ResizeHandler";
-import { mapState } from "vuex";
+import {mapState} from "vuex";
 import variables from "@/assets/styles/variables.scss";
 import mes412 from "@/assets/images/mes412.svg";
 import mecLogoLogin from "@/assets/images/mec-logo-login.svg";
 import mecosLogo1 from "@/assets/images/mecosLogo1.svg";
 
-import { refreshToken } from "@/api/login";
+import {refreshToken} from "@/api/login";
 
 export default {
   name: "Layout",
@@ -168,10 +168,11 @@ export default {
           //   this.$router.push({path: "/login", query: {tenantCode: tenantCode}});
           // });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     handleClickOutside() {
-      this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
+      this.$store.dispatch("app/closeSideBar", {withoutAnimation: false});
     },
     getlogo() {
       let logo = sessionStorage.getItem("logo");
@@ -188,10 +189,10 @@ export default {
     },
   },
   mounted() {
-    var user = sessionStorage.getItem("sessionObj");
-    var user = JSON.parse(user);
-    this.userName = JSON.parse(user.data).username;
     this.getlogo();
+    var user = JSON.parse(sessionStorage.getItem("sessionObj"));
+    this.userName = JSON.parse(user.data).username;
+
     // this.startTokenRefresh();
   },
   beforeDestroy() {