Merge branch 'dev-mysql' into feature/yc-mobile-0522

# Conflicts:
#	src/main/resources/jxls-tpl/trade/releaseByBatchError-rmb.xls

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -2,11 +2,14 @@
 package com.uas.platform.b2c.common.account.v2.service.impl;
 
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
+import com.uas.platform.b2c.common.account.dao.RoleDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.Role;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
 import com.uas.platform.b2c.core.constant.IntegerConstant;
+import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.sso.entity.UserView;
@@ -16,6 +19,7 @@ import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Set;
 
 
 @Service("v2.UserService")
@@ -27,6 +31,9 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private EnterpriseDao enterpriseDao;
 
+    @Autowired
+    private RoleDao roleDao;
+
     private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
@@ -161,7 +168,7 @@ public class UserServiceImpl implements UserService {
     }*/
 
     @Override
-    public void bindOrUnbind(Long uu, Long enuu, Integer type) {
+    public void bindOrUnbind(Long uu, Long enuu, Integer type)  {
         User user = userDao.findOne(uu);
         Enterprise enterprise = enterpriseDao.findByUu(enuu);
         if (null == user) {
@@ -175,6 +182,14 @@ public class UserServiceImpl implements UserService {
         if (null != type) {
             if (type.equals(IntegerConstant.YES_SHORT)) { //1为绑定，0为解绑
                 user.addEnterprise(enterprise);
+                List<Role> roles = roleDao.findByEnUUAndDesc(enterprise.getUu(),"普通用户");
+                if(roles.size()>0){
+                    Set<Role> set = user.getRoles();
+                    set.add(roles.get(0));
+                    user.setRoles(set);
+                }else{
+                    enterpriseDao.callInitProcedure(enterprise.getUu());
+                }
                 userDao.save(user);
             } else {
                 user.removeEnterprise(enterprise);

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

@@ -208,7 +208,8 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         // 暂时在正式 过滤admin访问权限
         if (needPermission != null) {
             if ("prod".equals(profile)) {
-                if (!user.getEnterprise().getUu().toString().equals(enUU)) {
+                //暂时放行所有权限拦截, 权限发布时候再开放注释;
+               /* if (!user.getEnterprise().getUu().toString().equals(enUU)) {
                     throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
                 } else {
                     if (user.getEnterprise().getUu().toString().equals(enUU)) {
@@ -216,7 +217,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
                             throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
                         }
                     }
-                }
+                }*/
             } else {
                 throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
             }

src/main/java/com/uas/platform/b2c/fa/payment/utils/StringUtils.java

@@ -99,4 +99,22 @@ public class StringUtils {
 		builder.deleteCharAt(builder.length() - 1);
 		return builder.toString();
 	}
+
+
+
+	/**
+	 *	截取指定字节长度的字符串忽略编码格式
+	 *
+	 * @param original 截取的字符串
+	 * @param length 截取的字节长度
+	 * @return
+	 */
+	public static String cutOutStringIgnoreEncode(String original, int length) {
+		if (org.springframework.util.StringUtils.isEmpty(original)) {
+			return original;
+		} else {
+			String substring = original.substring(0, length);
+			return substring;
+		}
+	}
 }

src/main/java/com/uas/platform/b2c/prod/commodity/constant/UploadConstant.java

@@ -138,5 +138,5 @@ public final class UploadConstant {
     /**
      * 规格的最大长度
      */
-    public static final int SPEC_MAX_BYTE = 80;
+    public static final int SPEC_MAX_BYTE = 20;
 }

src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -680,12 +680,8 @@ public class ReleaseProductByBatch implements Serializable {
 	 */
 	public void setSpecByExcel(Object value) {
 		if (!StringUtils.isEmpty(value)) {
-			try {
-				String str = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(value.toString(), UploadConstant.SPEC_MAX_BYTE);
+				String str = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutStringIgnoreEncode(value.toString(), UploadConstant.SPEC_MAX_BYTE);
 				setSpec(str);
-			} catch (UnsupportedEncodingException e) {
-				throw new RuntimeException(e + "指定字符集不支持");
-			}
 		}
 	}
 

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -298,11 +298,8 @@ public class GoodsServiceImpl implements GoodsService {
 //            throw new IllegalOperatorException("包装信息只能包含中文和英文");
 //        }
         if (!StringUtils.isEmpty(goods.getSpec())) {
-            try {
-                String spec = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(goods.getSpec().toString(), UploadConstant.SPEC_MAX_BYTE);
+                String spec = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutStringIgnoreEncode(goods.getSpec().toString(), UploadConstant.SPEC_MAX_BYTE);
                 goods.setSpec(spec);
-            } catch (Exception e) {
-            }
         }
         if (StringUtils.isEmpty(goods.getProduceDate())) {
             throw new IllegalOperatorException("型号" + goods.getCode()+"品牌" + goods.getBrandNameEn() +"的产品生产日期为空");

src/main/resources/dev/redis.properties

@@ -1,2 +1,2 @@
-redis.host=10.10.100.200
+redis.host=192.168.253.6
 redis.port=6379

src/main/resources/test/redis.properties

@@ -1,3 +1,3 @@
-#redis.host=192.168.253.6
-redis.host=10.10.100.200
+redis.host=192.168.253.6
+#redis.host=10.10.100.200
 redis.port=6379