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

app/controller/weixin.js

@@ -7,12 +7,8 @@ class WeixinController extends Controller {
     super(ctx);
     this.service = this.ctx.service.weixin;
   }
-  async index() {
-    console.log(this.ctx.params, this.ctx.query);
-    this.ctx.ok();
-  }
   async auth() {
-    await this.service.auth(this.ctx.query);
+    await this.service.auth(this.ctx.params, this.ctx.query);
   }
   async authBack() {
     await this.service.authBack(this.ctx.query);

app/router.js

@@ -8,7 +8,8 @@ module.exports = app => {
   router.get('/', controller.home.index);
   const profix = '/api/live/';
   const vision = 'v0';
-  router.get(`${profix}${vision}/wxlogin/:site`, controller.weixin.index);
+  router.get(`${profix}${vision}/wxlogin/:site`, controller.weixin.auth);
+  router.get(`${profix}${vision}/authBack`, controller.weixin.authBack);
   router.post(`${profix}${vision}/util`, controller.home.utilMethod);
   router.post(`${profix}${vision}/spm`, controller.home.spm);
   router.get(`${profix}${vision}/index`, controller.home.indexQuery);

app/service/weixin.js

@@ -18,7 +18,7 @@ class WeixinAuthService extends AxiosService {
     this.jsapiKey = 'jsapi_ticket';
     this.access_tokenKey = 'access_token';
     this.wxInfo = ctx.app.config.wxapi;
-    this.authBackUrl = `${ctx.app.config.baseUrl}/api/article/authBack`;
+    this.authBackUrl = `${ctx.app.config.baseUrl}/api/live/v0/authBack`;
   }
   /**
    * 网页授权

config/config.default.js

@@ -62,7 +62,7 @@ module.exports = appInfo => {
     client: {
       port: 6379, // Redis port
       host: '127.0.0.1', // Redis host
-      password: 123456,
+      password: '123456',
       db: 1,
     },
   };
@@ -83,12 +83,12 @@ module.exports = appInfo => {
   // 服务器发布路径
   config.baseUrl = 'http://broadcast.waityou24.cn';
   config.wxapi = {
-    appid: 'wxdf3ed83c095be97a', // 微信公众号APPID
-    appSecret: 'd85dbe075c090cb12ce416bbda8e698c',
+    // appid: 'wxdf3ed83c095be97a', // 微信公众号APPID
+    // appSecret: 'd85dbe075c090cb12ce416bbda8e698c',
     baseUrl: 'http://wx.cc-lotus.info', // 微信网关地址
     kjzl: {
-      appid: '',
-      appSecret: '',
+      appid: 'wxcf1b5457939b0932',
+      appSecret: 'f9a947c4a11f5304fc0bcabef98093d8',
     },
   };
   return {