Skip to content

Z
zhichan
Commit c87b2c9b by 蒋勇
Options

Merge branch 'scratch-web' of gitlab.gongsibao.com:jiangyong/zhichan into scratch-web

parents 58aecb68 b8d35c8c
Showing with 27 additions and 27 deletions
scratch-web/app/base/api/impl/lbssearch.js
......@@ -6,9 +6,9 @@ const ApiBase =require("../api.base");
class LbsSearch extends ApiBase{
constructor(){
super();
this.AdressUrl="http://43.247.184.92:8880/lbs/api/addresssearch";
this.LalUrl="http://43.247.184.92:8889/lbs/api/lalsearch";
this.CityUrl="http://43.247.184.92:8886/lbs/api/citysearch";
this.AdressUrl="http://idc92.gongsibao.com:8880/lbs/api/addresssearch";
this.LalUrl="http://idc92.gongsibao.com:8889/lbs/api/lalsearch";
this.CityUrl="http://idc92.gongsibao.com:8886/lbs/api/citysearch";
this.appkey="d41d8cd98f00b204e9800998ecf8427e";
}
......
scratch-web/app/base/controller/impl/lbsCtl.js
......@@ -26,7 +26,7 @@ class LbsCtl extends CtlBase{
"pagesize":pobj.pageSize,
"currentPage":pobj.currentPage
}
var reqUrl="http://43.247.184.92:8880/lbs/api/addresssearch";
var reqUrl="http://idc92.gongsibao.com:8880/lbs/api/addresssearch";
var rtn=null;
var rc=system.getObject("util.execClient");
try{
......@@ -68,7 +68,7 @@ class LbsCtl extends CtlBase{
"pagesize":pobj.pageSize,
"currentPage":pobj.currentPage
};
var reqUrl="http://43.247.184.92:8889/lbs/api/lalsearch";
var reqUrl="http://idc92.gongsibao.com:8889/lbs/api/lalsearch";
var rtn=null;
var rc=system.getObject("util.execClient");
try{
......@@ -100,7 +100,7 @@ class LbsCtl extends CtlBase{
"pagesize":pobj.pageSize,
"currentPage":pobj.currentPage
}
var reqUrl="http://43.247.184.92:8886/lbs/api/citysearch";
var reqUrl="http://idc92.gongsibao.com:8886/lbs/api/citysearch";
var rtn=null;
var rc=system.getObject("util.execClient");
try{
......
scratch-web/app/base/db/impl/mgconnection.js
const mongoose = require('mongoose')
class MgDbFactory {
constructor() {
const reqUrl = "mongodb://wdy1:123456@43.247.184.94:27017/phones";
const reqUrl = "mongodb://wdy1:123456@er.es.gongsibao.com:27017/phones";
this.mgdb = mongoose.connect(reqUrl, { useNewUrlParser: true });
}
......
scratch-web/app/base/service/impl/orderSve.js
......@@ -1046,7 +1046,7 @@ class OrderService extends ServiceBase {
if (copyrightData.fileUrl) {
//操作word里面的信息-需要解析附件中的信息
var rc1 = system.getObject("util.execClient");
var reqUrl = "http://43.247.184.92:8009/readcrword?appKey=343aff200d18be6637d&aliyunurl=" + copyrightData.fileUrl;
var reqUrl = "http://idc92.gongsibao.com:8009/readcrword?appKey=343aff200d18be6637d&aliyunurl=" + copyrightData.fileUrl;
try {
var rtn1 = await rc1.execGet("", reqUrl);
var relocation = JSON.parse(rtn1.stdout);
......
scratch-web/app/base/service/impl/utilstmSve.js
......@@ -52,7 +52,7 @@ class UtilsTmService{
"ncl_one_codes": "43",
"regist_notice_day": 1425013200,
"tm_regist_num": "13739653",
"pic_url": "http://43.247.184.94:7170/Img/000/137/396/53A/068d5558-be1d-4f2c-94db-61808c8316ad.jpg",
"pic_url": "http://er.es.gongsibao.com:7170/Img/000/137/396/53A/068d5558-be1d-4f2c-94db-61808c8316ad.jpg",
"status": 3
}
],
......@@ -128,7 +128,7 @@ class UtilsTmService{
"apply_day": 1504843200,
"original_applicant_cn": null,
"applicant_en": null,
"pic_url": "http://43.247.184.94:7170/Img/000/143/154/66A/original.jpg"
"pic_url": "http://er.es.gongsibao.com:7170/Img/000/143/154/66A/original.jpg"
}
],
......
scratch-web/app/config/settings.js
......@@ -33,9 +33,9 @@ var settings = {
reqEsAddr:function(){
if(this.env=="dev"){
var localsettings=require("./localsettings");
return "http://43.247.184.94:7200/";//localsettings.reqEsDevUrl;
return "http://er.es.gongsibao.com:7200/";//localsettings.reqEsDevUrl;
}else {
return "http://43.247.184.94:7200/";
return "http://er.es.gongsibao.com:7200/";
}
},
centerChannelUrl: function () {
......@@ -48,9 +48,9 @@ var settings = {
reqEsAddrIc:function(){
if(this.env=="dev"){
var localsettings=require("./localsettings");
return "http://43.247.184.94:9200/";//localsettings.reqEsDevUrl;
return "http://er.es.gongsibao.com:9200/";//localsettings.reqEsDevUrl;
}else {
return "http://43.247.184.94:9200/";
return "http://er.es.gongsibao.com:9200/";
}
},
apiconfig:{
......@@ -169,9 +169,9 @@ var settings = {
onLineMakeTMUrl:"http://bigdata.gongsibao.com/api/imghandle/onLineMakeTM",
toblackUrl:"https://bigdata.gongsibao.com/api/imghandle/toblack",
makeDeleForTMUrl:"http://boss.gongsibao.com/api/imghandle/makeDeleForTM",
LbsAddressUrl:"http://43.247.184.92:8880/lbs/api/addresssearch",//地址查询
LbsLalUrl:"http://43.247.184.92:8889/lbs/api/lalsearch",//坐标查询
LbsCityUrl:"http://43.247.184.92:8886/lbs/api/cityseicsoftwareCopyrightSearchUrlarch",//城市查询
LbsAddressUrl:"http://idc92.gongsibao.com:8880/lbs/api/addresssearch",//地址查询
LbsLalUrl:"http://idc92.gongsibao.com:8889/lbs/api/lalsearch",//坐标查询
LbsCityUrl:"http://idc92.gongsibao.com:8886/lbs/api/cityseicsoftwareCopyrightSearchUrlarch",//城市查询
pdf2wordUrl:function(){
if(settings.env=="dev"){
return "http://59.110.125.77:3000/api/pdf2word/pdf2word";
......@@ -181,30 +181,30 @@ var settings = {
},
imageQueryUrl:function(){//商标图像检索
if(settings.env=="dev"){
return "http://43.247.184.92:8004/gsb/api/v1";
return "http://idc92.gongsibao.com:8004/gsb/api/v1";
}else {
return "http://43.247.184.92:8004/gsb/api/v1";
return "http://idc92.gongsibao.com:8004/gsb/api/v1";
}
},
tmZntjQueryUrl:function(){//商标智能推荐
if(settings.env=="dev"){
return "http://192.168.18.123:8005/companybusiness?appKey=343aff200d18be6637d&name={companyName}";
}else {
return "http://43.247.184.92:8005/companybusiness?appKey=343aff200d18be6637d&name={companyName}";
return "http://idc92.gongsibao.com:8005/companybusiness?appKey=343aff200d18be6637d&name={companyName}";
}
},
tmtjdlQueryUrl:function(){//根据经营范围推荐
if(settings.env=="dev"){
return "http://192.168.18.181:7000/companynclone?appKey=343aff200d18be6637d&name={companyName}&tmName={tmName}";
}else {
return "http://43.247.184.92:8006/companynclone?appKey=343aff200d18be6637d&name={companyName}&tmName={tmName}";
return "http://idc92.gongsibao.com:8006/companynclone?appKey=343aff200d18be6637d&name={companyName}&tmName={tmName}";
}
},
tmncloneQueryUrl:function(){//计算通过率
if(settings.env=="dev"){
return "http://192.168.18.44:7000/tmnclone?appKey=343aff200d18be6637d&nclonecode={nclonecode}&tmName={tmName}";
}else {
return "http://43.247.184.92:8007/tmnclone?appKey=343aff200d18be6637d&nclonecode={nclonecode}&tmName={tmName}";
return "http://idc92.gongsibao.com:8007/tmnclone?appKey=343aff200d18be6637d&nclonecode={nclonecode}&tmName={tmName}";
}
},
yunzhanghuApiUrl:function(){//云帐户提现接口url
......@@ -261,7 +261,7 @@ var settings = {
var localsettings=require("./localsettings");
return localsettings.reqMgDevUrl;
}else {
return "mongodb://wdy1:123456@43.247.184.94:27017/";
return "mongodb://wdy1:123456@er.es.gongsibao.com:27017/";
}
},
redis:function(){
......
scratch-web/app/front/vues/pages/cylbs/cylbs.js
......@@ -9143,16 +9143,16 @@
var point = new BMap.Point(this.data1[i][0], this.data1[i][1]);
var myIcon = "";
if (this.data1[i][2] >=30 && this.data1[i][2] <=49){
myIcon = new BMap.Icon("http://43.247.184.94:7170/Img/LBS/icon4.png",new BMap.Size(20,30));
myIcon = new BMap.Icon("http://er.es.gongsibao.com:7170/Img/LBS/icon4.png",new BMap.Size(20,30));
}
else if (this.data1[i][2] >=50 && this.data1[i][2] <=99) {
myIcon = new BMap.Icon("http://43.247.184.94:7170/Img/LBS/icon5.png",new BMap.Size(20,30));
myIcon = new BMap.Icon("http://er.es.gongsibao.com:7170/Img/LBS/icon5.png",new BMap.Size(20,30));
}
else if (this.data1[i][2] >=100) {
myIcon = new BMap.Icon("http://43.247.184.94:7170/Img/LBS/icon6.png",new BMap.Size(20,30));
myIcon = new BMap.Icon("http://er.es.gongsibao.com:7170/Img/LBS/icon6.png",new BMap.Size(20,30));
}
else {
myIcon = new BMap.Icon("http://43.247.184.94:7170/Img/LBS/icon1.png",new BMap.Size(20,30));
myIcon = new BMap.Icon("http://er.es.gongsibao.com:7170/Img/LBS/icon1.png",new BMap.Size(20,30));
}
var marker = new BMap.Marker(point,{icon:myIcon});
map.addOverlay(marker);
......
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