Merge branch 'dev-mysql' into liusw-account-v1.0.10.19

pom.xml

@@ -48,7 +48,13 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<version>3.0.1</version>
+			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

src/main/java/com/uas/platform/b2c/advertise/ad/model/RecommendProduct.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2c.advertise.ad.model;
 
+import com.uas.platform.b2c.core.constant.Status;
+
 import java.util.Date;
 
 /**
@@ -117,9 +119,22 @@ public class RecommendProduct {
 	 */
 	private String storeUuid;
 
+	/**
+	 * 售罄状态
+	 */
+	private Integer status;
+
 	public RecommendProduct() {
 	}
 
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
 	public String getId() {
 		return id;
 	}

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

@@ -70,9 +70,10 @@ public class RecommendProductServiceImpl implements RecommendProductService {
 		message.setBatchCodes(batchCodes);
 		System.out.println(JacksonUtils.toJson(message));
 
-		String topic = "recommend-products-delete" + "-" + ("prod".equals(profile) ? "prod" : "test");
-
-		kafkaTemplate.send(topic, "batchCode", JacksonUtils.toJson(message));
+		/*String topic = "recommend-products-delete" + "-" + ("prod".equals(profile) ? "prod" : "test");
+		kafkaTemplate.send(topic, "batchCode", JacksonUtils.toJson(message));*/
+		String url = conf.getRecommendUrl("/api/recommend/products/delete");
+		restTemplate.postForObject(url, JacksonUtils.toJson(message), String.class);
 	}
 
 	@Override

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -210,6 +210,9 @@ public class SecurityController {
 				SSOHelper.setSSOCookie(request, response, tk, true);
 				User user = getUserByToken(tk);
 				if (user != null) {
+					if (!user.getUserPwd().equals(FlexJsonUtils.fromJson(tk.getData(), com.uas.account.entity.User.class).getPassword())){
+						return "successCallback({success:'0'})";
+					}
 					user.setIp(AgentUtils.getIp(request));
 					request.getSession().setAttribute("user", user);
 					SystemSession.setUser(user);

src/main/java/com/uas/platform/b2c/common/base/service/impl/FileClientImpl.java

@@ -59,17 +59,10 @@ public class FileClientImpl implements FileClient {
 
         };
         form.add("file", arrayResource);
-
         HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<MultiValueMap<String, Object>>(form, headers);
         ResponseEntity<JSONObject> responseEntity = null;
         try {
-            logger.info("------------------");
-            logger.info(sysConf.getUploadFileUrl() + FileClientConstant.FILE_UPLOAD);
             responseEntity = restTemplate.postForEntity(sysConf.getUploadFileUrl() + FileClientConstant.FILE_UPLOAD, requestEntity, JSONObject.class);
-            logger.info(responseEntity);
-            logger.info(responseEntity.getBody());
-            logger.info(responseEntity.getBody().getString("patch"));
-            logger.info("------------------");
         }catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/com/uas/platform/b2c/core/config/SysConf.java

@@ -94,6 +94,12 @@ public class SysConf {
 	@Value("#{sys.storeid}")
 	private String storeid;
 
+	/**
+	 * 银盛支付接口地址
+	 */
+	@Value("#{sys.yes_gateway}")
+	private String yesGateway;
+
 	/**
 	 * 银盛支付后台通知地址
 	 */
@@ -319,4 +325,12 @@ public class SysConf {
 	public void setMessageServiceIp(String messageServiceIp) {
 		this.messageServiceIp = messageServiceIp;
 	}
+
+	public String getYesGateway() {
+		return yesGateway;
+	}
+
+	public void setYesGateway(String yesGateway) {
+		this.yesGateway = yesGateway;
+	}
 }

src/main/java/com/uas/platform/b2c/core/constant/EncodingRulesConstant.java

@@ -136,7 +136,7 @@ public class EncodingRulesConstant {
 	/**
 	 * 交易流水号 YS + 8位时间戳 + 8位编码
 	 */
-	public static final String YSEPAY = "YS_TIMESTAP_NUMBER";
+	public static final String YSEPAY = "TIMESTAP_NUMBER";
 
 	/**
 	 * 爬虫任务表CCT + 8 位时间戳 + 8 位编码

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

@@ -12,10 +12,13 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.common.SSOProperties;
+import com.uas.sso.common.util.HttpUtil;
 import com.uas.sso.web.spring.AbstractSSOInterceptor;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.mobile.device.Device;
 import org.springframework.mobile.device.DeviceResolver;
@@ -49,6 +52,8 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 	private ResourceItemDao resourceItemDao;
 	@Autowired
 	private SigninLogService signinLogService;
+	@Value("#{sys.profile}")
+	private String profile;
 
 	private final DeviceResolver deviceResolver = new LiteDeviceResolver();
 
@@ -258,7 +263,11 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 		boolean cross = SSOHelper.isCrossDomain(request);
 		if (cross) {
 			request.getSession().setAttribute("SSOReferer", request.getRequestURL());
-			response.sendRedirect(SSOHelper.getRedirectLoginUrl(request,request.getHeader("Referer")));
+			if ("prod".equals(profile)){
+				response.sendRedirect(SSOHelper.getRedirectLoginUrl(request, "https://www.usoftmall.com"+request.getRequestURI()));
+			}else{
+				response.sendRedirect(SSOHelper.getRedirectLoginUrl(request, request.getRequestURL().toString()));
+			}
 		} else {
 			SSOHelper.clearRedirectLogin(request, response);
 		}

src/main/java/com/uas/platform/b2c/fa/payment/controller/YseReturnController.java

@@ -30,7 +30,7 @@ public class YseReturnController {
      * @param request  the request
      * @param response the response
      */
-    @RequestMapping(method = RequestMethod.POST)
+    @RequestMapping
     @ApiOperation(value = "成功之后回调请求，跳转至前端的跳转页面 ", httpMethod = "POST")
     public void returnUrl(HttpServletRequest request, HttpServletResponse response) {
         String paymentId = request.getParameter("out_trade_no");

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/PaymentServiceImpl.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.fa.payment.service.impl;
 
 import com.uas.platform.b2c.core.config.SysConf;
+import com.uas.platform.b2c.core.constant.EncodingRulesConstant;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.NumberUtil;
@@ -19,7 +20,6 @@ import com.uas.platform.b2c.trade.order.dao.OrderDao;
 import com.uas.platform.b2c.trade.order.model.Order;
 import com.uas.platform.b2c.trade.order.service.OrderService;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.model.EncodingRulesConstant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.model.Type;
@@ -111,12 +111,12 @@ public class PaymentServiceImpl implements PaymentService {
 			set.add(paymentDetail);
 		}
 		String paymentid = null;
-		String numberUtil = EncodingRulesConstant.YSEPAY.replace("_TIMESTAP_NUMBER",
-				createNumberService.getTimeNumber("trade$payment", 8));
+		String numberUtil = EncodingRulesConstant.YSEPAY.replace("TIMESTAP_NUMBER",
+				createNumberService.getTimeNumber("trade$payment", 7));
 		Map<String, String> map = new HashMap<String, String>();
 		String referer = request.getHeader("Referer");
 		if("test".equals(sysConf.getPaymentPrice())){
-			paymentid = numberUtil + "test";
+			paymentid = numberUtil + "t";
 			StringBuilder buffer = new StringBuilder();
 			String returnUrl = null;
 			if(StringUtils.isEmpty(basePath)) {
@@ -127,7 +127,7 @@ public class PaymentServiceImpl implements PaymentService {
 			map.put("return_url", returnUrl);
 		}
 		if("prod".equals(sysConf.getPaymentPrice())){
-			paymentid = numberUtil + "prod";
+			paymentid = numberUtil + "p";
 			map.put("return_url", sysConf.getReturnUrl());
 		}
 		payment.setPaymentid(paymentid);
@@ -146,6 +146,8 @@ public class PaymentServiceImpl implements PaymentService {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String timestamp = sdf.format(new Date());
 
+
+
 		// 待签名参数
 		map.put("out_trade_no", paymentid);
 		map.put("subject", subject);
@@ -165,6 +167,10 @@ public class PaymentServiceImpl implements PaymentService {
 		// 生成付款请求参数map（加上签名）
 		Map<String, String> sPara = ApipaySubmit.buildRequestPara(request, map);
 
+		// 银盛接口链接
+		String yesGateway = sysConf.getYesGateway();
+		sPara.put("action", yesGateway);
+
 		return sPara;
 	}
 

src/main/java/com/uas/platform/b2c/prod/product/brand/service/impl/BrandSubmitServiceImpl.java

@@ -267,15 +267,19 @@ public class BrandSubmitServiceImpl implements BrandSubmitService {
 			throw new IllegalOperatorException("此品牌申请已被处理");
 		}
 		// 检查简介数据正确性
-		if (brandSubmit.getBrief() != null) {
-			if (brandSubmit.getBrief().length() > 4000) {
-				throw new IllegalOperatorException("产品简介请不要超过4000字");
-			}
+		if ((brandSubmit.getBrief() != null) && (brandSubmit.getBrief().length() > 4000)) {
+			throw new IllegalOperatorException("产品简介请不要超过4000字");
 		}
-		if (brandSubmit.getAchievement() != null) {
-			if (brandSubmit.getAchievement().length() > 4000) {
-				throw new IllegalOperatorException("主要成就请不要超过4000字");
-			}
+		if ((brandSubmit.getAchievement() != null) && (brandSubmit.getAchievement().length() > 4000)) {
+			throw new IllegalOperatorException("主要成就请不要超过4000字");
+		}
+
+		if (brandSubmit.getNameEn() == null) {
+			throw new IllegalOperatorException("品牌英文名不可为空");
+		}
+
+		if (brandSubmit.getNameCn() == null) {// 若中文品牌名为空将英文品牌名赋予中文品牌名
+			brandSubmit.setNameCn(brandSubmit.getNameEn());
 		}
 		// 检查新增还是更新
 		if (brandSubmit.getUuid() == null) {

src/main/java/com/uas/platform/b2c/prod/store/task/ViolationsAutoFinish.java

@@ -39,10 +39,6 @@ public class ViolationsAutoFinish {
 	@Scheduled(cron = "0 */1 * * * ?")
 	public void execute() {
 		try {
-			Date startTime = new Date();
-			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			logger.info(String.format("%s 店铺违规处置自动完成任务开始", dateFormat.format(startTime)));
-
 			violationsService.autoFinishViolationsWhenDisposeTimeIsInvalid();
 		} catch (Exception e) {
 			e.printStackTrace();

src/main/resources/dev/sys.properties

@@ -14,8 +14,11 @@ adminUU=1000001962
 adminName=\u5218\u840C\u51B0
 enName=\u4F18\u8F6F\u6D4B\u8BD5\u4E8C
 storeid = 33069557578d44e69bd91ad12d28a8d4
+
+# YesPay config
+yes_gateway=https://mertest.ysepay.com/openapi_gateway/gateway.do
 notifyURL=http://218.17.158.219:9090/platform-b2c/api/payment/ysepayNotify
-returnUrl =/api/yesreturn
+returnUrl=/api/yesreturn
 paymentPrice=test
 orderProxyUrl=http://192.168.253.12:23400/order/proxy
 #report url

src/main/resources/prod/account.properties

@@ -15,6 +15,7 @@ sso.register.url=http://account.ubtob.com/sso/register
 #cross domain
 sso.ask.url=https://account.ubtob.com/sso/login/ask
 sso.askout.url=https://account.ubtob.com/sso/logout/ask
+sso.return.url=https://www.usoftmall.com
 
 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/prod/sys.properties

@@ -15,10 +15,13 @@ adminUU=1000002821
 adminName=\u5218\u840C\u51B0
 storeid = 33069557578d44e69bd91ad12d28a8d4
 enName=\u6DF1\u5733\u5E02\u4F18\u8F6F\u5546\u57CE\u79D1\u6280\u6709\u9650\u516C\u53F8
-notifyURL=http://www.usoftmall.com/api/payment/ysepayNotify
-returnUrl=http://www.usoftmall.com/api/yesreturn
+
+# YesPay config
+yes_gateway=https://openapi.ysepay.com/gateway.do
+notifyURL=https://www.usoftmall.com/api/payment/ysepayNotify
+returnUrl=https://www.usoftmall.com/api/yesreturn
 paymentPrice=prod
-orderProxyUrl=http://www.usoftmall.com/order/proxy
+orderProxyUrl=https://www.usoftmall.com/order/proxy
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2C

src/main/resources/test/account.properties

@@ -14,6 +14,7 @@ sso.register.url=http://113.105.74.135:8001/sso/register
 #cross domain
 sso.ask.url=http://113.105.74.135:8001/sso/login/ask
 sso.askout.url=http://113.105.74.135:8001/sso/logout/ask
+sso.return.url=http://192.168.253.12:23400
 
 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/test/sys.properties

@@ -14,6 +14,9 @@ adminUU=1000001962
 storeid = 33069557578d44e69bd91ad12d28a8d4
 adminName=\u5218\u840C\u51B0
 enName=\u4F18\u8F6F\u6D4B\u8BD5\u4E8C
+
+# YesPay config
+yes_gateway=https://mertest.ysepay.com/openapi_gateway/gateway.do
 notifyURL=http://218.17.158.219:9090/platform-b2c/api/payment/ysepayNotify
 returnUrl=/api/yesreturn
 paymentPrice=test

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

@@ -629,7 +629,7 @@ define(['app/app'], function(app) {
 				$scope.ysepayRequest = data;
 				$scope.$apply();
 				var form = document.getElementById('paymentForm');
-				form.action = "https://openapi.ysepay.com/gateway.do";
+				form.action = data.action;
 				form.method = "POST";
 				var submit = form.submit();
 			},function(res){