change course v1 to v2

b5762670 · 任国军 · d3803a5b · b5762670 · b5762670 · b5762670
Commit b5762670 authored Nov 19, 2019 by 任国军
23 changed files
--- a/app/controller/course/v2/institution.js
+++ b/app/controller/course/v2/institution.js
+'use strict';
+
+const Controller = require('egg').Controller;
+
+class InstitutionController extends Controller {
+
+  //机构列表
+  async getInstitutions() {
+
+    const { ctx } = this;
+    const inputParams = ctx.request.query;
+    const ret = await ctx.service.course.v2.institution.getInstitutions(inputParams);
+
+    ctx.success(ret);
+  }
+
+  //机构详情
+  async getInstitution() {
+
+    const { ctx } = this;
+    let inputParams = ctx.params;
+    const query = ctx.query;
+    inputParams = Object.assign(inputParams, query);
+    const result = await ctx.service.course.v2.institution.getInstitution(inputParams);
+
+    ctx.success({ result });
+  }
+
+  //课程列表
+  async getClasses() {
+
+    const { ctx } = this;
+    const inputParams = ctx.request.query;
+    const ret = await ctx.service.course.v2.institution.getClasses(inputParams);
+
+    ctx.success(ret);
+  }
+
+  //课程详情
+  async getClass() {
+
+    const { ctx } = this;
+    const class_id = ctx.params.class_id;
+    if (!class_id) {
+      ctx.failed('error class_id');
+    }
+    const ret = await ctx.service.course.v2.institution.getClass(class_id);
+
+    ctx.success(ret);
+  }
+
+  // 老师列表
+  async getTeachers() {
+
+    const { ctx } = this;
+    const inputParams = ctx.request.query;
+    if (ctx.isEmpty(inputParams.institution_id)) {
+        ctx.failed('institution_id is empty');
+    }
+    const ret = await ctx.service.course.v2.institution.getTeachers(inputParams);
+
+    ctx.success(ret);
+  }
+
+  // 老师详情
+  async getTeacher() {
+
+    const { ctx } = this;
+    const teacher_id = ctx.params.teacher_id;
+    if (!teacher_id) {
+      ctx.failed('error teacher_id');
+    }
+    const ret = await ctx.service.course.v2.institution.getTeacher(teacher_id);
+
+    ctx.success(ret);
+  }
+
+  // 获取分类
+  async getCats() {
+    const { ctx } = this;
+
+    const ret = await ctx.service.course.v2.institution.getCats();
+
+    ctx.success(ret);
+  }
+
+  // 搜索
+  async search() {
+
+    const { ctx } = this;
+    const inputParams = ctx.request.query;
+    const ret = await ctx.service.course.v2.institution.search(inputParams);
+
+    ctx.success(ret);
+  }
+
+  // 用户搜索历史
+  async getUserSearch() {
+    const { ctx, service } = this;
+    const ret = await service.course.v2.institution.getUserSearch();
+
+    ctx.success(ret);
+  }
+
+  // 获取热搜
+  async getHotSearch() {
+    const { ctx, service } = this;
+    const ret = await service.course.v2.institution.getHotSearch();
+
+    ctx.success(ret);
+  }
+
+  // 删除用户搜索历史
+  async deleteUserSearch() {
+    const { ctx, service } = this;
+    await service.course.v2.institution.deleteUserSearch();
+
+    ctx.success();
+  }
+
+  // 评论列表
+  async getComments() {
+    const { ctx, service } = this;
+    const inputParams = ctx.request.query;
+    const ret = await service.course.v2.institution.getComments(inputParams);
+
+    ctx.success(ret);
+  }
+
+  // 搜索联想
+  async getSuggestSearch() {
+    const { ctx, service } = this;
+    const inputParams = ctx.request.query;
+    const ret = await service.course.v2.institution.getSuggestSearch(inputParams);
+
+    ctx.success(ret);
+  }
+
+  //用户收藏机构列表
+  async getUserCollectedInstitutions() {
+    const { ctx, service } = this;
+    const inputParams = ctx.request.query;
+    const ret = await service.course.v2.institution.getUserCollectedInstitutions(inputParams);
+
+    ctx.success(ret);
+  }
+}
+
+module.exports = InstitutionController;
--- a/app/controller/course/v2/location.js
+++ b/app/controller/course/v2/location.js
+'use strict';
+
+const Controller = require('egg').Controller;
+
+class LocationController extends Controller {
+
+    /**
+     * 筛选项
+     */
+    async getAddress() {
+
+        const { ctx } = this;
+        let { lat, lng } = ctx.request.body;
+        let address = '';
+        if (lat && lng) {
+            const location_ret = await ctx.service.course.v2.lbs.getLBSLocation({ lat, lng });
+            const loaction = location_ret.result;
+            if (loaction.formatted_addresses && loaction.formatted_addresses.recommend) {
+                address = loaction.formatted_addresses.recommend;
+                lat = loaction.location.lat;
+                lng = loaction.location.lng;
+            }
+        }
+        if (!address) {
+            const ip_ret = await ctx.service.course.v2.lbs.getLBSIp();
+            const ip = ip_ret.result;
+            if (ip.location && ip.ad_info) {
+                const city = ip.ad_info.city ? ip.ad_info.city : '';
+                const district = ip.ad_info.district ? ip.ad_info.district : '';
+                address = ip.ad_info.province + city + district;
+                lat = ip.location.lat;
+                lng = ip.location.lng;
+            }
+        }
+        if (!address) {
+            address = '获取地理位置信息失败';
+        }
+        ctx.success({ result: { address, lat, lng } });
+    }
+
+}
+
+module.exports = LocationController;
--- a/app/controller/course/v2/option.js
+++ b/app/controller/course/v2/option.js
+'use strict';
+
+const Controller = require('egg').Controller;
+
+class OptionController extends Controller {
+
+  /**
+     * 筛选项
+     */
+  async getOptions() {
+
+    const { ctx } = this;
+    const results = await ctx.service.course.v2.option.getOptions();
+
+    ctx.success({ results });
+  }
+
+  async getBanners() {
+    const { ctx, service } = this;
+    const inputParams = ctx.request.query;
+    if (ctx.isEmpty(inputParams.alias)) {
+      ctx.failed('alias is empty');
+    }
+    const ret = await service.course.v2.option.getBanners(inputParams.alias);
+
+    ctx.success(ret);
+  }
+
+}
+
+module.exports = OptionController;
--- a/app/controller/course/v2/user.js
+++ b/app/controller/course/v2/user.js
+'use strict';
+
+const Controller = require('egg').Controller;
+const uuidv4 = require('uuid/v4');
+class UserController extends Controller {
+
+
+    async auth() {
+
+        const { ctx, app } = this;
+        const code = ctx.request.body.code;
+        if (!code) {
+            ctx.failed('error code');
+        }
+
+        //请求微信授权 获取openid
+        const wx_auth_ret = await ctx.service.course.v2.user.requestWxAuth(code);
+        const openid = wx_auth_ret.openid;//获取openid
+
+        //检查是否已授权过 是否已入用户表
+        let user = await ctx.classModel.V2.CourseUser.one({ where: { openid, is_deleted: 0 } });
+        if (!user || !user.uuid) {
+            const uuid = uuidv4();
+            user = await ctx.classModel.V2.CourseUser.create({ uuid, openid });
+            // user.uuid = uuid;
+        }
+        console.info(user);
+        //存储缓存标识
+        const user_uuid = user.uuid;
+        const key = 'course_user_session_' + user_uuid;
+        await app.memcache.set(key, { user_uuid, openid }, 86400 * 180);
+        const auth_token = ctx.helper.md5(openid + user_uuid + 'jbwl');
+        ctx.set('uuid', key);
+        ctx.set('auth_token', auth_token);
+
+        const result = { uuid: user_uuid, auth_token };
+
+        ctx.success({ result });
+
+    }
+
+    async registerUserInfo() {
+
+        const { ctx } = this;
+        const uuid = ctx.userUuid;
+        const input_params = ctx.request.body;
+        const { avatar, nickname, province, country, sex, city } = input_params;
+
+        //查找用户是否存在并更新
+        const user = ctx.classModel.V2.CourseUser.one({ where: { uuid } });
+        await ctx.classModel.V2.CourseUser.edit({ params: { avatar, nickname, sex }, where: { uuid } });
+        let bindphone = 0;
+        if (user.phone) {
+            bindphone = 1;
+        }
+        const result = { bindphone };
+
+        ctx.success({ result });
+    }
+
+    /**
+     * 获取baby信息
+     */
+    async getBabyInfo() {
+
+        const { ctx } = this;
+        const result = await ctx.service.course.v2.user.getBabyInfo();
+
+        ctx.success({ result });
+    }
+
+    /**
+     * 保存baby信息
+     */
+    async saveBabyInfo() {
+
+        const { ctx } = this;
+        const input_params = ctx.request.body;
+        const result = await ctx.service.course.v2.user.saveBabyInfo(input_params);
+
+        ctx.success({ result });
+    }
+
+    /**
+     * 删除baby信息
+     */
+    async delBabyInfo() {
+
+        const { ctx } = this;
+        const result = await ctx.service.course.v2.user.delBabyInfo();
+
+        ctx.success({ result });
+    }
+
+    /**
+     * 用户收藏机构列表
+     */
+    async getCollectInstitutions() {
+
+        const { ctx } = this;
+        let input_params = ctx.request.body;
+        input_params = Object.assign(input_params, ctx.request.query);
+        const result = await ctx.service.course.v2.user.getCollectInstitutions(input_params);
+
+        ctx.success({ result });
+    }
+
+    /**
+     * 收藏机构
+     */
+    async collectInstitution() {
+
+        const { ctx } = this;
+        const institution_id = ctx.request.body.institution_id;
+        if (!institution_id) {
+            ctx.failed('error institution_id');
+        }
+        const result = await ctx.service.course.v2.user.collectInstitution(institution_id);
+
+        ctx.success({ result });
+    }
+
+    /**
+    * 取消收藏机构
+    */
+    async delCollectInstitution() {
+
+        const { ctx } = this;
+        const institution_id = ctx.request.body.institution_id;
+        if (!institution_id) {
+            ctx.failed('error institution_id');
+        }
+        const result = await ctx.service.course.v2.user.delCollectInstitution(institution_id);
+
+        ctx.success({ result });
+    }
+
+
+
+
+}
+
+module.exports = UserController;
--- a/app/controller/course/v2/wechat.js
+++ b/app/controller/course/v2/wechat.js
+'use strict';
+
+const Controller = require('egg').Controller;
+const crypto = require('crypto');
+const fs = require('fs');
+const request = require('request');
+
+class WechatController extends Controller {
+  async test() {
+    const { ctx, service } = this;
+    const data = {MsgType: 'miniprogrampage'};
+    await service.course.v2.wechat.sendMsg(data);
+    ctx.success();
+  }
+
+  async callbackAction() {
+    const { ctx, service } = this;
+    await service.course.v2.wechat.callbackAction();
+    ctx.success('success');
+  }
+
+  async check() {
+    const { ctx } = this;
+    const params = ctx.request.query;
+    const {
+      signature,
+      timestamp,
+      nonce,
+      echostr,
+    } = params;
+
+    const array = [ '51gjj', timestamp, nonce ];
+    array.sort();
+
+    // 3.将三个参数字符串拼接成一个字符串进行sha1加密
+    const tempStr = array.join('');
+    const hashCode = crypto.createHash('sha1'); // 创建加密类型
+    const resultCode = hashCode.update(tempStr, 'utf8').digest('hex');
+
+    console.log(resultCode);
+    // 4.开发者获得加密后的字符串可与signature对比，标识该请求来源于微信
+    if (resultCode === signature) {
+      ctx.success(echostr);
+    } else {
+      ctx.success();
+    }
+  }
+}
+
+module.exports = WechatController;
--- a/app/model/class/course_area.js
+++ b/app/model/class/course_area.js
@@ -6,7 +6,7 @@ const moment = require('moment');
 module.exports = app => {
    const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM, FLOAT } = app.Sequelize;

-    const CourseArea = app.classModel.define('course_area', {
+    const CourseArea = app.classModel.define('course_old_area', {
        id: {
            type: INTEGER,
            primaryKey: true,
@@ -30,7 +30,7 @@ module.exports = app => {
        }
    }, {
            timestamps: false,
-            tableName: 'course_area',
+            tableName: 'course_old_area',
        });

    CourseArea.one = async (data) => {

--- a/app/model/class/course_cat.js
+++ b/app/model/class/course_cat.js
@@ -6,7 +6,7 @@ const moment = require('moment');
 module.exports = app => {
  const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;

-  const CourseCat = app.classModel.define('course_cat', {
+  const CourseCat = app.classModel.define('course_old_cat', {
    id: {
      type: INTEGER,
      primaryKey: true,
@@ -39,7 +39,7 @@ module.exports = app => {
    },
  }, {
    timestamps: false,
-    tableName: 'course_cat',
+    tableName: 'course_old_cat',
  });

  CourseCat.one = async data => {

--- a/app/model/class/course_class.js
+++ b/app/model/class/course_class.js
@@ -5,7 +5,7 @@ const moment = require('moment');
 module.exports = app => {
    const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;

-    const CourseClass = app.classModel.define('course_class', {
+    const CourseClass = app.classModel.define('course_old_class', {
        id: {
            type: INTEGER,
            primaryKey: true,
@@ -37,7 +37,7 @@ module.exports = app => {
        }
    }, {
            timestamps: false,
-            tableName: 'course_class',
+            tableName: 'course_old_class',
        });

    CourseClass.one = async (data) => {

--- a/app/model/class/course_images.js
+++ b/app/model/class/course_images.js
@@ -7,7 +7,7 @@ module.exports = app => {

  const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;

-  const CourseImages = app.classModel.define('course_images', {
+  const CourseImages = app.classModel.define('course_old_images', {
    id: {
      type: INTEGER,
      primaryKey: true,
@@ -30,7 +30,7 @@ module.exports = app => {
    },
  }, {
    timestamps: false,
-    tableName: 'course_images',
+    tableName: 'course_old_images',
  });

  CourseImages.one = async data => {

--- a/app/model/class/course_institution.js
+++ b/app/model/class/course_institution.js
@@ -9,7 +9,7 @@ module.exports = app => {

  const CourseArea = app.classModel.define('course_area');

-  const CourseInstitution = app.classModel.define('course_institution', {
+  const CourseInstitution = app.classModel.define('course_old_institution', {
    id: {
      type: INTEGER,
      primaryKey: true,
@@ -41,7 +41,7 @@ module.exports = app => {
    },
  }, {
    timestamps: false,
-    tableName: 'course_institution',
+    tableName: 'course_old_institution',
  });

  CourseInstitution.hasMany(CourseArea, {

--- a/app/model/class/course_institution_to_cat.js
+++ b/app/model/class/course_institution_to_cat.js
@@ -6,7 +6,7 @@ const moment = require('moment');
 module.exports = app => {
    const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;

-    const CourseInstitutionToCat = app.classModel.define('course_institution_to_cat', {
+    const CourseInstitutionToCat = app.classModel.define('course_old_institution_to_cat', {
        id: {
            type: INTEGER,
            primaryKey: true,
@@ -34,7 +34,7 @@ module.exports = app => {
        },
    }, {
            timestamps: false,
-            tableName: 'course_institution_to_cat',
+            tableName: 'course_old_institution_to_cat',
        });

    CourseInstitutionToCat.one = async (data) => {

--- a/app/model/class/course_log_user_gps.js
+++ b/app/model/class/course_log_user_gps.js
@@ -6,7 +6,7 @@ const moment = require('moment');
 module.exports = app => {
    const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;

-    const CourseLogUserGps = app.classModel.define('course_log_user_gps', {
+    const CourseLogUserGps = app.classModel.define('course_old_log_user_gps', {
        id: {
            type: INTEGER,
            primaryKey: true,
@@ -26,7 +26,7 @@ module.exports = app => {
        },
    }, {
            timestamps: false,
-            tableName: 'course_log_user_gps',
+            tableName: 'course_old_log_user_gps',
        });

    CourseLogUserGps.one = async (data) => {

--- a/app/model/class/course_teacher.js
+++ b/app/model/class/course_teacher.js
@@ -5,7 +5,7 @@ const moment = require('moment');
 module.exports = app => {
    const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;

-    const CourseTeacher = app.classModel.define('course_teacher', {
+    const CourseTeacher = app.classModel.define('course_old_teacher', {
        id: {
            type: INTEGER,
            primaryKey: true,
@@ -35,7 +35,7 @@ module.exports = app => {
        }
    }, {
            timestamps: false,
-            tableName: 'course_teacher',
+            tableName: 'course_old_teacher',
        });

    CourseTeacher.one = async (data) => {

--- a/app/model/class/course_user.js
+++ b/app/model/class/course_user.js
@@ -6,7 +6,7 @@ const moment = require('moment');
 module.exports = app => {
  const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;

-  const CourseUser = app.classModel.define('course_user', {
+  const CourseUser = app.classModel.define('course_old_user', {
    id: {
      type: INTEGER,
      primaryKey: true,
@@ -41,7 +41,7 @@ module.exports = app => {
    },
  }, {
    timestamps: false,
-    tableName: 'course_user',
+    tableName: 'course_old_user',
  });

  CourseUser.one = async data => {

--- a/app/model/class/course_user_baby.js
+++ b/app/model/class/course_user_baby.js
@@ -6,7 +6,7 @@ const moment = require('moment');
 module.exports = app => {
  const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;

-  const CourseUserBaby = app.classModel.define('course_user_baby', {
+  const CourseUserBaby = app.classModel.define('course_old_user_baby', {
    id: {
      type: INTEGER,
      primaryKey: true,
@@ -37,7 +37,7 @@ module.exports = app => {
    },
  }, {
    timestamps: false,
-    tableName: 'course_user_baby',
+    tableName: 'course_old_user_baby',
  });

  CourseUserBaby.one = async data => {

--- a/app/model/class/course_user_collection.js
+++ b/app/model/class/course_user_collection.js
@@ -6,7 +6,7 @@ const moment = require('moment');
 module.exports = app => {
    const { STRING, INTEGER, DATE, DECIMAL, TEXT, ENUM } = app.Sequelize;

-    const CourseUserCollection = app.classModel.define('course_user_collection', {
+    const CourseUserCollection = app.classModel.define('course_old_user_collection', {
        id: {
            type: INTEGER,
            primaryKey: true,
@@ -33,7 +33,7 @@ module.exports = app => {
        },
    }, {
            timestamps: false,
-            tableName: 'course_user_collection',
+            tableName: 'course_old_user_collection',
        });

    CourseUserCollection.one = async (data) => {

--- a/app/router/course.js
+++ b/app/router/course.js
@@ -33,38 +33,5 @@ module.exports = app => {
  router.post('third', '/wechat/test', 'course.wechat.test');


-  // 版本二
-  router.get('third', '/sub/cats', 'course.institutionSub.getCats');// 分类
-  router.get('third', '/sub/options', 'course.optionSub.getOptions');// 筛选项
-  router.get('third', '/sub/banners', 'course.optionSub.getBanners');// banner
-  router.post('third', '/sub/address', miniAuth, 'course.location.getAddress');// 根据经纬度或ip获取地理位置信息
-  router.get('third', '/sub/institutions', miniAuth, 'course.institutionSub.getInstitutions');// 机构列表
-  router.get('third', '/sub/institution/:institution_id', miniAuth, 'course.institutionSub.getInstitution');// 机构详情
-  router.get('third', '/sub/classes', miniAuth, 'course.institutionSub.getClasses');// 课程列表
-  router.get('third', '/sub/class/:class_id', miniAuth, 'course.institutionSub.getClass');// 课程详情
-  router.get('third', '/sub/teachers', miniAuth, 'course.institutionSub.getTeachers');// 老师列表
-  router.get('third', '/sub/teacher/:teacher_id', miniAuth, 'course.institutionSub.getTeacher');// 老师详情
-
-  router.post('third', '/sub/user/auth', 'course.user.auth');// 微信授权登录
-  router.post('third', '/sub/user/register_user', miniAuth, 'course.user.registerUserInfo');// 授权后注册用户
-
-  router.get('third', '/sub/user/baby', miniAuth, 'course.user.getBabyInfo');// 获取baby信息
-  router.post('third', '/sub/user/baby', miniAuth, 'course.user.saveBabyInfo');// 保存baby信息
-  router.delete('third', '/sub/user/baby', miniAuth, 'course.user.delBabyInfo');// 删除baby信息
-
-  router.get('third', '/sub/user/collection/institution', miniAuth, 'course.institutionSub.getUserCollectedInstitutions');// 收藏的机构列表
-  router.post('third', '/sub/user/collection/institution', miniAuth, 'course.user.collectInstitution');// 收藏机构
-  router.delete('third', '/sub/user/collection/institution', miniAuth, 'course.user.delCollectInstitution');// 取消收藏机构
-
-  router.get('third', '/sub/wechat/callbackAction', 'course.wechat.check');
-  router.post('third', '/sub/wechat/callbackAction', 'course.wechat.callbackAction');
-  router.post('third', '/sub/wechat/test', 'course.wechat.test');
-
-  router.get('third', '/sub/comments', miniAuth, 'course.institutionSub.getComments');// 评论列表
-  router.get('third', '/sub/search/hot', miniAuth, 'course.institutionSub.getHotSearch');// 热搜
-  router.get('third', '/sub/search/suggest', miniAuth, 'course.institutionSub.getSuggestSearch');//搜索联想
-  router.get('third', '/sub/search', miniAuth, 'course.institutionSub.search');// 搜索
-  router.get('third', '/sub/user/search', miniAuth, 'course.institutionSub.getUserSearch');// 用户搜索历史
-  router.delete('third', '/sub/user/search', miniAuth, 'course.institutionSub.deleteUserSearch');//清空用户搜索记录
-
+  
 };
--- a/app/router/course_v2.js
+++ b/app/router/course_v2.js
+'use strict';
+
+module.exports = app => {
+  const router = app.router.namespace(app.config.projectRootPath + '/course/v2');
+  const loginAuth = app.middleware.loginAuth({ type: 'new' });// 登录中间件
+  const miniAuth = app.middleware.miniAuth();// 因为不跟现有的用户中心系统，所以使用单独的登录中间件
+
+  // 版本二
+  router.get('third', '/cats', 'course.v2.institution.getCats');// 分类
+  router.get('third', '/options', 'course.v2.option.getOptions');// 筛选项
+  router.get('third', '/banners', 'course.v2.option.getBanners');// banner
+  router.post('third', '/address', miniAuth, 'course.v2.location.getAddress');// 根据经纬度或ip获取地理位置信息
+  router.get('third', '/institutions', miniAuth, 'course.v2.institution.getInstitutions');// 机构列表
+  router.get('third', '/institution/:institution_id', miniAuth, 'course.v2.institution.getInstitution');// 机构详情
+  router.get('third', '/classes', miniAuth, 'course.v2.institution.getClasses');// 课程列表
+  router.get('third', '/class/:class_id', miniAuth, 'course.v2.institution.getClass');// 课程详情
+  router.get('third', '/teachers', miniAuth, 'course.v2.institution.getTeachers');// 老师列表
+  router.get('third', '/teacher/:teacher_id', miniAuth, 'course.v2.institution.getTeacher');// 老师详情
+
+  router.post('third', '/user/auth', 'course.v2.user.auth');// 微信授权登录
+  router.post('third', '/user/register_user', miniAuth, 'course.v2.user.registerUserInfo');// 授权后注册用户
+
+  router.get('third', '/user/baby', miniAuth, 'course.v2.user.getBabyInfo');// 获取baby信息
+  router.post('third', '/user/baby', miniAuth, 'course.v2.user.saveBabyInfo');// 保存baby信息
+  router.delete('third', '/user/baby', miniAuth, 'course.v2.user.delBabyInfo');// 删除baby信息
+
+  router.get('third', '/user/collection/institution', miniAuth, 'course.v2.institution.getUserCollectedInstitutions');// 收藏的机构列表
+  router.post('third', '/user/collection/institution', miniAuth, 'course.v2.user.collectInstitution');// 收藏机构
+  router.delete('third', '/user/collection/institution', miniAuth, 'course.v2.user.delCollectInstitution');// 取消收藏机构
+
+  router.get('third', '/wechat/callbackAction', 'course.v2.wechat.check');
+  router.post('third', '/wechat/callbackAction', 'course.v2.wechat.callbackAction');
+  router.post('third', '/wechat/test', 'course.v2.wechat.test');
+
+  router.get('third', '/comments', miniAuth, 'course.v2.institution.getComments');// 评论列表
+  router.get('third', '/search/hot', miniAuth, 'course.v2.institution.getHotSearch');// 热搜
+  router.get('third', '/search/suggest', miniAuth, 'course.v2.institution.getSuggestSearch');//搜索联想
+  router.get('third', '/search', miniAuth, 'course.v2.institution.search');// 搜索
+  router.get('third', '/user/search', miniAuth, 'course.v2.institution.getUserSearch');// 用户搜索历史
+  router.delete('third', '/user/search', miniAuth, 'course.v2.institution.deleteUserSearch');//清空用户搜索记录
+
+};
--- a/app/service/course/institutionSub.js
+++ b/app/service/course/institutionSub.js
--- a/app/service/course/v2/lbs.js
+++ b/app/service/course/v2/lbs.js
+'use strict';
+
+const Service = require('egg').Service;
+
+class LbsService extends Service {
+  // 计算两个经纬度之间的距离，用Haversine公式，单位:m
+  async getDistance(from, to) {
+    const rad_from = from.lat * Math.PI / 180.0;
+    const rad_to = to.lat * Math.PI / 180.0;
+    const sub_lat = rad_from - rad_to;
+    const sub_lng = from.lng * Math.PI / 180.0 - to.lng * Math.PI / 180.0;
+    const r = 6378137; // 地球半径
+    const distance = r * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(sub_lat / 2), 2) + Math.cos(rad_from) * Math.cos(rad_to) * Math.pow(Math.sin(sub_lng / 2), 2)));
+    return distance;
+  }
+
+  // 腾讯位置服务WebService API,距离计算（一对多）
+  // 返回示例：
+  // {
+  //   "results": [
+  //           {
+  //               "from": {
+  //                   "lat": 39.983171,
+  //                   "lng": 116.308479
+  //               },
+  //               "to": {
+  //                   "lat": 39.996059,
+  //                   "lng": 116.353454
+  //               },
+  //               "distance": 5354.7,
+  //               "duration": 1678
+  //           },
+  //           {
+  //               "from": {
+  //                   "lat": 39.983171,
+  //                   "lng": 116.308479
+  //               },
+  //               "to": {
+  //                   "lat": 39.949226,
+  //                   "lng": 116.394309
+  //               },
+  //               "distance": 10495.8, // 起点到终点的距离，单位：米。如果radius半径过小或者无法搜索到，则返回-1
+  //               "duration": 2635 // 表示从起点到终点的结合路况的时间，秒为单位。 注：步行方式不计算耗时，该值始终为0
+  //           }
+  //       ]
+  // }
+  async getLBSDistance(mode = 'driving', from, toArr) {
+    const { ctx } = this;
+    const to = [];
+    let result = [];
+    for (const v of toArr) {
+      to.push(String(v.lat) + ',' + String(v.lng));
+    }
+    console.info(from);
+    const params = {
+      mode, // driving, walking；默认driving
+      from: String(from.lat) + ',' + String(from.lng),
+      to: to.join(';'),
+      key: ctx.app.config.TX_LBS_KEY,
+    };
+
+    const resp = await ctx.helper.send_request(ctx.app.config.TX_LBS_DISTANCE_URL, params, { method: 'GET' });
+    // resp.data.status 状态码，0：正常，310：请求参数信息有误，311：Key格式错误，306：请求有护持信息请检查字符串，110：请求来源未被授权
+    ctx.logger.info('tx_lbs_distance_params: ' + JSON.stringify(params));
+    ctx.logger.info('tx_lbs_distance_resp: ' + JSON.stringify(resp));
+    if (resp.status === 200) {
+      // 判断响应是否正确
+      if (resp.data.status === 0) {
+        result = resp.data.result.elements;
+      }
+    }
+
+    return { results: result };
+  }
+
+  // 地址解析
+  async getLBSAddress(address) {
+    const { ctx } = this;
+    let result = {};
+    const params = {
+      address,
+      key: ctx.app.config.TX_LBS_KEY,
+    };
+
+    const resp = await ctx.helper.send_request(ctx.app.config.TX_LBS_ADDRESS_URL, params, { method: 'GET' });
+    // resp.data.status 状态码，0：正常，310：请求参数信息有误，311：Key格式错误，306：请求有护持信息请检查字符串，110：请求来源未被授权
+    ctx.logger.info('tx_lbs_address_resp: ' + JSON.stringify(resp));
+    if (resp.status === 200) {
+      // 判断响应是否正确
+      if (resp.data.status === 0) {
+        result = resp.data.result;
+      }
+    }
+
+    return { result };
+  }
+
+  // 逆地址解析
+  async getLBSLocation(location) {
+    const { ctx } = this;
+    let result = {};
+    const params = {
+      location: location.lat + ',' + location.lng,
+      key: ctx.app.config.TX_LBS_KEY,
+    };
+
+    const resp = await ctx.helper.send_request(ctx.app.config.TX_LBS_ADDRESS_URL, params, { method: 'GET' });
+    // resp.data.status 状态码，0：正常，310：请求参数信息有误，311：Key格式错误，306：请求有护持信息请检查字符串，110：请求来源未被授权
+    ctx.logger.info('tx_lbs_address_resp: ' + JSON.stringify(resp));
+    if (resp.status === 200) {
+      // 判断响应是否正确
+      if (resp.data.status === 0) {
+        result = resp.data.result;
+      }
+    }
+
+    return { result };
+  }
+
+  // 地址解析
+  async getLBSAddress(address) {
+    const { ctx } = this;
+    let result = {};
+    const params = {
+      address,
+      key: ctx.app.config.TX_LBS_KEY,
+    };
+
+    const resp = await ctx.helper.send_request(ctx.app.config.TX_LBS_ADDRESS_URL, params, { method: 'GET' });
+    // resp.data.status 状态码，0：正常，310：请求参数信息有误，311：Key格式错误，306：请求有护持信息请检查字符串，110：请求来源未被授权
+    ctx.logger.info('tx_lbs_location_resp: ' + JSON.stringify(resp));
+    if (resp.status === 200) {
+      // 判断响应是否正确
+      if (resp.data.status === 0) {
+        result = resp.data.result;
+      }
+    }
+
+    return { result };
+  }
+
+  // 逆地址解析
+  async getLBSIp() {
+    const { ctx } = this;
+    let result = {};
+    const ip = ctx.helper.getClientIP();
+    if (!ip) {
+      return result;
+    }
+    const params = {
+      ip: ip,
+      key: ctx.app.config.TX_LBS_KEY,
+    };
+
+    const resp = await ctx.helper.send_request(ctx.app.config.TX_LBS_URL + '/location/v1/ip ', params, { method: 'GET' });
+    // resp.data.status 状态码，0：正常，310：请求参数信息有误，311：Key格式错误，306：请求有护持信息请检查字符串，110：请求来源未被授权
+    ctx.logger.info('tx_lbs_ip_resp: ' + JSON.stringify(resp));
+    if (resp.status === 200) {
+      // 判断响应是否正确
+      if (resp.data.status === 0) {
+        result = resp.data.result;
+      }
+    }
+
+    return { result };
+  }
+
+
+
+}
+
+module.exports = LbsService;
--- a/app/service/course/optionSub.js
+++ b/app/service/course/optionSub.js
@@ -32,10 +32,10 @@ const DISTANCES = [
  { id: -21, name: '5公里以内', value: 5000 },
 ];

-class OptionSubService extends Service {
+class OptionService extends Service {
  async getOptions() {
    const { service } = this;
-    const cats = await service.course.institutionSub.getCats();
+    const cats = await service.course.v2.institution.getCats();

    const options = {
      cats,
@@ -48,12 +48,12 @@ class OptionSubService extends Service {

  async getBanners(alias) {
    const { ctx } = this;
-    const bannerType = await ctx.classModel.CourseBannerType.findOne({ where: { alias, status: 'online', is_deleted: 0 }, row: true });
+    const bannerType = await ctx.classModel.V2.CourseBannerType.findOne({ where: { alias, status: 'online', is_deleted: 0 }, row: true });
    if (ctx.isEmpty(bannerType)) {
      ctx.failed('数据不存在');
    }

-    const banners = await ctx.classModel.CourseBanner.findAll({ where: { type_id: bannerType.id, status: 'online', is_deleted: 0 }, order: [[ 'sort', 'asc' ]], row: true });
+    const banners = await ctx.classModel.V2.CourseBanner.findAll({ where: { type_id: bannerType.id, status: 'online', is_deleted: 0 }, order: [[ 'sort', 'asc' ]], row: true });
    const ret = {
      results: banners,
      count: banners.length,
@@ -63,4 +63,4 @@ class OptionSubService extends Service {
  }
 }

-module.exports = OptionSubService;
+module.exports = OptionService;
--- a/app/service/course/v2/user.js
+++ b/app/service/course/v2/user.js
+
+'use strict';
+
+const Service = require('egg').Service;
+const moment = require('moment');
+const R = require('ramda');
+const GENDER = {
+  boy: '小王子',
+  girl: '小公主',
+};
+
+class UserService extends Service {
+
+
+  async getBabyInfo() {
+
+    const { ctx } = this;
+    const user_uuid = ctx.userUuid;
+    const where = { user_uuid, is_deleted: 0 };
+    const babys_info = await ctx.classModel.V2.CourseUserBaby.all({ where, order: [[ 'id', 'desc' ]] });
+    const babys = [];
+    for (const i in babys_info) {
+      const baby_info = babys_info[i];
+      babys.push({
+        id: baby_info.id,
+        gender: baby_info.gender,
+        birth: baby_info.birth,
+        address: baby_info.address,
+        lat: baby_info.lat,
+        lng: baby_info.lng,
+        gender_text: GENDER[baby_info.gender],
+        age: moment().format('YYYY') - baby_info.birth.substr(0, 4),
+      });
+
+    }
+    if (babys.length === 0) {
+      return {};
+    }
+    const user_info = { address: babys[0].address, lat: babys[0].lat, lng: babys[0].lng };
+    return { user_info, babys };
+  }
+
+  async saveBabyInfo(input) {
+
+    const { ctx } = this;
+    const user_uuid = ctx.userUuid;
+    const { id, gender, birth, address, lat, lng } = input;
+    const where = { id, user_uuid, is_deleted: 0 };
+    if (id) {
+      await ctx.classModel.V2.CourseUserBaby.edit({ params: { gender, birth, address, lat, lng }, where });
+    } else {
+      await ctx.classModel.V2.CourseUserBaby.add({ user_uuid, gender, birth, address, lat, lng });
+    }
+
+    return true;
+  }
+
+  async delBabyInfo() {
+
+    const { ctx } = this;
+    const user_uuid = ctx.userUuid;
+    await ctx.classModel.V2.CourseUserBaby.edit({ params: { is_deleted: 1 }, where: { user_uuid } });
+
+    return true;
+  }
+
+  async collectInstitution(institution_id) {
+
+    const { ctx } = this;
+    const user_uuid = ctx.userUuid;
+    const where = { user_uuid, is_deleted: 0, institution_id };
+    let ret = await ctx.classModel.V2.CourseUserCollection.one({ where });
+    if (ret && ret.id) {
+      return ret.id;
+    }
+    ret = await await ctx.classModel.V2.CourseUserCollection.add({ user_uuid, institution_id });
+
+    return ret;
+  }
+
+  async delCollectInstitution(institution_id) {
+
+    const { ctx } = this;
+    const user_uuid = ctx.userUuid;
+    const where = { user_uuid, is_deleted: 0, institution_id };
+    let ret = await ctx.classModel.V2.CourseUserCollection.one({ where });
+    if (!ret || !ret.id) {
+      return true;
+    }
+    ret = await await ctx.classModel.V2.CourseUserCollection.edit({ params: { is_deleted: 1 }, where });
+
+    return true;
+  }
+
+  async requestWxAuth(code) {
+
+    const { ctx } = this;
+    const APPID = 'wx07a5f0ed5bdf4751';
+    const SECRET = 'a1b2d32b018988176181497bd74a0b7d';
+    const url = `https://api.weixin.qq.com/sns/jscode2session?appid=${APPID}&secret=${SECRET}&js_code=${code}&grant_type=authorization_code`;
+
+    const result = await ctx.helper.send_request(url, {}, { method: 'GET' });
+    // const result = {"data":{"session_key":"Ce7HE1+MXfyZpWLYmkP0Iw==","openid":"oSjKI5LlG6AF7_vdV5Qb_DsbHcf4"},"status":200,"headers":{"connection":"keep-alive","content-type":"text/plain","date":"Tue, 24 Sep 2019 06:18:58 GMT","content-length":"82"},"res":{"status":200,"statusCode":200,"statusMessage":"OK","headers":{"connection":"keep-alive","content-type":"text/plain","date":"Tue, 24 Sep 2019 06:18:58 GMT","content-length":"82"},"size":82,"aborted":false,"rt":113,"keepAliveSocket":false,"data":{"session_key":"Ce7HE1+MXfyZpWLYmkP0Iw==","openid":"oSjKI5LlG6AF7_vdV5Qb_DsbHcf4"},"requestUrls":["https://api.weixin.qq.com/sns/jscode2session?appid=wx4769ebba9b91f8ec&secret=680440637b4e38c9b66529cfd5dc590e&js_code=021678ss18NNAk0Fohps1oA6ss1678sT&grant_type=authorization_code"],"timing":{"queuing":15,"dnslookup":15,"connected":27,"requestSent":57,"waiting":111,"contentDownload":113},"remoteAddress":"101.227.162.120","remotePort":443,"socketHandledRequests":1,"socketHandledResponses":1}};
+    ctx.logger.info(JSON.stringify({ course_mini_auth_ret: result }));
+    if (result.status !== 200) {
+      ctx.failed('授权失败');
+    }
+
+    const ret = result.data;
+    if (!ret.session_key && !ret.openid && ret.errcode !== 0) {
+      ctx.failed(ret.errmsg);
+    }
+
+    const openid = ret.openid;
+    const session_key = ret.session_key;
+
+    return { openid, session_key };
+
+  }
+
+
+}
+
+module.exports = UserService;
--- a/app/service/course/v2/wechat.js
+++ b/app/service/course/v2/wechat.js