b2b接口地址调整

src/com/uas/erp/ac/service/common/CompanyNewServiceImpl.java

@@ -47,7 +47,7 @@ public class CompanyNewServiceImpl implements CompanyNewService {
 			BaseUtil.showError("您还不是优软云的个人用户，请联系管理员开通！");
 		}
 		if(!StringUtil.hasText(b2bUrl)){
-			b2bUrl = "http://b2b.usoftchina.com";
+			b2bUrl = "http://b2brest.usoftchina.com";
 		}
 		Object businessCode = baseDao.getFieldDataByCondition("enterprise", "en_businesscode", "1=1");
 		b2bUrl+="/public/invitation/checkEnName?name="+name
@@ -129,7 +129,7 @@ public class CompanyNewServiceImpl implements CompanyNewService {
 			BaseUtil.showError("您还不是优软云的个人用户，请联系管理员开通！");
 		}
 		if(!StringUtil.hasText(b2bUrl)){
-			b2bUrl = "http://b2b.usoftchina.com";
+			b2bUrl = "http://b2brest.usoftchina.com";
 		}
 		try {
 			InvitationRecord invita = new InvitationRecord();

src/com/uas/erp/ac/service/common/CustomerInfoServiceImpl.java

@@ -43,7 +43,7 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
 		params.put("pageInfo", FlexJsonUtil.toJsonDeep(pageInfo));
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -106,7 +106,7 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
 		ModelMap map = new ModelMap();
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}

src/com/uas/erp/ac/service/common/InvitationRecordServiceImpl.java

@@ -74,7 +74,7 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 			return res;
 		}
 		if(!StringUtil.hasText(b2bUrl)){
-			b2bUrl = "http://b2b.usoftchina.com";
+			b2bUrl = "http://b2brest.usoftchina.com";
 		}
 		b2bUrl += "/public/invitation/count?enUU="+enUU+"&userUU="+userUU;
 		try {
@@ -113,7 +113,7 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 			return map;
 		}
 		if(!StringUtil.hasText(b2bUrl)){
-			b2bUrl = "http://b2b.usoftchina.com";
+			b2bUrl = "http://b2brest.usoftchina.com";
 		}
 		Object businessCode = baseDao.getFieldDataByCondition("ENTERPRISE","EN_BUSINESSCODE", "1=1");
 		b2bUrl += "/public/invitation/records?enUU="+enUU

src/com/uas/erp/ac/service/common/PartnersRecordServiceImpl.java

@@ -59,7 +59,7 @@ public class PartnersRecordServiceImpl implements PartnersRecordService {
 		params.put("data", FlexJsonUtil.toJsonDeep(pageInfo));
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -120,7 +120,7 @@ public class PartnersRecordServiceImpl implements PartnersRecordService {
 		HashMap<String, String> params = new HashMap<String, String>();
 		params.put("data", FlexJsonUtil.toJsonDeep(pageInfo));
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null") ) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -154,7 +154,7 @@ public class PartnersRecordServiceImpl implements PartnersRecordService {
 		HashMap<String, String> params = new HashMap<String, String>();
 		params.put("data", FlexJsonUtil.toJsonDeep(inRecord));
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -225,7 +225,7 @@ public class PartnersRecordServiceImpl implements PartnersRecordService {
 		String b2burl = null;
 		params.put("enUU",master.getMa_uu().toString());
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}

src/com/uas/erp/ac/service/common/VendorInfoServiceImpl.java

@@ -43,7 +43,7 @@ public class VendorInfoServiceImpl implements VendorInfoService {
 		params.put("pageInfo", FlexJsonUtil.toJsonDeep(pageInfo));
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -106,7 +106,7 @@ public class VendorInfoServiceImpl implements VendorInfoService {
 		ModelMap map = new ModelMap();
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -186,7 +186,7 @@ public class VendorInfoServiceImpl implements VendorInfoService {
 		params.put("pageInfo", FlexJsonUtil.toJsonDeep(pageInfo));
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -220,7 +220,7 @@ public class VendorInfoServiceImpl implements VendorInfoService {
 		ModelMap map = new ModelMap();
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}

src/com/uas/erp/service/crm/impl/ContactServiceImpl.java

@@ -102,7 +102,7 @@ public class ContactServiceImpl implements ContactService{
 				params.put("enUU", enUU.toString());
 				params.put("userTel", enMobile.toString());
 				try {
-					Response response = HttpUtil.sendGetRequest("http://b2b.usoftchina.com/public/queriable/userUUByTelAndEnUU", params, false);
+					Response response = HttpUtil.sendGetRequest("http://b2brest.usoftchina.com/public/queriable/userUUByTelAndEnUU", params, false);
 					if (response.getStatusCode() == HttpStatus.OK.value()) {
 						Map<String, Object> backInfo = FlexJsonUtil.fromJson(response.getResponseText(), HashMap.class);
 						if ((Boolean) backInfo.get("ok")) {

src/com/uas/erp/service/fs/impl/ApiForMQServiceImpl.java

@@ -341,7 +341,7 @@ public class ApiForMQServiceImpl implements ApiForMQService {
 	 * 获取B2B数据信息
 	 */
 	public void saveB2BInformation(int id, String master, String enUU) {
-		String baseUrl = "https://b2b.usoftchina.com";
+		String baseUrl = "https://b2brest.usoftchina.com";
 		// 获取token
 		Object enterpriseUU = baseDao.getFieldDataByCondition("ENTERPRISE", "EN_UU", "1=1");
 		if (!StringUtil.hasText(master)) {

src/com/uas/erp/service/hr/impl/EmployeeManagerServiceImpl.java

@@ -352,7 +352,7 @@ public class EmployeeManagerServiceImpl implements EmployeeManagerService {
 				String ma_accesssecret = master.getMa_accesssecret();
 				String b2burl = null;
 				if (master.getMa_b2bwebsite() == null || "".equals(master.getMa_b2bwebsite())) {
-					b2burl = "http://b2b.usoftchina.com";
+					b2burl = "http://b2brest.usoftchina.com";
 				} else {
 					b2burl = master.getMa_b2bwebsite();
 				}

src/com/uas/erp/service/hr/impl/TurnoverServiceImpl.java

@@ -125,7 +125,7 @@ public class TurnoverServiceImpl implements TurnoverService {
 			if (em_uu != null && !"".equals(em_uu) && !"0".equals(em_uu)) {
 				String b2burl = null;
 				if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-					b2burl = "http://b2b.usoftchina.com";
+					b2burl = "http://b2brest.usoftchina.com";
 				} else {
 					b2burl = master.getMa_b2bwebsite();
 				}
@@ -245,7 +245,7 @@ public class TurnoverServiceImpl implements TurnoverService {
 		if (!"".equals(emUus)) {
 			String b2burl = null;
 			if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-				b2burl = "http://b2b.usoftchina.com";
+				b2burl = "http://b2brest.usoftchina.com";
 			} else {
 				b2burl = master.getMa_b2bwebsite();
 			}

src/com/uas/erp/service/hr/impl/TurnpositionServiceImpl.java

@@ -194,7 +194,7 @@ public class TurnpositionServiceImpl implements TurnpositionService {
 			if (em_uu != null && !"".equals(em_uu) && !"0".equals(em_uu)) {
 				String b2burl = null;
 				if (master.getMa_b2bwebsite() == null || master.getMa_b2bwebsite().equals("null")) {
-					b2burl = "http://b2b.usoftchina.com";
+					b2burl = "http://b2brest.usoftchina.com";
 				} else {
 					b2burl = master.getMa_b2bwebsite();
 				}

src/com/uas/erp/service/ma/impl/EnterpriseServiceImpl.java

@@ -118,7 +118,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 							+ "=(select en_uu,'" + content.get("accessSecret") + "' from  " + "Enterprise where en_id=" + store.get("en_id") + ") where ma_user='" + ma_user + "'");
 					String ma_env = "test";
 					if (store.get("en_b2benable") != null && store.get("en_b2bwebsite") != null) {// 配置了是否启用B2B,与B2B网址
-						if (store.get("en_b2bwebsite").equals("http://b2b.usoftchina.com")) {
+						if (store.get("en_b2bwebsite").equals("http://b2brest.usoftchina.com")) {
 							ma_env = "prod";
 						}
 						baseDao.execute("update " + sob + ".master set (ma_B2benable,ma_B2bwebsite,ma_env) =(select  abs(nvl(En_B2benable,0)),nvl(En_B2bwebsite,' '),'" + ma_env + "' from  " + "Enterprise where en_id=" + store.get("en_id") + ") where ma_user='" + ma_user + "'");// 将是否启用B2B,与B2B网址更新到默认账套master表
@@ -221,7 +221,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		params.put("emPassword", em_password);
 		params.put("emName", en_adminname);
 		try {
-			Response response = HttpUtil.sendGetRequest("http://b2b.usoftchina.com/public/queriable/members/UserEnterprise", params, false);
+			Response response = HttpUtil.sendGetRequest("http://b2brest.usoftchina.com/public/queriable/members/UserEnterprise", params, false);
 			if (response.getStatusCode() == HttpStatus.OK.value()) {
 				Map<String, Object> backInfo = FlexJsonUtil.fromJson(response.getResponseText(), HashMap.class);
 				if (backInfo != null) {
@@ -259,7 +259,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 					if (enterprise != null) {
 						Map<String, Object> regInfos = regEnterprise(enterprise);
 						if (regInfos != null && regInfos.get("ok").equals(true)) {
-							sqls.add("update enterprise set en_uu='" + regInfos.get("enUU") + "',en_adminuu='" + regInfos.get("emUU") + "',en_b2benable=-1,en_b2bwebsite='http://b2b.usoftchina.com' where en_id=" + enid);
+							sqls.add("update enterprise set en_uu='" + regInfos.get("enUU") + "',en_adminuu='" + regInfos.get("emUU") + "',en_b2benable=-1,en_b2bwebsite='http://b2brest.usoftchina.com' where en_id=" + enid);
 							sqls.add("update employee set em_uu='" + regInfos.get("emUU") + "' where em_name='" + objs[3].toString() + "'");
 						} else {
 							BaseUtil.showError(regInfos.get("error").toString());
@@ -289,7 +289,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 			HashMap<String, String> params = new HashMap<String, String>();
 			params.put("data", FlexJsonUtil.toJson(enterprise));
 			try {
-				Response response = HttpUtil.sendPostRequest("http://b2b.usoftchina.com/public/queriable/erpRegister", params, false);
+				Response response = HttpUtil.sendPostRequest("http://b2brest.usoftchina.com/public/queriable/erpRegister", params, false);
 				/*
 				 * Response response = HttpUtil.sendPostRequest(
 				 * "http://localhost:8080/platform-b2b/public/queriable/erpRegister"

src/com/uas/erp/service/scm/impl/BatchDealServiceImpl.java

@@ -7005,7 +7005,7 @@ public class BatchDealServiceImpl implements BatchDealService {
 		String ma_accesssecret = master.getMa_accesssecret();
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || "".equals(master.getMa_b2bwebsite())) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -7904,7 +7904,7 @@ public class BatchDealServiceImpl implements BatchDealService {
 			}
 			String b2burl = master.getMa_b2bwebsite();
 			if (!StringUtil.hasText(b2burl)) {
-				b2burl = "http://b2b.usoftchina.com";
+				b2burl = "http://b2brest.usoftchina.com";
 			}
 			b2burl += "/public/invitation/invite/batch";
 			try {

src/com/uas/erp/service/scm/impl/ProductServiceImpl.java

@@ -744,7 +744,7 @@ public class ProductServiceImpl implements ProductService {
 		HashMap<String, String> params = new HashMap<String, String>();
 		try {
 			params.put("data", pr_code);
-			String b2burl = "http://b2b.usoftchina.com";
+			String b2burl = "http://b2brest.usoftchina.com";
 			if (!(master.getMa_b2bwebsite() == null || "".equals(master.getMa_b2bwebsite()))) {
 				b2burl = master.getMa_b2bwebsite();
 			}

src/com/uas/erp/service/scm/impl/VendorImportFromB2BServiceImpl.java

@@ -36,7 +36,7 @@ public class VendorImportFromB2BServiceImpl implements VendorImportFromB2BServic
 		Master master = SystemSession.getUser().getCurrentMaster();
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || "".equals(master.getMa_b2bwebsite())) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -134,7 +134,7 @@ public class VendorImportFromB2BServiceImpl implements VendorImportFromB2BServic
 		}
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || "".equals(master.getMa_b2bwebsite())) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}
@@ -179,7 +179,7 @@ public class VendorImportFromB2BServiceImpl implements VendorImportFromB2BServic
 		}
 		String b2burl = null;
 		if (master.getMa_b2bwebsite() == null || "".equals(master.getMa_b2bwebsite())) {
-			b2burl = "http://b2b.usoftchina.com";
+			b2burl = "http://b2brest.usoftchina.com";
 		} else {
 			b2burl = master.getMa_b2bwebsite();
 		}