Merge branch 'master' into dev

src/main/java/com/uas/platform/b2c/advertise/ad/service/impl/FloorsServiceImpl.java

@@ -120,7 +120,7 @@ public class FloorsServiceImpl implements FloorsService {
 					home.put("name", goods1.getCode());
 					home.put("body", goods1.getBrandNameEn() + "<br/>" + goods1.getKindNameCn());
 					home.put("pictureUrl", goods1.getImg());
-					home.put("hrefUrl", "http://www.usoftmall.com/store/batchInfo/" + goods1.getBatchCode());
+					home.put("hrefUrl", "http://mall.usoftchina.com/store/batchInfo/" + goods1.getBatchCode());
 					break;
 				}
 			}

src/main/java/com/uas/platform/b2c/common/weixin/service/impl/WeChatServiceImpl.java

@@ -133,7 +133,7 @@ public class WeChatServiceImpl implements WeChatService{
                 params.put("keyword3", WechatTemplateMsg.item("点击查看详情", "#173177"));
                 params.put("remark", WechatTemplateMsg.item(WeChatUtil.TEMPLATE_REMARK.replace("cmpCode", messageModel.getCmpCode()), null));
 
-                wechatTemplateMsg.setUrl("https://www.usoftmall.com/mobile/wechat?url=/mobile/applyPurchase/list/businessOpportunity&enuu=" + messageModel.getReceiverEnuu());
+                wechatTemplateMsg.setUrl("https://mall.usoftchina.com/mobile/wechat?url=/mobile/applyPurchase/list/businessOpportunity&enuu=" + messageModel.getReceiverEnuu());
                 wechatTemplateMsg.setTouser(user.getOpenId());
                 wechatTemplateMsg.setData(params);
                 String json = HttpReqUtil.doPost(sendTemplateUrl, FlexJsonUtils.toJsonDeep(wechatTemplateMsg));

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -135,7 +135,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         SSOHelper.clearLogin(request, response);
         String redirectUrl;
         if ("prod".equals(profile)) {
-            redirectUrl = (SSOHelper.getRedirectLoginUrl(request, "https://www.usoftmall.com" + request.getRequestURI()));
+            redirectUrl = (SSOHelper.getRedirectLoginUrl(request, "https://mall.usoftchina.com" + request.getRequestURI()));
         } else {
             if (null == request.getParameter("returnURL") || "".equals(request.getParameter("returnURL"))) {
                 redirectUrl = (SSOHelper.getRedirectLoginUrl(request,"http://192.168.253.12:23400" + request.getRequestURI()));
@@ -338,7 +338,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         if (cross) {
             request.getSession().setAttribute("SSOReferer", request.getRequestURL());
             if ("prod".equals(profile)) {
-                response.sendRedirect(SSOHelper.getRedirectLoginUrl(request, "https://www.usoftmall.com" + request.getRequestURI()));
+                response.sendRedirect(SSOHelper.getRedirectLoginUrl(request, "https://mall.usoftchina.com" + request.getRequestURI()));
             } else {
                 if (null == request.getParameter("returnURL") || "".equals(request.getParameter("returnURL"))) {
                     response.sendRedirect(SSOHelper.getRedirectLoginUrl(request,"http://192.168.253.12:23400" + request.getRequestURI()));

src/main/java/com/uas/platform/b2c/core/utils/StringUtilB2C.java

@@ -219,10 +219,10 @@ public class StringUtilB2C {
 	public static <T> String joinListUseContact(List<T> tList, String contactStr) {
 		String str = "";
 		for (T t : tList) {
-			str = t.toString() + contactStr;
+			str = str +  t.toString() + contactStr;
 		}
 		if(!StringUtils.isEmpty(str)) {
-			str.substring(0, str.length() - 1);
+			str = str.substring(0, str.length() - 1);
 		}
 		return str;
 	}

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -4091,7 +4091,7 @@ public class GoodsServiceImpl implements GoodsService {
         if (CollectionUtils.isEmpty(prIds)) {
             return new HashedMap();
         } else {
-            String sql = "select go_productid, count(go_id) num from trade$goods where go_productid in (:prids) group by go_productid";
+            String sql = "/*#mycat:db_type=master*/select go_productid, count(go_id) num from trade$goods where go_productid in (:prids) group by go_productid";
             Map<String,Object> parameters = new HashMap<String,Object>();
             parameters.put("prids", prIds);
             final Map<Long, Integer> resultMap = new HashedMap();

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductPrivateServiceImpl.java

@@ -1,12 +1,16 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
 import com.uas.platform.b2c.core.constant.IntegerConstant;
+import com.uas.platform.b2c.core.constant.SplitChar;
+import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.prod.commodity.dao.ProductPrivateDao;
 import com.uas.platform.b2c.prod.commodity.model.ProductPrivate;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.service.ProductPrivateService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -26,10 +30,13 @@ public class ProductPrivateServiceImpl implements ProductPrivateService {
 
     private final GoodsService goodsService;
 
+    private final JdbcTemplate jdbcTemplate;
+
     @Autowired
-    public ProductPrivateServiceImpl(ProductPrivateDao productPrivateDao, GoodsService goodsService) {
+    public ProductPrivateServiceImpl(ProductPrivateDao productPrivateDao, GoodsService goodsService, JdbcTemplate jdbcTemplate) {
         this.productPrivateDao = productPrivateDao;
         this.goodsService = goodsService;
+        this.jdbcTemplate = jdbcTemplate;
     }
 
 
@@ -55,8 +62,10 @@ public class ProductPrivateServiceImpl implements ProductPrivateService {
         if (CollectionUtils.isEmpty(prIds)) {
             return Collections.emptyList();
         } else {
-            List<ProductPrivate> privates = productPrivateDao.findByPrIds(prIds);
-            return privates;
+            String contact = StringUtilB2C.joinListUseContact(prIds, SplitChar.COMMA);
+            String sql = "/*#mycat:db_type=master*/ select p.id, p.pr_id,p.pr_b2cenabled,p.pr_batchcount,p.pr_attach from product$private p where p.pr_id in ("+ contact +");";
+            List<ProductPrivate> mapList = jdbcTemplate.query(sql, new BeanPropertyRowMapper(ProductPrivate.class));
+            return mapList;
         }
     }
 

src/main/resources/txcloud/sys.properties

@@ -55,8 +55,8 @@ inquiryServiceInnerUrl=http://172.21.0.48:8080
 messageServiceUrl=http://api-message.ubtob.com/
 
 #b2b
-b2b=http://uas.ubtob.com
-b2bDomain=uas.ubtob.com
+b2b=http://b2b.usoftchina.com
+b2bDomain=b2b.usoftchina.com
 b2bInner=http://10.10.100.103:8080
 
 #lottery

src/main/webapp/WEB-INF/views/normal/index.html

@@ -6,7 +6,7 @@
 <meta name="renderer" content="webkit" />
 <meta name="baidu-site-verification" content="sJ1b7CPxbl" />
 <title>【优软商城】IC电子元器件现货采购交易平台商城</title>
-<meta name="description" content="优软商城（usoftmall.com）是中国领先的IC电子元器件现货采购交易网上商城，提供上千万种电子元器件现货采购交易。优软商城的主要服务有：标准器件库、器件选型、样品申请、现货交易、库存寄售，采购电子元器件就上优软商城！" />
+<meta name="description" content="优软商城（mall.usoftchina.com）是中国领先的IC电子元器件现货采购交易网上商城，提供上千万种电子元器件现货采购交易。优软商城的主要服务有：标准器件库、器件选型、样品申请、现货交易、库存寄售，采购电子元器件就上优软商城！" />
 <meta name="keywords" content="优软商城,IC,元器件,网上商城" />
 <meta name="author" content="深圳优软商城科技有限公司">
 <link href="static/img/all/u.png" rel="icon" type="image/x-icon" />

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -182,7 +182,7 @@ define([ 'app/app' ], function(app) {
             User.isDevOrProd(null, function (data) {
                 var ssoUrl = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://192.168.253.6:32323',
                 // uasUrl = data.data == 'success' ? 'http://uas.ubtob.com' : 'http://192.168.253.12:9000/b2b-test',
-                commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftmall.com' : 'http://218.17.158.219:24000';
+                commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftchina.com' : 'http://218.17.158.219:24000';
                 defer.resolve([
                     getSeekInfo(commonUrl),
                     getAddEnUserCount(ssoUrl),

src/main/webapp/resources/js/common/query/seekPurchase.js

@@ -19,15 +19,15 @@ define([ 'ngResource' ], function() {
                 method: 'POST'
             },
             saveOneSeekPurchaseProd: {
-                url: 'https://api-inquiry.usoftmall.com/inquiry/buyer/save',
+                url: 'https://api-inquiry.usoftchina.com/inquiry/buyer/save',
                 method: 'POST'
             },
             saveOffer: {
-                url: 'http://218.17.158.219:24000//inquiry/sale/item/saveQuote',
+                url: 'http://218.17.158.219:24000/inquiry/sale/item/saveQuote',
                 method: 'POST'
             },
             saveOfferProd: {
-                url: 'https://api-inquiry.usoftmall.com/inquiry/sale/item/saveQuote',
+                url: 'https://api-inquiry.usoftchina.com/inquiry/sale/item/saveQuote',
                 method: 'POST'
             },
             getUserSeekPageInfo: {

src/main/webapp/resources/js/common/query/storeInfo.js

@@ -212,7 +212,7 @@ define([ 'ngResource' ], function() {
 			 * 用户自营转寄售时，获取寄售协议
 			 */
 			obtainAConsignmentAgreement: {
-				url: 'http://www.usoftmall.com/api/help-service/issues/16',
+				url: 'https://mall.usoftchina.com/api/help-service/issues/16',
 				method: 'GET'
 			},
 			/**

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -528,7 +528,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
               var inquiryItems = [];
               inquiryItems.push(inquiryItem);
               inquiry.inquiryItems = inquiryItems;
-              if ($scope.seekUrl == 'https://api-inquiry.usoftmall.com') {
+              if ($scope.seekUrl == 'https://api-inquiry.usoftchina.com') {
                   seekPurchase.saveOneSeekPurchaseProd(inquiry,
                       function (data) {
                           $scope.showUseFlag = false;
@@ -560,8 +560,8 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                       // 校验
                       if ($scope.checkAll()) {
                           var materialUrl = $scope.seekUrl;
-                          if ($scope.seekUrl == 'https://api-inquiry.usoftmall.com') {
-                              materialUrl = 'https://api-product.usoftmall.com/';
+                          if ($scope.seekUrl == 'https://api-inquiry.usoftchina.com') {
+                              materialUrl = 'https://api-product.usoftchina.com/';
                           }
                           $http({
                               method: 'get',

src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -292,7 +292,7 @@ define(['app/app'], function (app) {
               }
               // $scope.inquiryItem.id = $scope.inquiryItem.itemId;
               $scope.inquiryItem.sourceId = $scope.inquiryItem.id;
-              if (seekUrl == 'https://api-inquiry.usoftmall.com') {
+              if (seekUrl == 'https://api-inquiry.usoftchina.com') {
                 seekPurchase.saveOfferProd($scope.inquiryItem, function (data) {
                   toaster.pop('success', '感谢您参与报价，敬请期待回复');
                   $scope.isShowSayPriceBox = false;

src/main/webapp/resources/view/activity/business.html

@@ -12,7 +12,7 @@
                 我们严格把关供应商资质，从源头上杜绝虚假信息，做到付款交期如实，借助物流仓储的一站式服务帮您实现交易高效、库存无忧。<br/>
             </div>
             <div class="join">
-                <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+                <a href="https://account.ubtob.com/sso/register/enterpriseRegistration?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
             </div>
         </div>
     </div>
@@ -48,7 +48,7 @@
                 </ul>
             </div>
             <div class="join">
-                <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+                <a href="http://account.ubtob.com/sso/register/enterpriseRegistration?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
             </div>
         </div>
     </div>
@@ -92,7 +92,7 @@
                 </ul>
             </div>
             <div class="join">
-                <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+                <a href="http://account.ubtob.com/sso/register/enterpriseRegistration?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
             </div>
         </div>
     </div>
@@ -114,7 +114,7 @@
                 </div>
             </div>
             <div class="join">
-                <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+                <a href="http://account.ubtob.com/sso/register/enterpriseRegistration?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
             </div>
         </div>
     </div>

src/main/webapp/resources/view/admin/store/fragments/enterprise_info.html

@@ -207,7 +207,7 @@
 			<div class="col-md-2">电话</div>
 			<div class="col-md-4" ng-bind="store.enterprise.enTel">0755-02356985</div>
 			<div class="col-md-2">官网地址</div>
-			<div class="col-md-4" ng-bind="store.enterprise.enUrl">http://www.usoftmall.com/</div>
+			<div class="col-md-4" ng-bind="store.enterprise.enUrl">http://mall.usoftchina.com/</div>
 		</div>
 		<div class="row">
 			<div class="col-md-2">传真</div>

src/main/webapp/resources/view/admin/store_qualification_maintenance.html

@@ -635,7 +635,7 @@
 										<h5>商城品牌信息</h5>
 										<p>英文名称：<span ng-bind="brand.nameEn">LJHJNGHBFGVGHVHGH</span></p>
 										<p>中文名称：<span ng-bind="brand.nameCn">这个是中文名称</span></p>
-										<p>官方网址：<span ng-bind="brand.website || '暂无'">http://www.usoftmall.com</span></p>
+										<p>官方网址：<span ng-bind="brand.website || '暂无'"></span></p>
 									</div>
 								</div>
 							</div>
@@ -732,7 +732,7 @@
 										<h5>商城品牌信息</h5>
 										<p>英文名称：<span ng-bind="brand.nameEn">LJHJNGHBFGVGHVHGH</span></p>
 										<p>中文名称：<span ng-bind="brand.nameCn">这个是中文名称</span></p>
-										<p>官方网址：<span ng-bind="brand.website || '暂无'">http://www.usoftmall.com</span></p>
+										<p>官方网址：<span ng-bind="brand.website || '暂无'"></span></p>
 									</div>
 								</div>
 							</div>

src/main/webapp/resources/view/common/advert.html

@@ -38,57 +38,57 @@
         <div class="innerElem">
             <ul>
                 <li>
-                    <a href="http://www.usoftmall.com/store/worldshine#/home" target="_blank" title="深圳市华商龙商务互联科技有限公司">
+                    <a href="https://mall.usoftchina.com/store/worldshine#/home" target="_blank" title="深圳市华商龙商务互联科技有限公司">
                         <img src="static/img/index/adv01.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/adtracon#/home" target="_blank" title="贝尔（深圳）新材料有限公司">
+                    <a href="https://mall.usoftchina.com/store/adtracon#/home" target="_blank" title="贝尔（深圳）新材料有限公司">
                         <img src="static/img/index/adv02.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/compa#/home" target="_blank" title="上海康帕科贸有限公司">
+                    <a href="https://mall.usoftchina.com/store/compa#/home" target="_blank" title="上海康帕科贸有限公司">
                     <img src="static/img/index/adv03.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/corestaff#/home" target="_blank" title="CoreStaff Hong Kong Limited">
+                    <a href="https://mall.usoftchina.com/store/corestaff#/home" target="_blank" title="CoreStaff Hong Kong Limited">
                         <img src="static/img/index/adv04.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/chipled#/home" target="_blank" title="深圳市光台光电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/chipled#/home" target="_blank" title="深圳市光台光电子有限公司">
                         <img src="static/img/index/adv05.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/opd#/home" target="_blank" title="深圳市欧睿达电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/opd#/home" target="_blank" title="深圳市欧睿达电子有限公司">
                         <img src="static/img/index/adv06.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/jrxy#/home" target="_blank" title="深圳市景瑞兴业科技有限公司">
+                    <a href="https://mall.usoftchina.com/store/jrxy#/home" target="_blank" title="深圳市景瑞兴业科技有限公司">
                         <img src="static/img/index/adv07.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/hbt#/home" target="_blank" title="深圳市宏博通电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/hbt#/home" target="_blank" title="深圳市宏博通电子有限公司">
                         <img src="static/img/index/adv08.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/yjycoin#/home" target="_blank" title="深圳市益嘉源电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/yjycoin#/home" target="_blank" title="深圳市益嘉源电子有限公司">
                         <img src="static/img/index/adv09.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/d3567635164a4811a5ba9e9adbcdcc87#/home" target="_blank" title="张家港恒芯电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/d3567635164a4811a5ba9e9adbcdcc87#/home" target="_blank" title="张家港恒芯电子有限公司">
                         <img src="static/img/index/adv10.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://www.usoftmall.com/store/winsen#/home" target="_blank" title="郑州炜盛电子科技有限公司">
+                    <a href="https://mall.usoftchina.com/store/winsen#/home" target="_blank" title="郑州炜盛电子科技有限公司">
                         <img src="static/img/index/adv11.jpg" alt=""/>
                     </a>
                 </li>

src/main/webapp/resources/view/common/footer.html

@@ -85,9 +85,9 @@ a:hover {
 		<li>
 			<h3>用户指南</h3>
 			<ul class="list-unstyled">
-				<li><a href="http://www.usoftmall.com/help#/issue/50" target="_blank">服务条款</a></li>
-				<li><a href="http://www.usoftmall.com/help#/issue/16" target="_blank">买卖条例</a></li>
-				<li><a href="http://www.usoftmall.com/help#/issue/51" target="_blank">代收代付协议</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/50" target="_blank">服务条款</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/16" target="_blank">买卖条例</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/51" target="_blank">代收代付协议</a></li>
 			</ul>
 		</li>
 		<!--<li>
@@ -101,9 +101,9 @@ a:hover {
 		<li>
 			<h3>关于我们</h3>
 			<ul class="list-unstyled">
-				<li><a href="http://www.usoftmall.com/help#/issue/1" target="_blank">公司简介</a></li>
-				<li><a href="http://www.usoftmall.com/help#/issue/28" target="_blank">公司地址</a></li>
-				<li><a href="http://www.usoftmall.com/help#/issue/1" target="_blank">联系我们</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/1" target="_blank">公司简介</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/28" target="_blank">公司地址</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/1" target="_blank">联系我们</a></li>
 			</ul>
 		</li>
 		<li>

src/main/webapp/resources/view/common/site-nav.html

@@ -178,7 +178,7 @@
         </li>
         <li ng-if="!userInfo"><a ng-click="signinModal()" href="javascript:void(0)">登录</a></li>
         <li ng-if="!userInfo"><a ng-click="registerModal()" href="javascript:void(0)">注册</a></li>
-        <!--<li ng-if="!userInfo"><a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fwww.usoftmall.com%252Flogin%252Fproxy&appId=mall">注册</a></li>-->
+        <!--<li ng-if="!userInfo"><a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall">注册</a></li>-->
         <li ng-if="userInfo" class="dropdown">
             <a class="dropdown-toggle" href="javascript:void(0)">欢迎您，
                 <span ng-bind="userInfo.userName"></span>

src/main/webapp/resources/view/vendor/forstore/vendor_store_info.html

@@ -678,7 +678,7 @@
 				<div class="col-md-10 custom_col">
 					<input type="text" class="form-control" style="border-radius: inherit;padding-left: 243px;" title="storeUuid" ng-model="storeUuid"
 						   ng-change="changeInfo('STORE_UUID', storeUuid)" placeholder="ubtob" maxlength="30"/>
-					<span style="position: absolute;display: block;top: 0;z-index: 2;padding-left: 12px;">http://www.usoftmall.com/store/</span>
+					<span style="position: absolute;display: block;top: 0;z-index: 2;padding-left: 12px;">https://mall.usoftchina.com/store/</span>
 				</div>
 			</div>
 			<div class="row com_row" style="margin-top: 10px;">

src/main/webapp/resources/view/vendor/modal/confirm_consignment_agreement.html

@@ -270,7 +270,7 @@
 			<input type="checkbox" ng-model="agreement" id="1" class="ng-pristine ng-untouched ng-valid">
 			<label for="1"></label>
 		</label>
-		<span>我已阅读并同意<a href="http://www.usoftmall.com/help#/issue/16" TARGET="_blank">《优软商城买卖条例》</a> 关于库存寄售的全部条款.</span>
+		<span>我已阅读并同意<a href="http://mall.usoftchina.com/help#/issue/16" TARGET="_blank">《优软商城买卖条例》</a> 关于库存寄售的全部条款.</span>
 	</div>
 	<div class="bottom">
 		<p><strong>* </strong>您在使用库存寄售的服务前，请认真阅读 《优软商城买卖条例》：若您是误操作，请点击“取消”按钮进行返回操作.</p>