refactor

api/appServerApi.js

@@ -0,0 +1,222 @@
+import Config from "../config";
+import FavItem from "../wfc/model/favItem";
+import {stringValue} from "../wfc/util/longUtil";
+import AppServerError from "./appServerError";
+import wfc from "../wfc/client/wfc";
+import {getItem, setItem} from "../pages/util/storageHelper";
+import wfcUIKit from "../wfc/uikit/wfcUIKit";
+
+export class AppServerApi {
+    constructor() {
+    }
+
+    requestAuthCode(mobile) {
+        return this._post('/send_code', {mobile})
+    }
+
+    loinWithPassword(mobile, password) {
+        return new Promise((resolve, reject) => {
+            let responsePromise = this._post('/login_pwd', {
+                mobile,
+                password,
+                platform: Config.getWFCPlatform(),
+                clientId: wfc.getClientId()
+            }, true)
+            this._interceptLoginResponse(responsePromise, resolve, reject)
+        })
+    }
+
+    loginWithAuthCode(mobile, authCode) {
+        return new Promise((resolve, reject) => {
+            let responsePromise = this._post('/login', {
+                mobile,
+                code: authCode,
+                platform: Config.getWFCPlatform(),
+                clientId: wfc.getClientId()
+            }, true);
+            this._interceptLoginResponse(responsePromise, resolve, reject)
+        })
+    }
+
+
+    changePassword(oldPassword, newPassword) {
+        return this._post('/change_pwd', {
+            oldPassword,
+            newPassword
+        })
+    }
+
+    requestResetPasswordAuthCode() {
+        return this._post('/send_reset_code')
+    }
+
+    resetPassword(resetPasswordAuthCode, newPassword) {
+        return this._post('/reset_pwd', {
+            resetCode: resetPasswordAuthCode,
+            newPassword: newPassword,
+        })
+    }
+
+    getGroupAnnouncement(groupId) {
+        return this._post('/get_group_announcement', {groupId: groupId})
+    }
+
+    updateGroupAnnouncement(author, groupId, announcement) {
+        return this._post('/put_group_announcement', {
+            author,
+            groupId,
+            text: announcement
+        })
+    }
+
+    favMessage(message) {
+        let favItem = FavItem.fromMessage(message);
+        return this._post('/fav/add', {
+            messageUid: stringValue(favItem.messageUid),
+            type: favItem.favType,
+            convType: favItem.conversation.type,
+            convTarget: favItem.conversation.target,
+            convLine: favItem.conversation.line,
+            origin: favItem.origin,
+            sender: favItem.sender,
+            title: favItem.title,
+            url: favItem.url,
+            thumbUrl: favItem.thumbUrl,
+            data: favItem.data,
+        });
+    }
+
+    getFavList(startId, count = 20) {
+        return this._post('/fav/list', {id: startId, count: count}, false, true)
+    }
+
+    delFav(favItemId) {
+        return this._post('/fav/del/' + favItemId, '')
+    }
+
+    _interceptLoginResponse(responsePromise, resolve, reject) {
+        responsePromise
+            .then(response => {
+                if (response.data.code === 0) {
+                    let appAuthToken = response.header['authtoken'];
+                    if (!appAuthToken) {
+                        appAuthToken = response.header['authToken'];
+                    }
+
+                    if (appAuthToken) {
+                        setItem('authToken-app', appAuthToken);
+                        wfcUIKit.setupAppServer(Config.APP_SERVER, appAuthToken);
+                    }
+                    resolve(response.data.result);
+                } else {
+                    reject(new AppServerError(response.data.code, response.data.message));
+                }
+            })
+            .catch(err => {
+                reject(err);
+            })
+    }
+
+    /**
+     *
+     * @param path
+     * @param data
+     * @param rawResponse
+     * @param rawResponseData
+     * @return {Promise<string | Response<any>|*|T>}
+     * @private
+     */
+    _post(path, data = {}, rawResponse = false, rawResponseData = false) {
+        let response;
+        path = Config.APP_SERVER + path;
+        let p = new Promise((resolve, reject) => {
+            console.log('_post', path, data);
+            uni.request({
+                url: path,
+                data: data,
+                header: {
+                    'content-type': 'application/json', // 默认值
+                    'authToken': getItem('authToken-app'),
+                },
+                method: 'POST',
+
+                success: (res) => {
+                    console.log('_post result', res);
+                    if (res.statusCode === 200) {
+                        if (rawResponse) {
+                            resolve(res);
+                            return;
+                        }
+                        if (rawResponseData) {
+                            resolve(res.data);
+                            return
+                        }
+                        if (res.data.code === 0) {
+                            resolve(res.data.result);
+                        } else {
+                            throw new AppServerError(response.data.code, res.data.message)
+                        }
+                    } else {
+                        throw new Error('request error, status code: ' + res.status)
+                    }
+                },
+                fail: (res) => {
+                    console.log('fail', res);
+                    throw new Error('request error: ' + res)
+                }
+            });
+        });
+        return p;
+    }
+
+    login(phone, code) {
+        let appServer = Config.APP_SERVER + '/login';
+        let clientId = wfc.getClientId();
+        console.log('login', wfc.getClientId(), Config.getWFCPlatform());
+        uni.request({
+            url: appServer,
+            data: {
+                mobile: phone,
+                code: code,
+                clientId: clientId,
+                platform: Config.getWFCPlatform(),
+            },
+            header: {
+                'content-type': 'application/json' // 默认值
+            },
+            method: 'POST',
+
+            success: (res) => {
+                if (res.statusCode === 200) {
+                    let loginResult = res.data;
+
+                    if (loginResult.code === 0) {
+                        let userId = loginResult.result.userId;
+                        let token = loginResult.result.token;
+                        wfc.connect(userId, token);
+                        setItem('userId', userId);
+                        setItem('token', token)
+
+                        let authToken = res.header['authToken'];
+                        if (!authToken) {
+                            authToken = res.header['authtoken'];
+                        }
+
+                        console.log('setupAppserver', Config.APP_SERVER, authToken);
+                        wfcUIKit.setupAppServer(Config.APP_SERVER, authToken);
+
+
+                        this.go2ConversationList();
+
+                    } else {
+                        console.log('login failed', loginResult);
+                    }
+                }
+            }
+
+        });
+    }
+}
+
+const appServerApi = new AppServerApi();
+export default appServerApi;

api/appServerError.js

@@ -0,0 +1,12 @@
+export default class AppServerError extends Error {
+    errorCode;
+
+    constructor(errorCode, message) {
+        super(message);
+        this.errorCode = errorCode;
+    }
+
+    toString() {
+        return this.errorCode + '-' + this.message;
+    }
+}

pages/login/login.vue

@@ -28,6 +28,7 @@ import wfcUIKit from "../../wfc/uikit/wfcUIKit";
 import Config from '../../config';
 import {getItem, setItem} from "../util/storageHelper";
 import ConnectionStatus from "../../wfc/client/connectionStatus";
+import appServerApi from "../../api/appServerApi";
 
 export default {
     data() {
@@ -65,52 +66,25 @@ export default {
         },
 
         login(phone, code) {
-            let appServer = Config.APP_SERVER + '/login';
-            let clientId = wfc.getClientId();
             console.log('login', wfc.getClientId(), Config.getWFCPlatform());
-            uni.request({
-                url: appServer,
-                data: {
-                    mobile: phone,
-                    code: code,
-                    clientId: clientId,
-                    platform: Config.getWFCPlatform(),
-                },
-                header: {
-                    'content-type': 'application/json' // 默认值
-
-                },
-                method: 'POST',
-
-                success: (res) => {
-                    if (res.statusCode === 200) {
-                        let loginResult = res.data;
-
-                        if (loginResult.code === 0) {
-                            let userId = loginResult.result.userId;
-                            let token = loginResult.result.token;
-                            wfc.connect(userId, token);
-                            setItem('userId', userId);
-                            setItem('token', token)
-
-                            let authToken = res.header['authToken'];
-                            if (!authToken){
-                                authToken = res.header['authtoken'];
-                            }
-
-                            console.log('setupAppserver', Config.APP_SERVER, authToken);
-                            wfcUIKit.setupAppServer(Config.APP_SERVER, authToken);
-
-
-                            this.go2ConversationList();
-
-                        } else {
-                            console.log('login failed', loginResult);
-                        }
-                    }
-                }
-
-            });
+            appServerApi.loginWithAuthCode(phone, code)
+                .then(result => {
+                    console.log('login result', result);
+                    let userId = result.userId;
+                    let token = result.token;
+                    wfc.connect(userId, token);
+                    setItem('userId', userId);
+                    setItem('token', token)
+
+                    this.go2ConversationList();
+                })
+                .catch(r => {
+                    console.log('login failed', r)
+                    uni.showToast({
+                        title: r,
+                        icon: 'none',
+                    });
+                });
         },
 
         bindAuthCodeTap: function (e) {
@@ -119,24 +93,19 @@ export default {
         },
 
         authCode(phone) {
-            let appServer = Config.APP_SERVER + '/send_code';
-            uni.request({
-                url: appServer,
-                data: {
-                    mobile: phone
-                },
-                header: {
-                    'content-type': 'application/json' // 默认值
-                },
-                method: 'POST',
-                success(res) {
-                    console.log(res.data);
-
-                    if (res.statusCode === 200) {
-                        console.log('发送验证码成功');
-                    }
-                }
-            });
+            appServerApi.requestAuthCode(phone)
+                .then(result => {
+                    uni.showToast({
+                        title: '发送验证码成功',
+                        icon: 'none',
+                    });
+                })
+                .catch(reason => {
+                    uni.showToast({
+                        title: reason,
+                        icon: 'none',
+                    });
+                })
         },
 
         go2ConversationList() {
@@ -185,7 +154,7 @@ export default {
     font-size: 14px;
 }
 
-.confirm-button{
+.confirm-button {
     margin-top: 20px;
 }