Skip to content

Z
zhichan
Commit 4cd7939d by 王勇飞
Options

Merge branch 'center-manage' of gitlab.gongsibao.com:jiangyong/zhichan into center-manage

parents 9bb1bacf 87f94328
Showing with 12 additions and 9 deletions
center-manage/app/base/service/impl/auth/userSve.js
...@@ -136,10 +136,12 @@ class UserService extends ServiceBase { ...@@ -136,10 +136,12 @@ class UserService extends ServiceBase {
var self = this; var self = this;
//先要按照用户名，在统一账户中查找存在性 //先要按照用户名，在统一账户中查找存在性
//如果不存在 //如果不存在
console.log(UserService.consumerUrl(p.userName))
let consumer = await this.cget(UserService.consumerUrl(p.userName)); let consumer = await this.cget(UserService.consumerUrl(p.userName));
if (!consumer.data) { if (!consumer.data) {
return null; return null;
} else { } else {
console.log(JSON.stringify(consumer.data))
let password = consumer.data.tags[1].split("_")[1]; let password = consumer.data.tags[1].split("_")[1];
let inpassword = this.getEncryptStr(p.password); let inpassword = this.getEncryptStr(p.password);
if (password != inpassword) { if (password != inpassword) {
......
center-manage/app/base/service/impl/product/xproductSve.js
...@@ -56,11 +56,11 @@ function findTitlePath(items, findstr, results) { ...@@ -56,11 +56,11 @@ function findTitlePath(items, findstr, results) {
//按照price_name去策略表中查询策略id //按照price_name去策略表中查询策略id
let strategy=await ps.db.models.pricestrategy.findOne({where:{optionunion:tg}}) let strategy=await ps.db.models.pricestrategy.findOne({where:{optionunion:tg}})
if(!strategy){ if(!strategy){
tags.push(tg) tags.push(tg)
}else{ strategy=await ps.db.models.pricestrategy.findOne({where:{optionunion:"通用"}})
straid.push(strategy.id)
skucodemap[strategy.id]=stinfo.price_code
} }
straid.push(strategy.id)
skucodemap[strategy.id]=stinfo.price_code
} }
// //
// console.log(stsinfos.length,"..................") // console.log(stsinfos.length,"..................")
......
center-manage/app/config/settings.js
var path = require('path'); var path = require('path');
var localsettings = require("./localsettings");
var ENVINPUT = { var ENVINPUT = {
KONG_ADMIAN: process.env.KONG_ADMIAN, KONG_ADMIAN: process.env.KONG_ADMIAN,
DB_HOST: process.env.DB_HOST, DB_HOST: process.env.DB_HOST,
...@@ -21,9 +20,10 @@ var settings = { ...@@ -21,9 +20,10 @@ var settings = {
port: process.env.NODE_PORT || 80, port: process.env.NODE_PORT || 80,
kongurl: function () { kongurl: function () {
if (this.env == "dev") { if (this.env == "dev") {
var localsettings = require("./localsettings");
return localsettings.kongurl; return localsettings.kongurl;
} else { } else {
return ENVINPUT.KONG_ADMIAN; return "http://kong-dbproxy.kong:8001/";
} }
}, },
icUrl: function () { icUrl: function () {
...@@ -39,7 +39,7 @@ var settings = { ...@@ -39,7 +39,7 @@ var settings = {
pmroleid: { "ta": 1, "pr": 2 }, pmroleid: { "ta": 1, "pr": 2 },
redis: function () { redis: function () {
if (this.env == "dev") { if (this.env == "dev") {
var localsettings = require("./localsettings");
return localsettings.redis; return localsettings.redis;
} else { } else {
return { return {
...@@ -61,6 +61,7 @@ var settings = { ...@@ -61,6 +61,7 @@ var settings = {
password: ENVINPUT.DB_PWD, password: ENVINPUT.DB_PWD,
config: { config: {
host: ENVINPUT.DB_HOST, host: ENVINPUT.DB_HOST,
port: ENVINPUT.DB_PORT,
dialect: 'mysql', dialect: 'mysql',
operatorsAliases: false, operatorsAliases: false,
pool: { pool: {
......
center-manage/app/front/entry/public/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-0e49e0e0.9e7173ae.css rel=prefetch><link href=/css/chunk-12ad0968.71e3d438.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-2f5f87d6.9e7173ae.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-46b916e6.9e7173ae.css rel=prefetch><link href=/css/chunk-536fd493.84fd9662.css rel=prefetch><link href=/css/chunk-6382b34a.8797b2b5.css rel=prefetch><link href=/css/chunk-6523067c.6c1c04c4.css rel=prefetch><link href=/css/chunk-8419046c.9e7173ae.css rel=prefetch><link href=/css/chunk-8a24a96a.e8e9a917.css rel=prefetch><link href=/css/chunk-fa30b8f2.9e7173ae.css rel=prefetch><link href=/js/chunk-01087725.0e19c9bf.js rel=prefetch><link href=/js/chunk-03756f9a.4c9cf769.js rel=prefetch><link href=/js/chunk-0aa146fd.cc46693b.js rel=prefetch><link href=/js/chunk-0e49e0e0.9a5d537c.js rel=prefetch><link href=/js/chunk-12ad0968.b04bb8ed.js rel=prefetch><link href=/js/chunk-138091e6.9f54d20a.js rel=prefetch><link href=/js/chunk-14b9857b.fffc8d61.js rel=prefetch><link href=/js/chunk-15c7622f.a0a9ffe1.js rel=prefetch><link href=/js/chunk-17916361.a72cbd54.js rel=prefetch><link href=/js/chunk-22331440.448b4f32.js rel=prefetch><link href=/js/chunk-25dc6da4.34467edc.js rel=prefetch><link href=/js/chunk-2af06968.ea8f906f.js rel=prefetch><link href=/js/chunk-2b5c7a88.0b3d16f4.js rel=prefetch><link href=/js/chunk-2c359864.931438c0.js rel=prefetch><link href=/js/chunk-2d0d61ef.4e49948b.js rel=prefetch><link href=/js/chunk-2d0e68e0.a7250a3f.js rel=prefetch><link href=/js/chunk-2d0efc5d.146e3bce.js rel=prefetch><link href=/js/chunk-2f5f87d6.95bd7a5e.js rel=prefetch><link href=/js/chunk-3385141a.275cf957.js rel=prefetch><link href=/js/chunk-404534a8.72b9b35f.js rel=prefetch><link href=/js/chunk-46b916e6.e134666b.js rel=prefetch><link href=/js/chunk-47792d5a.010f35ba.js rel=prefetch><link href=/js/chunk-536fd493.0339b700.js rel=prefetch><link href=/js/chunk-5e7a3166.4bca4f2a.js rel=prefetch><link href=/js/chunk-6382b34a.a19f4779.js rel=prefetch><link href=/js/chunk-6523067c.ed40b61a.js rel=prefetch><link href=/js/chunk-65daace2.7aa3d832.js rel=prefetch><link href=/js/chunk-682c1ef7.b9a68126.js rel=prefetch><link href=/js/chunk-8419046c.7a609559.js rel=prefetch><link href=/js/chunk-8a24a96a.bfbaa692.js rel=prefetch><link href=/js/chunk-d9cdc768.5f81a064.js rel=prefetch><link href=/js/chunk-fa30b8f2.e5aecc2f.js rel=prefetch><link href=/css/app.4189c8e8.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.287ebd35.js rel=preload as=script><link href=/js/chunk-vendors.648df678.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.4189c8e8.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.648df678.js></script><script src=/js/app.287ebd35.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-0e49e0e0.9e7173ae.css rel=prefetch><link href=/css/chunk-12ad0968.71e3d438.css rel=prefetch><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-2f5f87d6.9e7173ae.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-46b916e6.9e7173ae.css rel=prefetch><link href=/css/chunk-536fd493.84fd9662.css rel=prefetch><link href=/css/chunk-6382b34a.8797b2b5.css rel=prefetch><link href=/css/chunk-6523067c.6c1c04c4.css rel=prefetch><link href=/css/chunk-8419046c.9e7173ae.css rel=prefetch><link href=/css/chunk-8a24a96a.e8e9a917.css rel=prefetch><link href=/css/chunk-fa30b8f2.9e7173ae.css rel=prefetch><link href=/js/chunk-01087725.0e19c9bf.js rel=prefetch><link href=/js/chunk-03756f9a.4c9cf769.js rel=prefetch><link href=/js/chunk-0aa146fd.cc46693b.js rel=prefetch><link href=/js/chunk-0e49e0e0.9a5d537c.js rel=prefetch><link href=/js/chunk-12ad0968.b04bb8ed.js rel=prefetch><link href=/js/chunk-138091e6.9f54d20a.js rel=prefetch><link href=/js/chunk-14b9857b.fffc8d61.js rel=prefetch><link href=/js/chunk-15c7622f.a0a9ffe1.js rel=prefetch><link href=/js/chunk-17916361.a72cbd54.js rel=prefetch><link href=/js/chunk-22331440.448b4f32.js rel=prefetch><link href=/js/chunk-25dc6da4.34467edc.js rel=prefetch><link href=/js/chunk-2af06968.ea8f906f.js rel=prefetch><link href=/js/chunk-2b5c7a88.0b3d16f4.js rel=prefetch><link href=/js/chunk-2c359864.931438c0.js rel=prefetch><link href=/js/chunk-2d0d61ef.4e49948b.js rel=prefetch><link href=/js/chunk-2d0e68e0.a7250a3f.js rel=prefetch><link href=/js/chunk-2d0efc5d.146e3bce.js rel=prefetch><link href=/js/chunk-2f5f87d6.95bd7a5e.js rel=prefetch><link href=/js/chunk-3385141a.275cf957.js rel=prefetch><link href=/js/chunk-404534a8.72b9b35f.js rel=prefetch><link href=/js/chunk-46b916e6.e134666b.js rel=prefetch><link href=/js/chunk-47792d5a.010f35ba.js rel=prefetch><link href=/js/chunk-536fd493.0339b700.js rel=prefetch><link href=/js/chunk-5e7a3166.4bca4f2a.js rel=prefetch><link href=/js/chunk-6382b34a.a19f4779.js rel=prefetch><link href=/js/chunk-6523067c.ed40b61a.js rel=prefetch><link href=/js/chunk-65daace2.7aa3d832.js rel=prefetch><link href=/js/chunk-682c1ef7.b9a68126.js rel=prefetch><link href=/js/chunk-8419046c.7a609559.js rel=prefetch><link href=/js/chunk-8a24a96a.bfbaa692.js rel=prefetch><link href=/js/chunk-d9cdc768.5f81a064.js rel=prefetch><link href=/js/chunk-fa30b8f2.e5aecc2f.js rel=prefetch><link href=/css/app.4189c8e8.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.a6f02d16.js rel=preload as=script><link href=/js/chunk-vendors.648df678.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.4189c8e8.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.648df678.js></script><script src=/js/app.a6f02d16.js></script></body></html>
\ No newline at end of file \ No newline at end of file
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