add

app/controller/cd/user.js

@@ -6,7 +6,7 @@ class UserController extends Controller {
     /**
      * 获取用户的手机号
      */
-    async getUserPhone() {
+    async userAuth() {
         const { ctx } = this;
         let inputParams = ctx.request.body;
         let rule = {
@@ -15,21 +15,7 @@ class UserController extends Controller {
             encryptedData: { type: 'string', required: true },
         };
         ctx.validate(rule, inputParams);
-        let ret = await ctx.service.cd.user.getUserWxPhone(inputParams);
-        ctx.success(ret);
-    }
-
-    /**
-     * 用户注册获取登录信息
-     */
-    async userRegister() {
-        const { ctx } = this;
-        let inputParams = ctx.request.body;
-        let rule = {
-            phone: { type: 'string', required: true },
-        };
-        ctx.validate(rule, inputParams);
-        let ret = await ctx.service.cd.user.register(inputParams.phone);
+        let ret = await ctx.service.cd.user.userAuth(inputParams);
         ctx.success(ret);
     }
 

app/router/cd.js

@@ -30,10 +30,8 @@ module.exports = app => {
     //摇号-用户根据查询历史重新查询
     router.post('/lottery/review', loginAuth, 'cd.lotteryPublicise.updateQuery');
 
-    //用户-获取手机号
-    router.get('/user/phone', 'cd.user.getUserPhone');
-    //用户-用户手机号授权登录
-    router.post('/user/register', 'cd.user.userRegister');
+    //用户-授权登录返回用户五要素
+    router.post('/user/auth', 'cd.user.userAuth');
 
 
 

app/service/cd/user.js

@@ -106,7 +106,7 @@ class UserService extends Service {
      * 解密获得手机号
      * @param {*} params 
      */
-    async getUserWxPhone(params) {
+    async userAuth(params) {
         const { ctx } = this;
         let code = params.code;
         let encryptedData = params.encryptedData;
@@ -114,14 +114,25 @@ class UserService extends Service {
 
         //获取微信session_key
         let wxAuth = await this.requestWxAuth(code);
-        //解密
+        //解密获得手机号
         let decodeData = await this.decryptData({ encryptedData, iv, sessionKey: wxAuth.session_key });
         ctx.logger.info('decodeData------:' + JSON.stringify(decodeData));
+        // {
+        //     "phoneNumber": "13580006666",
+        //     "purePhoneNumber": "13580006666",
+        //     "countryCode": "86",
+        //     "watermark":
+        //     {
+        //         "appid":"APPID",
+        //         "timestamp": TIMESTAMP
+        //     }
+        // }
         let phone = decodeData.purePhoneNumber;
         if (phone.length !== 11) {
             ctx.failed('暂时只支持11位手机号');
         }
-        return phone;
+        let userInfo = await this.register(phone);
+        return userInfo;
     }