Merge remote-tracking branch 'remotes/origin/master'

# Conflicts:
#	04.系统编码/Frontend/src/App.vue

04.系统编码/Frontend/.idea/workspace.xml

@@ -2,19 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4b7d7b72-f5b8-41e4-85d5-6267bdc12fc5" name="默认变更列表" comment="">
-      <change afterPath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/handler/GlobalDefaultExceptionHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/model/vo/ImageVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/util/FileUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Backend/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../Backend/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/config/CorsConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/config/CorsConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/config/WebMvcConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/config/WebMvcConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/controller/ImageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/controller/ImageController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/service/ImageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../Backend/src/main/java/com/userinformation/backend/service/ImageService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Backend/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../Backend/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Backend/src/test/java/com/userinformation/backend/UserInformationApplicationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/../Backend/src/test/java/com/userinformation/backend/UserInformationApplicationTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/MicrowaveRadiation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/MicrowaveRadiation.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/uilts/Config.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/uilts/Config.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/uilts/axios.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/uilts/axios.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -56,6 +45,18 @@
       <recent name="D:\project\NanJingLamanRadarProject\04.系统编码\Frontend\public\images" />
     </key>
   </component>
+  <component name="RunManager">
+    <configuration name="dev" type="js.build_tools.npm" nameIsGenerated="true">
+      <package-json value="$PROJECT_DIR$/package.json" />
+      <command value="run" />
+      <scripts>
+        <script value="dev" />
+      </scripts>
+      <node-interpreter value="project" />
+      <envs />
+      <method v="2" />
+    </configuration>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="默认任务">
@@ -96,7 +97,9 @@
       <workItem from="1638497917929" duration="12367000" />
       <workItem from="1638515445129" duration="7072000" />
       <workItem from="1638524838907" duration="8000" />
-      <workItem from="1638752962691" duration="4924000" />
+      <workItem from="1638752962691" duration="9088000" />
+      <workItem from="1638768088746" duration="2255000" />
+      <workItem from="1638770403708" duration="6218000" />
     </task>
     <task id="LOCAL-00001" summary="2021 12 01">
       <created>1638357539757</created>

04.系统编码/Frontend/src/components/Login.vue

@@ -23,7 +23,7 @@ import {reactive, toRefs} from "vue";
 import { post } from "./../uilts/axios";
 import { useRouter } from "vue-router"
 import { ElMessage } from 'element-plus'
-import { setStaff,guid } from "../uilts/storage";
+import { setStaff } from "../uilts/storage";
 
 export default {
   name: 'Login',
@@ -44,6 +44,14 @@ export default {
       return errors;
     }
 
+    const guid = ()=> {
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = Math.random() * 16 | 0,
+            v = c == 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+      });
+    }
+
     const onLoginClick = () => {
       const errors = staffValidate();
       if (errors.length > 0) {
@@ -71,7 +79,8 @@ export default {
 
     return {
       ...toRefs(option),
-      onLoginClick
+      onLoginClick,
+      guid
     }
   }
 }

04.系统编码/Frontend/src/uilts/storage.ts

@@ -1,11 +1,4 @@
 
-export function guid() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        var r = Math.random() * 16 | 0,
-            v = c == 'x' ? r : (r & 0x3 | 0x8);
-        return v.toString(16);
-    });
-}
 
 export function setStaff(key: any, staff: any) {
     localStorage.setItem(key, JSON.stringify(staff));