统一修改商城和B2B的域名

src/main/java/com/uas/platform/b2b/model/UserOrders.java

@@ -66,7 +66,7 @@ public class UserOrders {
     private String table;
 
     /**
-     * 阅读状态（201表示已读, 200表示未读）
+     * 阅读状态（211表示已读, 210表示未读）
      */
     @NotNull
     @Column(name = "puo_readstatus")

src/main/resources/txcloud/account.properties

@@ -19,7 +19,7 @@ sso.ask.url=https://sso.ubtob.com/sso/login/ask
 sso.askout.url=https://sso.ubtob.com/sso/logout/ask
 sso.updatePassword.url=https://sso.ubtob.com/reset/forgetPasswordValidationAccount
 sso.cloudcenter.url=https://sso.ubtob.com/cloudcenter
-mall.login.url=https://www.usoftmall.com/newLogin/other
+mall.login.url=https://mall.usoftchina.com/newLogin/other
 sso.proxy.uri=login/proxy
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

src/main/resources/txcloud/sys.properties

@@ -3,7 +3,7 @@ b2b=https://b2b.usoftchina.com
 manage=http://manage.ubtob.com
 manageInner=http://10.10.100.81:8080
 im=http://113.105.74.140:8092
-b2c=https://www.usoftmall.com
+b2c=https://mall.usoftchina.com
 registerUrl=https://sso.ubtob.com/register/enterpriseRegistration
 
 #report url

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

@@ -209,9 +209,9 @@
 			<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="http://mall.usoftchina.com/help#/issue/50" target="_blank">服务条款</a></li>
+					<li><a href="http://mall.usoftchina.com/help#/issue/16" target="_blank">买卖条例</a></li>
+					<li><a href="http://mall.usoftchina.com/help#/issue/51" target="_blank">代收代付协议</a></li>
 				</ul>
 			</li>
 			<!--<li>
@@ -225,9 +225,9 @@
 			<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="http://mall.usoftchina.com/help#/issue/1" target="_blank">公司简介</a></li>
+					<li><a href="http://mall.usoftchina.com/help#/issue/28" target="_blank">公司地址</a></li>
+					<li><a href="http://mall.usoftchina.com/help#/issue/1" target="_blank">联系我们</a></li>
 				</ul>
 			</li>
 			<li>

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

@@ -23,7 +23,7 @@
 			<div class="navbar-header">
 				<span class="navbar-brand">
 					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"></a>
-					<a href="http://www.usoftmall.com" title="优软商城" target="_blank">优软商城</a>
+					<a href="http://mall.usoftchina.com" title="优软商城" target="_blank">优软商城</a>
 				</span>
 			</div>
 			<div class="navbar-right">

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

@@ -25,7 +25,7 @@
 			<div class="navbar-header">
 				<span class="navbar-brand">
 					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"></a>
-					<a href="http://www.usoftmall.com" title="优软商城" target="_blank">优软商城</a>
+					<a href="http://mall.usoftchina.com" title="优软商城" target="_blank">优软商城</a>
 				</span>
 			</div>
 			<nav class="navbar-collapse">

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -847,7 +847,7 @@
 	<div class="pane-body">
 		<div class="row">
 			<div class="col-xs-4"><a href="http://uas.ubtob.com/#/index" class="bule" title="B2B商务平台">B2B商务平台</a></div>
-			<div class="col-xs-4"><a href="http://www.usoftmall.com/" class="bule" target="_blank" title="优软商城">优软商城</a></div>
+			<div class="col-xs-4"><a href="http://mall.usoftchina.com/" class="bule" target="_blank" title="优软商城">优软商城</a></div>
 			<div class="col-xs-4"><a href="http://v2.usoftchina.com/uu" class="bule" target="_blank" title="UU互联">UU互联</a></div>
 		</div>
 	</div>

src/main/webapp/resources/tpl/index/approvalFlow/prodList.html

@@ -268,7 +268,7 @@
                 	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.standard != 1"></span>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.standard ==1 , 'bg02' : product.standard != 1}" ng-if="product.standard == 1">
-                	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.standard == 1"></a>
+                	<a href="http://mall.usoftchina.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.standard == 1"></a>
                 </td>
                <td class="text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.standard != 1"></td>
                 <td class="text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.standard == 1"></td>

src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -305,7 +305,7 @@ width: 80px;
                 	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.standard != 1"></span>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.standard ==1 , 'bg02' : product.standard != 1}" ng-if="product.standard == 1">
-                	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.standard == 1"></a>
+                	<a href="http://mall.usoftchina.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.standard == 1"></a>
                 </td>
                <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.standard != 1"></td>
                 <td class="line-h20 text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.standard == 1"></td>

src/main/webapp/resources/tpl/index/cs/left.html

@@ -4,7 +4,7 @@
 	</div>
 	<ul class="list-unstyled">
 		<li><a href="{{userInfo.enterprise.enSaasUrl? 'http://' + userInfo.enterprise.enSaasUrl + '.saas.ubtob.com':'#/account/enterprise'}}" target="_blank">优企云服</a></li>
-		<li><a href="http://www.usoftmall.com/" target="_blank">电子元器件市场</a></li>
+		<li><a href="http://mall.usoftchina.com/" target="_blank">电子元器件市场</a></li>
 		<li><a href="#/baseInfo/myRequest">企业圈</a></li>
 	</ul>
 </div>

src/main/webapp/resources/tpl/index/home/modal/notice.html

@@ -4,7 +4,7 @@
         <h3>遵敬用户：</h3>
         <p>为了让您有更多元化的服务体验！</p>
         <p><span>B2B商务</span>将于<span>8月1号</span>合并到<span>优软商城</span>，原B2B商务的访问入口将暂停使用，届时您可以通过访问<span>优软商城官网 <a
-                href="https://www.usoftmall.com">www.usoftmall.com</a></span>使用B2B商务。</p>
+                href="https://mall.usoftchina.com">mall.usoftchina.com</a></span>使用B2B商务。</p>
         <h3>敬请期待！</h3>
     </div>
     <a class="btn-close" ng-click="close()">我知道了</a>

src/main/webapp/resources/tpl/index/purc/prodList.html

@@ -276,7 +276,7 @@
                 	<span title="产品型号" ng-bind="::product.cmpCode" ng-if="product.standard != 1"></span>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.standard ==1 , 'bg02' : product.standard != 1}" ng-if="product.standard == 1">
-                	<a href="http://www.usoftmall.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.standard == 1"></a>
+                	<a href="http://mall.usoftchina.com/product#/component/{{product.cmpUuId}}/" title="产品型号" ng-bind="::product.pcmpcode"  target="_blank" ng-if="product.standard == 1"></a>
                 </td>
                 <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand" ng-if="product.standard != 1"></td>
                 <td class="line-h20 text-center" title="{{product.pbranden}}" ng-bind="::product.pbranden" ng-if="product.standard == 1"></td>

src/main/webapp/resources/tpl/register/licenseView.html

@@ -11,7 +11,7 @@
 		<p>3、优软商城有权根据业务需要酌情修订“条款”，并以网站公告的形式进行更新，不再单独通知予您。经修订的“条款”一经在优软商城公布，即产生效力。如您不同意相关修订，请您立即停止使用“服务”。如您继续使用“服务”，则将视您已接受经修订的“条款”，当您与优软商城发生争议时，应以最新的“条款”为准。</p>
 		<b>二、释义</b>
 		<p>在本协议中：</p>
-		<p>1、“优软商城”是指域名为www.usoftmall.com/的网站；</p>
+		<p>1、“优软商城”是指域名为mall.usoftchina.com/的网站；</p>
 		<p>2、“用户”是指在“优软商城”网站上注册，在境内外有合法资质的法人、自然人及其他组织，本规则中统称为“用户”，除非另有说明，否则“用户”均指此含义；</p>
 		<p>3、“买方”是指经优软商城认证合格，并在优软商城购买产品的用户； </p>
 		<p>4、“卖方”是指经优软商城认证合格，并在优软商城成功上架产品，通过优软商城出售产品的用户；</p>