Merge branch 'master' of http://git.cc-lotus.info/new_train/service-center

app/controller/weixin.js

@@ -84,21 +84,24 @@ class WeixinController extends Controller {
           const token = await this.ctx.service.login.createJwt(user);
           const to_uri = urljoin(redirect_uri, `?token=${token}`);
           // TODO: 重定性页面
-          console.log('to_uri222-->' + to_uri);
+          console.log('to_uri000-->' + to_uri);
           this.ctx.redirect(to_uri);
         } else {
-          console.log('rrr--->' + redirect_uri);
-          const to_uri = urljoin(redirect_uri, `?openid=${openid}`);
+          console.log('rrr0000--->' + redirect_uri);
+          const touri = `${this.app.config.baseUrl}/student/bind`;
+          const to_uri = urljoin(touri, `?openid=${openid}`);
           // TODO: 重定性页面
           this.ctx.redirect(to_uri);
         }
       } else if (type === '1') {
         const to_uri = urljoin(redirect_uri, `?openid=${openid}&uid=${uid}&type=${type}&qrcode=${qrcode}`);
         // TODO: 重定性页面
+        console.log('1111---?' + to_uri);
         this.ctx.redirect(to_uri);
       } else if (type === '2') {
         const to_uri = urljoin(redirect_uri, `?openid=${openid}&type=${type}&qrcode=${qrcode}`);
         // TODO: 重定性页面
+        console.log('22222---?' + to_uri);
         this.ctx.redirect(to_uri);
       }
     }

config/config.default.js

@@ -44,7 +44,7 @@ module.exports = appInfo => {
   // 服务器发布路径
   config.baseUrl = 'http://free.liaoningdoupo.com';
   // 认证回调地址
-  config.authUrl = '/api/auth';
+  config.authUrl = '/api/train/auth';
   // 回调地址
   config.redirect_uri = `${config.baseUrl}/weixin`;
   config.redirect_uri_doctor = `${config.baseUrl}/patient/manage`;
@@ -76,7 +76,7 @@ module.exports = appInfo => {
     client: {
       port: 6379, // Redis port
       host: '127.0.0.1', // Redis host
-      password: null,
+      password: 123456,
       db: 0,
     },
   };