Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2b/core/util/DateFormatUtils.java

@@ -24,4 +24,9 @@ public class DateFormatUtils {
      */
 	public static final FastDateFormat EXPORT_FORMAT = FastDateFormat.getInstance("yyyy年MM月dd日");
 
+    /**
+     * yyyy-MM-dd 00:00:00 每天凌晨
+     */
+    public static final FastDateFormat WEE_HOURS_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd 00:00:00");
+
 }

src/main/java/com/uas/platform/b2b/core/util/DateUtils.java

@@ -209,4 +209,21 @@ public class DateUtils {
 	public static Integer addMonth(String date, int increase) {
 		return addMonth(parse(date, null), increase);
 	}
+
+    /**
+     * 天数加减
+     *
+     * @param date 传入日期
+     * @param increase 加减天数，负数表示减
+     * @return 处理后的日期
+     */
+    public static Date addDay(Date date, int increase) {
+        if (date == null) {
+            date = new Date();
+        }
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE, increase);
+        return calendar.getTime();
+    }
 }

src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -2,7 +2,11 @@ package com.uas.platform.b2b.filter;
 
 import com.uas.platform.b2b.dao.ResourceItemDao;
 import com.uas.platform.b2b.manage.service.AccessTokenService;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.ResourceItem;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.SigninLog;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.RoleService;
 import com.uas.platform.b2b.service.SigninLogService;
@@ -40,9 +44,15 @@ import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.*;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 访问拦截
@@ -191,8 +201,8 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
      */
     private String getLoginPage(HttpServletRequest request, HttpServletResponse response) throws IOException {
         // 引用页面
-        String refererSymbol = "Referer";
-        request.getSession().setAttribute(SSOConfig.SSOReferer, request.getHeader(refererSymbol));
+        String referSymbol = "Referer";
+        request.getSession().setAttribute(SSOConfig.SSOReferer, request.getHeader(referSymbol));
         SSOHelper.clearLogin(request, response);
         String redirectUrl = (SSOHelper.getRedirectLoginUrl(request, conf.getB2b()));
         return redirectUrl;
@@ -392,6 +402,8 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 		String token = request.getParameter(tokenParam);
 		// 发现有采用access_token方式
 		if (token != null) {
+		    // 清除上一次访问的数据
+            SystemSession.clear();
 			Object sUser = request.getSession().getAttribute("user");
 			User user = null;
 			if (sUser != null) {

src/main/java/com/uas/platform/b2b/manage/service/AccessTokenService.java

@@ -2,6 +2,11 @@ package com.uas.platform.b2b.manage.service;
 
 import java.util.Map;
 
+/**
+ * AccessTokenService
+ *
+ * @author US50
+ */
 public interface AccessTokenService {
 
 	/**

src/main/java/com/uas/platform/b2b/manage/service/impl/AccessTokenServiceImpl.java

@@ -1,19 +1,23 @@
 package com.uas.platform.b2b.manage.service.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.manage.service.AccessTokenService;
 import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.core.exception.SystemException;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 
+/**
+ * AccessTokenServiceImpl
+ *
+ * @author US50
+ */
 @Service("manage.AccessTokenServiceImpl")
 public class AccessTokenServiceImpl implements AccessTokenService {
 
@@ -22,9 +26,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
 
 	@Override
 	public Map<String, Object> validFormManage(String accessToken) {
-		Map<String, String> params = new HashMap<String, String>();
+		Map<String, String> params = new HashMap<>(1);
 		params.put("access_token", accessToken);
-		Response response = null;
+		Response response;
 		try {
 			response = HttpUtil.sendGetRequest(sysConf.getManageInner() + "/public/token", params);
 		} catch (Exception e) {

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/java/com/uas/platform/b2b/support/SysConf.java

@@ -70,6 +70,12 @@ public class SysConf {
 	@Value("#{sys.inquiryServiceUrl}")
 	private String inquiryServiceUrl;
 
+    /**
+     * 文件服务器的地址
+     */
+    @Value("#{sys.dfsFileUrl}")
+    private String dfsFileUrl;
+
     public String getRegisterUrl() {
         return registerUrl;
     }
@@ -149,4 +155,12 @@ public class SysConf {
 	public void setInquiryServiceUrl(String inquiryServiceUrl) {
 		this.inquiryServiceUrl = inquiryServiceUrl;
 	}
+
+    public String getDfsFileUrl() {
+        return dfsFileUrl;
+    }
+
+    public void setDfsFileUrl(String dfsFileUrl) {
+        this.dfsFileUrl = dfsFileUrl;
+    }
 }

src/main/java/com/uas/platform/b2b/task/ErrorLogTask.java

@@ -1,10 +1,16 @@
 package com.uas.platform.b2b.task;
 
+import com.uas.platform.b2b.core.util.DateFormatUtils;
+import com.uas.platform.b2b.core.util.DateUtils;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.CommunalLogDao;
+import com.uas.platform.b2b.model.CommunalLog;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 
 /**
  * 系统日志任务
@@ -17,25 +23,62 @@ import org.springframework.stereotype.Component;
 public class ErrorLogTask {
 
     @Autowired
-    private JdbcTemplate jdbcTemplate;
+    private CommonDao commonDao;
+
+    @Autowired
+    private CommunalLogDao communalLogDao;
 
     /**
      * 每天凌晨0点到2点开始执行
      */
     @Scheduled(cron = "0 0/5 0,1,2 * * ? ")
     public void deleteLogs() {
+        int increase = -2;
+        // 两天前时间
+        Date date = DateUtils.addDay(new Date(), increase);
+
+        // 整点格式
+        String dateString = DateFormatUtils.WEE_HOURS_FORMAT.format(date);
+
         // 先查询最大id
-        Long maxId = jdbcTemplate.queryForObject("select max(log_id) from log$error where date_format(log_date, '%Y-%m-%d') <= date_format(date_add(now(), interval -2 day), '%Y-%m-%d')", Long.class);
-
-        // 删除日志明细
-        jdbcTemplate.execute("delete from log$error$detail where log_logid in (select log_id from log$error " +
-                "where log_logid <= " + maxId + " limit 10000");
-        // 删除日志主表信息
-        jdbcTemplate.execute("delete from log$error " +
-                "where log_id <= " + maxId + " limit 10000");
-        // 删除单据记录
-        jdbcTemplate.execute("delete from erp$orders where date_format(or_date, '%Y-%m-%d') <= date_format(date_add(now(), interval -2 day), '%Y-%m-%d') limit 10000");
-        // 删除物料记录
-        jdbcTemplate.execute("delete from erp$products where date_format(pr_date, '%Y-%m-%d') <= date_format(date_add(now(), interval -2 day), '%Y-%m-%d') limit 10000");
+        Long maxId = commonDao.queryForObject("select max(log_id) from log$error where log_date <= ?",  Long.class, dateString);
+
+        if (null != maxId) {
+            // 删除日志明细
+            commonDao.getJdbcTemplate().execute("delete from log$error$detail where log_logid <= " + maxId + " limit 10000");
+
+            // 删除日志主表信息
+            commonDao.getJdbcTemplate().execute("delete from log$error " + "where log_id <= " + maxId + " limit 10000");
+
+            CommunalLog log = new CommunalLog();
+            log.setTitle("删除B2B异常日志");
+            log.setMessage("最大id" + maxId);
+            log.setTime(System.currentTimeMillis());
+            communalLogDao.save(log);
+        }
+
+        Long maxOrderId = commonDao.queryForObject("select max(or_id) from erp$orders where or_date <= ?",  Long.class, dateString);
+
+        if (null != maxOrderId) {
+            // 删除单据记录
+            commonDao.getJdbcTemplate().execute("delete from erp$orders where or_id <= " + maxOrderId + " limit 10000");
+            CommunalLog log = new CommunalLog();
+            log.setTitle("删除ERP不存在单据记录");
+            log.setMessage("最大id" + maxOrderId);
+            log.setTime(System.currentTimeMillis());
+            communalLogDao.save(log);
+        }
+
+        Long maxProductId = commonDao.queryForObject("select max(pr_id) from erp$products where pr_date <= ?",  Long.class, dateString);
+
+        if (null != maxProductId) {
+            // 删除物料记录
+            commonDao.getJdbcTemplate().execute("delete from erp$products where pr_id <= " + maxProductId + " limit 10000");
+            CommunalLog log = new CommunalLog();
+            log.setTitle("删除ERP不存在物料记录");
+            log.setMessage("最大id" + maxProductId);
+            log.setTime(System.currentTimeMillis());
+            communalLogDao.save(log);
+        }
     }
 }

src/main/java/com/uas/platform/b2b/temporary/model/FileUrl.java

@@ -1,5 +1,9 @@
 package com.uas.platform.b2b.temporary.model;
 
+
+import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.support.SysConf;
+
 /**
  * 文件服务器的基本链接
  *
@@ -7,29 +11,34 @@ package com.uas.platform.b2b.temporary.model;
  */
 public class FileUrl {
 
+    /**
+     * 文件服务器地址
+     */
+    private static final String DFS_FILE_URL = ContextUtils.getBean(SysConf.class).getDfsFileUrl();
+    
     /**
      * 文件上传
      */
-    public final static String FILE_UPLOAD = "http://10.10.100.200:9999/file/upload";
+    public final static String FILE_UPLOAD = DFS_FILE_URL + "/file/upload";
 
 
     /**
      * 文件下载
      */
-    public final static String FILE_DOWNLOAD = "http://10.10.100.200:9999/file/download";
+    public final static String FILE_DOWNLOAD = DFS_FILE_URL + "/file/download";
 
     /**
      * 文件删除
      */
-    public final static String FILE_DELETE = "http://10.10.100.200:9999/file/delete";
+    public final static String FILE_DELETE = DFS_FILE_URL + "/file/delete";
 
     /**
      * 文件信息
      */
-    public final static String FILE_INFO = "http://10.10.100.200:9999/file/info";
+    public final static String FILE_INFO = DFS_FILE_URL + "/file/info";
 
     /**
      * 文件额外属性
      */
-    public final static String FILE_METADATA = "http://10.10.100.200:9999/file/metadata";
+    public final static String FILE_METADATA = DFS_FILE_URL + "/file/metadata";
 }

src/main/resources/dev/sys.properties

@@ -20,4 +20,7 @@ inquiryServiceUrl=http://218.17.158.219:24000/
 messageServiceIp=http://message.ubtob.com/
 
 #search url
-searchUrl=http://10.10.100.191:8081
+searchUrl=http://10.10.100.191:8081
+
+#dfs file url
+dfsFileUrl=http://10.10.100.200:9999

src/main/resources/prod/sys.properties

@@ -20,4 +20,7 @@ inquiryServiceUrl=https://api-inquiry.usoftmall.com/
 messageServiceIp=http://message.ubtob.com/
 
 #search url
-searchUrl=http://10.10.100.179:8081
+searchUrl=http://10.10.100.179:8081
+
+# dfs file url
+dfsFileUrl=http://dfs-api.ubtob.com

src/main/resources/test/sys.properties

@@ -1,7 +1,7 @@
 #path
 b2b=http://218.17.158.219:9000/b2b-test
 manage=http://218.17.158.219:9090/platform-manage
-manageInner=http://192.168.253.60:9090/platform-manage
+manageInner=http://10.1.51.24:8888
 im=http://113.105.74.131:8092
 b2c=http://192.168.253.12:23400
 registerUrl=http://192.168.253.12:32323/register/enterpriseRegistration
@@ -22,4 +22,7 @@ inquiryServiceUrl=http://218.17.158.219:24000
 messageServiceIp=http://message.ubtob.com/
 
 #search url
-searchUrl=http://10.10.100.191:8081
+searchUrl=http://10.10.100.191:8081
+
+#dfs file url
+dfsFileUrl=http://10.10.100.200:9999

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

@@ -1,9 +1,9 @@
 #path
 b2b=https://b2b.usoftchina.com
 manage=http://manage.ubtob.com
-manageInner=http://10.10.100.81:8080
+manageInner=http://192.168.253.12:23396
 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
@@ -20,4 +20,7 @@ inquiryServiceUrl=https://api-inquiry.usoftchina.com/
 messageServiceIp=http://message.ubtob.com/
 
 #search url
-searchUrl=http://172.21.0.6:8081
+searchUrl=http://172.21.0.6:8081
+
+# dfs file url
+dfsFileUrl=http://dfs-api.ubtob.com

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/common/header.html

@@ -260,6 +260,12 @@
             <li>
                 <a ng-click="b2cLink('/pcb')">PCB专区</a>
             </li>
+            <li>
+                <a href="https://zb.usoftchina.com/" target="_blank">U创网</a>
+            </li>
+            <li>
+                <a href="https://bbs.usoftchina.com/" target="_blank">U客论坛</a>
+            </li>
             <li>
                 <a ng-click="b2cLink('/news')">优软快讯</a>
             </li>

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>