1

app/controller/response.js

@@ -51,7 +51,6 @@ class ResponseController extends Controller {
     const device_login_id = ctx.cookies.get('device_login_id', { signed: false });
     ctx.logger.info('target_user--' + JSON.stringify({ target_cookies_user: { token, user_id, app_user_id, device_id, device_login_id } }));
 
-
     let user_sid = ctx.cookies.get('jianbing_customer_id', { signed: false });
     let auth_token = ctx.cookies.get('auth_token', { signed: false });
     if (input_params.user_token) {
@@ -63,11 +62,12 @@ class ResponseController extends Controller {
       }
     }
     // 判断user_sid 和 app_user_id
-
+    let oid = '';
     if (app_user_id) {
       const result = await ctx.helper.send_request(this.config.USER_CENTER_API_URI + '/v1/appusers/' + app_user_id, {}, { method: 'GET', dataType: 'json' });
       const ret_appuid = result.status === 200 ? result.data : {};
       this.logger.info(`user: ${user_sid}, appuid: ${app_user_id}, ret: ${JSON.stringify(ret_appuid)}`);
+      oid = ret_appuid.oid;
       if (this.ctx.helper.encodeUserSid(ret_appuid.oid) == user_sid) {
         if (token && user_id && app_user_id && device_id && device_login_id) {
           ctx.redirect(target_url2);
@@ -138,6 +138,8 @@ class ResponseController extends Controller {
       node_user_center_login_ret.device_id = device_login_data.device_id;
       node_user_center_login_ret.device_login_id = device_login_data.device_login_logs_id;
     }
+    if (auth_token) node_user_center_login_ret.auth_token = auth_token;
+    if (user_sid && this.ctx.helper.encodeUserSid(oid) !== user_sid) node_user_center_login_ret.jianbing_customer_id = this.ctx.helper.encodeUserSid(input_params.user_sid);
 
     const expire = 7200 * 1000;
     const date = new Date();
@@ -145,11 +147,10 @@ class ResponseController extends Controller {
       const value = node_user_center_login_ret[key];
       // const exist_value = ctx.cookies.get(key, { signed: false });
       // if (!exist_value) {
-      ctx.logger.info(JSON.stringify({ key, value, phone }));  
+      ctx.logger.info(JSON.stringify({ key, value, phone }));
       ctx.cookies.set(key, value, { httpOnly: false, signed: false, path: '/', overwrite: true });
       // }
     }
-
     ctx.redirect(target_url2);
     return;
   }

config/config.local.js

@@ -64,6 +64,18 @@ module.exports = appInfo => {
         port: 3306,
       },
       {
+        // 公积金数据库
+        timezone: '+08:00',
+        delegate: 'gjjModel',
+        baseDir: 'model/gjj',
+        dialect: 'mysql',
+        host: 'rm-bp1mnwmta5778y0d3jo.mysql.rds.aliyuncs.com',
+        database: 'uatgjj',
+        username: 'uatgjj',
+        password: 'jianbingUATsljwd',
+        port: 3306,
+      },
+      {
         // 东八时区
         timezone: '+08:00',
         delegate: 'realestateModel',
@@ -71,7 +83,7 @@ module.exports = appInfo => {
         // other sequelize configurations
         dialect: 'mysql',
         host: 'rm-bp1mnwmta5778y0d3jo.mysql.rds.aliyuncs.com',
-        database: 'realestate_dev',
+        database: 'realestate_uat',
         username: 'realestate',
         password: 'ppD1sDSutHG83T2s1Ue3k',
         port: 3306,
@@ -84,9 +96,9 @@ module.exports = appInfo => {
         // other sequelize configurations
         dialect: 'mysql',
         host: 'rm-bp1mnwmta5778y0d3jo.mysql.rds.aliyuncs.com',
-        database: 'devhuodong',
-        username: 'devhuodong',
-        password: 'jianbing2014GG',
+        database: 'uathuodong',
+        username: 'uathuodong',
+        password: 'jianbingUATsljwd2016',
         port: 3306,
       },
       {
@@ -97,7 +109,7 @@ module.exports = appInfo => {
         // other sequelize configurations
         dialect: 'mysql',
         host: 'rm-bp1mnwmta5778y0d3jo.mysql.rds.aliyuncs.com',
-        database: 'prometheus_dev',
+        database: 'prometheus_uat',
         username: 'prometheus',
         password: 'q9t8Ay4qIUW4sw3s25K28',
         port: 3306,