登陆重构

src/api/infoApi.js

@@ -1,142 +1,142 @@
-import {
-  getRequest,
-  postJsonRequest,
-  deleteRequest,
-  putRequest,
-} from "@/utils/axios";
-const infoApi = {
-  // 获取设备信息
-  getSys(params) {
-    return getRequest("/info", params);
-  },
-  // 获取网络信息
-  getNet(params) {
-    return getRequest("/net", params);
-  },
-  saveNet(params) {
-    return putRequest("/net", params);
-  },
-  reboot() {
-    return postJsonRequest("/reboot",);
-  },
-  // 透传列表
-  getTc(params) {
-    return getRequest('/tc', params)
-  },
-  // 获取透传类型
-  getSupport(params) {
-    return getRequest('/tc/support', params)
-  },
-  // 获取可用串口列表
-  getFree(params) {
-    return getRequest('/com/free', params)
-  },
-  // 获取支持的通讯驱动
-  getTxSupport(params) {
-    return getRequest('/tx/support', params)
-  },
+// import {
+//   getRequest,
+//   postJsonRequest,
+//   deleteRequest,
+//   putRequest,
+// } from "@/utils/axios";
+// const infoApi = {
+//   // 获取设备信息
+//   getSys(params) {
+//     return getRequest("/info", params);
+//   },
+//   // 获取网络信息
+//   getNet(params) {
+//     return getRequest("/net", params);
+//   },
+//   saveNet(params) {
+//     return putRequest("/net", params);
+//   },
+//   reboot() {
+//     return postJsonRequest("/reboot",);
+//   },
+//   // 透传列表
+//   getTc(params) {
+//     return getRequest('/tc', params)
+//   },
+//   // 获取透传类型
+//   getSupport(params) {
+//     return getRequest('/tc/support', params)
+//   },
+//   // 获取可用串口列表
+//   getFree(params) {
+//     return getRequest('/com/free', params)
+//   },
+//   // 获取支持的通讯驱动
+//   getTxSupport(params) {
+//     return getRequest('/tx/support', params)
+//   },
 
-  // 获取所有串口列表api/com
-  getCom(params) {
-    return getRequest('/com', params)
-  },
+//   // 获取所有串口列表api/com
+//   getCom(params) {
+//     return getRequest('/com', params)
+//   },
   
-  saveTx(params) {
-    return postJsonRequest("/tx", params);
-  },
-  editTx(params) {
-    return putRequest("/tx", params);
-  },
-  // 透传服务启停
-  stopTc(params) {
-    return putRequest("/tc", params);
-  },
-  // 透传服务删除
-  delTc(params) {
-    return deleteRequest("/tc", params);
-  },
-  // 模板列表
-  getMb(params) {
-    return getRequest('/tx/mb/list', params)
-  },
-  // 新增模板
-  addMb(params) {
-    return postJsonRequest('/tx/mb', params)
-  },
-  // 编辑模板
-  editMb(params) {
-    return putRequest('/tx/mb', params)
-  },
-  // 删除模板
-  delMb(params) {
-    return deleteRequest('/tx/mb', params)
-  },
-  // 新增点位
-  addP(params) {
-    return putRequest('/tx/mb', params)
-  },
+//   saveTx(params) {
+//     return postJsonRequest("/tx", params);
+//   },
+//   editTx(params) {
+//     return putRequest("/tx", params);
+//   },
+//   // 透传服务启停
+//   stopTc(params) {
+//     return putRequest("/tc", params);
+//   },
+//   // 透传服务删除
+//   delTc(params) {
+//     return deleteRequest("/tc", params);
+//   },
+//   // 模板列表
+//   getMb(params) {
+//     return getRequest('/tx/mb/list', params)
+//   },
+//   // 新增模板
+//   addMb(params) {
+//     return postJsonRequest('/tx/mb', params)
+//   },
+//   // 编辑模板
+//   editMb(params) {
+//     return putRequest('/tx/mb', params)
+//   },
+//   // 删除模板
+//   delMb(params) {
+//     return deleteRequest('/tx/mb', params)
+//   },
+//   // 新增点位
+//   addP(params) {
+//     return putRequest('/tx/mb', params)
+//   },
  
-  // 获取点位
-  getP(params) {
-    return postJsonRequest('/tx/mb/info', params)
-  },
-  // 获取设备列表
-  getSet(params) {
-    return postJsonRequest('/tx/info', params)
-  },
-   // 新增设备
-   addSet(params) {
-    return putRequest('/tx/device', params)
-  },
-  // 通讯列表
-  getTx(params) {
-    return getRequest('/tx/list', params)
-  },
-  // 新增通讯列表
-  saveTx(params) {
-    return postJsonRequest("/tx", params);
-  },
+//   // 获取点位
+//   getP(params) {
+//     return postJsonRequest('/tx/mb/info', params)
+//   },
+//   // 获取设备列表
+//   getSet(params) {
+//     return postJsonRequest('/tx/info', params)
+//   },
+//    // 新增设备
+//    addSet(params) {
+//     return putRequest('/tx/device', params)
+//   },
+//   // 通讯列表
+//   getTx(params) {
+//     return getRequest('/tx/list', params)
+//   },
+//   // 新增通讯列表
+//   saveTx(params) {
+//     return postJsonRequest("/tx", params);
+//   },
   
-  // 通讯服务启用,停用
-  changeStatus(params) {
-    return postJsonRequest(`/tx/${params.url}/${params.name}`, params);
-  },
+//   // 通讯服务启用,停用
+//   changeStatus(params) {
+//     return postJsonRequest(`/tx/${params.url}/${params.name}`, params);
+//   },
 
-  // 删除通讯
-  delTx(params) {
-    return deleteRequest(`/tx`, params);
-  },
-  // 获取上报列表
-  getSc(params) {
-    return getRequest('/sb/list', params)
-  },
-  // 获取上报驱动
-  getQuDong(params) {
-    return getRequest('/sb/support', params)
-  },
-  // 新增上报
-  saveTx(params) {
-    return postJsonRequest("/sb", params);
-  },
-  // 编辑通讯
-  updateTx(params) {
-    return putRequest('/sb', params);
-  },
-  // 上报启停
-  stopSc(params) {
-    return putRequest("/sc", params);
-  },
-  // 删除上报
-  delSc(params) {
-    return deleteRequest("/sb", params);
-  },
-  // 规则查询
-  getRules(params) {
-    return getRequest('/rule', params);
-  },
-  // 规则操作
-  postRules(params) {
-    return postJsonRequest('/rule', params)
-  },
-};
-export default infoApi;
+//   // 删除通讯
+//   delTx(params) {
+//     return deleteRequest(`/tx`, params);
+//   },
+//   // 获取上报列表
+//   getSc(params) {
+//     return getRequest('/sb/list', params)
+//   },
+//   // 获取上报驱动
+//   getQuDong(params) {
+//     return getRequest('/sb/support', params)
+//   },
+//   // 新增上报
+//   saveTx(params) {
+//     return postJsonRequest("/sb", params);
+//   },
+//   // 编辑通讯
+//   updateTx(params) {
+//     return putRequest('/sb', params);
+//   },
+//   // 上报启停
+//   stopSc(params) {
+//     return putRequest("/sc", params);
+//   },
+//   // 删除上报
+//   delSc(params) {
+//     return deleteRequest("/sb", params);
+//   },
+//   // 规则查询
+//   getRules(params) {
+//     return getRequest('/rule', params);
+//   },
+//   // 规则操作
+//   postRules(params) {
+//     return postJsonRequest('/rule', params)
+//   },
+// };
+// export default infoApi;

src/api/myApi.js

@@ -1,22 +1,16 @@
 import {
-    getRequest,
-    postJsonRequest,
-    deleteRequest,
-    putRequest
+  postPBRequest,
 } from '@/utils/axios';
 const myApi = {
   // 登录
+  loginStatus() {
+    return postPBRequest('/login', null, 1000);
+  },
   login(params = {}) {
-      return postJsonRequest('/login', params);
+    return postPBRequest('/login', params, 1001);
   },
-    // 修改密码
-    editPass(params) {
-      return putRequest("/user", params);
-    },
-    // 退出
-    logOut() {
-      return postJsonRequest('/logout');
+  logout() {
+    return postPBRequest('/login', null, 1002);
   }
 }
 export default myApi;
-  

src/components/EditPass.vue

@@ -51,7 +51,7 @@ import myApi from "@/api/myApi.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useStore } from "vuex";
 import md5 from 'js-md5'
-import { passwd, response } from '../proto/data/pd'
+import { response } from '../proto/data/pd'
 
 export default {
   props: ["dialogVisible"],

src/components/Header.vue

@@ -46,13 +46,10 @@
 <script>
 import { onMounted, reactive, toRefs } from "vue";
 import { useRouter } from "vue-router";
-import { localRemove, pathMap } from "@/utils";
-import infoApi from "@/api/infoApi.js";
+import { pathMap } from "@/utils";
 import EditPass from "@/components/EditPass.vue";
-import { ElMessage } from "element-plus";
 import { useStore } from "vuex";
 import myApi from "@/api/myApi.js";
-import { response } from '../proto/data/pd'
 export default {
   name: "Header",
   components: {
@@ -94,25 +91,26 @@ export default {
     };
 
     const reStart = async () => {
-      const res = await infoApi.reboot();
-      if (res.code == 0) {
-        ElMessage.success(res.msg || "请求成功");
-      } else {
-        ElMessage.error(res.msg || "请求失败");
-      }
+      // const res = await infoApi.reboot();
+      // if (res.code == 0) {
+      //   ElMessage.success(res.msg || "请求成功");
+      // } else {
+      //   ElMessage.error(res.msg || "请求失败");
+      // }
     };
     const logout = async () => { 
-      const res = await myApi.logOut();
+      const res = await myApi.logout();
+      console.log("666",res);
       // 解析返回数据
-      const ret = response.decode(new Uint8Array(res));  
-      if (ret.code == 0) {
-          // 获取数据
-          console.log(new TextDecoder().decode(ret.data));
-          localRemove("token");
-          window.location.reload();
-      } else {
-          console.log(ret);
-      }
+      // const ret = response.decode(new Uint8Array(res));  
+      // if (ret.code == 0) {
+      //     // 获取数据
+      //     console.log(new TextDecoder().decode(ret.data));
+      //     localRemove("token");
+      //     window.location.reload();
+      // } else {
+      //     console.log(ret);
+      // }
     };
 
     const editPass = () => {

src/proto/info.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "data/";
+option go_package = "pb/";
 
 message info{
     Basicinfo basicinfo = 1;
@@ -12,8 +12,9 @@ message info{
 // 基本信息
 message Basicinfo{
     string model = 1;       // 设备型号
-    string sn = 2;          // 设备SN
-    string first_time = 3;  // 初次激活时间
+    string id = 2;          // 设备id
+    string sn = 3;          // 设备SN
+    string factory = 4;     // 出厂日期
 }
 
 // 主机信息

src/proto/reponse.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+option go_package = "pb/";
+
+message response{
+    uint32 code = 1;
+    bytes data = 2;
+    string message = 3;
+}

src/proto/user.proto

@@ -1,22 +1,14 @@
 syntax = "proto3";
-option go_package = "data/";
+option go_package = "pb/";
 
 message user{
     string name = 1;
     string password = 2;
-    fixed64 timestamp = 3;
+    string new_password = 3;
 }
 
 message token{
     string name = 1;
-    string token = 2;
-    fixed64 timestamp = 3;
-    fixed64 expiration_time  = 4;
-}
-
-message passwd{
-    string name = 1;
-    string old_password = 2;
-    string new_password = 3;
-    string new_password2 = 4;
+    int64 expires_time = 2;
+    string value = 3;
 }

src/proto2/info.proto

@@ -0,0 +1,55 @@
+syntax = "proto3";
+option go_package = "pb/";
+
+message info{
+    Basicinfo basicinfo = 1;
+    Hostinfo hostinfo = 2;
+    Meminfo meminfo = 3;
+    repeated Diskinfo diskinfo = 4;
+    repeated Netinfo netinfo = 5;
+}
+
+// 基本信息
+message Basicinfo{
+    string model = 1;       // 设备型号
+    string id = 2;          // 设备id
+    string sn = 3;          // 设备SN
+    string factory = 4;     // 出厂日期
+}
+
+// 主机信息
+message Hostinfo{
+    int32 cpu = 1;          // cpu核数
+    string uptime = 2;      // 开机时长
+    string boottime = 3;    // 开机时间
+}
+
+// 内存信息
+message Meminfo{
+    double total = 1;           // 总大小
+    double available = 2;       // 可用
+    double used = 3;            // 已用
+    double used_percent = 4;    // 已用占比
+    double free = 5;            // 空闲
+    double buffers = 6;         // 缓冲区
+    double cached = 7;          // 缓存
+}
+
+// 存储信息
+message Diskinfo{
+    string name = 1;            // 名称
+    string path = 2;            // 路径
+    double total = 3;           // 总大小
+    double free = 4;            // 空闲
+    double used = 5;            // 已用
+    double used_percent = 6;    // 已用占比
+}
+
+// 网络信息
+message Netinfo{
+    string name = 1;        // 网卡名称
+    uint64 bytesSent = 2;   // number of bytes sent
+    uint64 bytesRecv = 3;   // number of bytes received
+    uint64 packetsSent = 4; // number of packets sent
+    uint64 packetsRecv = 5; // number of packets received
+}

src/proto2/user.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+option go_package = "pb/";
+
+message user{
+    string name = 1;
+    string password = 2;
+    string new_password = 3;
+}
+
+message token{
+    string name = 1;
+    int64 expires_time = 2;
+    string value = 3;
+}

src/utils/axios.js

@@ -1,96 +1,69 @@
 import axios from "axios";
-import md5 from "js-md5";
-import { Base64 } from "js-base64";
-import { ElMessage } from "element-plus";
+import {
+  ElMessage
+} from "element-plus";
 import router from "@/router/index";
-import { localGet } from "./index";
+import {
+  localSet,
+  localGet,
+  localRemove
+} from "./index";
 import config from "~/config";
-import { token,response } from '../proto/data/pd';
-import { localRemove, pathMap } from "@/utils";
+import {
+  response
+} from '../proto/data/pd';
 
-axios.defaults.baseURL = config[import.meta.env.MODE].baseUrl;
+axios.defaults.baseURL = config[
+  import.meta.env.MODE].baseUrl;
 axios.defaults.withCredentials = true;
 // 请求头，headers 信息
 axios.defaults.headers["X-Requested-With"] = "XMLHttpRequest";
 
-axios.defaults.headers = getNeedToken();
-
-
-function getNeedToken() {
-  const ret_token = localGet("token");
-  if (ret_token && ret_token.timestamp) {
-    ret_token.timestamp = new Date().getTime();
-    const tokenInfo = token.encode(ret_token).finish();
-    // 直接转换为string丢到header里，header的key为"cdcm"
-    const cdcm = tokenInfo.slice(0, tokenInfo.length).toString()
-    return { cdcm };
-  } else {
-    localRemove("token");
+axios.interceptors.request.use(
+    (req) => {
+        req.headers["cdcm"] = localGet("token");
+        return req;
     }
+);
 
-}
-
-// 请求拦截器，内部根据返回值，重新组装，统一管理。
 axios.interceptors.response.use(
   (res) => {
+    const token = res.headers["token"]
+    // 如果token不为空，就缓存到本地
+    if (typeof (token) != "undefined") {
+      localSet("token", token);
+    }
+    const ret = response.decode(new Uint8Array(res.data));
     // token过期 
-    const ret = response.decode(new Uint8Array(res));  
-    if(ret.code ===40100 || ret.code ===40101) {
+    if (ret.code === 2003) {
       localRemove("token");
       ElMessage.closeAll();
-      ElMessage.error(ret.msg || "Token过期，请重新登录");
-      router.push({ path: "/login" });
+      ElMessage.error(ret.msg + "[" + new TextDecoder().decode(res.data) + "]" || "Token异常,请重新登录");
+      router.push({
+        path: "/login"
+      });
       return Promise.reject(ret);
     }
-    return res.data;
+    return ret
   },
   (error) => {
     ElMessage.closeAll();
-    ElMessage.error(error || "401 Unauthorized");
-    router.push({ path: "/login" });
+    ElMessage.error(error);
+    router.push({
+      path: "/login"
+    });
     return Promise.reject(error);
   }
 );
 // post请求
-export function postJsonRequest(url, params) {
+export function postPBRequest(url, params, actionNum) {
   return axios({
     method: "post",
     url: url,
     data: params,
     responseType: 'arraybuffer',
     headers: {
-      "Content-Type": "application/json",
+      "action": actionNum,
     },
   });
 }
-// get请求
-export function getRequest(url, params) {
-  return axios({
-    method: "get",
-    responseType: 'arraybuffer',
-    params: {
-      ...params,
-    },
-    url: url,
-  });
-}
-
-export function deleteRequest(url, params) {
-  return axios({
-    method: "delete",
-    data: params,
-    responseType: 'arraybuffer',
-    url: url,
-  });
-}
-export const putRequest = (url, params) => {
-  return axios({
-    method: "put",
-    data: params,
-    responseType: 'arraybuffer',
-    url: url,
-    headers: {
-      "Content-Type": "application/json",
-    },
-  });
-};

src/views/Home.vue

@@ -70,7 +70,7 @@
 
 <script>
 import { onMounted, reactive, ref, toRefs, nextTick } from "vue";
-import infoApi from "@/api/infoApi.js";
+// import infoApi from "@/api/infoApi.js";
 import { ElMessage } from "element-plus";
 import * as echarts from "echarts";
 import { user, token, response, info } from '../proto/data/pd';
@@ -92,19 +92,19 @@ export default {
       getSys(); 
     });
     const getSys = async () => {
-      const res = await infoApi.getSys();
-      // 解析返回数据
-      const ret = response.decode(new Uint8Array(res)); 
-      console.log(ret)
+      // const res = await infoApi.getSys();
+      // // 解析返回数据
+      // const ret = response.decode(new Uint8Array(res)); 
+      // console.log(ret)
        
-      if (ret.code == 0) {
-        // 解析数据
-        state.deviceData = info.decode(ret.data);
-        console.log(44, state.deviceData);
-        nextTick(() => {
-          drawEchart();
-        });
-      }
+      // if (ret.code == 0) {
+      //   // 解析数据
+      //   state.deviceData = info.decode(ret.data);
+      //   console.log(44, state.deviceData);
+      //   nextTick(() => {
+      //     drawEchart();
+      //   });
+      // }
        
       
     };

src/views/Login.vue

@@ -76,27 +76,18 @@ export default {
           const userInfo = user.encode({
             name: state.ruleForm.username,
             password: md5(state.ruleForm.password).toUpperCase(),
-            timestamp: new Date().getTime()
+            // timestamp: new Date().getTime()
           }).finish()
         
           // 2. 截取有效长度
           const send_userInfo = userInfo.slice(0, userInfo.length);
           const res = await myApi.login(send_userInfo);
-  
-          // 解析返回数据
-          const ret = response.decode(new Uint8Array(res)); 
-
-          console.log(2, ret);
-          if (ret.code == 0) {
-              // 解析数据
-              const ret_token = token.decode(ret.data);
-              // 将返回token传入路由
-              localSet('token', ret_token); 
-              console.log(222, localGet("token"));
-              // 跳转
+          // console.log("===",res);
+          console.log("===",new TextDecoder().decode(res.data));
+          if (res.code == 0){
+            const res2 = await myApi.loginStatus();
+            console.log("===",new TextDecoder().decode(res2.data));
             window.location.href = '/';
-          } else {
-              console.log(ret);
           }
         } else {
           console.log("error submit!!");

vite.config.js

@@ -24,10 +24,10 @@ export default ({ mode }) =>  defineConfig({
   server: {
     proxy: {
       '/api': {
-        target: 'http://cdcm_test_api.shikicc.com:58909',
+        // target: 'http://cdcm_test_api.shikicc.com:58909',
         // target: 'http://frp.shikicc.com:58951',
         // target: 'http://10.10.14.123',
-        // target: 'https://cdcmapi.shikicc.com',
+        target: 'https://cdcm_api.shikicc.com',
         changeOrigin: true,
         rewrite: path => path.replace(/^\/api/, '/api')
       }