Commit 5c43bed9 by 蒋勇

Merge branch 'bigdata' of gitlab.gongsibao.com:jiangyong/zhichan into bigdata

parents d0c222ed 5ef39829
......@@ -9,7 +9,7 @@ class AccessAuthAPI extends APIBase {
this.authUtils = system.getObject("util.businessManager.authUtils");
this.userSve = system.getObject("service.auth.userSve");
}
/*查询注册用户的信息*/
/*查询注册用户的信息sys*/
async queryRegUser(pobj, query, req){
var appid=req.app.id;
var userList= await this.userSve.queryUsersByAppId(appid);
......
......@@ -56,8 +56,8 @@ var settings = {
// }
// },
reqEsDevUrl: "http://192.168.4.249:9200/",
reqHomePageDevUrl: "http://p.apps.com:3001/",
reqAuthUrl: "http://p.apps.com:3001/auth",
docUrl:"http://p.apps.com:3001/web/common/metaCtl/getApiDoc"
reqHomePageDevUrl: "http://p.apps.com:4001/",
reqAuthUrl: "http://p.apps.com:4001/auth",
docUrl:"http://p.apps.com:4001/web/common/metaCtl/getApiDoc"
};
module.exports = settings;
......@@ -24,7 +24,7 @@ var settings = {
salt: "%iatpD1gcxz7iF#B",
defaultpwd:"987456",
basepath : path.normalize(path.join(__dirname, '../..')),
port : process.env.NODE_PORT || 3001,
port : process.env.NODE_PORT || 4001,
reqEsAddr:function(){
if(this.env=="dev"){
var localsettings=require("./localsettings");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment