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

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/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/filter/KeyWordFilter.java

@@ -13,6 +13,8 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.util.StringUtils;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 
@@ -36,7 +38,10 @@ public class KeyWordFilter implements Filter {
         HttpServletResponse response = (HttpServletResponse) arg1;
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/json; charset=utf-8");
-        if(!req.getMethod().equals("GET")){
+        String contentType = req.getContentType();
+        String method = req.getMethod();
+        // POST请求 或 PUT请求，并且不是附件上传请求
+        if(("POST".equals(method) || "PUT".equals(method)) && (StringUtils.isEmpty(contentType) || !contentType.contains("multipart"))){
             //注入Service
             ServletContext sc = req.getSession().getServletContext();
             XmlWebApplicationContext cxt = (XmlWebApplicationContext) WebApplicationContextUtils.getWebApplicationContext(sc);

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));
+			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/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/prod/account.properties

@@ -4,6 +4,7 @@ account.user.save.url=https://account.ubtob.com/api/user
 
 ### sso config
 sso.app=mall
+sso.cookie.domain=usoftmall.com
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
@@ -14,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/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=