代码修改

@@ -13,4 +13,5 @@ run/
 typings/
 .nyc_output/
 .DS_Store
-yarn-error.lock
\ No newline at end of file
+yarn-error.lock
+public
\ No newline at end of file

-module.exports = app => {
+// const passport = require('./app/etc/authorization');
+const flash = require('connect-flash');
+const passport = require('./app/middleware/authorization');
 
-    app.once('server', server => {
-
-    })
-
-    app.on('error', (err, ctx) => {
-
-    })
-
-    app.on('request', ctx => {
-
-    })
-
-    app.on('response', ctx => {
-        const used = Date.now() - ctx.starttime
-        console.log(ctx, 'used')
-    })
-}
\ No newline at end of file
+class Hro {
+    constructor(app) {
+        this.app = app;
+    }
+    configWillLoad() {
+        // Ready to call configDidLoad,
+        // Config, plugin files are referred,
+        // this is the last chance to modify the config.
+        console.log('configWillLoad');
+    }
+    configDidLoad() {
+        // Config, plugin files have been loaded.
+        console.log('configDidLoad');
+    }
+    async didLoad() {
+        // All files have loaded, start plugin here.
+        console.log('didLoad');
+    }
+    async willReady() {
+        // All plugins have started, can do some thing before app ready'
+        const { app } = this;
+        passport(app);// 添加passport验证方法
+        flash(app)
+        // console.log('willReady',app);
+    }
+    async didReady() {
+        // Worker is ready, can do some things
+        // don't need to block the app boot. 
+        console.log('didReady');
+    }
+    async serverDidReady() {
+        // Server is listening.
+        console.log('serverDidReady');
+    }
+    async beforeClose() {
+        // Do some thing before app close.
+        console.log('configWillLoad');
+    }
+}
+module.exports = Hro;
\ No newline at end of file

 "use strict";
-
-const passport = require("passport");
 const urlencode = require("urlencode");
 const async = require("async");
 const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
-
 const Controller = require("egg").Controller;
-// logger, rest, settings
 
 class AuthController extends Controller {
-  async index() {
-    const { ctx, logger } = this;
-    const { request } = ctx;
-
-    logger.info(request);
+  index(req, res, next) {
+    logger.info(req);
+    // res.redirect("https://www.baidu.com");
   }
 
-  async getImg(req, res) {
+  getImg(req, res, next) {
+    logger.info(req.url, "1231231231");
     const parentdir = path.resolve(__dirname, "..");
     const paths =
       parentdir + "/build/public" + urlencode.decode(req.url, "utf8");
-
     fs.readFile(paths, function (err, data) {
+      console.log(err, data);
       if (err) {
         res.send("读取错误");
       } else {
@@ -32,81 +27,56 @@ class AuthController extends Controller {
     });
   }
 
-  async indexPrefix(req, res) {
+  indexPrefix() {
     const { ctx } = this;
-
-    ctx.body = {
-      data: req.csrfToken(),
-    };
-
-    return ctx.body;
+    const { logger, req } = ctx;
+    return (ctx.body = {});
+    //  return ctx.body({ data: ctx.csrfToken });
+    // if (req.csrfToken) {
+    //   if (settings.prefix && settings.prefix.length > 1) {
+    //     res.redirect(settings.prefix.substring(0, settings.prefix.length - 1));
+    //   } else {
+    //     res.render("index", { csrfToken: req.csrfToken() });
+    //   }
+    // } else res.render("index", { csrfToken: "" });
   }
 
-  async productDes(req, res) {
-    const { ctx } = this;
-
-    if (req.csrfToken) {
-      await ctx.render("chat/new-chat", { csrfToken: req.csrfToken() });
-    } else {
-      await ctx.render("chat/new-chat", { csrfToken: "" });
-    }
+  productDes(req, res, next) {
+    if (req.csrfToken)
+      res.render("chat/new-chat", { csrfToken: req.csrfToken() });
+    else res.render("chat/new-chat", { csrfToken: "" });
   }
 
-  async recharge(req, res) {
-    const { ctx } = this;
-    let params = JSON.parse(urlencode.decode(req.query.params));
-
-    if (req.csrfToken) {
-      ctx.render("recharge", {
-        recharge: params,
-        csrfToken: req.csrfToken(),
-      });
-    } else {
-      ctx.render("recharge", {
-        recharge: params,
-        csrfToken: "",
-      });
-    }
+  recharge(req, res) {
+    var params = JSON.parse(urlencode.decode(req.query.params));
+    console.log(params);
+    if (req.csrfToken)
+      res.render("recharge", { recharge: params, csrfToken: req.csrfToken() });
+    else res.render("recharge", { recharge: params, csrfToken: "" });
   }
 
-  async register(req, res) {
-    const { ctx } = this;
-
-    if (req.csrfToken) {
-      ctx.render("newRegister", { csrfToken: req.csrfToken() });
-    } else {
-      ctx.render("newRegister", { csrfToken: "" });
-    }
+  register(req, res, next) {
+    if (req.csrfToken)
+      res.render("newRegister", { csrfToken: req.csrfToken() });
+    else res.render("newRegister", { csrfToken: "" });
   }
 
-  async mobileRegister(req, res) {
-    const { ctx } = this;
-
-    if (req.csrfToken) {
-      ctx.render("registerMobile", { csrfToken: req.csrfToken() });
-    } else {
-      ctx.render("registerMobile", { csrfToken: "" });
-    }
+  mobileRegister(req, res) {
+    if (req.csrfToken)
+      res.render("registerMobile", { csrfToken: req.csrfToken() });
+    else res.render("registerMobile", { csrfToken: "" });
   }
 
-  async mobileRegisterSuccess(req, res) {
-    const { ctx } = this;
-
-    if (req.csrfToken) {
-      ctx.render("registerMobileSuccess", { csrfToken: req.csrfToken() });
-    } else {
-      ctx.render("registerMobileSuccess", { csrfToken: "" });
-    }
+  mobileRegisterSuccess(req, res) {
+    if (req.csrfToken)
+      res.render("registerMobileSuccess", { csrfToken: req.csrfToken() });
+    else res.render("registerMobileSuccess", { csrfToken: "" });
   }
 
-  async signIn(req, res) {
-    const { ctx } = this;
-
-    if (req.csrfToken) {
-      ctx.render("newLogin", { csrfToken: req.csrfToken() });
-    } else {
-      ctx.render("newLogin", { csrfToken: "" });
-    }
+  signIn(req, res, next) {
+    //	console.log(req);
+    if (req.csrfToken) res.render("newLogin", { csrfToken: req.csrfToken() });
+    else res.render("newLogin", { csrfToken: "" });
   }
 
   async doLogin(req, res, next) {
@@ -132,10 +102,35 @@ class AuthController extends Controller {
     })(req, res, next);
   }
 
-  async signOut(req, res) {
-    const { ctx, logger } = this;
-    const { session } = ctx;
+  async loginCallback() {
+    const { ctx } = this;
+    if ("application/json" == ctx.request.get("accept")) {
+      //用户名密码json登录
+      if (ctx.isAuthenticated() && !ctx.session.returnTo) {
+       if(ctx.session.user_info.code>=300){
+        ctx.body = ctx.session.user_info
+       }else {
+        ctx.body = {
+          scope: ctx.session.user_info.scope,
+          user_info: ctx.session.user_info.user,
+        };
+       }
+        
+      } else if (ctx.isAuthenticated() && ctx.session.returnTo) {
+        ctx.body = { code: 301, redirect_uri: ctx.session.returnTo };
+      } else {
+        ctx.body = { code: 400, message: "登录失败" };
+      }
+    } else {
+      //扫二维码第三方登录
+      ctx.body = { code: 400, message: "登录失败" };
+    }
+    return ctx.body;
+  }
 
+  signOut() {
+    const { ctx, logger } = this;
+    const { req, res, session } = ctx;
     if (
       session.passport &&
       session.passport.user &&
@@ -147,13 +142,13 @@ class AuthController extends Controller {
         "You have successfully logged out"
       );
     }
-
-    req.logout();
-    req.flash("success", "You have successfully logged out");
-    res.redirect("/");
+    logger.info(req);
+    // req.logout();
+    // req.flash("success", "You have successfully logged out");
+    ctx.redirect("/");
   }
 
-  async smsCodes(req, res) {
+  smsCodes(req, res, next) {
     rest.postJson({
       baseUrl: "url",
       url: "auth/smscodes",
@@ -174,7 +169,7 @@ class AuthController extends Controller {
     }
   }
 
-  async tenants(req, res, next) {
+  tenants(req, res, next) {
     rest.register({
       baseUrl: "url",
       url: "tenants",
@@ -191,7 +186,7 @@ class AuthController extends Controller {
     }
   }
 
-  async resetPass(req, res) {
+  resetPass(req, res) {
     rest.putJson({
       baseUrl: "url",
       url: "auth/user",
@@ -211,9 +206,7 @@ class AuthController extends Controller {
     }
   }
 
-  async updatePassword(req, res) {
-    const { logger } = this;
-
+  updatePassword(req, res) {
     rest.patchJson({
       baseUrl: "url",
       url: "users/" + req.body.userId,
@@ -232,7 +225,7 @@ class AuthController extends Controller {
     }
   }
 
-  async loadUserInfo(req, res) {
+  loadUserInfo(req, res) {
     settings;
 
     if (req.session.passport.user && req.session.passport.user.user_info) {
@@ -245,9 +238,7 @@ class AuthController extends Controller {
     }
   }
 
-  async getUploaderToken(req, res) {
-    const { logger } = this;
-
+  getUploaderToken(req, res) {
     rest.postJson({
       baseUrl: "ossUrl",
       url: "inits",
@@ -264,9 +255,7 @@ class AuthController extends Controller {
     }
   }
 
-  async getObjectTokenByID(req, res) {
-    const { logger } = this;
-    
+  getObjectTokenByID(req, res) {
     rest.get({
       baseUrl: "ossUrl",
       url: "objects/" + req.body.file_id,
@@ -283,7 +272,7 @@ class AuthController extends Controller {
     }
   }
 
-  async delOSSObject(req, res) {
+  delOSSObject(req, res) {
     rest.del({
       baseUrl: "ossUrl",
       url:
@@ -307,7 +296,7 @@ class AuthController extends Controller {
     }
   }
 
-  async smsVerification(req, res) {
+  smsVerification(req, res) {
     rest.postJson({
       baseUrl: "url",
       url: "auth/sms_verification",
@@ -332,13 +321,13 @@ class AuthController extends Controller {
     }
   }
 
-  async healthMonitor(res) {
+  healthMonitor(res) {
     res.statusCode = 200;
 
     return res.send("status ok");
   }
 
-  async updateUserRoles(req, res) {
+  updateUserRoles(req, res) {
     rest.putJson({
       baseUrl: "url",
       url: "user_roles/" + req.body.user_id,
@@ -358,7 +347,7 @@ class AuthController extends Controller {
     }
   }
 
-  async getRoles(req, res) {
+  getRoles(req, res) {
     rest.get({
       baseUrl: "url",
       url: "roles",
@@ -374,7 +363,7 @@ class AuthController extends Controller {
     }
   }
 
-  async getUserRoles(req, res) {
+  getUserRoles(req, res) {
     rest.get({
       baseUrl: "url",
       url:
@@ -396,7 +385,7 @@ class AuthController extends Controller {
     }
   }
 
-  async getTenant(req, res) {
+  getTenant(req, res) {
     rest.get({
       baseUrl: "url",
       url: "tenants/" + req.body.tenant_id,
@@ -412,7 +401,7 @@ class AuthController extends Controller {
     }
   }
 
-  async updateTenant(req, res) {
+  updateTenant(req, res) {
     rest.putJson({
       baseUrl: "url",
       url: "tenants/" + req.body.tenant_id,
@@ -428,7 +417,7 @@ class AuthController extends Controller {
     }
   }
 
-  async offer(req, res) {
+  offer(req, res) {
     rest.get({
       baseUrl: "hrUrl",
       url:
@@ -448,7 +437,7 @@ class AuthController extends Controller {
     }
   }
 
-  async onboardStatus(req, res) {
+  onboardStatus(req, res) {
     rest.get({
       baseUrl: "hrUrl",
       url: "onboard-status",
@@ -465,9 +454,9 @@ class AuthController extends Controller {
     }
   }
 
-  async dowloadApp(req, res) {
-    let mobileAgent = req.headers["user-agent"].toLowerCase();
-    let agent = {
+  dowloadApp(req, res) {
+    var mobileAgent = req.headers["user-agent"].toLowerCase();
+    var agent = {
       android:
         mobileAgent.indexOf("android") > -1 || mobileAgent.indexOf("Adr") > -1,
       iPhone: mobileAgent.indexOf("iphone") > -1,
@@ -491,12 +480,12 @@ class AuthController extends Controller {
     }
   }
 
-  async softwareLicense(res) {
+  softwareLicense(res) {
     res.render("softwareLicense");
   }
 
-  async changePassForRegister(req, res) {
-    let options = {
+  changePassForRegister(req, res) {
+    var options = {
       baseUrl: "url",
       url: "users/" + req.body.user_id,
       params: {
@@ -523,8 +512,8 @@ class AuthController extends Controller {
     }
   }
 
-  async changeTenant(req, res) {
-    let params = {
+  changeTenant(req, res) {
+    var params = {
       grant_type: "refresh_token",
       scope: "global_access:tenant_admin,tenant:" + req.body.id,
       refresh_token: req.session.passport.user.refreshToken,
@@ -620,7 +609,7 @@ class AuthController extends Controller {
     }
   }
 
-  async sendRejectOffer(req, res) {
+  sendRejectOffer(req, res) {
     rest.get({
       baseUrl: "hrUrl",
       url: req.body.url, //传一个参数
@@ -642,7 +631,7 @@ class AuthController extends Controller {
     }
   }
 
-  async acceptOffer(req, res) {
+  acceptOffer(req, res) {
     rest.get({
       baseUrl: "hrUrl",
       url: req.body.url, //传一个参数
@@ -664,7 +653,7 @@ class AuthController extends Controller {
     }
   }
 
-  async imTokens(req, res) {
+  imTokens(req, res) {
     rest.post({
       url: "auth/im_tokens",
       params: req.body,
@@ -679,7 +668,7 @@ class AuthController extends Controller {
     }
   }
 
-  async listChannels(req, res) {
+  listChannels(req, res) {
     rest.get({
       baseUrl: "chatUrl",
       url: "channels?page_size=10&page=0&status=active",
@@ -695,8 +684,8 @@ class AuthController extends Controller {
     }
   }
 
-  async filemeta(req, res) {
-    let fullPath =
+  filemeta(req, res) {
+    var fullPath =
       settings.restful.url +
       "filemeta" +
       settings.restful.version +
@@ -754,8 +743,8 @@ class AuthController extends Controller {
     }
   }
 
-  async getCustomerQrcode(req, res) {
-    let fullPath =
+  getCustomerQrcode(req, res) {
+    var fullPath =
       settings.restful.url +
       "crm" +
       settings.restful.version +
@@ -784,8 +773,8 @@ class AuthController extends Controller {
     }
   }
 
-  async getPositionQrcode(req, res) {
-    let fullPath =
+  getPositionQrcode(req, res) {
+    var fullPath =
       settings.restful.url +
       "recruit" +
       settings.restful.version +
@@ -815,8 +804,8 @@ class AuthController extends Controller {
     }
   }
 
-  async getOSSConfig(req, res) {
-    let fullPath =
+  getOSSConfig(req, res) {
+    var fullPath =
       settings.restful.url + "filemeta" + settings.restful.version + "/config";
     let options = {
       service_catalog: "",
@@ -844,7 +833,7 @@ class AuthController extends Controller {
     }
   }
 
-  async weidianTempLate(req, res) {
+  weidianTempLate(req, res) {
     const { params } = req;
     let fullPath =
       settings.restful.url + "socialwork/internal/minishop/" + params.id;
@@ -882,10 +871,8 @@ class AuthController extends Controller {
     }
   }
 
-  async workaiSecurityOAuth(req, res) {
-    const { logger } = this;
-    let params = req.query;
-
+  workaiSecurityOAuth(req, res) {
+    var params = req.query;
     if (params.authorization_code) {
       let passport = {
         user: {
@@ -941,7 +928,7 @@ class AuthController extends Controller {
                   callback(err, data);
                 }
               })
-              .on("error", function (err, response) {
+              .on("error", function (_err, response) {
                 let err = new Error("Third login err");
 
                 callback(err, response);
@@ -984,7 +971,7 @@ class AuthController extends Controller {
                   callback(err, data);
                 }
               })
-              .on("error", function (err, response) {
+              .on("error", function (_err, response) {
                 let err = new Error("Third login tenants list err");
 
                 callback(err, response);
@@ -1058,8 +1045,8 @@ class AuthController extends Controller {
                     callback(err, data2);
                   }
                 })
-                .on("error", function (err, response) {
-                  logger.error("Third login error", err);
+                .on("error", function (_err, response) {
+                  logger.error("Third login error", _err);
 
                   let err = new Error("Third login err");
 
@@ -1139,9 +1126,8 @@ class AuthController extends Controller {
     }
   }
 
-  async getTastLink(req, res) {
-    let url = crypto.createHash("md5").update(req.body.id).digest("hex");
-
+  getTastLink(req, res) {
+    var url = crypto.createHash("md5").update(req.body.id).digest("hex");
     if (settings.prefix && settings.prefix.length > 1) {
       res.send(
         req.protocol +
@@ -1167,10 +1153,9 @@ class AuthController extends Controller {
     }
   }
 
-  async freedomJobsEmp(req, res) {
-    const { logger } = this;
-    let id = req.params.id;
-
+  freedomJobsEmp(req, res) {
+    var id = req.params.id;
+    // var url = crypto.createHash('md5').update(id).digest('hex');
     if (false) {
       //验证未通过verification != url
       if (settings.prefix && settings.prefix.length > 1) {
@@ -1234,8 +1219,8 @@ class AuthController extends Controller {
             passport.user.err = data.message;
           }
         })
-        .on("error", function (err, response) {
-          logger.error("Third login error", err);
+        .on("error", function (_err, response) {
+          logger.error("Third login error", _err);
 
           let err = new Error("Third login err");
 
@@ -1247,9 +1232,8 @@ class AuthController extends Controller {
     }
   }
 
-  async getShortToken(req, res) {
-    const { logger } = this;
-    let params = {
+  getShortToken(req, res) {
+    var params = {
       grant_type: "refresh_token",
       scope: req.session.passport.user.scope,
       refresh_token: req.session.passport.user.refreshToken,

-'use strict';
-
-const Controller = require('egg').Controller;
-
-class HomeController extends Controller {
-  async index() {
-    const { ctx } = this;
-    ctx.body = 'hi,egg';
-  }
-}
-
-module.exports = HomeController;

-'use strict';
-const Controller = require('egg').Controller;
+"use strict";
+const Controller = require("egg").Controller;
 
 class ProxyController extends Controller {
   async info() {
@@ -15,16 +15,22 @@ class ProxyController extends Controller {
     const { ctx } = this;
     const { session, headers, ip } = ctx;
 
-    if (session.passport && session.passport.user && session.passport.user && session.passport.user.token) {
-      options.headers['Authorization'] = "Bearer " + session.passport.user.token;
+    if (
+      session.passport &&
+      session.passport.user &&
+      session.passport.user &&
+      session.passport.user.token
+    ) {
+      options.headers["Authorization"] =
+        "Bearer " + session.passport.user.token;
     }
 
-    if (headers['device-id']) {
-      options.headers['Device-Id'] = headers['device-id'];
+    if (headers["device-id"]) {
+      options.headers["Device-Id"] = headers["device-id"];
     }
 
     if (ip) {
-      options.headers['Client-Ip'] = ip;
+      options.headers["Client-Ip"] = ip;
     }
 
     return options;
@@ -43,7 +49,7 @@ class ProxyController extends Controller {
 
   addParams(options) {
     const { ctx } = this;
-    const postData = !ctx.body ? '' : JSON.stringify(ctx.body || {});
+    const postData = !ctx.body ? "" : JSON.stringify(ctx.body || {});
 
     options.params = postData;
   }
@@ -52,69 +58,53 @@ class ProxyController extends Controller {
     const { params, headers } = options;
 
     if (params) {
-      headers['Content-Length'] = params.length;
+      headers["Content-Length"] = params.length;
     }
   }
 
   getOptions(url, type) {
-    const { config } = this;
+    const { config,ctx,logger } = this;
+    const {  session } = ctx;
+    const { access_token } = session.user_info;
     const { restful = {} } = config;
     const { version, host, port } = restful;
-    const catalog = url.substring(1, url.indexOf('/', 1));
-    const pathUrl = url.substring(url.indexOf('/', 1));
-    const fullPath = '/' + catalog + version + pathUrl;
+    logger.info(version,'version')
+    const catalog = url.substring(1, url.indexOf("/", 1));
+    const pathUrl = url.substring(url.indexOf("/", 1));
+    const fullPath = "/" + catalog + version + pathUrl;
 
     return {
-      'host': host, //后台请求地址
-      'port': port,
-      'path': fullPath,
-      'method': type,
-      'agent': false,
-      'headers': {
-        "Accept": "application/json",
+      host: host, //后台请求地址
+      port: port,
+      path: fullPath,
+      method: type,
+      agent: false,
+      headers: {
+        authorization: `Bearer ${access_token}`,
+        Accept: "application/json",
         "Content-Type": "application/json",
-        'User-Agent': 'Request for Express'
-      }
+        // "User-Agent": "Request for Express",
+      },
     };
   }
 
   async get() {
-    const { ctx, config, logger } = this;
-    const { originalUrl, session, curl } = ctx;
-    const { restful = {} } = config;
-    const { host } = restful;
-    const { access_token } = session.user_info;
-    const url = splitUrl(originalUrl);
-    const options = getOptions(url, 'GET');
-
-    addToken(options);
-
-    const result = await curl(
-      `${host}${url}`,
-      {
-        method: 'GET',
-        dataType: 'json',
-        headers: {
-          'authorization': `Bearer ${access_token}`,
-          'accept': 'application/json',
-          'content-type': 'application/json'
-        },
-        timeout: [5000, 60000]
-      }
-    );
-
-    logger.info(
-      "get originalUrl:",
-      `${splitUrl(originalUrl)}`,
-      "get host:",
-      `${host}`,
-      "get url:",
-      `${url}`,
-      "result:",
-      result
-    );
-
-    ctx.body = result.data || {};
+    const { ctx, logger } = this;
+    const { originalUrl,  } = ctx;
+    const url = this.splitUrl(originalUrl);
+    const options = this.getOptions(url, 'GET');
+    const {host ,port,path,...rest} = options
+    logger.info(`${host}:${port}${path}`, {
+      ...rest,
+      timeout: [5000, 60000],
+    },12312321)
+    const result = await ctx.curl(`${host}:${port}${path}`, {
+      ...rest,
+      timeout: [5000, 60000],
+    });
+    logger.info("result:", result);
+
+    ctx.body = result.data|| {};
 
     return ctx.body;
   }
@@ -124,37 +114,34 @@ class ProxyController extends Controller {
     const { originalUrl, session, curl, request } = ctx;
     const { restful = {} } = config;
     const { host } = restful;
-    const { access_token } = session.user_info
-    const url = splitUrl(originalUrl);
-    const options = getOptions(url, 'POST');
+    const { access_token } = session.user_info;
+    const url = this.splitUrl(originalUrl);
+    const options = this.getOptions(url, "POST");
 
-    addToken(options);
+    this.addToken(options);
     addParams(options);
 
-    const result = await curl(
-      `${host}${url}`,
-      {
-        method: 'POST',
-        dataType: 'json',
-        data: JSON.stringify(request.body),
-        headers: {
-          'authorization': `Bearer ${access_token}`,
-          'accept': 'application/json',
-          'content-type': 'application/json'
-        }
-      }
-    );
+    const result = await curl(`${host}${url}`, {
+      method: "POST",
+      dataType: "json",
+      data: JSON.stringify(request.body),
+      headers: {
+        authorization: `Bearer ${access_token}`,
+        accept: "application/json",
+        "content-type": "application/json",
+      },
+    });
 
     logger.info(
       "post proxy url:",
       `${host}${url}`,
-      'headers',
+      "headers",
       {
-        'authorization': `Bearer ${access_token}`,
-        'accept': 'application/json',
-        'content-type': 'application/json'
+        authorization: `Bearer ${access_token}`,
+        accept: "application/json",
+        "content-type": "application/json",
       },
-      'data',
+      "data",
       JSON.stringify(request.body)
     );
 
@@ -169,36 +156,33 @@ class ProxyController extends Controller {
     const { hroProxy = {} } = config;
     const { host } = hroProxy;
     const { access_token } = session.user_info;
-    const url = splitUrl(originalUrl);
-    const options = getOptions(url, 'PUT');
+    const url = this.splitUrl(originalUrl);
+    const options = this.getOptions(url, "PUT");
 
-    addToken(options);
+    this.addToken(options);
     addParams(options);
 
-    const result = await curl(
-      `${host}${url}`,
-      {
-        method: 'PUT',
-        dataType: 'json',
-        data: JSON.stringify(request.body),
-        headers: {
-          'authorization': `Bearer ${access_token}`,
-          'accept': 'application/json',
-          'content-type': 'application/json'
-        }
-      }
-    );
+    const result = await curl(`${host}${url}`, {
+      method: "PUT",
+      dataType: "json",
+      data: JSON.stringify(request.body),
+      headers: {
+        authorization: `Bearer ${access_token}`,
+        accept: "application/json",
+        "content-type": "application/json",
+      },
+    });
 
     logger.info(
       "put proxy url:",
       `${host}${url}`,
-      'headers',
+      "headers",
       {
-        'authorization': `Bearer ${access_token}`,
-        'accept': 'application/json',
-        'content-type': 'application/json'
+        authorization: `Bearer ${access_token}`,
+        accept: "application/json",
+        "content-type": "application/json",
       },
-      'data',
+      "data",
       JSON.stringify(request.body)
     );
 
@@ -213,36 +197,33 @@ class ProxyController extends Controller {
     const { hroProxy = {} } = config;
     const { host } = hroProxy;
     const { access_token } = session.user_info;
-    const url = splitUrl(originalUrl);
-    const options = getOptions(url, 'HEAD');
+    const url = this.splitUrl(originalUrl);
+    const options = this.getOptions(url, "HEAD");
 
-    addToken(options);
+    this.addToken(options);
     addParams(options);
 
-    const result = await curl(
-      `${host}${url}`,
-      {
-        method: 'HEAD',
-        dataType: 'json',
-        data: JSON.stringify(request.body),
-        headers: {
-          'authorization': `Bearer ${access_token}`,
-          'accept': 'application/json',
-          'content-type': 'application/json'
-        }
-      }
-    );
+    const result = await curl(`${host}${url}`, {
+      method: "HEAD",
+      dataType: "json",
+      data: JSON.stringify(request.body),
+      headers: {
+        authorization: `Bearer ${access_token}`,
+        accept: "application/json",
+        "content-type": "application/json",
+      },
+    });
 
     logger.info(
       "head proxy url:",
       `${host}${url}`,
-      'headers',
+      "headers",
       {
-        'authorization': `Bearer ${access_token}`,
-        'accept': 'application/json',
-        'content-type': 'application/json'
+        authorization: `Bearer ${access_token}`,
+        accept: "application/json",
+        "content-type": "application/json",
       },
-      'data',
+      "data",
       JSON.stringify(request.body)
     );
 
@@ -256,37 +237,29 @@ class ProxyController extends Controller {
     const { originalUrl, session, curl } = ctx;
     const { hroProxy = {} } = config;
     const { host } = hroProxy;
-    const { access_token } = session.user_info
-    const url = splitUrl(originalUrl);
-    const options = getOptions(url, 'DELETE');
+    const { access_token } = session.user_info;
+    const url = this.splitUrl(originalUrl);
+    const options = this.getOptions(url, "DELETE");
 
-    addToken(options);
+    this.addToken(options);
     addParams(options);
     addContentLength(options);
 
-    const result = await curl(
-      `${host}${url}`,
-      {
-        method: 'DELETE',
-        dataType: 'json',
-        headers: {
-          'authorization': `Bearer ${access_token}`,
-          'accept': 'application/json',
-          'content-type': 'application/json'
-        }
-      }
-    );
+    const result = await curl(`${host}${url}`, {
+      method: "DELETE",
+      dataType: "json",
+      headers: {
+        authorization: `Bearer ${access_token}`,
+        accept: "application/json",
+        "content-type": "application/json",
+      },
+    });
 
-    logger.info(
-      "delete proxy url:",
-      `${host}${url}`,
-      'headers:',
-      {
-        'authorization': `Bearer ${access_token}`,
-        'accept': 'application/json',
-        'content-type': 'application/json'
-      }
-    );
+    logger.info("delete proxy url:", `${host}${url}`, "headers:", {
+      authorization: `Bearer ${access_token}`,
+      accept: "application/json",
+      "content-type": "application/json",
+    });
 
     ctx.body = result.data || {};
 

+/*
+ * 添加passport验证登录权限方法
+ */
+module.exports = (app) => {
+  app.passport.verify(async (ctx, user) => {
+    const { provider = "" } = user;
+    const { service = {} } = ctx;
+    const { redirect_uri } = ctx.request.body;
+    let result;
+    switch (provider) {
+      case "local":
+        result = await service.login.localLogin(user);
+        break;
+      default:
+        // console.log("error:", user)
+        break;
+    }
+    if (result && result.code >= 300) {
+      ctx.status = result.status;
+      ctx.body = result.data;
+      return false;
+    }
+    if (!result) {
+      ctx.status = 500;
+      ctx.body = {
+        message: "用户或密码错误",
+      };
+      return false;
+    }
+    if (redirect_uri) {
+      ctx.session.returnTo = `${redirect_uri}?ticket=${Math.random(10000)}`;
+    }
+    return result;
+  });
+
+  // 序列化与反序列化，序列化存储到session中只保存用户id
+  app.passport.serializeUser(async (ctx, user) => {
+    console.log(user, "user");
+    return user;
+  });
+
+  app.passport.deserializeUser(async (ctx, user) => {
+      console.log(user,'kncvkxznkcxlklasdjfajdfldkasjflkasdnvkasdnmklasndvldnsa');
+    return user;
+  });
+};

@@ -4,6 +4,6 @@
  * @param {Egg.Application} app - egg application
  */
 module.exports = app => {
+  require('./router/api')(app);
   require('./router/auth')(app);
-  require('./router/home')(app);
 };

+// var payRoll = require("../json/payRoll.json");
 
 module.exports = (app) => {
-  const { router, controller } = app;
+  const { router, controller} = app;
   const { auth } = controller;
-console.log('controllerxxxxx',controller);
-  router.get("/signOut", auth.signOut);
-
-  // router.get("/img/*", auth.getImg);
 
-  // router.get("/", auth.indexPrefix);
+  const localStrategy = app.passport.authenticate("local", {
+    successRedirect: "/doLogin/loginCallback",
+    failureRedirect: "/doLogin/loginCallback",
+  });
+  // router.get("/index", controller.index);
+  router.get("/signOut", auth.signOut);
 
-  // router.get("/productDes", auth.productDes);
+  router.get("/", auth.indexPrefix);
 
-  // router.get("/register", auth.register);
+  router.get("/productDes", auth.productDes);
 
-  // router.get("/mobileRegister", auth.mobileRegister);
+  router.get("/register", auth.register);
 
-  // router.get("/mobileRegisterSuccess", auth.mobileRegisterSuccess);
+  router.get("/mobileRegister", auth.mobileRegister);
 
-  // router.get("/signIn", auth.signIn);
+  router.get("/mobileRegisterSuccess", auth.mobileRegisterSuccess);
 
-  // router.post("/doLogin", auth.doLogin);
+  router.get("/signIn", auth.signIn);
 
-  // router.get("/signOut", auth.signOut);
+  router.post("/doLogin", localStrategy);
 
-  // router.post("/smsCodes", auth.smsCodes);
+  router.get('/doLogin/loginCallback', auth.loginCallback);
 
-  // router.post("/tenants", auth.tenants);
+  router.post("/smsCodes", auth.smsCodes);
 
-  // router.post("/resetPass", auth.resetPass);
+  router.post("/tenants", auth.tenants);
 
-  // router.post("/updatePassword", auth.updatePassword);
+  router.post("/resetPass", auth.resetPass);
 
-  // router.post("/loadUserInfo", auth.loadUserInfo);
+  router.post("/updatePassword", auth.updatePassword);
 
-  // router.post("/getUploaderToken", auth.getUploaderToken);
+  router.post("/loadUserInfo", auth.loadUserInfo);
 
-  // router.post("/delOSSObject", auth.delOSSObject);
+  router.post("/getUploaderToken", auth.getUploaderToken);
 
-  // router.post("/smsVerification", auth.smsVerification);
+  router.post("/delOSSObject", auth.delOSSObject);
 
-  // router.post("/getObjectTokenByID", auth.getObjectTokenByID);
+  router.post("/smsVerification", auth.smsVerification);
 
-  // router.post("/getUserRoles", auth.getUserRoles);
+  router.post("/getObjectTokenByID", auth.getObjectTokenByID);
 
-  // router.post("/getRoles", auth.getRoles);
+  // router.get(
+  // 	'/healthMonitor',
+  // 	auth.healthMonitor
+  // )
 
-  // router.post("/updateUserRoles", auth.updateUserRoles);
+  // router.head(
+  // 	'/healthMonitor',
+  // 	auth.healthMonitor
+  // )
 
-  // router.post("/getTenant", auth.getTenant);
+  router.post("/getUserRoles", auth.getUserRoles);
 
-  // router.post("/updateTenant", auth.updateTenant);
+  router.post("/getRoles", auth.getRoles);
 
-  // router.get("/offer/:requestId", auth.offer);
+  router.post("/updateUserRoles", auth.updateUserRoles);
 
-  // router.post("/onboardStatus", auth.onboardStatus);
+  router.post("/getTenant", auth.getTenant);
 
-  // router.get("/downloadApp", auth.dowloadApp);
+  router.post("/updateTenant", auth.updateTenant);
 
-  // router.get("/info/policy", auth.softwareLicense);
+  router.get("/offer/:requestId", auth.offer);
 
-  // router.get("/recharge", auth.recharge);
+  router.post("/onboardStatus", auth.onboardStatus);
 
-  // router.post("/changePassForRegister", auth.changePassForRegister);
+  router.get("/downloadApp", auth.dowloadApp);
 
-  // router.post("/changeTenant", auth.changeTenant);
+  router.get("/info/policy", auth.softwareLicense);
 
-  // router.post("/hr/sendRejectOffer", auth.sendRejectOffer);
+  // router.get("/payRoll", function (req, res, next) {
+  //   res.send(payRoll);
+  // });
 
-  // router.post("/hr/acceptOffer", auth.acceptOffer);
+  router.get("/recharge", auth.recharge);
 
-  // router.post("/imTokens", auth.imTokens);
+  router.post("/changePassForRegister", auth.changePassForRegister);
 
-  // router.post("/listChannels", auth.listChannels);
+  router.post("/changeTenant", auth.changeTenant);
 
-  // router.post("/getTastLink", auth.getTastLink);
+  router.post("/hr/sendRejectOffer", auth.sendRejectOffer);
 
-  // router.get("/filemeta", auth.filemeta);
+  router.post("/hr/acceptOffer", auth.acceptOffer);
 
-  // router.get("/getCustomerQrcode", auth.getCustomerQrcode);
+  router.post("/imTokens", auth.imTokens);
 
-  // router.get("/getPositionQrcode", auth.getPositionQrcode);
+  router.post("/listChannels", auth.listChannels);
 
-  // router.get("/minishop/:id", auth.weidianTempLate);
+  router.post("/getTastLink", auth.getTastLink);
 
-  // router.get("/wso-workai", auth.workaiSecurityOAuth);
+  router.get("/filemeta", auth.filemeta);
 
-  // router.get(
-  //   "/socialwork/freedom-jobs/emps/:id/:verification",
-  //   auth.freedomJobsEmp
-  // );
+  router.get("/getCustomerQrcode", auth.getCustomerQrcode);
 
-  // router.get("/socialwork/freedom-jobs/emps/:id", auth.freedomJobsEmp);
+  router.get("/getPositionQrcode", auth.getPositionQrcode);
 
-  // router.get("/getShortToken", auth.getShortToken);
+  router.get("/minishop/:id", auth.weidianTempLate);
 
-  // router.get("/gainianrenli/*", auth.getImg);
+  router.get("/wso-workai", auth.workaiSecurityOAuth);
 
-  // router.get("/waifu_img/*", auth.getImg);
+  router.get(
+    "/socialwork/freedom-jobs/emps/:id/:verification",
+    auth.freedomJobsEmp
+  );
 
-  // router.get("/my_img/*", auth.getImg);
+  router.get("/socialwork/freedom-jobs/emps/:id", auth.freedomJobsEmp);
 
-  // router.get("/invoice_file_icon/*", auth.getImg);
+  router.get("/getShortToken", auth.getShortToken);
 
-  // router.get("/gainianrenli/*", auth.getImg);
-  
-  // router.get("/claim_icons/*", auth.getImg);
+  // router.get("/gainianrenli/*", controller.getImg);
+  // router.get("/waifu_img/*", controller.getImg);
+  // router.get("/my_img/*", controller.getImg);
+  // router.get("/invoice_file_icon/*", controller.getImg);
+  // router.get("/gainianrenli/*", controller.getImg);
+  // router.get("/claim_icons/*", controller.getImg);
 };

-'use strict';
-
-module.exports = app => {
-    const { router, controller } = app;
- 
-    router.get('/api', controller.home.index);
-}
\ No newline at end of file

+const Service = require('egg').Service;
+
+class LoginService extends Service {
+    async localLogin(user,access_token='') {
+        const { ctx, config={}, app, logger } = this;  
+        const { restful={} } = config;
+        const {  host, port, tokenUrl,tokenMethod} = restful;
+        const result = await ctx.curl(`${host}:${port}${tokenUrl}`, {
+            method: `${tokenMethod}`,
+            dataType: 'json',
+            data: JSON.stringify(ctx.request.body),
+            headers: {
+                'authorization': `Bearer ${access_token}`,
+                'accept': 'application/json',
+                'content-type': 'application/json'
+            },
+            timeout: [5000, 60000]
+        });
+        ctx.session.user_info = result.data;
+        return result;
+    }
+ 
+}
+
+module.exports = LoginService;
\ No newline at end of file

 /* eslint valid-jsdoc: "off" */
 
-'use strict';
+"use strict";
 
-const path = require('path')
+const path = require("path");
 /**
  * @param {Egg.EggAppInfo} appInfo app info
  */
-module.exports = appInfo => {
+module.exports = (appInfo) => {
   /**
    * built-in config
    * @type {Egg.EggAppConfig}
    **/
-  const config = exports = {};
+  const config = (exports = {});
   // use for cookie sign key, should change to your own and keep security
-  config.keys = appInfo.name + '_1642067379356_9612';
+  config.keys = appInfo.name + "_1642067379356_9612";
 
   // add your middleware config here
   config.middleware = [];
@@ -24,50 +24,108 @@ module.exports = appInfo => {
   };
 
   const view = {
-    root: path.join(appInfo.baseDir, 'app/public'),
-    defaultViewEngine: 'nunjucks',
+    root: path.join(appInfo.baseDir, "app/public"),
+    defaultViewEngine: "nunjucks",
     mapping: {
-      '.html': 'nunjucks',
-    }
-  }
+      ".html": "nunjucks",
+    },
+  };
 
   config.cluster = {
     listen: {
-      path: '',
+      path: "",
       port: 8012,
-      hostname: '0.0.0.0',
-    }
+      hostname: "0.0.0.0",
+    },
   };
 
   config.restful = {
-    tokenUrl: '/uaa/v1/auth/tokens',
-    tokenMethod: 'POST',
+    tokenUrl: "/uaa/v1/auth/tokens",
+    tokenMethod: "POST",
     scope: "global_access:tenant_admin",
-    // host: 'http://118.178.181.180:20000/',
-    host: 'http://47.110.250.177:20000/',
-    // host: 'http://47.110.158.110:20000/',
-    // host:'http://120.27.220.60:20000/',
-    // host: 'http://39.104.52.206:20000/',
-    // host: 'http://47.99.189.12:20000/',
-    ossUrl: 'http://47.110.250.177:20000/',
-    version: '/v1',
+    // host: 'http://118.178.181.180',
+    host: "http://47.110.250.177",
+    // host: 'http://47.110.158.110',
+    // host:'http://120.27.220.60',
+    // host: 'http://39.104.52.206',
+    // host: 'http://47.99.189.12',
+    ossUrl: "http://47.110.250.177:20000",
+    version: "/v1",
     // host: '47.110.158.110',
     // host: '120.27.220.60',
-    // host: '39.104.52.206', 
-    port: 20000
+    // host: '39.104.52.206',
+    port: 20000,
   };
 
   config.static = {
-    prefix: '/',
-    dir: path.join(appInfo.baseDir, 'app/public'),
-    dynamic: true,//是否緩存靜態資源
-    preload: false,//啓動項目開啓緩存
+    prefix: "/",
+    dir: path.join(appInfo.baseDir, "app/public"),
+    dynamic: true, //是否緩存靜態資源
+    preload: false, //啓動項目開啓緩存
     maxAge: 0, //緩存時間 開發建議設0 跳坑
-    buffer: false//是否緩存到内存 默認prod 緩存
+    buffer: false, //是否緩存到内存 默認prod 緩存
+  };
+
+  const security = {
+    csrf: {
+      xframe: {
+        enable: false,
+      },
+      // heaederName:'cookie',
+      type: "ctoken", // can be ctoken, referer, all or any, default to ctoken
+      useSession: false, // if useSession set to true, the secret will keep in session instead of cookie
+      ignoreJSON: false, // skip check JSON requests if ignoreJSON set to true
+      cookieName: "csrfToken", // csrf token's cookie name
+      sessionName: "csrfToken", // csrf token's session name
+      headerName: "x-csrf-token", // request csrf token's name in header
+      bodyName: "_csrf", // request csrf token's name in body
+      queryName: "_csrf", // request csrf token's name in query
+      refererWhiteList: [], // referer white list
+
+      // queryName: '_csrf', // 通过 query 传递 CSRF token 的默认字段为 _csrf
+      // bodyName: '_csrf', // 通过 body 传递 CSRF token 的默认字段为 _csrf
+      ignore: (ctx) => {
+        if (
+          ctx.request.url.indexOf("/api") != -1 ||
+          ctx.request.url.indexOf("/doLogin") != -1
+        ) {
+          return true;
+        }
+        return false;
+      },
+    },
+  };
+
+  config.connectHistoryApiFallback = {
+    whiteList: ["/api", "/passport", "/__webpack_hmr"],
+  };
+
+  config.logger = {
+    consoleLevel: "DEBUG",
+    // dir:'/root/logs/eggjs'
+  };
+
+  config.passportLocal = {
+    usernameField: 'username',
+    passwordField: 'password',
+  };
+  
+  //redis config
+  const redis = {
+    client: {
+      host: "127.0.0.1",
+      port: "6379",
+      password: "",
+      db: "1",
+    },
+    agent: true,
   };
 
   return {
     ...config,
     ...userConfig,
+    security,
+    redis,
+    view,
   };
 };

 'use strict';
 
+
+
+/*
+* nunjucks view config
+*/
+const nunjucks = {
+  enable: true,
+  package: 'egg-view-nunjucks'
+}
+
+
+/*
+* passport config
+*/
+const passport = {
+  enable: true,
+  package: 'egg-passport',
+};
+const passportLocal = {
+  enable: true,
+  package: 'egg-passport-local',
+};
+
+/*
+* redis config
+*/
+const sessionRedis = {
+  enable: true,
+  package: 'egg-session-redis',
+};
+
+const redis = {
+  enable: true,
+  package: 'egg-redis',
+};
+
+
 /** @type Egg.EggPlugin */
 module.exports = {
   // had enabled by egg
   // static: {
   //   enable: true,
   // }
+  nunjucks,
+  passport,
+  passportLocal,
+  sessionRedis,
+  redis,
 };

@@ -8,18 +8,24 @@
   },
   "dependencies": {
     "egg": "^2.15.1",
-    "egg-scripts": "^2.11.0"
+    "egg-scripts": "^2.11.0",
+    "egg-session-redis": "^2.1.0",
+    "egg-view-nunjucks": "^2.3.0"
   },
   "devDependencies": {
     "async": "^3.2.3",
     "autod": "^3.0.1",
     "autod-egg": "^1.1.0",
+    "connect-flash": "^0.1.1",
+    "crypto": "^1.0.1",
     "egg-bin": "^4.11.0",
     "egg-ci": "^1.11.0",
     "egg-mock": "^3.21.0",
+    "egg-passport": "^2.1.1",
+    "egg-passport-local": "^1.2.1",
+    "egg-redis": "^2.4.0",
     "eslint": "^5.13.0",
     "eslint-config-egg": "^7.1.0",
-    "passport": "^0.5.2",
     "urlencode": "^1.1.0"
   },
   "engines": {