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

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

@@ -6,6 +6,7 @@ import com.uas.dfs.domain.MetaData;
 import com.uas.dfs.service.FileClient;
 import com.uas.platform.b2c.common.base.constant.FileClientConstant;
 import com.uas.platform.b2c.core.config.SysConf;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.http.*;
@@ -26,6 +27,8 @@ public class FileClientImpl implements FileClient {
 
     private final SysConf sysConf;
 
+    private final Logger logger = Logger.getLogger(getClass());
+
     @Autowired
     public FileClientImpl(RestTemplate restTemplate, SysConf sysConf) {
         this.restTemplate = restTemplate;
@@ -58,7 +61,18 @@ public class FileClientImpl implements FileClient {
         form.add("file", arrayResource);
 
         HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<MultiValueMap<String, Object>>(form, headers);
-        ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity(sysConf.getUploadFileUrl() + FileClientConstant.FILE_UPLOAD, requestEntity, JSONObject.class);
+        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();
+        }
         return responseEntity.getBody().getString("path");
     }
 

src/main/java/com/uas/platform/b2c/common/search/controller/SearcherController.java

@@ -256,8 +256,8 @@ public class SearcherController {
 	 */
 	@RequestMapping(value = "/similarKeywords", method = RequestMethod.GET)
 	@ResponseBody
-	public Map<String,Object> getSimilarKeywords(String keyword) {
-		return searcherService.getSimilarKeywords(keyword);
+	public List<String> getSimilarKeywords(String keyword) {
+		return (List<String>) searcherService.getSimilarKeywords(keyword).get("all");
 	}
 
 	/**

src/main/java/com/uas/platform/b2c/common/search/rpc/service/Impl/SearchServiceImpl.java

@@ -214,7 +214,7 @@ public class SearchServiceImpl implements SearchService{
             return null;
         }else {
             try {
-                List<String> reMapA = FastjsonUtils.fromJson(strC, List.class);
+                List<String> reMapA = FastjsonUtils.fromJson(strA, List.class);
                 List<String> reMapC = FastjsonUtils.fromJson(strC, List.class);
                 List<String> reMapB = FastjsonUtils.fromJson(strB, List.class);
                 List<String> reMapK = FastjsonUtils.fromJson(strK, List.class);

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

@@ -36,7 +36,9 @@ 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();
+        // 不是get请求，并且不是附件上传请求
+        if(!req.getMethod().equals("GET") && !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

@@ -208,7 +208,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 	/**
 	 * 根据路径获取访问权限的集合接口
 	 * 
-	 * @param object
+	 * @param request
 	 * @return
 	 * @throws IllegalArgumentException
 	 */
@@ -253,6 +253,17 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 		authorities.put(user.getUserUU(), authSet);
 	}
 
+	@Override
+	protected void sendRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException {
+		boolean cross = SSOHelper.isCrossDomain(request);
+		if (cross) {
+			request.getSession().setAttribute("SSOReferer", request.getRequestURL());
+			response.sendRedirect(SSOHelper.getRedirectLoginUrl(request,request.getHeader("Referer")));
+		} else {
+			SSOHelper.clearRedirectLogin(request, response);
+		}
+	}
+
 	private SitePreference getDefaultSitePreferenceForDevice(Device device) {
 		if (device == null) {
 			return null;

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentCrawl.java

@@ -125,6 +125,16 @@ public class ComponentCrawl implements Serializable {
 	@Column(name = "cc_task")
 	private Long task;
 
+	/**
+	 * 器件所处生命周期
+	 * ACTIVE 815 正常
+	 * DISCONTINUED 816 即将停产
+	 * OBSOLETE 817 停产
+	 * PRELIMINARY 818 新品
+	 */
+	@Column(name = "cc_lifecycle")
+	private Integer lifecycle;
+
 	/**
 	 * 属性
 	 */
@@ -276,6 +286,14 @@ public class ComponentCrawl implements Serializable {
 		this.task = task;
 	}
 
+	public Integer getLifecycle() {
+		return lifecycle;
+	}
+
+	public void setLifecycle(Integer lifecycle) {
+		this.lifecycle = lifecycle;
+	}
+
 	public Set<PropertyValueCrawl> getProperties() {
 		return properties;
 	}

src/main/resources/dev/account.properties

@@ -14,7 +14,7 @@ sso.register.url=http://113.105.74.135:8001/sso/register_p
 #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.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=
 sso.client.public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKrkx/azsoEdYsjM1NQkkA1xvpSaTEIFpEVjMDt5c0vlCdxkatcscQ/JjxWQriLTEcT+DL7t578Q77CcfJX0V5ODBrMETiAT3HQQJ2rKYTe8EuZg7w3v1QSCr/n4OI+FRJ2pPVVAEIUtYA7afmZkKQnPf4M/L7nhdbniF7KQKFIQIDAQAB

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,7 +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.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=
 sso.client.public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKrkx/azsoEdYsjM1NQkkA1xvpSaTEIFpEVjMDt5c0vlCdxkatcscQ/JjxWQriLTEcT+DL7t578Q77CcfJX0V5ODBrMETiAT3HQQJ2rKYTe8EuZg7w3v1QSCr/n4OI+FRJ2pPVVAEIUtYA7afmZkKQnPf4M/L7nhdbniF7KQKFIQIDAQAB

src/main/resources/test/account.properties

@@ -14,7 +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.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=
 sso.client.public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKrkx/azsoEdYsjM1NQkkA1xvpSaTEIFpEVjMDt5c0vlCdxkatcscQ/JjxWQriLTEcT+DL7t578Q77CcfJX0V5ODBrMETiAT3HQQJ2rKYTe8EuZg7w3v1QSCr/n4OI+FRJ2pPVVAEIUtYA7afmZkKQnPf4M/L7nhdbniF7KQKFIQIDAQAB

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

@@ -148,8 +148,8 @@
 			<li class="nav-node"><a href="#audit/bankinfo"><i class="fa fa-bank"></i><span> 银行账户信息</span></a></li>
 			<li class="nav-node"><a href="#audit/realAuth"><i class="glyphicon glyphicon-user"></i><span> 实名认证审核</span></a></li>
 			<li class="nav-header">维护</li>
-			<li class="nav-node"><a href="#/brand/map"><i
-					class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>
+			<!--<li class="nav-node"><a href="#/brand/map"><i-->
+					<!--class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>-->
 			<li class="nav-node"><a href="#/store/company"><i
 					class="fa fa-flag"></i><span> 寄售管理</span></a></li>
 			<li class="nav-node"><a href="#/store/list"><i

src/main/webapp/resources/js/common/services.js

@@ -164,7 +164,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 			logoutWithoutProxy : function(){
                 var logout = $http.get(rootPath+'/logout/crossBefore');
                 logout.success(function(data){
-                    window.location.href =  data.logoutUrl + encodeURIComponent( rootPath+ data.baseUrl);
+                    window.location.href =  data.logoutUrl +'&baseUrl='+ encodeURIComponent( rootPath+ data.baseUrl);
                 });
 			},
 			logout : function() {

src/test/java/com/uas/platform/b2c/common/base/FileServiceTest.java

@@ -0,0 +1,54 @@
+package com.uas.platform.b2c.common.base;
+
+import com.uas.platform.b2c.BaseJunitTest;
+import com.uas.platform.b2c.common.base.service.FileService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.*;
+
+public class FileServiceTest extends BaseJunitTest {
+
+    @Autowired
+    private FileService fileService;
+
+    @Test
+    public void testUpload() {
+        String filePath = "C:\\Users\\Administrator\\Desktop\\kaifa.jpg";
+        File file = new File(filePath);
+        String fileName = file.getName();
+        byte[] bytes = file2byte(file);
+        String returnPath = fileService.save(fileName, bytes);
+        System.out.println(returnPath);
+    }
+
+    public static byte[] file2byte(String filePath) {
+        byte[] buffer = null;
+        File file = new File(filePath);
+        return file2byte(file);
+    }
+
+    public static byte[] file2byte(File file) {
+        byte[] buffer = null;
+        try {
+            FileInputStream fis = new FileInputStream(file);
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            byte[] b = new byte[1024];
+            int n;
+            while ((n = fis.read(b)) != -1) {
+                bos.write(b, 0, n);
+            }
+            fis.close();
+            bos.close();
+            buffer = bos.toByteArray();
+        }
+        catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+        return buffer;
+    }
+
+}