liyongli il y a 3 ans
Parent
commit
3b7c945dc6
5 fichiers modifiés avec 31 ajouts et 13 suppressions
  1. 1 0
      package.json
  2. 21 9
      src/api/index.js
  3. 0 1
      src/main.js
  4. 4 3
      src/view/login.vue
  5. 5 0
      yarn.lock

+ 1 - 0
package.json

@@ -12,6 +12,7 @@
     "axios": "^0.24.0",
     "core-js": "^3.6.5",
     "element-ui": "^2.15.6",
+    "js-sha256": "^0.9.0",
     "vue": "^2.6.11",
     "vue-router": "^3.5.3"
   },

+ 21 - 9
src/api/index.js

@@ -12,6 +12,18 @@ export function login(data) {
     data,
   });
 }
+/**
+ * 登录
+ * @param {FormData}
+ * @returns {AxiosPromise}
+ */
+export function loginv2(data) {
+  return request({
+    url: "/login-v2",
+    method: "POST",
+    data,
+  });
+}
 /**
  * 活动列表
  * @param {}
@@ -119,7 +131,7 @@ export function bumenData(data) {
   return request({
     url: "/topic/read",
     method: "POST",
-    data
+    data,
   });
 }
 
@@ -132,7 +144,7 @@ export function pingtaiData(data) {
   return request({
     url: "/topic/dep-platform",
     method: "POST",
-    data
+    data,
   });
 }
 
@@ -145,7 +157,7 @@ export function zhanghaoData(data) {
   return request({
     url: "/topic/detail",
     method: "POST",
-    data
+    data,
   });
 }
 
@@ -166,9 +178,9 @@ export function bumenList() {
  * @param {}
  * @returns {AxiosPromise}
  */
- export function baodianList(topic) {
-    return request({
-      url: "/charts/hot-topic?topic=" + topic,
-      method: "GET",
-    });
-  }
+export function baodianList(topic) {
+  return request({
+    url: "/charts/hot-topic?topic=" + topic,
+    method: "GET",
+  });
+}

+ 0 - 1
src/main.js

@@ -7,7 +7,6 @@ Vue.use(ElementUI);
 Vue.config.productionTip = false
 
 router.beforeEach((to, from, next) => {
-    console.log(to.name === "Login")
     if(localStorage.token || to.name === "Login") next();
     else next({path:"/"})
   })

+ 4 - 3
src/view/login.vue

@@ -47,7 +47,8 @@
 
 <script>
 // @ is an alias to /src
-import {login} from "@/api/index.js"
+ let sha256 = require("js-sha256").sha256
+import {loginv2} from "@/api/index.js"
 export default {
   name: "Login",
   data() {
@@ -64,8 +65,8 @@ export default {
       onSubmit(){
           let from = new FormData();
           from.append("username", this.form.username)
-          from.append("password", this.form.password)
-          login(from).then(r=>{
+          from.append("sign", sha256(this.form.username+this.form.password.toLowerCase()))
+          loginv2(from).then(r=>{
               localStorage.token = r.token || "";
               localStorage.login = this.form.username || "";
               this.$router.replace({path: "/main" })

+ 5 - 0
yarn.lock

@@ -5112,6 +5112,11 @@ js-queue@2.0.2:
   dependencies:
     easy-stack "^1.0.1"
 
+js-sha256@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
+  integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"