filter 放过websocket

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java

@@ -5,13 +5,12 @@ import cn.hutool.json.JSONUtil;
 import com.jero.common.api.vo.Result;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -55,7 +54,8 @@ public class CsrfFilter implements Filter {
             String url = req.getRequestURL().toString();
             // 获取来源
             String referurl = req.getHeader("Referer");
-            if(isWhiteReq(referurl)){
+            // websocket 请求放过
+            if(isWhiteReq(referurl) || url.contains("/websocket/")){
                 chain.doFilter(request, response);
             }else{
                 String log = "";

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java

@@ -301,6 +301,12 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		}catch (Exception e){
 			log.error("手机号、邮箱加密异常！",e);
 		}
+		// 变更企业，删除原有用户
+//		if(!Objects.equals(payContactsManagement.getCompanyId(),payContactsManagementOld.getCompanyId())){
+//
+//		}else{
+//
+//		}
 
 		LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
 		updatePayContactsManagement.eq(PayContactsManagement::getId,payContactsManagement.getId());
@@ -314,9 +320,14 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 		updatePayContactsManagement.set(PayContactsManagement::getContactAddress,payContactsManagement.getContactAddress());
 		updatePayContactsManagement.set(PayContactsManagement::getPostalCode,payContactsManagement.getPostalCode());
 		updatePayContactsManagement.set(PayContactsManagement::getRemarks,payContactsManagement.getRemarks());
+		// 更换企业，变更为企业联系人
 		if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){
 			updatePayContactsManagement.set(PayContactsManagement::getRoleCode,PayContactsManagementCommon.ROLE_CODE1);
 		}
+		// 会员系统同步用户，更细会员性质
+		if(StringUtils.isBlank(payContactsManagement.getMemberNature())){
+			updatePayContactsManagement.set(PayContactsManagement::getMemberNature,payContactsManagement.getMemberNature());
+		}
 		payContactsManagementService.update(updatePayContactsManagement);
 		// payContactsManagementService.updateById(payContactsManagement);
 		return Result.OK("编辑成功!");

jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java

@@ -1,24 +1,25 @@
 package com.jero.company.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jero.common.aspect.annotation.Dict;
-import com.jero.modules.system.volid.group.CreateGroup;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: pay_contacts_management
@@ -103,6 +104,9 @@ public class PayContactsManagement implements Serializable {
     @ApiModelProperty(value = "备注")
     @Size(max = 200, message = "备注长度不能大于200个字符")
     private String remarks;
+    /**会员性质字段*/
+    @ApiModelProperty(value = "会员性质字段")
+    private String memberNature;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;

jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.api.vo.Result;
 import com.jero.common.common.RoleCommon;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.ManagementMessageEnums;
@@ -47,6 +46,7 @@ import org.apache.shiro.SecurityUtils;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -404,7 +404,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void saveOrEdit(PayCompanyAndContactsManagement payCompanyAndContactsManagement) {
         if(Objects.isNull(payCompanyAndContactsManagement)){
             throw new JeroBootException("数据为空！");
@@ -426,15 +426,6 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         queryPayContactsManagement.last("limit 1");
         List<PayContactsManagement> listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement);
 
-//        if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){
-//            payCompanyManagement.setCompanyPhone(PasswordUtil.decrypt(payCompanyManagement.getCompanyPhone()));
-//        }
-//        if (!StringUtils.isBlank(payContactsManagement.getPhone())){
-//            payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
-//        }
-//        if (!StringUtils.isBlank(payContactsManagement.getEmail())){
-//            payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
-//        }
         payCompanyManagement.setFlagStatus(PayCompanyManagementCommon.FLAG_STATUS);
         payContactsManagement.setFlagStatus(PayContactsManagementCommon.FLAG_STATUS);
         payCompanyManagement.setRoleCode(PayCompanyManagementCommon.ROLE_CODE2);