登录：实名认证

web-server/app/middleware/tokenParser.ts

@@ -17,6 +17,8 @@ module.exports = () => {
     ctx.uid = user.uid;
     ctx.serverType = user.serverType;
     ctx.auth = user.auth;
+    ctx.userCode = user.userCode;
+    ctx.pkgName = user.pkgName;
     await next();
   };
 };

web-server/app/service/Auth.ts

@@ -13,6 +13,7 @@ import { getExpByLv, getHeroExpByLv, gameData } from 'app/pubUtils/data';
 import { isString } from 'underscore';
 import { getAge } from 'app/pubUtils/timeUtil';
 import { shouldRefresh } from 'app/pubUtils/util';
+import { authenticate } from 'app/pubUtils/httpUtil';
 
 /**
  * Test Service
@@ -161,7 +162,7 @@ export default class Auth extends Service {
 
         let user = await UserModel.findUserByTel(tel);
         return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
-            hasAccount: !!user
+            hasAccount: !!user && user.hasSetPw
         });
     }
 
@@ -367,6 +368,8 @@ export default class Auth extends Service {
         const ctx = this.ctx;
         // TODO 接SDK
         console.log(name, idNum);
+        let result = await authenticate(name, idNum, ctx.userCode, ctx.pkgName);
+        if(!result) return ctx.service.utils.resResult(STATUS.AUTHEN_FAIL);
 
         let birthday = this.getBirthdayByIdCard(idNum);
         let user = await UserModel.authentication(ctx.uid, birthday, '');

web-server/package-lock.json

@@ -269,6 +269,12 @@
         }
       }
     },
+    "@types/bluebird": {
+      "version": "3.5.33",
+      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.33.tgz",
+      "integrity": "sha512-ndEo1xvnYeHxm7I/5sF6tBvnsA4Tdi3zj1keRKRs12SP+2ye2A27NDJ1B6PqkfMbGAcT+mqQVqbZRIrhfOp5PQ==",
+      "dev": true
+    },
     "@types/body-parser": {
       "version": "1.19.0",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz",
@@ -285,6 +291,12 @@
         }
       }
     },
+    "@types/caseless": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
+      "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==",
+      "dev": true
+    },
     "@types/color-name": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -544,6 +556,28 @@
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
       "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
     },
+    "@types/request": {
+      "version": "2.48.5",
+      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz",
+      "integrity": "sha512-/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ==",
+      "dev": true,
+      "requires": {
+        "@types/caseless": "*",
+        "@types/node": "*",
+        "@types/tough-cookie": "*",
+        "form-data": "^2.5.0"
+      }
+    },
+    "@types/request-promise": {
+      "version": "4.1.47",
+      "resolved": "https://registry.npmjs.org/@types/request-promise/-/request-promise-4.1.47.tgz",
+      "integrity": "sha512-eRSZhAS8SMsrWOM8vbhxFGVZhTbWSJvaRKyufJTdIf4gscUouQvOBlfotPSPHbMR3S7kfkyKbhb1SWPmQdy3KQ==",
+      "dev": true,
+      "requires": {
+        "@types/bluebird": "*",
+        "@types/request": "*"
+      }
+    },
     "@types/serve-static": {
       "version": "1.13.5",
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz",
@@ -572,6 +606,12 @@
         "@types/superagent": "*"
       }
     },
+    "@types/tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==",
+      "dev": true
+    },
     "@types/yargs": {
       "version": "12.0.18",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.18.tgz",

web-server/package.json

@@ -37,6 +37,7 @@
   "devDependencies": {
     "@types/mocha": "^2.2.40",
     "@types/node": "^7.0.12",
+    "@types/request-promise": "^4.1.47",
     "@types/supertest": "^2.0.0",
     "autod": "^3.0.1",
     "autod-egg": "^1.1.0",