Merge branch '2.1.0'

README.md

@@ -73,6 +73,17 @@ Composer
         1. 修改./src/config.js，将crossDomain 值改为‘false’
         2. 修改./vue.config.js，将DEV_URL的值改为接口的访问地址
         3. 重启启动项目
+8. 消息推送
+    1. 后端
+        1. 进入application/common/Plugins/GateWayWorker
+        2. 修改config.php，修改 SERVER_ADDRESS 的值为内网IP地址。端口号根据情况需改，注意服务器要放行对应的端口
+        3. 如果是HTTPS协议，需要开启SSL支持
+        4. Windows环境下，直接运行start_for_win.bat文件
+        5. Linux环境下，运行 bash start.sh 启动服务，运行 bash stop.sh 终止服务
+    2. 前端
+        1. 进入 src/config/config.js
+        2.WS_URI 地址修改为相应的ip地址。如果使用https，不能写ip需要写域名 
+
 ### 鼓励一下 ###
 <img src="https://static.vilson.xyz/pay/wechat.png" alt="Sample"  width="150" height="150">
 

src/api/common/common.js

@@ -8,6 +8,14 @@ export function checkInstall() {
     return $http.post('index/index/checkInstall');
 }
 
+export function inviteInfo(inviteCode) {
+    return $http.post('project/invite_link/_read', {inviteCode: inviteCode});
+}
+export function createInviteLink(data) {
+    return $http.post('project/invite_link/save', data);
+}
+
+
 export function notifyOverview(to) {
     return $http.post('index/notify/listTypeFormat', {to: to});
 }

src/api/projectMember.js

@@ -7,6 +7,9 @@ export function searchInviteMember(keyword, code) {
 export function inviteMember(memberCode, code) {
     return $http.post('project/project_member/inviteMember', {memberCode: memberCode, projectCode: code});
 }
+export function _joinByInviteLink(inviteCode) {
+    return $http.post('project/project_member/_joinByInviteLink', {inviteCode: inviteCode});
+}
 export function removeMember(memberCode, code) {
     return $http.post('project/project_member/removeMember', {memberCode: memberCode, projectCode: code});
 }

src/api/task.js

@@ -7,6 +7,7 @@ export function list(data) {
 export function selfList(data) {
     return $http.post('project/task/selfList', data);
 }
+
 export function taskSources(data) {
     return $http.post('project/task/taskSources', data);
 }
@@ -39,6 +40,10 @@ export function assignTask(data) {
     return $http.post('project/task/assignTask', data);
 }
 
+export function batchAssignTask(data) {
+    return $http.post('project/task/batchAssignTask', data);
+}
+
 export function read(code) {
     return $http.post('project/task/read', {taskCode: code});
 }
@@ -47,9 +52,14 @@ export function taskDone(code, done) {
     return $http.post('project/task/taskDone', {taskCode: code, done: done});
 }
 
+export function setPrivate(code, isPrivate) {
+    return $http.post('project/task/setPrivate', {taskCode: code, private: isPrivate});
+}
+
 export function recycle(code) {
     return $http.post('project/task/recycle', {taskCode: code});
 }
+
 export function recycleBatch(data) {
     return $http.post('project/task/recycleBatch', data);
 }

src/api/user.js

@@ -3,46 +3,67 @@ import $http from '@/assets/js/http'
 export async function Login(data) {
     return $http.post('project/login', data);
 }
+
 export function register(data) {
     return $http.post('project/login/register', data);
 }
+
 export function getCaptcha() {
     return $http.post('project/login/getCaptcha');
 }
+
 export function changeCurrentOrganization(organizationCode) {
-    return $http.post('project/index/changeCurrentOrganization', {organizationCode:organizationCode});
+    return $http.post('project/index/changeCurrentOrganization', {organizationCode: organizationCode});
 }
 
 export function list(data) {
     return $http.post('project/account', data);
 }
+
 export function forbid(accountCode) {
     return $http.post('project/account/forbid', {accountCode: accountCode, status: 0});
 }
 
 export function resume(accountCode) {
     return $http.post('project/account/resume', {accountCode: accountCode, status: 1});
 }
+
 export function doAccount(data) {
     let url = 'project/account/add';
-    if (data.id) {
+    if (data.code) {
         url = 'project/account/edit';
     }
     return $http.post(url, data);
 }
+
 export function auth(id, auth) {
     return $http.post('project/account/auth', {id: id, auth: auth});
 }
+
 export function del(accountCode) {
     return $http.post('project/account/del', {accountCode: accountCode});
 }
+
 export function info($id) {
     return $http.post('project/index/info', {id: $id});
 }
 
+export function read(code) {
+    return $http.post('project/account/read', {code: code});
+}
+
+export function editAccount(data) {
+    return $http.post('project/account/edit', data);
+}
+
 export function editPersonal(data) {
     return $http.post('project/index/editPersonal', data);
 }
+
 export function editPassword(data) {
     return $http.post('project/index/editPassword', data);
 }
+
+export function _joinByInviteLink(inviteCode) {
+    return $http.post('project/account/_joinByInviteLink', {inviteCode: inviteCode});
+}