linkdood-web-sdk 0.1.0 → 1.0.2

package/lib/service/GroupMemberService.js

@@ -1,21 +1,21 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _thriftClient=require("../thrift/thriftClient");var _userModel=_interopRequireDefault(require("../model/userModel"));var _dictionaryConstant=_interopRequireDefault(require("../constant/dictionaryConstant"));var _SystemDictionaryService=_interopRequireDefault(require("./SystemDictionaryService"));var _GroupMemberCache=_interopRequireDefault(require("../cache/GroupMemberCache"));var _BuddyService=_interopRequireDefault(require("./BuddyService"));function _createForOfIteratorHelper(o,allowArrayLike){var it=typeof Symbol!=="undefined"&&o[Symbol.iterator]||o["@@iterator"];if(!it){if(Array.isArray(o)||(it=_unsupportedIterableToArray(o))||allowArrayLike&&o&&typeof o.length==="number"){if(it)o=it;var i=0;var F=function F(){};return{s:F,n:function n(){if(i>=o.length)return{done:true};return{done:false,value:o[i++]}},e:function e(_e){throw _e},f:F}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var normalCompletion=true,didErr=false,err;return{s:function s(){it=it.call(o)},n:function n(){var step=it.next();normalCompletion=step.done;return step},e:function e(_e2){didErr=true;err=_e2},f:function f(){try{if(!normalCompletion&&it.return!=null)it.return()}finally{if(didErr)throw err}}}}function _unsupportedIterableToArray(o,minLen){if(!o)return;if(typeof o==="string")return _arrayLikeToArray(o,minLen);var n=Object.prototype.toString.call(o).slice(8,-1);if(n==="Object"&&o.constructor)n=o.constructor.name;if(n==="Map"||n==="Set")return Array.from(o);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _arrayLikeToArray(o,minLen)}function _arrayLikeToArray(arr,len){if(len==null||len>arr.length)len=arr.length;for(var i=0,arr2=new Array(len);i<len;i++)arr2[i]=arr[i];return arr2}/**
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _thriftClient=require("../thrift/thriftClient");var _userModel=_interopRequireDefault(require("../model/userModel"));var _dictionaryConstant=_interopRequireDefault(require("../constant/dictionaryConstant"));var _SystemDictionaryService=_interopRequireDefault(require("./SystemDictionaryService"));var _GroupMemberCache=_interopRequireDefault(require("../cache/GroupMemberCache"));var _BuddyService=_interopRequireDefault(require("./BuddyService"));function _createForOfIteratorHelper(o,allowArrayLike){var it=typeof Symbol!=="undefined"&&o[Symbol.iterator]||o["@@iterator"];if(!it){if(Array.isArray(o)||(it=_unsupportedIterableToArray(o))||allowArrayLike&&o&&typeof o.length==="number"){if(it)o=it;var i=0;var F=function F(){};return{s:F,n:function n(){if(i>=o.length)return{done:true};return{done:false,value:o[i++]}},e:function e(_e){throw _e},f:F}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var normalCompletion=true,didErr=false,err;return{s:function s(){it=it.call(o)},n:function n(){var step=it.next();normalCompletion=step.done;return step},e:function e(_e2){didErr=true;err=_e2},f:function f(){try{if(!normalCompletion&&it.return!=null)it.return()}finally{if(didErr)throw err}}}}function _unsupportedIterableToArray(o,minLen){if(!o)return;if(typeof o==="string")return _arrayLikeToArray(o,minLen);var n=Object.prototype.toString.call(o).slice(8,-1);if(n==="Object"&&o.constructor)n=o.constructor.name;if(n==="Map"||n==="Set")return Array.from(o);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _arrayLikeToArray(o,minLen)}function _arrayLikeToArray(arr,len){if(len==null||len>arr.length)len=arr.length;for(var i=0,arr2=new Array(len);i<len;i++){arr2[i]=arr[i]}return arr2}/**
  * 群成员缓存
  * @author 李文龙
  * @date 2020/1/9
- */var _default=new(/*#__PURE__*/function(){function GroupMemberService(){(0,_classCallCheck2.default)(this,GroupMemberService)}(0,_createClass2.default)(GroupMemberService,[{key:"_setGroupMemberTimeStamp",value://设置群成员时间戳时间戳
-function(){var _setGroupMemberTimeStamp2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(groupID,groupPageTimeStampMap){var groupMemberTimeStamp,key;return _regenerator.default.wrap(function _callee$(_context){while(1)switch(_context.prev=_context.next){case 0:_context.next=2;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 2:groupMemberTimeStamp=_context.sent;for(key in groupPageTimeStampMap){//设置群成员时间戳
+ */var _default=new(/*#__PURE__*/function(){function GroupMemberService(){(0,_classCallCheck2.default)(this,GroupMemberService)}(0,_createClass2.default)(GroupMemberService,[{key:"_setGroupMemberTimeStamp",//设置群成员时间戳时间戳
+value:function(){var _setGroupMemberTimeStamp2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(groupID,groupPageTimeStampMap){var groupMemberTimeStamp,key;return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:_context.next=2;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 2:groupMemberTimeStamp=_context.sent;for(key in groupPageTimeStampMap){//设置群成员时间戳
 groupMemberTimeStamp[key-1]=groupPageTimeStampMap[key]}//修改群成员时间戳
-_context.next=6;return _SystemDictionaryService.default.setSystemDictionaryValueByKeyAndGroup(_dictionaryConstant.default.groupMemberTimeStamp,groupID,groupMemberTimeStamp);case 6:case"end":return _context.stop();}},_callee)}));function _setGroupMemberTimeStamp(_x,_x2){return _setGroupMemberTimeStamp2.apply(this,arguments)}return _setGroupMemberTimeStamp}()/**
+_context.next=6;return _SystemDictionaryService.default.setSystemDictionaryValueByKeyAndGroup(_dictionaryConstant.default.groupMemberTimeStamp,groupID,groupMemberTimeStamp);case 6:case"end":return _context.stop();}}},_callee)}));function _setGroupMemberTimeStamp(_x,_x2){return _setGroupMemberTimeStamp2.apply(this,arguments)}return _setGroupMemberTimeStamp}()/**
      * 判断时间戳与本地时间戳是否相同
      * 如果相同，则为thrift 推送重复内容
      * @param groupPageTimeStampMap
      * @private
-     */},{key:"_judgeTimeStampEquals",value:function(){var _judgeTimeStampEquals2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(groupID,groupPageTimeStampMap){var timeStampMap,groupMemberTimeStamp,isFalg,_iterator,_step,_step$value,page,value,pageNum;return _regenerator.default.wrap(function _callee2$(_context2){while(1)switch(_context2.prev=_context2.next){case 0:timeStampMap=new Map(Object.entries(groupPageTimeStampMap));_context2.next=3;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 3:groupMemberTimeStamp=_context2.sent;isFalg=true;if(groupMemberTimeStamp){_context2.next=7;break}return _context2.abrupt("return",false);case 7:_iterator=_createForOfIteratorHelper(timeStampMap);try{for(_iterator.s();!(_step=_iterator.n()).done;){_step$value=(0,_slicedToArray2.default)(_step.value,2),page=_step$value[0],value=_step$value[1];pageNum=Number(page);if(groupMemberTimeStamp[pageNum-1]!=value){isFalg=false}}}catch(err){_iterator.e(err)}finally{_iterator.f()}return _context2.abrupt("return",isFalg);case 10:case"end":return _context2.stop();}},_callee2)}));function _judgeTimeStampEquals(_x3,_x4){return _judgeTimeStampEquals2.apply(this,arguments)}return _judgeTimeStampEquals}()/**
+     */},{key:"_judgeTimeStampEquals",value:function(){var _judgeTimeStampEquals2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(groupID,groupPageTimeStampMap){var timeStampMap,groupMemberTimeStamp,isFalg,_iterator,_step,_step$value,page,value,pageNum;return _regenerator.default.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:timeStampMap=new Map(Object.entries(groupPageTimeStampMap));_context2.next=3;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 3:groupMemberTimeStamp=_context2.sent;isFalg=true;if(groupMemberTimeStamp){_context2.next=7;break}return _context2.abrupt("return",false);case 7:_iterator=_createForOfIteratorHelper(timeStampMap);try{for(_iterator.s();!(_step=_iterator.n()).done;){_step$value=(0,_slicedToArray2.default)(_step.value,2),page=_step$value[0],value=_step$value[1];pageNum=Number(page);if(groupMemberTimeStamp[pageNum-1]!=value){isFalg=false}}}catch(err){_iterator.e(err)}finally{_iterator.f()}return _context2.abrupt("return",isFalg);case 10:case"end":return _context2.stop();}}},_callee2)}));function _judgeTimeStampEquals(_x3,_x4){return _judgeTimeStampEquals2.apply(this,arguments)}return _judgeTimeStampEquals}()/**
      * 根据时间戳页面刷新群成员数据
      * @param groupID
      * @param groupPageTimeStampMap
      * @private
-     */},{key:"_refreshGroupMemberByPageNum",value:function(){var _refreshGroupMemberByPageNum2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(groupID,groupPageTimeStampMap){var timeStampMap,_iterator2,_step2,num,pageNum,groupMemberList;return _regenerator.default.wrap(function _callee3$(_context3){while(1)switch(_context3.prev=_context3.next){case 0:timeStampMap=new Map(Object.entries(groupPageTimeStampMap));_iterator2=_createForOfIteratorHelper(timeStampMap.keys());_context3.prev=2;_iterator2.s();case 4:if((_step2=_iterator2.n()).done){_context3.next=16;break}num=_step2.value;pageNum=Number(num);_context3.next=9;return _GroupMemberCache.default.deleteAllGroupMemberPage(groupID,pageNum);case 9:_context3.next=11;return this._queryGroupMembers(groupID,pageNum);case 11:groupMemberList=_context3.sent;_context3.next=14;return _GroupMemberCache.default.addGroupMembers(groupMemberList);case 14:_context3.next=4;break;case 16:_context3.next=21;break;case 18:_context3.prev=18;_context3.t0=_context3["catch"](2);_iterator2.e(_context3.t0);case 21:_context3.prev=21;_iterator2.f();return _context3.finish(21);case 24:case"end":return _context3.stop();}},_callee3,this,[[2,18,21,24]])}));function _refreshGroupMemberByPageNum(_x5,_x6){return _refreshGroupMemberByPageNum2.apply(this,arguments)}return _refreshGroupMemberByPageNum}()/**
+     */},{key:"_refreshGroupMemberByPageNum",value:function(){var _refreshGroupMemberByPageNum2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(groupID,groupPageTimeStampMap){var timeStampMap,_iterator2,_step2,num,pageNum,groupMemberList;return _regenerator.default.wrap(function _callee3$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:timeStampMap=new Map(Object.entries(groupPageTimeStampMap));_iterator2=_createForOfIteratorHelper(timeStampMap.keys());_context3.prev=2;_iterator2.s();case 4:if((_step2=_iterator2.n()).done){_context3.next=16;break}num=_step2.value;pageNum=Number(num);_context3.next=9;return _GroupMemberCache.default.deleteAllGroupMemberPage(groupID,pageNum);case 9:_context3.next=11;return this._queryGroupMembers(groupID,pageNum);case 11:groupMemberList=_context3.sent;_context3.next=14;return _GroupMemberCache.default.addGroupMembers(groupMemberList);case 14:_context3.next=4;break;case 16:_context3.next=21;break;case 18:_context3.prev=18;_context3.t0=_context3["catch"](2);_iterator2.e(_context3.t0);case 21:_context3.prev=21;_iterator2.f();return _context3.finish(21);case 24:case"end":return _context3.stop();}}},_callee3,this,[[2,18,21,24]])}));function _refreshGroupMemberByPageNum(_x5,_x6){return _refreshGroupMemberByPageNum2.apply(this,arguments)}return _refreshGroupMemberByPageNum}()/**
      * 前置判断
      * 1：时间戳是否是否改变
      * 2：收重复发送
@@ -23,55 +23,60 @@ _context.next=6;return _SystemDictionaryService.default.setSystemDictionaryValue
      * @param groupPageTimeStampMap
      * @returns {Promise.<void>}
      * @private
-     */},{key:"_prepositionJudge",value:function(){var _prepositionJudge2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(groupID,groupPageTimeStampMap){return _regenerator.default.wrap(function _callee4$(_context4){while(1)switch(_context4.prev=_context4.next){case 0:_context4.next=2;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 2:if(_context4.sent){_context4.next=4;break}return _context4.abrupt("return",Promise.resolve(true));case 4:_context4.next=6;return this._judgeTimeStampEquals(groupID,groupPageTimeStampMap);case 6:if(!_context4.sent){_context4.next=8;break}return _context4.abrupt("return",Promise.resolve(true));case 8:_context4.next=10;return this._setGroupMemberTimeStamp(groupID,groupPageTimeStampMap);case 10:return _context4.abrupt("return",Promise.resolve(false));case 11:case"end":return _context4.stop();}},_callee4,this)}));function _prepositionJudge(_x7,_x8){return _prepositionJudge2.apply(this,arguments)}return _prepositionJudge}()//加入群成员缓存
-},{key:"addGroupMemberCache",value:function(){var _addGroupMemberCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(groupMemberList,groupPageTimeStampMap){var groupID,timeStampMap;return _regenerator.default.wrap(function _callee5$(_context5){while(1)switch(_context5.prev=_context5.next){case 0:groupID=groupMemberList[0].groupID;//判断前置条件
+     */},{key:"_prepositionJudge",value:function(){var _prepositionJudge2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(groupID,groupPageTimeStampMap){return _regenerator.default.wrap(function _callee4$(_context4){while(1){switch(_context4.prev=_context4.next){case 0:_context4.next=2;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 2:if(_context4.sent){_context4.next=4;break}return _context4.abrupt("return",Promise.resolve(true));case 4:_context4.next=6;return this._judgeTimeStampEquals(groupID,groupPageTimeStampMap);case 6:if(!_context4.sent){_context4.next=8;break}return _context4.abrupt("return",Promise.resolve(true));case 8:_context4.next=10;return this._setGroupMemberTimeStamp(groupID,groupPageTimeStampMap);case 10:return _context4.abrupt("return",Promise.resolve(false));case 11:case"end":return _context4.stop();}}},_callee4,this)}));function _prepositionJudge(_x7,_x8){return _prepositionJudge2.apply(this,arguments)}return _prepositionJudge}()//加入群成员缓存
+},{key:"addGroupMemberCache",value:function(){var _addGroupMemberCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(groupMemberList,groupPageTimeStampMap){var groupID,timeStampMap;return _regenerator.default.wrap(function _callee5$(_context5){while(1){switch(_context5.prev=_context5.next){case 0:groupID=groupMemberList[0].groupID;//判断前置条件
 _context5.next=3;return this._prepositionJudge(groupID,groupPageTimeStampMap);case 3:if(!_context5.sent){_context5.next=5;break}return _context5.abrupt("return");case 5:if(groupMemberList&&groupMemberList.length>0){//转成map对象
 timeStampMap=new Map(Object.entries(groupPageTimeStampMap));//如果不涉及跨页处理,直接入库添加数据信息
 if(timeStampMap.size==1){groupMemberList.forEach(function(groupMember){groupMember.member=groupMember.member||{SDKID:null,avatar:null,remark:null,uForbidUntil:null,userID:groupMember.userID,userName:null,userType:1,userTypeNum:1,vSign:0};groupMember.loggedUserID=_userModel.default.userID;groupMember.pageNum=Number(timeStampMap.keys().next().value)});_GroupMemberCache.default.addGroupMembers(groupMemberList)}else{//如果涉及跨页处理,则清除原先页数中所有内容,重新查询插入信息
-this._refreshGroupMemberByPageNum(groupID,groupPageTimeStampMap)}}case 6:case"end":return _context5.stop();}},_callee5,this)}));function addGroupMemberCache(_x9,_x10){return _addGroupMemberCache.apply(this,arguments)}return addGroupMemberCache}()/**
+this._refreshGroupMemberByPageNum(groupID,groupPageTimeStampMap)}}case 6:case"end":return _context5.stop();}}},_callee5,this)}));function addGroupMemberCache(_x9,_x10){return _addGroupMemberCache.apply(this,arguments)}return addGroupMemberCache}()/**
      * 根据groupID删除群缓存
      * @returns {Promise.<*>}
-     */},{key:"deleteGroupMemberCache",value:function(){var _deleteGroupMemberCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(groupMemberList,groupPageTimeStampMap){var groupID;return _regenerator.default.wrap(function _callee6$(_context6){while(1)switch(_context6.prev=_context6.next){case 0:groupID=groupMemberList[0].groupID;//判断前置条件
-_context6.next=3;return this._prepositionJudge(groupID,groupPageTimeStampMap);case 3:if(!_context6.sent){_context6.next=5;break}return _context6.abrupt("return");case 5:if(groupMemberList&&groupMemberList.length>0){groupMemberList.forEach(function(groupMember){_GroupMemberCache.default.deleteGroupMember(groupMember)})}case 6:case"end":return _context6.stop();}},_callee6,this)}));function deleteGroupMemberCache(_x11,_x12){return _deleteGroupMemberCache.apply(this,arguments)}return deleteGroupMemberCache}()/**
+     */},{key:"deleteGroupMemberCache",value:function(){var _deleteGroupMemberCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(groupMemberList,groupPageTimeStampMap){var groupID;return _regenerator.default.wrap(function _callee6$(_context6){while(1){switch(_context6.prev=_context6.next){case 0:groupID=groupMemberList[0].groupID;//判断前置条件
+_context6.next=3;return this._prepositionJudge(groupID,groupPageTimeStampMap);case 3:if(!_context6.sent){_context6.next=5;break}return _context6.abrupt("return");case 5:if(groupMemberList&&groupMemberList.length>0){groupMemberList.forEach(function(groupMember){_GroupMemberCache.default.deleteGroupMember(groupMember)})}case 6:case"end":return _context6.stop();}}},_callee6,this)}));function deleteGroupMemberCache(_x11,_x12){return _deleteGroupMemberCache.apply(this,arguments)}return deleteGroupMemberCache}()/**
      * 群转让，重构群成员结构
      * @param groupInfo
      * @param groupPageTimeStampMap
      * @returns {Promise.<void>}
-     */},{key:"groupTransferRestructureGroupMemberCache",value:function(){var _groupTransferRestructureGroupMemberCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7(groupInfo,groupPageTimeStampMap){var groupID;return _regenerator.default.wrap(function _callee7$(_context7){while(1)switch(_context7.prev=_context7.next){case 0:groupID=groupInfo.groupID;//判断前置条件
-_context7.next=3;return this._prepositionJudge(groupID,groupPageTimeStampMap);case 3:if(!_context7.sent){_context7.next=5;break}return _context7.abrupt("return");case 5:_context7.next=7;return this._refreshGroupMemberByPageNum(groupID,groupPageTimeStampMap);case 7:case"end":return _context7.stop();}},_callee7,this)}));function groupTransferRestructureGroupMemberCache(_x13,_x14){return _groupTransferRestructureGroupMemberCache.apply(this,arguments)}return groupTransferRestructureGroupMemberCache}()/**
+     */},{key:"groupTransferRestructureGroupMemberCache",value:function(){var _groupTransferRestructureGroupMemberCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7(groupInfo,groupPageTimeStampMap){var groupID;return _regenerator.default.wrap(function _callee7$(_context7){while(1){switch(_context7.prev=_context7.next){case 0:groupID=groupInfo.groupID;//判断前置条件
+_context7.next=3;return this._prepositionJudge(groupID,groupPageTimeStampMap);case 3:if(!_context7.sent){_context7.next=5;break}return _context7.abrupt("return");case 5:_context7.next=7;return this._refreshGroupMemberByPageNum(groupID,groupPageTimeStampMap);case 7:case"end":return _context7.stop();}}},_callee7,this)}));function groupTransferRestructureGroupMemberCache(_x13,_x14){return _groupTransferRestructureGroupMemberCache.apply(this,arguments)}return groupTransferRestructureGroupMemberCache}()/**
      * 设置/取消 群成员为管理
      * @returns {Promise.<void>}
-     */},{key:"setOrCancelGroupMemberAdmin",value:function(){var _setOrCancelGroupMemberAdmin=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(groupID,groupMember,page,groupPageTimeStamp){var groupMemberTimeStamp,groupPageTimeStampMap;return _regenerator.default.wrap(function _callee8$(_context8){while(1)switch(_context8.prev=_context8.next){case 0:_context8.next=2;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 2:groupMemberTimeStamp=_context8.sent;if(!groupMemberTimeStamp){_context8.next=13;break}//根据服务器返回信息，拼接为对比时间戳
+     */},{key:"setOrCancelGroupMemberAdmin",value:function(){var _setOrCancelGroupMemberAdmin=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(groupID,groupMember,page,groupPageTimeStamp){var groupMemberTimeStamp,groupPageTimeStampMap;return _regenerator.default.wrap(function _callee8$(_context8){while(1){switch(_context8.prev=_context8.next){case 0:_context8.next=2;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 2:groupMemberTimeStamp=_context8.sent;if(!groupMemberTimeStamp){_context8.next=13;break}//根据服务器返回信息，拼接为对比时间戳
 groupMemberTimeStamp[page-1]=groupPageTimeStamp;groupPageTimeStampMap={};groupMemberTimeStamp.forEach(function(item,index){groupPageTimeStampMap[index+1]=item});//判断前置条件
-_context8.next=9;return this._prepositionJudge(groupID,groupPageTimeStampMap);case 9:if(!_context8.sent){_context8.next=11;break}return _context8.abrupt("return");case 11:groupMember.groupID=groupID;_GroupMemberCache.default.updateGroupMember(groupMember);case 13:case"end":return _context8.stop();}},_callee8,this)}));function setOrCancelGroupMemberAdmin(_x15,_x16,_x17,_x18){return _setOrCancelGroupMemberAdmin.apply(this,arguments)}return setOrCancelGroupMemberAdmin}()/**
+_context8.next=9;return this._prepositionJudge(groupID,groupPageTimeStampMap);case 9:if(!_context8.sent){_context8.next=11;break}return _context8.abrupt("return");case 11:groupMember.groupID=groupID;_GroupMemberCache.default.updateGroupMember(groupMember);case 13:case"end":return _context8.stop();}}},_callee8,this)}));function setOrCancelGroupMemberAdmin(_x15,_x16,_x17,_x18){return _setOrCancelGroupMemberAdmin.apply(this,arguments)}return setOrCancelGroupMemberAdmin}()/**
      * 分页查询群成员
      * @param groupID
      * @param pageNum
      * @returns {Promise.<Array>}
      * @private
-     */},{key:"_queryGroupMembers",value:function(){var _queryGroupMembers2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9(groupID,pageNum){var memberRes,groupMemberList,groupUserMembers;return _regenerator.default.wrap(function _callee9$(_context9){while(1)switch(_context9.prev=_context9.next){case 0:_context9.next=2;return(0,_thriftClient.serviceClient)("getGroupMembers",true,groupID,pageNum);case 2:memberRes=_context9.sent;if(!(memberRes.code==0)){_context9.next=7;break}groupMemberList=memberRes.users||[],groupUserMembers=memberRes.members||[];groupMemberList.forEach(function(user){user.groupID=groupID;user.member=groupUserMembers.find(function(item){return item.userID==user.userID});user.loggedUserID=_userModel.default.userID;user.pageNum=pageNum});return _context9.abrupt("return",groupMemberList);case 7:return _context9.abrupt("return",[]);case 8:case"end":return _context9.stop();}},_callee9)}));function _queryGroupMembers(_x19,_x20){return _queryGroupMembers2.apply(this,arguments)}return _queryGroupMembers}()},{key:"_addGroupMemberList",value:function(){var _addGroupMemberList2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10(groupID){var groupMemberList,pageRes,groupMemberTimeStamp,i,newGroupMemberList;return _regenerator.default.wrap(function _callee10$(_context10){while(1)switch(_context10.prev=_context10.next){case 0://数据结果集
+     */},{key:"_queryGroupMembers",value:function(){var _queryGroupMembers2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9(groupID,pageNum){var memberRes,groupMemberList,groupUserMembers;return _regenerator.default.wrap(function _callee9$(_context9){while(1){switch(_context9.prev=_context9.next){case 0:_context9.next=2;return(0,_thriftClient.serviceClient)("getGroupMembers",true,groupID,pageNum);case 2:memberRes=_context9.sent;if(!(memberRes.code==0)){_context9.next=7;break}groupMemberList=memberRes.users||[],groupUserMembers=memberRes.members||[];groupMemberList.forEach(function(user){user.groupID=groupID;user.member=groupUserMembers.find(function(item){return item.userID==user.userID});user.loggedUserID=_userModel.default.userID;user.pageNum=pageNum});return _context9.abrupt("return",groupMemberList);case 7:return _context9.abrupt("return",[]);case 8:case"end":return _context9.stop();}}},_callee9)}));function _queryGroupMembers(_x19,_x20){return _queryGroupMembers2.apply(this,arguments)}return _queryGroupMembers}()},{key:"_addGroupMemberList",value:function(){var _addGroupMemberList2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10(groupID){var groupMemberList,pageRes,groupMemberTimeStamp,i,newGroupMemberList;return _regenerator.default.wrap(function _callee10$(_context10){while(1){switch(_context10.prev=_context10.next){case 0://数据结果集
 groupMemberList=[];//查询群成员总页数
 _context10.next=3;return(0,_thriftClient.serviceClient)("getGroupPages",true,groupID);case 3:pageRes=_context10.sent;groupMemberTimeStamp=[];if(!(pageRes.code==0)){_context10.next=17;break}groupMemberTimeStamp=pageRes.list_i64;i=1;case 8:if(!(i<=groupMemberTimeStamp.length)){_context10.next=16;break}_context10.next=11;return this._queryGroupMembers(groupID,i);case 11:newGroupMemberList=_context10.sent;groupMemberList=groupMemberList.concat(newGroupMemberList);case 13:i++;_context10.next=8;break;case 16://添加字典数据
 _SystemDictionaryService.default.addSystemDictionary({loggedUserID:_userModel.default.userID,key:_dictionaryConstant.default.groupMemberTimeStamp,value:groupMemberTimeStamp,groupID:groupID});case 17:// 本地缓存好友列表
-_GroupMemberCache.default.addGroupMembers(groupMemberList);return _context10.abrupt("return",groupMemberList);case 19:case"end":return _context10.stop();}},_callee10,this)}));function _addGroupMemberList(_x21){return _addGroupMemberList2.apply(this,arguments)}return _addGroupMemberList}()},{key:"_updateGroupMemberList",value:function(){var _updateGroupMemberList2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11(groupMemberTimeStamp,groupID){var pageRes,timeStamp,i,pageNum,newGroupMemberList;return _regenerator.default.wrap(function _callee11$(_context11){while(1)switch(_context11.prev=_context11.next){case 0:_context11.next=2;return(0,_thriftClient.serviceClient)("getGroupPages",true,groupID);case 2:pageRes=_context11.sent;if(!(pageRes.code==0)){_context11.next=26;break}//返回时间戳
+_GroupMemberCache.default.addGroupMembers(groupMemberList);return _context10.abrupt("return",groupMemberList);case 19:case"end":return _context10.stop();}}},_callee10,this)}));function _addGroupMemberList(_x21){return _addGroupMemberList2.apply(this,arguments)}return _addGroupMemberList}()},{key:"_updateGroupMemberList",value:function(){var _updateGroupMemberList2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11(groupMemberTimeStamp,groupID){var pageRes,timeStamp,i,pageNum,newGroupMemberList;return _regenerator.default.wrap(function _callee11$(_context11){while(1){switch(_context11.prev=_context11.next){case 0:_context11.next=2;return(0,_thriftClient.serviceClient)("getGroupPages",true,groupID);case 2:pageRes=_context11.sent;if(!(pageRes.code==0)){_context11.next=26;break}//返回时间戳
 timeStamp=pageRes.list_i64;//如果时间戳没有变化，则不更新群成员信息
 if(!(timeStamp.toString()==groupMemberTimeStamp.toString())){_context11.next=7;break}return _context11.abrupt("return");case 7:i=0;case 8:if(!(i<timeStamp.length)){_context11.next=21;break}if(!(timeStamp[i]!=groupMemberTimeStamp[i])){_context11.next=18;break}pageNum=i+1;//拉取不同当页数据
-_context11.next=13;return this._queryGroupMembers(groupID,pageNum);case 13:newGroupMemberList=_context11.sent;_context11.next=16;return _GroupMemberCache.default.deleteAllGroupMemberPage(groupID,pageNum);case 16:_context11.next=18;return _GroupMemberCache.default.addGroupMembers(newGroupMemberList);case 18:i++;_context11.next=8;break;case 21:_context11.next=23;return _SystemDictionaryService.default.setSystemDictionaryValueByKeyAndGroup(_dictionaryConstant.default.groupMemberTimeStamp,groupID,timeStamp);case 23:_context11.next=25;return _GroupMemberCache.default.getBaseGroupMemberList(groupID);case 25:return _context11.abrupt("return",_context11.sent);case 26:case"end":return _context11.stop();}},_callee11,this)}));function _updateGroupMemberList(_x22,_x23){return _updateGroupMemberList2.apply(this,arguments)}return _updateGroupMemberList}()/**
+_context11.next=13;return this._queryGroupMembers(groupID,pageNum);case 13:newGroupMemberList=_context11.sent;_context11.next=16;return _GroupMemberCache.default.deleteAllGroupMemberPage(groupID,pageNum);case 16:_context11.next=18;return _GroupMemberCache.default.addGroupMembers(newGroupMemberList);case 18:i++;_context11.next=8;break;case 21:_context11.next=23;return _SystemDictionaryService.default.setSystemDictionaryValueByKeyAndGroup(_dictionaryConstant.default.groupMemberTimeStamp,groupID,timeStamp);case 23:_context11.next=25;return _GroupMemberCache.default.getBaseGroupMemberList(groupID);case 25:return _context11.abrupt("return",_context11.sent);case 26:case"end":return _context11.stop();}}},_callee11,this)}));function _updateGroupMemberList(_x22,_x23){return _updateGroupMemberList2.apply(this,arguments)}return _updateGroupMemberList}()/**
      * 获取群列表
-     */},{key:"getGroupMemberList",value:function(){var _getGroupMemberList=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12(groupID){var localGroupMemberList,groupMemberTimeStamp,groupMemberList,i,groupMember,user;return _regenerator.default.wrap(function _callee12$(_context12){while(1)switch(_context12.prev=_context12.next){case 0:_context12.next=2;return _GroupMemberCache.default.getBaseGroupMemberList(groupID);case 2:localGroupMemberList=_context12.sent;_context12.next=5;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 5:groupMemberTimeStamp=_context12.sent;// 返回结果
-groupMemberList=[];if(!(localGroupMemberList.length==0&&!groupMemberTimeStamp)){_context12.next=16;break}_context12.next=10;return this._addGroupMemberList(groupID);case 10:_context12.t0=_context12.sent;if(_context12.t0){_context12.next=13;break}_context12.t0=[];case 13:groupMemberList=_context12.t0;_context12.next=25;break;case 16:_context12.next=18;return this._updateGroupMemberList(groupMemberTimeStamp,groupID);case 18:_context12.t2=_context12.sent;if(_context12.t2){_context12.next=21;break}_context12.t2=localGroupMemberList;case 21:_context12.t1=_context12.t2;if(_context12.t1){_context12.next=24;break}_context12.t1=[];case 24:groupMemberList=_context12.t1;case 25:i=0;case 26:if(!(i<groupMemberList.length)){_context12.next=35;break}groupMember=groupMemberList[i];_context12.next=30;return _BuddyService.default.getBuddyCacheById(groupMember.userID);case 30:user=_context12.sent;if(user&&user.remark){groupMember.name=user.remark}case 32:i++;_context12.next=26;break;case 35:return _context12.abrupt("return",groupMemberList);case 36:case"end":return _context12.stop();}},_callee12,this)}));function getGroupMemberList(_x24){return _getGroupMemberList.apply(this,arguments)}return getGroupMemberList}()/**
+     */},{key:"getGroupMemberList",value:function(){var _getGroupMemberList=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12(groupID){var localGroupMemberList,groupMemberTimeStamp,groupMemberList,i,groupMember,user;return _regenerator.default.wrap(function _callee12$(_context12){while(1){switch(_context12.prev=_context12.next){case 0:_context12.next=2;return _GroupMemberCache.default.getBaseGroupMemberList(groupID);case 2:localGroupMemberList=_context12.sent;_context12.next=5;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 5:groupMemberTimeStamp=_context12.sent;// 返回结果
+groupMemberList=[];if(!(localGroupMemberList.length==0&&!groupMemberTimeStamp)){_context12.next=16;break}_context12.next=10;return this._addGroupMemberList(groupID);case 10:_context12.t0=_context12.sent;if(_context12.t0){_context12.next=13;break}_context12.t0=[];case 13:groupMemberList=_context12.t0;_context12.next=25;break;case 16:_context12.next=18;return this._updateGroupMemberList(groupMemberTimeStamp,groupID);case 18:_context12.t2=_context12.sent;if(_context12.t2){_context12.next=21;break}_context12.t2=localGroupMemberList;case 21:_context12.t1=_context12.t2;if(_context12.t1){_context12.next=24;break}_context12.t1=[];case 24:groupMemberList=_context12.t1;case 25:i=0;case 26:if(!(i<groupMemberList.length)){_context12.next=35;break}groupMember=groupMemberList[i];_context12.next=30;return _BuddyService.default.getBuddyCacheById(groupMember.userID);case 30:user=_context12.sent;if(user&&user.remark){groupMember.name=user.remark}case 32:i++;_context12.next=26;break;case 35:return _context12.abrupt("return",groupMemberList);case 36:case"end":return _context12.stop();}}},_callee12,this)}));function getGroupMemberList(_x24){return _getGroupMemberList.apply(this,arguments)}return getGroupMemberList}()/**
      * 根据群ID，用户ID 获取详情
      * @param groupID
      * @param userID
      * @returns {Dexie.Promise<Array<T>>|Dexie.Promise<*>}
-     */},{key:"getGroupMemberById",value:function getGroupMemberById(groupID,userID){return _GroupMemberCache.default.getGroupMemberById(groupID,userID)}/**
+     */},{key:"getGroupMemberByGroupIdAndId",value:function getGroupMemberByGroupIdAndId(groupID,userID){return _GroupMemberCache.default.getGroupMemberByGroupIdAndId(groupID,userID)}/**
      * 消息修改群成员信息
      * @param groupID
      * @param groupMember
      * @returns {Promise<void>}
-     */},{key:"notifyUpdateGroupMember",value:function(){var _notifyUpdateGroupMember=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13(groupID,groupMember,page,groupPageTimeStamp){var groupMemberTimeStamp,groupPageTimeStampMap,oldGroupMember,memberKey;return _regenerator.default.wrap(function _callee13$(_context13){while(1)switch(_context13.prev=_context13.next){case 0:_context13.next=2;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 2:groupMemberTimeStamp=_context13.sent;if(!groupMemberTimeStamp){_context13.next=19;break}//根据服务器返回信息，拼接为对比时间戳
+     */},{key:"notifyUpdateGroupMember",value:function(){var _notifyUpdateGroupMember=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13(groupID,groupMember,page,groupPageTimeStamp){var groupMemberTimeStamp,groupPageTimeStampMap,oldGroupMember,memberKey;return _regenerator.default.wrap(function _callee13$(_context13){while(1){switch(_context13.prev=_context13.next){case 0:_context13.next=2;return _SystemDictionaryService.default.getSystemDictionaryValueByKeyAndGroupID(_dictionaryConstant.default.groupMemberTimeStamp,groupID);case 2:groupMemberTimeStamp=_context13.sent;if(!groupMemberTimeStamp){_context13.next=19;break}//根据服务器返回信息，拼接为对比时间戳
 groupMemberTimeStamp[page-1]=groupPageTimeStamp;groupPageTimeStampMap={};groupMemberTimeStamp.forEach(function(item,index){groupPageTimeStampMap[index+1]=item});//判断前置条件
-_context13.next=9;return this._prepositionJudge(groupID,groupPageTimeStampMap);case 9:if(!_context13.sent){_context13.next=11;break}return _context13.abrupt("return");case 11:_context13.next=13;return this.getGroupMemberById(groupID,groupMember.userID);case 13:oldGroupMember=_context13.sent;if(!oldGroupMember){_context13.next=19;break}groupMember.groupID=groupID;for(memberKey in oldGroupMember.member){if(groupMember.member[memberKey]){oldGroupMember.member[memberKey]=groupMember.member[memberKey]}}_context13.next=19;return _GroupMemberCache.default.updateGroupMember(groupMember);case 19:case"end":return _context13.stop();}},_callee13,this)}));function notifyUpdateGroupMember(_x25,_x26,_x27,_x28){return _notifyUpdateGroupMember.apply(this,arguments)}return notifyUpdateGroupMember}()/**
+_context13.next=9;return this._prepositionJudge(groupID,groupPageTimeStampMap);case 9:if(!_context13.sent){_context13.next=11;break}return _context13.abrupt("return");case 11:_context13.next=13;return this.getGroupMemberByGroupIdAndId(groupID,groupMember.userID);case 13:oldGroupMember=_context13.sent;if(!oldGroupMember){_context13.next=19;break}groupMember.groupID=groupID;for(memberKey in oldGroupMember.member){if(groupMember.member[memberKey]){oldGroupMember.member[memberKey]=groupMember.member[memberKey]}}_context13.next=19;return _GroupMemberCache.default.updateGroupMember(groupMember);case 19:case"end":return _context13.stop();}}},_callee13,this)}));function notifyUpdateGroupMember(_x25,_x26,_x27,_x28){return _notifyUpdateGroupMember.apply(this,arguments)}return notifyUpdateGroupMember}()/**
      * 删除一个群下所有成员
      * @param {*} user
-     */},{key:"deleteAllGroupMember",value:function deleteAllGroupMember(groupID){return _GroupMemberCache.default.deleteAllGroupMember(groupID)}}]);return GroupMemberService}());exports.default=_default;
+     */},{key:"deleteAllGroupMember",value:function deleteAllGroupMember(groupID){return _GroupMemberCache.default.deleteAllGroupMember(groupID)}/**
+     * 根据发送者替换用户信息
+     * @param userID
+     * @param user
+     * @return {Promise<void>}
+     */},{key:"updateGroupMemberBySendUserId",value:function(){var _updateGroupMemberBySendUserId=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee15(userID,user){var groupMembers;return _regenerator.default.wrap(function _callee15$(_context15){while(1){switch(_context15.prev=_context15.next){case 0:_context15.next=2;return _GroupMemberCache.default.getGroupMemberById(userID);case 2:_context15.t0=_context15.sent;if(_context15.t0){_context15.next=5;break}_context15.t0=[];case 5:groupMembers=_context15.t0;groupMembers.forEach(/*#__PURE__*/function(){var _ref=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee14(item){var newGroupMember;return _regenerator.default.wrap(function _callee14$(_context14){while(1){switch(_context14.prev=_context14.next){case 0:newGroupMember=Object.assign({},item,user);_context14.next=3;return _GroupMemberCache.default.updateGroupMember(newGroupMember);case 3:case"end":return _context14.stop();}}},_callee14)}));return function(_x31){return _ref.apply(this,arguments)}}());case 7:case"end":return _context15.stop();}}},_callee15)}));function updateGroupMemberBySendUserId(_x29,_x30){return _updateGroupMemberBySendUserId.apply(this,arguments)}return updateGroupMemberBySendUserId}()}]);return GroupMemberService}());exports.default=_default;

package/lib/service/GroupMessageService.js

@@ -2,20 +2,20 @@
  * 群消息 缓存
  * @author 李文龙
  * @date 2020/1/9
- */var _default=new(/*#__PURE__*/function(){function GroupMessageService(){(0,_classCallCheck2.default)(this,GroupMessageService)}(0,_createClass2.default)(GroupMessageService,[{key:"addGroupMessageCache",value:/**
+ */var _default=new(/*#__PURE__*/function(){function GroupMessageService(){(0,_classCallCheck2.default)(this,GroupMessageService)}(0,_createClass2.default)(GroupMessageService,[{key:"addGroupMessageCache",/**
      * 新增群消息缓存
      * @param {*} messageStoreBean 
-     */function addGroupMessageCache(messageStoreBean){return _GroupMessageCache.default.addGroupMessage(messageStoreBean)}/**
+     */value:function addGroupMessageCache(messageStoreBean){return _GroupMessageCache.default.addGroupMessage(messageStoreBean)}/**
      * 根据id获取群消息缓存
      * @param {*} id 
      */},{key:"getGroupMessageCache",value:function getGroupMessageCache(id){return _GroupMessageCache.default.getGroupMessage(id)}/**
      * 更新接收群消息缓存、更新会话缓存
      * @param {*} messageStoreBean
-     */},{key:"setGroupMessageCache",value:function(){var _setGroupMessageCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(messageStoreBean){return _regenerator.default.wrap(function _callee$(_context){while(1)switch(_context.prev=_context.next){case 0:_context.next=2;return _GroupMessageCache.default.setGroupMessage(messageStoreBean);case 2:case"end":return _context.stop();}},_callee)}));function setGroupMessageCache(_x){return _setGroupMessageCache.apply(this,arguments)}return setGroupMessageCache}()/**
+     */},{key:"setGroupMessageCache",value:function(){var _setGroupMessageCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(messageStoreBean){return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:_context.next=2;return _GroupMessageCache.default.setGroupMessage(messageStoreBean);case 2:case"end":return _context.stop();}}},_callee)}));function setGroupMessageCache(_x){return _setGroupMessageCache.apply(this,arguments)}return setGroupMessageCache}()/**
      * 获取本地缓存群聊天信息列表
-     */},{key:"getBaseGroupMessageByCursor",value:function(){var _getBaseGroupMessageByCursor=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(groupID,messageID){var size,messages,i,message,_args2=arguments;return _regenerator.default.wrap(function _callee2$(_context2){while(1)switch(_context2.prev=_context2.next){case 0:size=_args2.length>2&&_args2[2]!==undefined?_args2[2]:10;_context2.next=3;return _GroupMessageCache.default.getBaseGroupMessageByCursor(groupID,messageID,size);case 3:_context2.t0=_context2.sent;if(_context2.t0){_context2.next=6;break}_context2.t0=[];case 6:messages=_context2.t0;i=0;case 8:if(!(i<messages.length)){_context2.next=20;break}message=messages[i];if(!message.user){_context2.next=14;break}_context2.next=13;return _BuddyService.default.getBuddy(message.user.userID);case 13:message.user=_context2.sent;case 14:_context2.next=16;return _MessageService.default.getMessageRemark(message);case 16:message.remark=_context2.sent;case 17:i++;_context2.next=8;break;case 20:return _context2.abrupt("return",messages);case 21:case"end":return _context2.stop();}},_callee2)}));function getBaseGroupMessageByCursor(_x2,_x3){return _getBaseGroupMessageByCursor.apply(this,arguments)}return getBaseGroupMessageByCursor}()/**
+     */},{key:"getBaseGroupMessageByCursor",value:function(){var _getBaseGroupMessageByCursor=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(groupID,messageID){var size,messages,i,message,_args2=arguments;return _regenerator.default.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:size=_args2.length>2&&_args2[2]!==undefined?_args2[2]:10;_context2.next=3;return _GroupMessageCache.default.getBaseGroupMessageByCursor(groupID,messageID,size);case 3:_context2.t0=_context2.sent;if(_context2.t0){_context2.next=6;break}_context2.t0=[];case 6:messages=_context2.t0;i=0;case 8:if(!(i<messages.length)){_context2.next=20;break}message=messages[i];if(!message.user){_context2.next=14;break}_context2.next=13;return _BuddyService.default.getBuddy(message.user.userID);case 13:message.user=_context2.sent;case 14:_context2.next=16;return _MessageService.default.getMessageRemark(message);case 16:message.remark=_context2.sent;case 17:i++;_context2.next=8;break;case 20:return _context2.abrupt("return",messages);case 21:case"end":return _context2.stop();}}},_callee2)}));function getBaseGroupMessageByCursor(_x2,_x3){return _getBaseGroupMessageByCursor.apply(this,arguments)}return getBaseGroupMessageByCursor}()/**
      * 清空群消息
      * @param groupID
-     */},{key:"emptyGroupMessages",value:function(){var _emptyGroupMessages=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(groupID){return _regenerator.default.wrap(function _callee3$(_context3){while(1)switch(_context3.prev=_context3.next){case 0:_context3.next=2;return _ChatService.default.updateChatUser(groupID,{messageContent:""});case 2:return _context3.abrupt("return",_GroupMessageCache.default.emptyGroupMessages(groupID));case 3:case"end":return _context3.stop();}},_callee3)}));function emptyGroupMessages(_x4){return _emptyGroupMessages.apply(this,arguments)}return emptyGroupMessages}()/**
+     */},{key:"emptyGroupMessages",value:function(){var _emptyGroupMessages=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(groupID){return _regenerator.default.wrap(function _callee3$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:_context3.next=2;return _ChatService.default.updateChatUser(groupID,{messageContent:""});case 2:return _context3.abrupt("return",_GroupMessageCache.default.emptyGroupMessages(groupID));case 3:case"end":return _context3.stop();}}},_callee3)}));function emptyGroupMessages(_x4){return _emptyGroupMessages.apply(this,arguments)}return emptyGroupMessages}()/**
      * 清空群消息
      */},{key:"clearGroupMessages",value:function clearGroupMessages(){_GroupMessageCache.default.clearGroupMessages()}}]);return GroupMessageService}());exports.default=_default;

package/lib/service/GroupService.js

@@ -2,21 +2,21 @@
  * 群缓存数据
  * @author 李文龙
  * @date 2020/1/9
- */var _default=new(/*#__PURE__*/function(){function GroupService(){(0,_classCallCheck2.default)(this,GroupService)}(0,_createClass2.default)(GroupService,[{key:"addGroupCache",value://加入群缓存
-function(){var _addGroupCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(group,groupListIDTimestamp){var groupOld;return _regenerator.default.wrap(function _callee$(_context){while(1)switch(_context.prev=_context.next){case 0:_context.next=2;return _SystemDictionaryService.default.setSystemDictionaryValue(_dictionaryConstant.default.groupMaxTimeStamp,groupListIDTimestamp);case 2:_context.next=4;return this.getGroupCacheByID(group.groupID);case 4:groupOld=_context.sent;if(groupOld){_context.next=9;break}group.shield=group.shield||{};group.loggedUserID=_userModel.default.userID;return _context.abrupt("return",_GroupCache.default.addGroup(group));case 9:return _context.abrupt("return",null);case 10:case"end":return _context.stop();}},_callee,this)}));function addGroupCache(_x,_x2){return _addGroupCache.apply(this,arguments)}return addGroupCache}()/**
+ */var _default=new(/*#__PURE__*/function(){function GroupService(){(0,_classCallCheck2.default)(this,GroupService)}(0,_createClass2.default)(GroupService,[{key:"addGroupCache",//加入群缓存
+value:function(){var _addGroupCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(group,groupListIDTimestamp){var groupOld;return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:_context.next=2;return _SystemDictionaryService.default.setSystemDictionaryValue(_dictionaryConstant.default.groupMaxTimeStamp,groupListIDTimestamp);case 2:_context.next=4;return this.getGroupCacheByID(group.groupID);case 4:groupOld=_context.sent;if(groupOld){_context.next=9;break}group.shield=group.shield||{};group.loggedUserID=_userModel.default.userID;return _context.abrupt("return",_GroupCache.default.addGroup(group));case 9:return _context.abrupt("return",null);case 10:case"end":return _context.stop();}}},_callee,this)}));function addGroupCache(_x,_x2){return _addGroupCache.apply(this,arguments)}return addGroupCache}()/**
      * 根据groupID更新群缓存
      * @returns {Promise.<*>}
-     */},{key:"updateGroupCache",value:function(){var _updateGroupCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(group,groupListIDTimestamp){var groupOld,res,groupChat;return _regenerator.default.wrap(function _callee2$(_context2){while(1)switch(_context2.prev=_context2.next){case 0:_context2.next=2;return _SystemDictionaryService.default.setSystemDictionaryValue(_dictionaryConstant.default.groupMaxTimeStamp,groupListIDTimestamp);case 2:_context2.next=4;return this.getGroupCacheByID(group.groupID);case 4:groupOld=_context2.sent;group.shield=groupOld.shield;group.loggedUserID=_userModel.default.userID;_context2.next=9;return _GroupCache.default.updateGroup(group);case 9:res=_context2.sent;_context2.next=12;return _ChatService.default.getChat(group.groupID);case 12:groupChat=_context2.sent;groupChat.groupInfo=group;groupChat.header=group.groupIcon;groupChat.title=group.groupName;_context2.next=18;return _ChatService.default.updateChatGroup(group.groupID,groupChat);case 18:return _context2.abrupt("return",res);case 19:case"end":return _context2.stop();}},_callee2,this)}));function updateGroupCache(_x3,_x4){return _updateGroupCache.apply(this,arguments)}return updateGroupCache}()/**
+     */},{key:"updateGroupCache",value:function(){var _updateGroupCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(group,groupListIDTimestamp){var groupOld,res,groupChat;return _regenerator.default.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:_context2.next=2;return _SystemDictionaryService.default.setSystemDictionaryValue(_dictionaryConstant.default.groupMaxTimeStamp,groupListIDTimestamp);case 2:_context2.next=4;return this.getGroupCacheByID(group.groupID);case 4:groupOld=_context2.sent;group.shield=groupOld.shield;group.loggedUserID=_userModel.default.userID;_context2.next=9;return _GroupCache.default.updateGroup(group);case 9:res=_context2.sent;_context2.next=12;return _ChatService.default.getChat(group.groupID);case 12:groupChat=_context2.sent;groupChat.groupInfo=group;groupChat.header=group.groupIcon;groupChat.title=group.groupName;_context2.next=18;return _ChatService.default.updateChatGroup(group.groupID,groupChat);case 18:return _context2.abrupt("return",res);case 19:case"end":return _context2.stop();}}},_callee2,this)}));function updateGroupCache(_x3,_x4){return _updateGroupCache.apply(this,arguments)}return updateGroupCache}()/**
      * 根据groupID删除群缓存
      * @returns {Promise.<*>}
-     */},{key:"deleteGroupCache",value:function(){var _deleteGroupCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(group,groupListIDTimestamp){return _regenerator.default.wrap(function _callee3$(_context3){while(1)switch(_context3.prev=_context3.next){case 0:_context3.next=2;return _SystemDictionaryService.default.setSystemDictionaryValue(_dictionaryConstant.default.groupMaxTimeStamp,groupListIDTimestamp);case 2:_context3.next=4;return _GroupMemberService.default.deleteAllGroupMember(group.groupID);case 4:_context3.next=6;return _ChatService.default.deleteChatCache(group.groupID);case 6:return _context3.abrupt("return",_GroupCache.default.deleteGroup(group.groupID));case 7:case"end":return _context3.stop();}},_callee3)}));function deleteGroupCache(_x5,_x6){return _deleteGroupCache.apply(this,arguments)}return deleteGroupCache}()/**
+     */},{key:"deleteGroupCache",value:function(){var _deleteGroupCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(group,groupListIDTimestamp){return _regenerator.default.wrap(function _callee3$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:_context3.next=2;return _SystemDictionaryService.default.setSystemDictionaryValue(_dictionaryConstant.default.groupMaxTimeStamp,groupListIDTimestamp);case 2:_context3.next=4;return _GroupMemberService.default.deleteAllGroupMember(group.groupID);case 4:_context3.next=6;return _ChatService.default.deleteChatCache(group.groupID);case 6:return _context3.abrupt("return",_GroupCache.default.deleteGroup(group.groupID));case 7:case"end":return _context3.stop();}}},_callee3)}));function deleteGroupCache(_x5,_x6){return _deleteGroupCache.apply(this,arguments)}return deleteGroupCache}()/**
      * 获取群列表
-     */},{key:"getGroupList",value:function(){var _getGroupList=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(){return _regenerator.default.wrap(function _callee4$(_context4){while(1)switch(_context4.prev=_context4.next){case 0:return _context4.abrupt("return",_GroupCache.default.getBaseGroupList());case 1:case"end":return _context4.stop();}},_callee4)}));function getGroupList(){return _getGroupList.apply(this,arguments)}return getGroupList}()/**
+     */},{key:"getGroupList",value:function(){var _getGroupList=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(){return _regenerator.default.wrap(function _callee4$(_context4){while(1){switch(_context4.prev=_context4.next){case 0:return _context4.abrupt("return",_GroupCache.default.getBaseGroupList());case 1:case"end":return _context4.stop();}}},_callee4)}));function getGroupList(){return _getGroupList.apply(this,arguments)}return getGroupList}()/**
      * 修改群成员总数
      * @param group
      * @param size  整/负
      * @returns {Promise.<void>}
-     */},{key:"updategroupMemberNum",value:function(){var _updategroupMemberNum=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(groupID,size){var groupInfo;return _regenerator.default.wrap(function _callee5$(_context5){while(1)switch(_context5.prev=_context5.next){case 0:_context5.next=2;return this.getGroupByID(groupID);case 2:groupInfo=_context5.sent;groupInfo.groupMemberNum=groupInfo.groupMemberNum+size;_context5.next=6;return _GroupCache.default.updateGroup(groupInfo);case 6:case"end":return _context5.stop();}},_callee5,this)}));function updategroupMemberNum(_x7,_x8){return _updategroupMemberNum.apply(this,arguments)}return updategroupMemberNum}()/**
+     */},{key:"updategroupMemberNum",value:function(){var _updategroupMemberNum=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(groupID,size){var groupInfo;return _regenerator.default.wrap(function _callee5$(_context5){while(1){switch(_context5.prev=_context5.next){case 0:_context5.next=2;return this.getGroupByID(groupID);case 2:groupInfo=_context5.sent;groupInfo.groupMemberNum=groupInfo.groupMemberNum+size;_context5.next=6;return _GroupCache.default.updateGroup(groupInfo);case 6:case"end":return _context5.stop();}}},_callee5,this)}));function updategroupMemberNum(_x7,_x8){return _updategroupMemberNum.apply(this,arguments)}return updategroupMemberNum}()/**
      * 添加群缓存 数组
      * @param groups
      * @returns {Dexie.Promise<Key> | *}
@@ -32,14 +32,14 @@ function(){var _addGroupCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regen
      * 优先本地缓存查询，如果没有则发送请求查询
      * @param userID
      * @returns {Promise.<*>}
-     */},{key:"getGroupByID",value:function(){var _getGroupByID=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(groupID){var group,groupInfo;return _regenerator.default.wrap(function _callee6$(_context6){while(1)switch(_context6.prev=_context6.next){case 0:_context6.next=2;return _GroupCache.default.getGroupByID(groupID);case 2:group=_context6.sent;if(group){_context6.next=8;break}_context6.next=6;return(0,_thriftClient.serviceClient)("getGroupInfo",true,groupID);case 6:groupInfo=_context6.sent;group=groupInfo.group;case 8:return _context6.abrupt("return",group);case 9:case"end":return _context6.stop();}},_callee6)}));function getGroupByID(_x9){return _getGroupByID.apply(this,arguments)}return getGroupByID}()/**
+     */},{key:"getGroupByID",value:function(){var _getGroupByID=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(groupID){var group,groupInfo;return _regenerator.default.wrap(function _callee6$(_context6){while(1){switch(_context6.prev=_context6.next){case 0:_context6.next=2;return _GroupCache.default.getGroupByID(groupID);case 2:group=_context6.sent;if(group){_context6.next=8;break}_context6.next=6;return(0,_thriftClient.serviceClient)("getGroupInfo",true,groupID);case 6:groupInfo=_context6.sent;group=groupInfo.group;case 8:return _context6.abrupt("return",group);case 9:case"end":return _context6.stop();}}},_callee6)}));function getGroupByID(_x9){return _getGroupByID.apply(this,arguments)}return getGroupByID}()/**
      * 邀请群成员
      * @param groupID
      * @param members
      * @returns {*}
-     */},{key:"invitationGroupMembers",value:function(){var _invitationGroupMembers=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7(groupID,members){var isOldServer;return _regenerator.default.wrap(function _callee7$(_context7){while(1)switch(_context7.prev=_context7.next){case 0:// TODO 服务器版本
+     */},{key:"invitationGroupMembers",value:function(){var _invitationGroupMembers=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7(groupID,members){var isOldServer;return _regenerator.default.wrap(function _callee7$(_context7){while(1){switch(_context7.prev=_context7.next){case 0:// TODO 服务器版本
 isOldServer=false;// 邀请群成员
-if(!isOldServer){_context7.next=7;break}_context7.next=4;return this.addOldGroupMember(groupID,members);case 4:return _context7.abrupt("return",_context7.sent);case 7:_context7.next=9;return this.addNewGroupMember(groupID,members);case 9:return _context7.abrupt("return",_context7.sent);case 10:case"end":return _context7.stop();}},_callee7,this)}));function invitationGroupMembers(_x10,_x11){return _invitationGroupMembers.apply(this,arguments)}return invitationGroupMembers}()/**
+if(!isOldServer){_context7.next=7;break}_context7.next=4;return this.addOldGroupMember(groupID,members);case 4:return _context7.abrupt("return",_context7.sent);case 7:_context7.next=9;return this.addNewGroupMember(groupID,members);case 9:return _context7.abrupt("return",_context7.sent);case 10:case"end":return _context7.stop();}}},_callee7,this)}));function invitationGroupMembers(_x10,_x11){return _invitationGroupMembers.apply(this,arguments)}return invitationGroupMembers}()/**
      * 激活群-如果存在群成员则添加群成员
      * @param {*} groupID
      */},{key:"activeGroup",value:function activeGroup(groupID){return(0,_thriftClient.serviceClient)("activeGroup",true,groupID)}/**

package/lib/service/HelpService.js

@@ -1,11 +1,11 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _thriftClient=require("../thrift/thriftClient");var _HelpCache=_interopRequireDefault(require("../cache/HelpCache"));function _createForOfIteratorHelper(o,allowArrayLike){var it=typeof Symbol!=="undefined"&&o[Symbol.iterator]||o["@@iterator"];if(!it){if(Array.isArray(o)||(it=_unsupportedIterableToArray(o))||allowArrayLike&&o&&typeof o.length==="number"){if(it)o=it;var i=0;var F=function F(){};return{s:F,n:function n(){if(i>=o.length)return{done:true};return{done:false,value:o[i++]}},e:function e(_e){throw _e},f:F}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var normalCompletion=true,didErr=false,err;return{s:function s(){it=it.call(o)},n:function n(){var step=it.next();normalCompletion=step.done;return step},e:function e(_e2){didErr=true;err=_e2},f:function f(){try{if(!normalCompletion&&it.return!=null)it.return()}finally{if(didErr)throw err}}}}function _unsupportedIterableToArray(o,minLen){if(!o)return;if(typeof o==="string")return _arrayLikeToArray(o,minLen);var n=Object.prototype.toString.call(o).slice(8,-1);if(n==="Object"&&o.constructor)n=o.constructor.name;if(n==="Map"||n==="Set")return Array.from(o);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _arrayLikeToArray(o,minLen)}function _arrayLikeToArray(arr,len){if(len==null||len>arr.length)len=arr.length;for(var i=0,arr2=new Array(len);i<len;i++)arr2[i]=arr[i];return arr2}/**
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _thriftClient=require("../thrift/thriftClient");var _HelpCache=_interopRequireDefault(require("../cache/HelpCache"));function _createForOfIteratorHelper(o,allowArrayLike){var it=typeof Symbol!=="undefined"&&o[Symbol.iterator]||o["@@iterator"];if(!it){if(Array.isArray(o)||(it=_unsupportedIterableToArray(o))||allowArrayLike&&o&&typeof o.length==="number"){if(it)o=it;var i=0;var F=function F(){};return{s:F,n:function n(){if(i>=o.length)return{done:true};return{done:false,value:o[i++]}},e:function e(_e){throw _e},f:F}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var normalCompletion=true,didErr=false,err;return{s:function s(){it=it.call(o)},n:function n(){var step=it.next();normalCompletion=step.done;return step},e:function e(_e2){didErr=true;err=_e2},f:function f(){try{if(!normalCompletion&&it.return!=null)it.return()}finally{if(didErr)throw err}}}}function _unsupportedIterableToArray(o,minLen){if(!o)return;if(typeof o==="string")return _arrayLikeToArray(o,minLen);var n=Object.prototype.toString.call(o).slice(8,-1);if(n==="Object"&&o.constructor)n=o.constructor.name;if(n==="Map"||n==="Set")return Array.from(o);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _arrayLikeToArray(o,minLen)}function _arrayLikeToArray(arr,len){if(len==null||len>arr.length)len=arr.length;for(var i=0,arr2=new Array(len);i<len;i++){arr2[i]=arr[i]}return arr2}/**
  * 帮助业务类
- */var _default=new(/*#__PURE__*/function(){function HelpService(){(0,_classCallCheck2.default)(this,HelpService)}(0,_createClass2.default)(HelpService,[{key:"_recursionHelp",value:/**
+ */var _default=new(/*#__PURE__*/function(){function HelpService(){(0,_classCallCheck2.default)(this,HelpService)}(0,_createClass2.default)(HelpService,[{key:"_recursionHelp",/**
      * 递归塞入帮助数据
      * @param parent
      * @param dataMap
      * @private
-     */function _recursionHelp(parent,dataMap){parent.children=[];var _iterator=_createForOfIteratorHelper(dataMap),_step;try{for(_iterator.s();!(_step=_iterator.n()).done;){var _step$value=(0,_slicedToArray2.default)(_step.value,2),id=_step$value[0],data=_step$value[1];if(parent.id==data.parentId){parent.children.push(data);this._recursionHelp(data,dataMap);dataMap.delete(id)}}}catch(err){_iterator.e(err)}finally{_iterator.f()}}},{key:"getHelp",value:function getHelp(){return _HelpCache.default.getHelp()}},{key:"getOrderHelp",value:function(){var _getOrderHelp=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(){var _this=this;var helps,helpArr,helpMap;return _regenerator.default.wrap(function _callee$(_context){while(1)switch(_context.prev=_context.next){case 0:_context.next=2;return _HelpCache.default.getHelp();case 2:helps=_context.sent;helpArr=[];helpMap=new Map;helps.forEach(function(item){if(item.parentId==0){helpArr.push(item)}else{helpMap.set(item.id,item)}});helpArr.forEach(function(item){_this._recursionHelp(item,helpMap)});return _context.abrupt("return",helpArr);case 8:case"end":return _context.stop();}},_callee)}));function getOrderHelp(){return _getOrderHelp.apply(this,arguments)}return getOrderHelp}()},{key:"getServiceTime",value:function(){var _getServiceTime=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(){var timeStParam,res;return _regenerator.default.wrap(function _callee2$(_context2){while(1)switch(_context2.prev=_context2.next){case 0:timeStParam=new TimeStParam;timeStParam.type=1;timeStParam.value64_2=27;_context2.next=5;return(0,_thriftClient.serviceClient)("qTimeStS",true,timeStParam);case 5:res=_context2.sent;return _context2.abrupt("return",res.value64_1);case 7:case"end":return _context2.stop();}},_callee2)}));function getServiceTime(){return _getServiceTime.apply(this,arguments)}return getServiceTime}()/**
+     */value:function _recursionHelp(parent,dataMap){parent.children=[];var _iterator=_createForOfIteratorHelper(dataMap),_step;try{for(_iterator.s();!(_step=_iterator.n()).done;){var _step$value=(0,_slicedToArray2.default)(_step.value,2),id=_step$value[0],data=_step$value[1];if(parent.id==data.parentId){parent.children.push(data);this._recursionHelp(data,dataMap);dataMap.delete(id)}}}catch(err){_iterator.e(err)}finally{_iterator.f()}}},{key:"getHelp",value:function getHelp(){return _HelpCache.default.getHelp()}},{key:"getOrderHelp",value:function(){var _getOrderHelp=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(){var _this=this;var helps,helpArr,helpMap;return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:_context.next=2;return _HelpCache.default.getHelp();case 2:helps=_context.sent;helpArr=[];helpMap=new Map;helps.forEach(function(item){if(item.parentId==0){helpArr.push(item)}else{helpMap.set(item.id,item)}});helpArr.forEach(function(item){_this._recursionHelp(item,helpMap)});return _context.abrupt("return",helpArr);case 8:case"end":return _context.stop();}}},_callee)}));function getOrderHelp(){return _getOrderHelp.apply(this,arguments)}return getOrderHelp}()},{key:"getServiceTime",value:function(){var _getServiceTime=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(){var timeStParam,res;return _regenerator.default.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:timeStParam=new TimeStParam;timeStParam.type=1;timeStParam.value64_2=27;_context2.next=5;return(0,_thriftClient.serviceClient)("qTimeStS",true,timeStParam);case 5:res=_context2.sent;return _context2.abrupt("return",res.value64_1);case 7:case"end":return _context2.stop();}}},_callee2)}));function getServiceTime(){return _getServiceTime.apply(this,arguments)}return getServiceTime}()/**
      * 查询并更新帮助信息
      * @returns {Promise<void>}
-     */},{key:"queryAndUpdateHelp",value:function(){var _queryAndUpdateHelp=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(){var feedBackParam,res;return _regenerator.default.wrap(function _callee3$(_context3){while(1)switch(_context3.prev=_context3.next){case 0:feedBackParam=new FeedBackParam;feedBackParam.type=2;feedBackParam.map_strstr={clientType:"1"};_context3.next=5;return(0,_thriftClient.serviceClient)("qFeedBackS",true,feedBackParam);case 5:res=_context3.sent;_context3.next=8;return _HelpCache.default.removeAllHelp();case 8:return _context3.abrupt("return",_HelpCache.default.bulkHelp(res.helpRlt));case 9:case"end":return _context3.stop();}},_callee3)}));function queryAndUpdateHelp(){return _queryAndUpdateHelp.apply(this,arguments)}return queryAndUpdateHelp}()}]);return HelpService}());exports.default=_default;
+     */},{key:"queryAndUpdateHelp",value:function(){var _queryAndUpdateHelp=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(){var feedBackParam,res;return _regenerator.default.wrap(function _callee3$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:feedBackParam=new FeedBackParam;feedBackParam.type=2;feedBackParam.map_strstr={clientType:"1"};_context3.next=5;return(0,_thriftClient.serviceClient)("qFeedBackS",true,feedBackParam);case 5:res=_context3.sent;_context3.next=8;return _HelpCache.default.removeAllHelp();case 8:return _context3.abrupt("return",_HelpCache.default.bulkHelp(res.helpRlt));case 9:case"end":return _context3.stop();}}},_callee3)}));function queryAndUpdateHelp(){return _queryAndUpdateHelp.apply(this,arguments)}return queryAndUpdateHelp}()}]);return HelpService}());exports.default=_default;

package/lib/service/LoginService.js

@@ -2,15 +2,15 @@
  * 登录业务类
  * @author 李文龙
  * @date 2020/3/17
- */var _default=new(/*#__PURE__*/function(){function LoginService(){(0,_classCallCheck2.default)(this,LoginService)}(0,_createClass2.default)(LoginService,[{key:"relogin",value:/**
+ */var _default=new(/*#__PURE__*/function(){function LoginService(){(0,_classCallCheck2.default)(this,LoginService)}(0,_createClass2.default)(LoginService,[{key:"relogin",/**
      * session超时重新登录
-     */function(){var _relogin=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(){var loginParam,res;return _regenerator.default.wrap(function _callee$(_context){while(1)switch(_context.prev=_context.next){case 0:loginParam=new LoginParam;loginParam.userType=-1;loginParam.tick="2";loginParam.user=_userModel.default.userID;loginParam.pwd=_userModel.default.ticket;// 合并静态
-(0,_commonUtil.merge)(loginParam,_loginModel.default.getAttrs());_context.next=8;return(0,_thriftClient.serviceClient)("login_im",false,loginParam);case 8:res=_context.sent;_context.next=11;return this.processCache(res);case 11:return _context.abrupt("return",Promise.resolve(res));case 12:case"end":return _context.stop();}},_callee,this)}));function relogin(){return _relogin.apply(this,arguments)}return relogin}()/**
+     */value:function(){var _relogin=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(){var loginParam,res;return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:loginParam=new LoginParam;loginParam.userType=-1;loginParam.tick="2";loginParam.user=_userModel.default.userID+"";loginParam.pwd=_userModel.default.ticket;// 合并静态
+(0,_commonUtil.merge)(loginParam,_loginModel.default.getAttrs());_context.next=8;return(0,_thriftClient.serviceClient)("login_im",false,loginParam);case 8:res=_context.sent;_context.next=11;return this.processCache(res);case 11:return _context.abrupt("return",Promise.resolve(res));case 12:case"end":return _context.stop();}}},_callee,this)}));function relogin(){return _relogin.apply(this,arguments)}return relogin}()/**
      * 登录成功后，处理数据缓存
      * 1.存储基本信息 2.时间戳 3.好友列表 4.会话列表 5.群列表
-     */},{key:"processCache",value:function(){var _processCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(res){return _regenerator.default.wrap(function _callee2$(_context2){while(1)switch(_context2.prev=_context2.next){case 0:// 1.存储基本信息
+     */},{key:"processCache",value:function(){var _processCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(res){return _regenerator.default.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:// 1.存储基本信息
 _userModel.default.setData(res);// 2.获取时间戳
 _context2.next=3;return _TimeStampService.default.getAllTimeStamp();case 3:_context2.next=5;return _SystemDictionaryService.default.setSystemDictionaryValue(_dictionaryConstant.default.activeChatID,0);case 5:_context2.next=7;return this.runOffline(_OfflineMyself.default);case 7:_context2.next=9;return this.runOffline(_OfflineEnterprise.default);case 9:_context2.next=11;return this.runOffline(_OfflineHelp.default);case 11:_context2.next=13;return this.runOffline(_OfflineBuddy.default);case 13:_context2.next=15;return this.runOffline(_OfflineGroup.default);case 15:_context2.next=17;return this.runOffline(_OfflineMessage.default);case 17:// 8.心跳监控
-_NotifyHeartBeat.default.listen();case 18:case"end":return _context2.stop();}},_callee2,this)}));function processCache(_x){return _processCache.apply(this,arguments)}return processCache}()/**
+_NotifyHeartBeat.default.listen();case 18:case"end":return _context2.stop();}}},_callee2,this)}));function processCache(_x){return _processCache.apply(this,arguments)}return processCache}()/**
      * 拉取离线内容
-     */},{key:"runOffline",value:function(){var _runOffline=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(offlineObj){return _regenerator.default.wrap(function _callee3$(_context3){while(1)switch(_context3.prev=_context3.next){case 0:_context3.prev=0;_context3.next=3;return offlineObj.run();case 3:_context3.next=8;break;case 5:_context3.prev=5;_context3.t0=_context3["catch"](0);console.log("LoginService.runOffline",offlineObj,_context3.t0);case 8:case"end":return _context3.stop();}},_callee3,null,[[0,5]])}));function runOffline(_x2){return _runOffline.apply(this,arguments)}return runOffline}()}]);return LoginService}());exports.default=_default;
+     */},{key:"runOffline",value:function(){var _runOffline=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(offlineObj){return _regenerator.default.wrap(function _callee3$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:_context3.prev=0;_context3.next=3;return offlineObj.run();case 3:_context3.next=8;break;case 5:_context3.prev=5;_context3.t0=_context3["catch"](0);console.log("LoginService.runOffline",offlineObj,_context3.t0);case 8:case"end":return _context3.stop();}}},_callee3,null,[[0,5]])}));function runOffline(_x2){return _runOffline.apply(this,arguments)}return runOffline}()}]);return LoginService}());exports.default=_default;

package/lib/service/MessageService.js

@@ -1,20 +1,20 @@
 "use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _commonUtil=require("../utils/commonUtil");var _userModel=_interopRequireDefault(require("../model/userModel"));var _filesUtil=require("../utils/filesUtil");var _ChatService=_interopRequireDefault(require("./ChatService"));var _GroupMessageService=_interopRequireDefault(require("./GroupMessageService"));var _SystemMessageService=_interopRequireDefault(require("./SystemMessageService"));var _MessageCache=_interopRequireDefault(require("../cache/MessageCache"));var _thriftClient=require("../thrift/thriftClient");var _MessageTimeStampService=_interopRequireDefault(require("./MessageTimeStampService"));var _GroupService=_interopRequireDefault(require("./GroupService"));var _BuddyService=_interopRequireDefault(require("./BuddyService"));var _GroupMemberService=_interopRequireDefault(require("../service/GroupMemberService"));var _CommonService=_interopRequireDefault(require("./CommonService"));var _EnterpriseService=_interopRequireDefault(require("./EnterpriseService"));var _SubscribeService=_interopRequireDefault(require("../service/SubscribeService"));/**
  * 消息缓存
- */var _default=new(/*#__PURE__*/function(){function MessageService(){(0,_classCallCheck2.default)(this,MessageService)}(0,_createClass2.default)(MessageService,[{key:"addMessageCache",value:/**
+ */var _default=new(/*#__PURE__*/function(){function MessageService(){(0,_classCallCheck2.default)(this,MessageService)}(0,_createClass2.default)(MessageService,[{key:"addMessageCache",/**
      * 添加消息缓存
      * @param {*} messageStoreBean 
-     */function addMessageCache(messageStoreBean){return _MessageCache.default.addMessage(messageStoreBean)}/**
+     */value:function addMessageCache(messageStoreBean){return _MessageCache.default.addMessage(messageStoreBean)}/**
      * 根据消息游标查询历史消息缓存
      * @param {*} chatID 
      * @param {*} messageID 
      * @param {*} size 
-     */},{key:"getMessageCacheByCursor",value:function(){var _getMessageCacheByCursor=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(chatID){var messageID,size,messages,i,message,_args=arguments;return _regenerator.default.wrap(function _callee$(_context){while(1)switch(_context.prev=_context.next){case 0:messageID=_args.length>1&&_args[1]!==undefined?_args[1]:0;size=_args.length>2&&_args[2]!==undefined?_args[2]:10;_context.next=4;return _MessageCache.default.getMessageCacheByCursor(chatID,messageID,size);case 4:_context.t0=_context.sent;if(_context.t0){_context.next=7;break}_context.t0=[];case 7:messages=_context.t0;i=0;case 9:if(!(i<messages.length)){_context.next=29;break}message=messages[i];if(!message.user){_context.next=15;break}_context.next=14;return _BuddyService.default.getBuddy(message.user.userID);case 14:message.user=_context.sent;case 15:if(!message.enterpriseInfo){_context.next=19;break}_context.next=18;return _EnterpriseService.default.getEnterpriseById(message.enterpriseInfo.appID);case 18:message.enterpriseInfo=_context.sent;case 19:if(!message.subscribeInfo){_context.next=23;break}_context.next=22;return _SubscribeService.default.getSubscribeById(message.subscribeInfo.userID);case 22:message.enterpriseInfo=_context.sent;case 23:_context.next=25;return this.getMessageRemark(message);case 25:message.remark=_context.sent;case 26:i++;_context.next=9;break;case 29:return _context.abrupt("return",messages);case 30:case"end":return _context.stop();}},_callee,this)}));function getMessageCacheByCursor(_x){return _getMessageCacheByCursor.apply(this,arguments)}return getMessageCacheByCursor}()/**
+     */},{key:"getMessageCacheByCursor",value:function(){var _getMessageCacheByCursor=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(chatID){var messageID,size,messages,i,message,_args=arguments;return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:messageID=_args.length>1&&_args[1]!==undefined?_args[1]:0;size=_args.length>2&&_args[2]!==undefined?_args[2]:10;_context.next=4;return _MessageCache.default.getMessageCacheByCursor(chatID,messageID,size);case 4:_context.t0=_context.sent;if(_context.t0){_context.next=7;break}_context.t0=[];case 7:messages=_context.t0;i=0;case 9:if(!(i<messages.length)){_context.next=29;break}message=messages[i];if(!message.user){_context.next=15;break}_context.next=14;return _BuddyService.default.getBuddy(message.user.userID);case 14:message.user=_context.sent;case 15:if(!message.enterpriseInfo){_context.next=19;break}_context.next=18;return _EnterpriseService.default.getEnterpriseById(message.enterpriseInfo.appID);case 18:message.enterpriseInfo=_context.sent;case 19:if(!message.subscribeInfo){_context.next=23;break}_context.next=22;return _SubscribeService.default.getSubscribeById(message.subscribeInfo.userID);case 22:message.enterpriseInfo=_context.sent;case 23:_context.next=25;return this.getMessageRemark(message);case 25:message.remark=_context.sent;case 26:i++;_context.next=9;break;case 29:return _context.abrupt("return",messages);case 30:case"end":return _context.stop();}}},_callee,this)}));function getMessageCacheByCursor(_x){return _getMessageCacheByCursor.apply(this,arguments)}return getMessageCacheByCursor}()/**
      * 新增发送消息缓存
      * @param {*} messageBean 
-     */},{key:"addSendMessageCache",value:function(){var _addSendMessageCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(messageBean){var msgStorage;return _regenerator.default.wrap(function _callee2$(_context2){while(1)switch(_context2.prev=_context2.next){case 0:// 转换MessageStorageBean
-msgStorage={sendUserID:Number.parseInt(messageBean.userID),receTargetID:Number.parseInt(messageBean.targetID),message:messageBean.message};// MessageStorageBean消息对象合并
+     */},{key:"addSendMessageCache",value:function(){var _addSendMessageCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(messageBean){var msgStorage;return _regenerator.default.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0:// 转换MessageStorageBean
+msgStorage={sendUserID:messageBean.userID,receTargetID:messageBean.targetID,message:messageBean.message};// MessageStorageBean消息对象合并
 msgStorage=(0,_commonUtil.merge)(new MessageStorageBean,msgStorage,messageBean);// 增加额外信息
-_context2.next=4;return this.packageLocalMessageStoreBean(msgStorage,0);case 4:return _context2.abrupt("return",this.storeSendMessage(msgStorage));case 5:case"end":return _context2.stop();}},_callee2,this)}));function addSendMessageCache(_x2){return _addSendMessageCache.apply(this,arguments)}return addSendMessageCache}()/**
+_context2.next=4;return this.packageLocalMessageStoreBean(msgStorage,0);case 4:return _context2.abrupt("return",this.storeSendMessage(msgStorage));case 5:case"end":return _context2.stop();}}},_callee2,this)}));function addSendMessageCache(_x2){return _addSendMessageCache.apply(this,arguments)}return addSendMessageCache}()/**
      * 存储send消息缓存
      * 1.区分单聊消息和群消息
      * @param {*} messageStoreBean 
@@ -27,11 +27,11 @@ return this.addMessageCache(messageStoreBean)}}/**
      * 更新发送消息状态、消息ID、发送时间
      * @param {*} id 
      * @param {*} msgStorageBean 
-     */},{key:"updateSendMessageCache",value:function(){var _updateSendMessageCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(id,msgStorageBean){var activeChat,localMsgStorageBean,msgStorage;return _regenerator.default.wrap(function _callee3$(_context3){while(1)switch(_context3.prev=_context3.next){case 0:_context3.next=2;return _ChatService.default.getChat(msgStorageBean.chatID);case 2:activeChat=_context3.sent;localMsgStorageBean={};// 是否群聊
+     */},{key:"updateSendMessageCache",value:function(){var _updateSendMessageCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3(id,msgStorageBean){var activeChat,localMsgStorageBean,msgStorage;return _regenerator.default.wrap(function _callee3$(_context3){while(1){switch(_context3.prev=_context3.next){case 0:_context3.next=2;return _ChatService.default.getChat(msgStorageBean.chatID);case 2:activeChat=_context3.sent;localMsgStorageBean={};// 是否群聊
 if(!(activeChat.chatType=="group")){_context3.next=10;break}_context3.next=7;return _GroupMessageService.default.getGroupMessageCache(id);case 7:localMsgStorageBean=_context3.sent;_context3.next=13;break;case 10:_context3.next=12;return _MessageCache.default.getMessage(id);case 12:localMsgStorageBean=_context3.sent;case 13:// 更新消息状态、消息ID、发送时间
 msgStorage={id:id,status:1,sendTime:msgStorageBean.sendTime,messageID:msgStorageBean.messageID,lastMessageID:msgStorageBean.lastMessageID};// 合并消息实体对象
 localMsgStorageBean=(0,_commonUtil.merge)(localMsgStorageBean,msgStorage);// 更新消息缓存
-_context3.next=17;return this.updateStoreMessage(localMsgStorageBean);case 17:case"end":return _context3.stop();}},_callee3,this)}));function updateSendMessageCache(_x3,_x4){return _updateSendMessageCache.apply(this,arguments)}return updateSendMessageCache}()/**
+_context3.next=17;return this.updateStoreMessage(localMsgStorageBean);case 17:case"end":return _context3.stop();}}},_callee3,this)}));function updateSendMessageCache(_x3,_x4){return _updateSendMessageCache.apply(this,arguments)}return updateSendMessageCache}()/**
      * 包装本地消息实体
      * 1.chatID: 会话ID
      * 2.source: 消息来源
@@ -39,7 +39,7 @@ _context3.next=17;return this.updateStoreMessage(localMsgStorageBean);case 17:ca
      * 4.status: 消息状态 1成功 0失败
      * 5.sendUserType: 发送者类型 system user group enterprise
      * @param {*} messageStoreBean
-     */},{key:"packageLocalMessageStoreBean",value:function(){var _packageLocalMessageStoreBean=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(messageStoreBean){var status,_args4=arguments;return _regenerator.default.wrap(function _callee4$(_context4){while(1)switch(_context4.prev=_context4.next){case 0:status=_args4.length>1&&_args4[1]!==undefined?_args4[1]:0;//永远记录对方(好友、群、系统)ID
+     */},{key:"packageLocalMessageStoreBean",value:function(){var _packageLocalMessageStoreBean=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4(messageStoreBean){var status,_args4=arguments;return _regenerator.default.wrap(function _callee4$(_context4){while(1){switch(_context4.prev=_context4.next){case 0:status=_args4.length>1&&_args4[1]!==undefined?_args4[1]:0;//永远记录对方(好友、群、系统)ID
 messageStoreBean.chatID="";// 消息来源(是否是其他端消息同步： 'send'为发送消息，'receive'接收消息 )，消息状态：0未读
 messageStoreBean.source=messageStoreBean.sendUserID==_userModel.default.userID?"send":"receive";//系统消息 取系统ID(10000)
 if(messageStoreBean.messageType===100){messageStoreBean.chatID=messageStoreBean.sendUserID;//发送者是自己 则取接受者ID
@@ -48,21 +48,21 @@ if(messageStoreBean.messageType===100){messageStoreBean.chatID=messageStoreBean.
 }else if(messageStoreBean.source=="receive"){messageStoreBean.chatID=messageStoreBean.receTargetID}//永远记录对方(好友、群、系统)类型 system user group enterprise
 _context4.next=6;return _CommonService.default.getMessageSendType(messageStoreBean.chatID);case 6:messageStoreBean.chatType=_context4.sent;// 消息解析成对象
 messageStoreBean.messageJson=(0,_commonUtil.analysisNotifyMessage)(messageStoreBean.message);messageStoreBean.msgPropertiesJson=(0,_commonUtil.analysisNotifyMessage)(messageStoreBean.msgProperties);messageStoreBean.loggedUserID=_userModel.default.userID;messageStoreBean.status=status;// 处理文件、图片消息路径
-messageStoreBean=(0,_filesUtil.processSendMessagePath)(messageStoreBean);if(!(messageStoreBean.chatType=="group")){_context4.next=21;break}_context4.next=15;return _GroupService.default.getGroupByID(messageStoreBean.chatID);case 15:messageStoreBean.groupInfo=_context4.sent;_context4.next=18;return _BuddyService.default.getBuddy(messageStoreBean.sendUserID);case 18:messageStoreBean.user=_context4.sent;_context4.next=45;break;case 21:if(!(messageStoreBean.chatType=="user")){_context4.next=27;break}_context4.next=24;return _BuddyService.default.getBuddy(messageStoreBean.chatID);case 24:messageStoreBean.user=_context4.sent;_context4.next=45;break;case 27:if(!(messageStoreBean.chatType=="subscribe")){_context4.next=37;break}_context4.next=30;return _SubscribeService.default.getSubscribeById(messageStoreBean.chatID);case 30:messageStoreBean.subscribeInfo=_context4.sent;if(!(messageStoreBean.source=="send")){_context4.next=35;break}_context4.next=34;return _BuddyService.default.getBuddy(messageStoreBean.sendUserID);case 34:messageStoreBean.user=_context4.sent;case 35:_context4.next=45;break;case 37:if(!(messageStoreBean.chatType=="enterprise")){_context4.next=45;break}_context4.next=40;return _EnterpriseService.default.getEnterpriseById(messageStoreBean.chatID);case 40:messageStoreBean.enterpriseInfo=_context4.sent;if(!(messageStoreBean.source=="send")){_context4.next=45;break}_context4.next=44;return _BuddyService.default.getBuddy(messageStoreBean.sendUserID);case 44:messageStoreBean.user=_context4.sent;case 45:return _context4.abrupt("return",messageStoreBean);case 46:case"end":return _context4.stop();}},_callee4)}));function packageLocalMessageStoreBean(_x5){return _packageLocalMessageStoreBean.apply(this,arguments)}return packageLocalMessageStoreBean}()/**
+messageStoreBean=(0,_filesUtil.processSendMessagePath)(messageStoreBean);if(!(messageStoreBean.chatType=="group")){_context4.next=21;break}_context4.next=15;return _GroupService.default.getGroupByID(messageStoreBean.chatID);case 15:messageStoreBean.groupInfo=_context4.sent;_context4.next=18;return _BuddyService.default.getBuddy(messageStoreBean.sendUserID);case 18:messageStoreBean.user=_context4.sent;_context4.next=45;break;case 21:if(!(messageStoreBean.chatType=="user")){_context4.next=27;break}_context4.next=24;return _BuddyService.default.getBuddy(messageStoreBean.chatID);case 24:messageStoreBean.user=_context4.sent;_context4.next=45;break;case 27:if(!(messageStoreBean.chatType=="subscribe")){_context4.next=37;break}_context4.next=30;return _SubscribeService.default.getSubscribeById(messageStoreBean.chatID);case 30:messageStoreBean.subscribeInfo=_context4.sent;if(!(messageStoreBean.source=="send")){_context4.next=35;break}_context4.next=34;return _BuddyService.default.getBuddy(messageStoreBean.sendUserID);case 34:messageStoreBean.user=_context4.sent;case 35:_context4.next=45;break;case 37:if(!(messageStoreBean.chatType=="enterprise")){_context4.next=45;break}_context4.next=40;return _EnterpriseService.default.getEnterpriseById(messageStoreBean.chatID);case 40:messageStoreBean.enterpriseInfo=_context4.sent;if(!(messageStoreBean.source=="send")){_context4.next=45;break}_context4.next=44;return _BuddyService.default.getBuddy(messageStoreBean.sendUserID);case 44:messageStoreBean.user=_context4.sent;case 45:return _context4.abrupt("return",messageStoreBean);case 46:case"end":return _context4.stop();}}},_callee4)}));function packageLocalMessageStoreBean(_x5){return _packageLocalMessageStoreBean.apply(this,arguments)}return packageLocalMessageStoreBean}()/**
      * 【注意】：messageStoreBean需先由packageLocalMessageStoreBean处理
      * 新增接收消息缓存
      * @param {*} messageStoreBean 
-     */},{key:"addReceiveMessageCache",value:function(){var _addReceiveMessageCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(messageStoreBean){var messageType;return _regenerator.default.wrap(function _callee5$(_context5){while(1)switch(_context5.prev=_context5.next){case 0:// 消息类型
+     */},{key:"addReceiveMessageCache",value:function(){var _addReceiveMessageCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5(messageStoreBean){var messageType;return _regenerator.default.wrap(function _callee5$(_context5){while(1){switch(_context5.prev=_context5.next){case 0:// 消息类型
 messageType=messageStoreBean.messageType;// 根据消息类型处理消息体
-_context5.t0=messageType;_context5.next=_context5.t0===2?4:_context5.t0===5?4:_context5.t0===6?4:_context5.t0===8?4:_context5.t0===14?4:_context5.t0===34?7:_context5.t0===64?8:_context5.t0===100?9:12;break;case 4:_context5.next=6;return this.updateStoreMessage(messageStoreBean);case 6:return _context5.abrupt("break",12);case 7:return _context5.abrupt("break",12);case 8:return _context5.abrupt("break",12);case 9:_context5.next=11;return this.storeSystemMessage(messageStoreBean);case 11:return _context5.abrupt("break",12);case 12:case"end":return _context5.stop();}},_callee5,this)}));function addReceiveMessageCache(_x6){return _addReceiveMessageCache.apply(this,arguments)}return addReceiveMessageCache}()/**
+_context5.t0=messageType;_context5.next=_context5.t0===2?4:_context5.t0===5?4:_context5.t0===6?4:_context5.t0===8?4:_context5.t0===14?4:_context5.t0===34?7:_context5.t0===64?8:_context5.t0===100?9:12;break;case 4:_context5.next=6;return this.updateStoreMessage(messageStoreBean);case 6:return _context5.abrupt("break",12);case 7:return _context5.abrupt("break",12);case 8:return _context5.abrupt("break",12);case 9:_context5.next=11;return this.storeSystemMessage(messageStoreBean);case 11:return _context5.abrupt("break",12);case 12:case"end":return _context5.stop();}}},_callee5,this)}));function addReceiveMessageCache(_x6){return _addReceiveMessageCache.apply(this,arguments)}return addReceiveMessageCache}()/**
      * 存储消息缓存
      * 1.区分单聊消息和群消息
      * @param {*} messageStoreBean 
-     */},{key:"updateStoreMessage",value:function(){var _updateStoreMessage=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(messageStoreBean){return _regenerator.default.wrap(function _callee6$(_context6){while(1)switch(_context6.prev=_context6.next){case 0:if(!(messageStoreBean.chatType=="group")){_context6.next=5;break}_context6.next=3;return _GroupMessageService.default.setGroupMessageCache(messageStoreBean);case 3:_context6.next=7;break;case 5:_context6.next=7;return _MessageCache.default.setMessage(messageStoreBean);case 7:_context6.next=9;return _ChatService.default.updateChatCache(messageStoreBean);case 9:case"end":return _context6.stop();}},_callee6)}));function updateStoreMessage(_x7){return _updateStoreMessage.apply(this,arguments)}return updateStoreMessage}()/**
+     */},{key:"updateStoreMessage",value:function(){var _updateStoreMessage=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(messageStoreBean){return _regenerator.default.wrap(function _callee6$(_context6){while(1){switch(_context6.prev=_context6.next){case 0:if(!(messageStoreBean.chatType=="group")){_context6.next=5;break}_context6.next=3;return _GroupMessageService.default.setGroupMessageCache(messageStoreBean);case 3:_context6.next=7;break;case 5:_context6.next=7;return _MessageCache.default.setMessage(messageStoreBean);case 7:_context6.next=9;return _ChatService.default.updateChatCache(messageStoreBean);case 9:case"end":return _context6.stop();}}},_callee6)}));function updateStoreMessage(_x7){return _updateStoreMessage.apply(this,arguments)}return updateStoreMessage}()/**
      * 存储系统消息通知
      * @param {*} messageStoreBean 
-     */},{key:"storeSystemMessage",value:function(){var _storeSystemMessage=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7(messageStoreBean){var systemMessage;return _regenerator.default.wrap(function _callee7$(_context7){while(1)switch(_context7.prev=_context7.next){case 0:systemMessage={message:messageStoreBean.message,messageID:messageStoreBean.messageID,applicationID:messageStoreBean.msgPropertiesJson.applicationId,msgPropertiesJson:messageStoreBean.msgPropertiesJson,loggedUserID:_userModel.default.userID,sendUserID:messageStoreBean.msgPropertiesJson.sendUserId,sendTime:messageStoreBean.sendTime,type:messageStoreBean.subMsgType,status:0};// 新增系统消息
-_context7.next=3;return _SystemMessageService.default.addSystemMessageCache(systemMessage);case 3:_context7.next=5;return _ChatService.default.updateChatCache(messageStoreBean);case 5:case"end":return _context7.stop();}},_callee7)}));function storeSystemMessage(_x8){return _storeSystemMessage.apply(this,arguments)}return storeSystemMessage}()/**
+     */},{key:"storeSystemMessage",value:function(){var _storeSystemMessage=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7(messageStoreBean){var systemMessage;return _regenerator.default.wrap(function _callee7$(_context7){while(1){switch(_context7.prev=_context7.next){case 0:systemMessage={message:messageStoreBean.message,messageID:messageStoreBean.messageID,applicationID:messageStoreBean.msgPropertiesJson.applicationId,msgPropertiesJson:messageStoreBean.msgPropertiesJson,loggedUserID:_userModel.default.userID,sendUserID:messageStoreBean.msgPropertiesJson.sendUserId,sendTime:messageStoreBean.sendTime,type:messageStoreBean.subMsgType,status:0};// 新增系统消息
+_context7.next=3;return _SystemMessageService.default.addSystemMessageCache(systemMessage);case 3:_context7.next=5;return _ChatService.default.updateChatCache(messageStoreBean);case 5:case"end":return _context7.stop();}}},_callee7)}));function storeSystemMessage(_x8){return _storeSystemMessage.apply(this,arguments)}return storeSystemMessage}()/**
      * 根据chatID清空会话消息记录
      * @param {*} chatID 
      */},{key:"clearChatCacheContent",value:function clearChatCacheContent(chatID){return this.clearChatContent(chatID)}/**
@@ -71,22 +71,22 @@ _context7.next=3;return _SystemMessageService.default.addSystemMessageCache(syst
      */},{key:"clearChatContent",value:function clearChatContent(chatID){return _MessageCache.default.clearChatContent(chatID)}/**
      * 发送消息
      * @param {*} messageBean
-     */},{key:"sendMessage",value:function(){var _sendMessage=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(messageBean){var mb,localMsgID,res;return _regenerator.default.wrap(function _callee8$(_context8){while(1)switch(_context8.prev=_context8.next){case 0:mb=new MessageBean;// 发送者ID
+     */},{key:"sendMessage",value:function(){var _sendMessage=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(messageBean){var mb,localMsgID,res;return _regenerator.default.wrap(function _callee8$(_context8){while(1){switch(_context8.prev=_context8.next){case 0:mb=new MessageBean;// 发送者ID
 mb.userID=_userModel.default.userID;// MAC地址
 mb.maccode=_userModel.default.macAddr;// 客户端本地消息ID
 mb.localID=new Date().getTime();// 合并消息对象
 (0,_commonUtil.merge)(mb,messageBean);// 修改消息体格式
 mb.message=(0,_commonUtil.formatSendMessage)(mb);// 创建新消息缓存
 _context8.next=8;return this.addSendMessageCache(mb);case 8:localMsgID=_context8.sent;_context8.next=11;return(0,_thriftClient.serviceClient)("sendMessage",true,mb);case 11:res=_context8.sent;// 携带当前会话ID
-res.chatID=Number.parseInt(mb.targetID);// 更新消息缓存
-_context8.next=15;return this.updateSendMessageCache(localMsgID,res);case 15:_context8.next=17;return _MessageTimeStampService.default.addReceiveMessageTimeStampCache(Object.assign({},messageBean,{sendUserID:_userModel.default.userID,receTargetID:messageBean.targetID,messageID:res.messageID}));case 17:return _context8.abrupt("return",Promise.resolve(res));case 18:case"end":return _context8.stop();}},_callee8,this)}));function sendMessage(_x9){return _sendMessage.apply(this,arguments)}return sendMessage}()/**
+res.chatID=mb.targetID;// 更新消息缓存
+_context8.next=15;return this.updateSendMessageCache(localMsgID,res);case 15:_context8.next=17;return _MessageTimeStampService.default.addReceiveMessageTimeStampCache(Object.assign({},messageBean,{sendUserID:_userModel.default.userID,receTargetID:messageBean.targetID,messageID:res.messageID}));case 17:return _context8.abrupt("return",Promise.resolve(res));case 18:case"end":return _context8.stop();}}},_callee8,this)}));function sendMessage(_x9){return _sendMessage.apply(this,arguments)}return sendMessage}()/**
      * 设置消息备注信息
      * 该信息不入库
      * @param messageStoreBean
-     */},{key:"getMessageRemark",value:function(){var _getMessageRemark=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9(messageStoreBean){var memberInfo;return _regenerator.default.wrap(function _callee9$(_context9){while(1)switch(_context9.prev=_context9.next){case 0:_context9.t0=messageStoreBean.chatType;_context9.next=_context9.t0==="system"?3:_context9.t0==="user"?4:_context9.t0==="group"?5:_context9.t0==="subscribe"?22:_context9.t0==="enterprise"?23:24;break;case 3:return _context9.abrupt("return","system");case 4:return _context9.abrupt("return",messageStoreBean.user.remark||messageStoreBean.user.name);case 5:if(messageStoreBean.user){_context9.next=9;break}return _context9.abrupt("return","");case 9:if(!messageStoreBean.user.remark){_context9.next=13;break}return _context9.abrupt("return",messageStoreBean.user.remark);case 13:_context9.next=15;return _GroupMemberService.default.getGroupMemberById(messageStoreBean.chatID,messageStoreBean.user.userID);case 15:memberInfo=_context9.sent;if(!memberInfo){_context9.next=20;break}return _context9.abrupt("return",memberInfo.member.groupMemberName);case 20:return _context9.abrupt("return",messageStoreBean.user.remark||messageStoreBean.user.name);case 21:return _context9.abrupt("break",25);case 22:return _context9.abrupt("return",messageStoreBean.user?messageStoreBean.user.name:messageStoreBean.subscribeInfo.name);case 23:return _context9.abrupt("return",messageStoreBean.user?messageStoreBean.user.name:messageStoreBean.enterpriseInfo.appName);case 24:return _context9.abrupt("return","");case 25:case"end":return _context9.stop();}},_callee9)}));function getMessageRemark(_x10){return _getMessageRemark.apply(this,arguments)}return getMessageRemark}()/**
+     */},{key:"getMessageRemark",value:function(){var _getMessageRemark=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9(messageStoreBean){var _messageStoreBean$use;var memberInfo;return _regenerator.default.wrap(function _callee9$(_context9){while(1){switch(_context9.prev=_context9.next){case 0:_context9.t0=messageStoreBean.chatType;_context9.next=_context9.t0==="system"?3:_context9.t0==="user"?4:_context9.t0==="group"?5:_context9.t0==="subscribe"?18:_context9.t0==="enterprise"?19:20;break;case 3:return _context9.abrupt("return","system");case 4:return _context9.abrupt("return",messageStoreBean.user.remark||messageStoreBean.user.name);case 5:if(!((_messageStoreBean$use=messageStoreBean.user)!==null&&_messageStoreBean$use!==void 0&&_messageStoreBean$use.remark)){_context9.next=9;break}return _context9.abrupt("return",messageStoreBean.user.remark);case 9:_context9.next=11;return _GroupMemberService.default.getGroupMemberByGroupIdAndId(messageStoreBean.chatID,messageStoreBean.user.userID);case 11:memberInfo=_context9.sent;if(!(memberInfo&&memberInfo.member)){_context9.next=16;break}return _context9.abrupt("return",memberInfo.member.groupMemberName||memberInfo.member.userName||messageStoreBean.user.name);case 16:return _context9.abrupt("return",messageStoreBean.user.name);case 17:return _context9.abrupt("break",21);case 18:return _context9.abrupt("return",messageStoreBean.user?messageStoreBean.user.name:messageStoreBean.subscribeInfo.name);case 19:return _context9.abrupt("return",messageStoreBean.user?messageStoreBean.user.name:messageStoreBean.enterpriseInfo.appName);case 20:return _context9.abrupt("return","");case 21:case"end":return _context9.stop();}}},_callee9)}));function getMessageRemark(_x10){return _getMessageRemark.apply(this,arguments)}return getMessageRemark}()/**
      * 清空好友聊天消息
      * @param userID
-     */},{key:"emptyMessages",value:function(){var _emptyMessages=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10(userID){return _regenerator.default.wrap(function _callee10$(_context10){while(1)switch(_context10.prev=_context10.next){case 0:_context10.next=2;return _ChatService.default.updateChatUser(userID,{messageContent:""});case 2:return _context10.abrupt("return",_MessageCache.default.emptyMessages(userID));case 3:case"end":return _context10.stop();}},_callee10)}));function emptyMessages(_x11){return _emptyMessages.apply(this,arguments)}return emptyMessages}()/**
+     */},{key:"emptyMessages",value:function(){var _emptyMessages=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10(userID){return _regenerator.default.wrap(function _callee10$(_context10){while(1){switch(_context10.prev=_context10.next){case 0:_context10.next=2;return _ChatService.default.updateChatUser(userID,{messageContent:""});case 2:return _context10.abrupt("return",_MessageCache.default.emptyMessages(userID));case 3:case"end":return _context10.stop();}}},_callee10)}));function emptyMessages(_x11){return _emptyMessages.apply(this,arguments)}return emptyMessages}()/**
      * 清空消息
      * @returns {Dexie.Promise<number>}
      */},{key:"clearMessage",value:function clearMessage(){return _MessageCache.default.clearMessage()}}]);return MessageService}());exports.default=_default;

package/lib/service/MessageTimeStampService.js

@@ -2,12 +2,12 @@
  * 消息时间戳
  * @author 李文龙
  * @date 2020/1/17
- */var _default=new(/*#__PURE__*/function(){function MessageTimeStampService(){(0,_classCallCheck2.default)(this,MessageTimeStampService)}(0,_createClass2.default)(MessageTimeStampService,[{key:"addReceiveMessageTimeStampCache",value:/**
+ */var _default=new(/*#__PURE__*/function(){function MessageTimeStampService(){(0,_classCallCheck2.default)(this,MessageTimeStampService)}(0,_createClass2.default)(MessageTimeStampService,[{key:"addReceiveMessageTimeStampCache",/**
      * 新增接收消息时间戳缓存
      * @param {*} messageStoreBean
-     */function(){var _addReceiveMessageTimeStampCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(messageStoreBean){var chatID;return _regenerator.default.wrap(function _callee$(_context){while(1)switch(_context.prev=_context.next){case 0:if(!messageStoreBean){_context.next=6;break}_context.next=3;return this._judgeChatID(messageStoreBean);case 3:chatID=_context.sent;_context.next=6;return _MessageTimeStampCache.default.setMessageTimeStamp({chatID:chatID,loggedUserID:_userModel.default.userID,messageID:messageStoreBean.messageID});case 6:case"end":return _context.stop();}},_callee,this)}));function addReceiveMessageTimeStampCache(_x){return _addReceiveMessageTimeStampCache.apply(this,arguments)}return addReceiveMessageTimeStampCache}()//根据消息获取chatID
-},{key:"_judgeChatID",value:function(){var _judgeChatID2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(messageStoreBean){var chatID;return _regenerator.default.wrap(function _callee2$(_context2){while(1)switch(_context2.prev=_context2.next){case 0://判断是否为群
-if(_groupJudgeUtil.default.isGroup(messageStoreBean.receTargetID)){chatID=messageStoreBean.receTargetID}else if(messageStoreBean.sendUserID==_userModel.default.userID){chatID=messageStoreBean.receTargetID}else{chatID=messageStoreBean.sendUserID}return _context2.abrupt("return",chatID);case 2:case"end":return _context2.stop();}},_callee2)}));function _judgeChatID(_x2){return _judgeChatID2.apply(this,arguments)}return _judgeChatID}()/**
+     */value:function(){var _addReceiveMessageTimeStampCache=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(messageStoreBean){var chatID;return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:if(!messageStoreBean){_context.next=6;break}_context.next=3;return this._judgeChatID(messageStoreBean);case 3:chatID=_context.sent;_context.next=6;return _MessageTimeStampCache.default.setMessageTimeStamp({chatID:chatID,loggedUserID:_userModel.default.userID,messageID:messageStoreBean.messageID});case 6:case"end":return _context.stop();}}},_callee,this)}));function addReceiveMessageTimeStampCache(_x){return _addReceiveMessageTimeStampCache.apply(this,arguments)}return addReceiveMessageTimeStampCache}()//根据消息获取chatID
+},{key:"_judgeChatID",value:function(){var _judgeChatID2=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2(messageStoreBean){var chatID;return _regenerator.default.wrap(function _callee2$(_context2){while(1){switch(_context2.prev=_context2.next){case 0://判断是否为群
+if(_groupJudgeUtil.default.isGroup(messageStoreBean.receTargetID)){chatID=messageStoreBean.receTargetID}else if(messageStoreBean.sendUserID==_userModel.default.userID){chatID=messageStoreBean.receTargetID}else{chatID=messageStoreBean.sendUserID}return _context2.abrupt("return",chatID);case 2:case"end":return _context2.stop();}}},_callee2)}));function _judgeChatID(_x2){return _judgeChatID2.apply(this,arguments)}return _judgeChatID}()/**
      * 根据charID获取消息时间戳
      * @param chatID
      * @returns {Dexie.Promise<any | T> | Dexie.Promise<any>}

package/lib/service/MyselfService.js

@@ -1,8 +1,8 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _MyselfCache=_interopRequireDefault(require("../cache/MyselfCache"));var _TimeStampService=_interopRequireDefault(require("../service/TimeStampService"));/**
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _regenerator=_interopRequireDefault(require("@babel/runtime/regenerator"));var _asyncToGenerator2=_interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _MyselfCache=_interopRequireDefault(require("../cache/MyselfCache"));var _TimeStampService=_interopRequireDefault(require("../service/TimeStampService"));var _MessageCache=_interopRequireDefault(require("../cache/MessageCache"));var _GroupMessageCache=_interopRequireDefault(require("../cache/GroupMessageCache"));/**
  * 我的缓存
- */var _default=new(/*#__PURE__*/function(){function MyselfService(){(0,_classCallCheck2.default)(this,MyselfService)}(0,_createClass2.default)(MyselfService,[{key:"getMyselfCache",value:/**
+ */var _default=new(/*#__PURE__*/function(){function MyselfService(){(0,_classCallCheck2.default)(this,MyselfService)}(0,_createClass2.default)(MyselfService,[{key:"getMyselfCache",/**
      * 获取我的缓存信息
-     */function getMyselfCache(userID){return _MyselfCache.default.getMyself(userID)}/**
+     */value:function getMyselfCache(userID){return _MyselfCache.default.getMyself(userID)}/**
      * 新增我的信息
      * @param myself
      * @returns {Dexie.Promise<any>}
@@ -13,7 +13,7 @@
      * 根据通知(其他端)修改我的信息
      * @param timestamp
      * @param myself
-     */},{key:"notifyUpdateMyself",value:function(){var _notifyUpdateMyself=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(timestamp,myself){var oldMyself,key;return _regenerator.default.wrap(function _callee$(_context){while(1)switch(_context.prev=_context.next){case 0:_context.next=2;return this.getMyselfCache(myself.userID);case 2:oldMyself=_context.sent;for(key in myself){if(key!="pwd"&&myself[key]!=null&&typeof myself[key]!="function"){oldMyself[key]=myself[key]}}_TimeStampService.default.updateTimeStamp("myselfID",timestamp);_context.next=7;return this.updateMyself(oldMyself);case 7:return _context.abrupt("return",oldMyself);case 8:case"end":return _context.stop();}},_callee,this)}));function notifyUpdateMyself(_x,_x2){return _notifyUpdateMyself.apply(this,arguments)}return notifyUpdateMyself}()/**
+     */},{key:"notifyUpdateMyself",value:function(){var _notifyUpdateMyself=(0,_asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(timestamp,myself){var oldMyself,key;return _regenerator.default.wrap(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:_context.next=2;return this.getMyselfCache(myself.userID);case 2:oldMyself=_context.sent;for(key in myself){if(key!="pwd"&&myself[key]!=null&&typeof myself[key]!="function"){oldMyself[key]=myself[key]}}_TimeStampService.default.updateTimeStamp("myselfID",timestamp);_context.next=7;return _MessageCache.default.updateMessageBySendUserIdForUser(oldMyself.userID,oldMyself);case 7:_context.next=9;return _GroupMessageCache.default.updateMessageBySendUserIdForUser(oldMyself.userID,oldMyself);case 9:_context.next=11;return this.updateMyself(oldMyself);case 11:return _context.abrupt("return",oldMyself);case 12:case"end":return _context.stop();}}},_callee,this)}));function notifyUpdateMyself(_x,_x2){return _notifyUpdateMyself.apply(this,arguments)}return notifyUpdateMyself}()/**
      * 删除我的信息
      * @param {*} myself
      */},{key:"deleteMyself",value:function deleteMyself(){return _MyselfCache.default.deleteMyself()}}]);return MyselfService}());exports.default=_default;