Merge pull request #15 from misterpancn/feature-develop-buck

release v1.0.5

Author: misterpancn

package.json

@@ -1,6 +1,6 @@
 {
   "name": "VueChat",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "author": "[email protected]",
   "description": "An electron-vue project",
   "private": true,
@@ -104,6 +104,7 @@
     "chalk": "^2.4.1",
     "copy-webpack-plugin": "^4.5.1",
     "cross-env": "^5.1.6",
+    "crypto-js": "^3.1.9-1",
     "css-loader": "^0.28.11",
     "del": "^3.0.0",
     "devtron": "^1.4.0",

src/renderer/components/Chat/Modal/modifyAvatar.vue

@@ -25,9 +25,11 @@
         }
       },
       headers () {
+        let keys = config.encrypt()
         return {
           'Accept': 'application/' + config.apiVersion + '+json',
-          'Client-Key': config.clientKey,
+          'Client-Key': keys.key,
+          'Secret-Salt': keys.salt,
           'Authorization': localStorage.getItem('tokenType') + ' ' + localStorage.getItem('token')
         }
       }

src/renderer/components/Chat/msgTextarea.vue

@@ -55,9 +55,11 @@
         return this.$store.getters.isGroup
       },
       headers () {
+        let keys = config.encrypt()
         return {
           'Accept': 'application/' + config.apiVersion + '+json',
-          'Client-Key': config.clientKey,
+          'Client-Key': keys.key,
+          'Secret-Salt': keys.salt,
           'Authorization': localStorage.getItem('tokenType') + ' ' + localStorage.getItem('token')
         }
       }

src/renderer/request/axios.js

@@ -1,20 +1,22 @@
 import axios from 'axios'
-import config from '@/store/config/config'
+import localConfig from '@/store/config/config'
 import store from '@/store'
-var transport = config.openssl === false ? 'http://' : 'https://'
+var transport = localConfig.openssl === false ? 'http://' : 'https://'
 var instance = axios.create({
-  baseURL: transport + config.serviceAddress + '/api/',
+  baseURL: transport + localConfig.serviceAddress + '/api/',
   timeout: 1000 * 60,
   headers: {
-    'Accept': 'application/' + config.apiVersion + '+json',
-    'Client-Key': config.clientKey
+    'Accept': 'application/' + localConfig.apiVersion + '+json'
   }
 })
 // 添加请求拦截器
 instance.interceptors.request.use(function (config) {
   // 在发送请求之前做些什么
   config.headers.Authorization = localStorage.getItem('tokenType') + ' ' + localStorage.getItem('token')
   config.headers.common['Accept-Language'] = store.getters.getLanguage || 'zh-CN'
+  let keys = localConfig.encrypt()
+  config.headers.common['Client-Key'] = keys.key
+  config.headers.common['Secret-Salt'] = keys.salt
   return config
 }, function (error) {
   // 对请求错误做些什么

src/renderer/request/index.js

@@ -12,39 +12,39 @@ export default {
   },
   // 获取表情库
   getExpression () {
-    return axios.get('lib/getExpression')
+    return axios.get('lib/expression')
   },
   // 获取好友聊天记录
-  getChatMessage (chatId, limit) {
-    return axios.get('chat/getChatMessage/chat/' + chatId + '/' + limit)
+  getChatMessage (chatId, limit, page) {
+    return axios.get('chat/message/list/chat/' + chatId + '/' + limit + '?page=' + page)
   },
   // 获取群历史聊天记录
   getGroupMessage (groupId, limit, page) {
-    return axios.get('chat/getGroupMessage/' + groupId + '/' + limit + '?page=' + page)
+    return axios.get('chat/message/list/group/' + groupId + '/' + limit + '?page=' + page)
   },
   // 获取用户信息
   getUserInfo (uid) {
-    return axios.get('chat/getUserInfo/' + uid)
+    return axios.get('chat/user/info/' + uid)
   },
   // websocket初始化
   initChat (data) {
     return axios.post('chat/init', Qs.stringify(data))
   },
   // 对话消息接口 param: chat_id & content
   sendChatMessage (data) {
-    return axios.post('chat/chatMessage', Qs.stringify(data))
+    return axios.post('chat/message/chat/send', Qs.stringify(data))
   },
   // 群消息接口 param: group_id & content
   sendGroupMessage (data) {
-    return axios.post('chat/groupMessage', Qs.stringify(data))
+    return axios.post('chat/message/group/send', Qs.stringify(data))
   },
   // websocket断开接口
   chatConnectClose () {
-    return axios.get('chat/connectClose');
+    return axios.get('chat/connect/close');
   },
   // 重置消息提醒 param:chat_id or group id & is_group
   resetBadge (data) {
-    return axios.post('chat/resetBadge', Qs.stringify(data))
+    return axios.post('chat/reset/badge', Qs.stringify(data))
   },
   // 对话发送语音
   uploadRecorderByChat (chatId, data, config) {
@@ -56,11 +56,11 @@ export default {
   },
   // 添加群或好友 param: friend_id | group_id & remarks
   addFriends (data) {
-    return axios.post('chat/addFriends', Qs.stringify(data))
+    return axios.post('chat/friend/add', Qs.stringify(data))
   },
   // 搜索好友和群 param: chat_number
   searchNo (data) {
-    return axios.post('chat/searchNo', Qs.stringify(data))
+    return axios.post('chat/number/search', Qs.stringify(data))
   },
   // 加群加好友审核 param: audit
   audit (applyId, data) {
@@ -76,11 +76,11 @@ export default {
   },
   // 获取好友列表  无参数
   getFriendList () {
-    return axios.get('chat/friendsList/get')
+    return axios.get('chat/friend/list')
   },
   // 获取登录用户的群列表  无参数
   getGroupList () {
-    return axios.get('chat/groupList/get')
+    return axios.get('chat/group/list')
   },
   me () {
     return axios.post('auth/me')
@@ -103,6 +103,6 @@ export default {
   },
   // 获取群成员
   getGroupMember (groupId) {
-    return axios.get('chat/getGroupMember/' + groupId)
+    return axios.get('chat/member/group/' + groupId)
   }
 }

src/renderer/store/config/config.js.example

@@ -22,7 +22,10 @@ const config = {
   /**
    * 客户端请求授权码
    */
-  clientKey: 'ce10ae3d3c94432db913cf9349d238b6',
+  appId: 10001,
+  secretId: '71c1d9683afa4b5dafb398dc2f49d580',
+  secretKey: 'd578ac32dd044fb3b3c80ead326e0806',
+  encrypt: () => {},
   /**
    * 程序自动更新地址
    */

src/renderer/view/auth/login.vue

@@ -114,7 +114,7 @@
                 this.loading = false;
               }
             }).catch((error) => {
-              console.log(error.response)
+              console.log(error)
               this.loading = false;
               this.$Notice.error({
                 title: this.$t('notifyTitle.errorReminding'),