From 0542e3e831930406be4973319e30f864b993903f Mon Sep 17 00:00:00 2001 From: khalil Date: Tue, 23 Apr 2024 13:33:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81-=E5=8E=BB=E6=8E=89jsx?= =?UTF-8?q?=E5=92=8Cjsoup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anchor/AnchorCheckAdminService.java | 1 - .../admin/service/gift/GiftAdminService.java | 2 +- .../com/accompany/admin/util/ExcelUtils.java | 106 ------------------ .../com/accompany/common/utils/BeanUtil.java | 0 .../business/config/WebInterceptorConfig.java | 11 -- .../interceptor/FusingInterceptor.java | 48 -------- .../interceptor/ResponseBodyHandler.java | 92 --------------- .../interceptor/SecurityInterceptor.java | 20 +--- .../UserInfoCompletedInterceptor.java | 105 ----------------- accompany-dependencies/pom.xml | 18 --- .../PasswordAuthenticationProvider.java | 2 +- .../VerifyCodeAuthenticationProvider.java | 2 +- .../interceptor/SecurityInterceptor.java | 20 +--- 13 files changed, 9 insertions(+), 418 deletions(-) rename accompany-base/{accompany-common => accompany-core}/src/main/java/com/accompany/common/utils/BeanUtil.java (100%) delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/FusingInterceptor.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/ResponseBodyHandler.java delete mode 100644 accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/UserInfoCompletedInterceptor.java diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorCheckAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorCheckAdminService.java index 0b0a57673..9c989203f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorCheckAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/anchor/AnchorCheckAdminService.java @@ -210,7 +210,6 @@ public class AnchorCheckAdminService extends BaseService { officialGoldRecord.setDiamondNum(diamondNum); } if (fourthCell != null) { - fourthCell.setCellType(Cell.CELL_TYPE_STRING); String remark = fourthCell.getStringCellValue(); officialGoldRecord.setRemark(remark); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java index 3c76fe207..b6ec97857 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java @@ -505,7 +505,7 @@ public class GiftAdminService extends AbstractCoreService { RoomExclusiveGift roomExclusiveGift = new RoomExclusiveGift(); //获取房主uid Cell firstCell = row.getCell(row.getFirstCellNum()); - if (firstCell != null && firstCell.getCellType() != Cell.CELL_TYPE_BLANK) { + if (firstCell != null) { Long erbanNo = Double.valueOf(firstCell.getNumericCellValue()).longValue(); Users users = usersService.getUserByErbanNo(erbanNo); if (users == null) { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/ExcelUtils.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/ExcelUtils.java index 2296a1e60..b42aa6b00 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/ExcelUtils.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/ExcelUtils.java @@ -1,13 +1,10 @@ package com.accompany.admin.util; -import net.sf.jxls.exception.ParsePropertyException; -import net.sf.jxls.transformer.XLSTransformer; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFont; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.*; -import org.jsoup.Jsoup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.ObjectUtils; @@ -50,17 +47,13 @@ public class ExcelUtils { // head font style CellStyle style = workbook.createCellStyle(); Font font = workbook.createFont(); - font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); style.setFont(font); style.setFillForegroundColor(IndexedColors.LIME.getIndex()); - style.setFillPattern(CellStyle.SOLID_FOREGROUND); - style.setAlignment(CellStyle.ALIGN_CENTER); Sheet sheet = workbook.createSheet("Sheet1"); Row row = sheet.createRow(0); for (int i = 0; i < listHeaders.size(); i++) { Cell cell = row.createCell(i); - cell.setCellType(HSSFCell.ENCODING_UTF_16); cell.setCellValue(listHeaders.get(i)); cell.setCellStyle(style); sheet.setColumnWidth(i, @@ -75,37 +68,12 @@ public class ExcelUtils { Cell cell = row.createCell(j); if(bean.get(j)!=null) { String cellValue = bean.get(j).toString(); - if (cellValue.matches(htmlRegex)) - cellValue = Jsoup.parse(cellValue).text(); cell.setCellValue(cellValue); } } } return workbook; } - - /** - * 使用模板来创建Excel。使用了jxls库。 - *

- * Excel模板请参考：http://jxls.sourceforge.net/reference/simplebeans.html - *

- * - * @see http://jxls.sourceforge.net/reference/simplebeans.html - * @param templatePath - * @param map - * @return - * @throws FileNotFoundException - * @throws ParsePropertyException - * @throws InvalidFormatException - */ - public static Workbook createExcelSheetByTemplate(String templatePath, - Map map) throws FileNotFoundException, - ParsePropertyException, InvalidFormatException { - FileInputStream in = new FileInputStream(templatePath); - XLSTransformer transformer = new XLSTransformer(); - Workbook workbook = transformer.transformXLS(in, map); - return workbook; - } /** * 帮助方法：设置Excel文件下载的response头。 @@ -175,78 +143,4 @@ public class ExcelUtils { return pixels; } - /** - * 读取某个工作簿上的所有单元格的值。 - * @param fis 文件流 - * @param sheetOrder - * 工作簿序号，从0开始。 - * @return List 所有单元格的值。 - * @throws IOException - * 加载excel文件IO异常。 - * @throws FileNotFoundException - * excel文件没有找到异常。 - * @throws InvalidFormatException - */ - public static List read(InputStream fis,int sheetOrder) throws FileNotFoundException, - IOException, InvalidFormatException { - Workbook workbook = WorkbookFactory.create(fis); - if (fis != null) { - fis.close(); - } - Sheet sheet = workbook.getSheetAt(sheetOrder); - // 用来记录excel值 - List valueList = new LinkedList(); - int coloumNum=sheet.getRow(0).getPhysicalNumberOfCells(); - // 循环遍历每一行、每一列。 - for (Row row : sheet) { - // 每一行 - Object[] rowObject = null; - for (int i =0;i maps = JSON.parseArray(json, Map.class); - return maps; - } - return body; - } - -} \ No newline at end of file diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/SecurityInterceptor.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/SecurityInterceptor.java index 7a372162d..4988ed33f 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/SecurityInterceptor.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/SecurityInterceptor.java @@ -76,12 +76,10 @@ public class SecurityInterceptor extends BasicInterceptor { * @return * @throws Exception */ - private boolean isLegalRequest(HttpServletRequest request) throws Exception { - TreeMap paramsMap = new TreeMap<>(); - paramsMap.putAll(request.getParameterMap()); + private boolean isLegalRequest(HttpServletRequest request) { + TreeMap paramsMap = new TreeMap<>(request.getParameterMap()); - - StringBuffer builder = new StringBuffer(); + StringBuilder builder = new StringBuilder(); Set> entries = paramsMap.entrySet(); for (Map.Entry entry : entries) { String name = entry.getKey(); @@ -111,16 +109,4 @@ public class SecurityInterceptor extends BasicInterceptor { return StringUtils.isNotEmpty(excludeUri) && StringUtils.equalsIgnoreCase(excludeUri, Boolean.TRUE.toString()); } - @Override - public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) - throws Exception { - - } - - @Override - public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception { - - } - - } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/UserInfoCompletedInterceptor.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/UserInfoCompletedInterceptor.java deleted file mode 100644 index 14110a9e2..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/UserInfoCompletedInterceptor.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.accompany.business.interceptor; - - -import com.accompany.common.annotation.Authorization; -import com.accompany.common.annotation.H5Authorization; -import com.accompany.common.config.SystemConfig; -import com.accompany.common.constant.ApplicationConstant; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.StringUtils; -import com.accompany.core.model.Users; -import com.accompany.core.service.common.JedisService; -import com.accompany.core.service.user.UsersBaseService; -import org.apache.commons.collections.CollectionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.lang.reflect.Method; - -/** - * 用户完善资料拦截器 - */ -public class UserInfoCompletedInterceptor extends BasicInterceptor { - - private static final Logger logger = LoggerFactory.getLogger(UserInfoCompletedInterceptor.class); - - @Autowired - JedisService jedisService; - - @Autowired - private UsersBaseService usersBaseService; - - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - if (!(handler instanceof HandlerMethod)) { - return true; - } - - if (isWhiteList(request.getRequestURI())) { - return true; - } - - HandlerMethod handlerMethod = (HandlerMethod) handler; - Method method = handlerMethod.getMethod(); - - // 不需要登录校验 - if (method.getAnnotation(Authorization.class) == null && method.getAnnotation(H5Authorization.class) == null) { - return true; - } - - - String uid = this.getUid(request); - if (StringUtils.isEmpty(uid) || StringUtils.equalsIgnoreCase(uid, "null") || !StringUtils.isNumeric(uid)) { - logger.warn("uid illegal, uri={}, uid={}", request.getRequestURI(), uid); - writeLoginExpireResponse(response, 401, "Login status has expired, please log in again ~"); - return false; - } - - Users user = usersBaseService.getUsersByUid(Long.valueOf(uid)); - if (user == null || StringUtils.isBlank(user.getNick()) ||user.getGender() == null || StringUtils.isBlank(user.getAvatar())) { - logger.warn("user not complete info, uri={}, uid={}", request.getRequestURI(), uid); - writeResponse(response, HttpServletResponse.SC_OK, BusiStatus.USER_NOT_COMPLETE_INFO.value(), BusiStatus.USER_NOT_COMPLETE_INFO.getReasonPhrase()); - return false; - } - - - return true; - } - - private boolean isWhiteList(String requestURI) { - if (CollectionUtils.isNotEmpty(SystemConfig.userInfoCompleteInterceptWhiteList)) { - return SystemConfig.userInfoCompleteInterceptWhiteList.contains(requestURI); - } - - return false; - } - - /** - * 获取 uid， 以业务参数为首选 - * @param request - * @return - */ - private String getUid(HttpServletRequest request) { - String uidStr = request.getHeader(ApplicationConstant.PublicParameters.PUB_UID); - if (StringUtils.isEmpty(uidStr)) { - uidStr = request.getParameter(ApplicationConstant.PublicParameters.UID); - } - return uidStr; - } - - @Override - public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) - throws Exception { - - } - - @Override - public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception { - } - -} diff --git a/accompany-dependencies/pom.xml b/accompany-dependencies/pom.xml index 6c805e533..a885c656c 100644 --- a/accompany-dependencies/pom.xml +++ b/accompany-dependencies/pom.xml @@ -55,12 +55,10 @@ 1.2.1 2.4.2 5.1.8 - 1.10.2 2.0.1.Final 1.1.0 1.1.8 1.3 - 1.0.5 7.10.0 1.5.4 2.0.1.RELEASE @@ -356,12 +354,6 @@ ${commons-fileupload.version} - - net.sf.jxls - jxls-core - ${jxls-core.version} - - org.jsoup jsoup @@ -618,16 +610,6 @@ aliyun-java-sdk-cloudauth - - net.sf.jxls - jxls-core - - - - org.jsoup - jsoup - - javax.validation validation-api diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/support/password/PasswordAuthenticationProvider.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/support/password/PasswordAuthenticationProvider.java index b80cc578b..4f822b6eb 100644 --- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/support/password/PasswordAuthenticationProvider.java +++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/support/password/PasswordAuthenticationProvider.java @@ -51,7 +51,7 @@ public class PasswordAuthenticationProvider implements AuthenticationProvider { @Override public Authentication authenticate(Authentication authentication) throws AuthenticationException { - Map params = (Map) authentication.getDetails(); + Map params = (Map) authentication.getDetails(); String smsCode = (String) params.get("code"); String phoneAreaCode = (String) params.get("phoneAreaCode"); String ipAddress = RequestContextHolderUtils.getRemoteAddr(); diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/support/verify/VerifyCodeAuthenticationProvider.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/support/verify/VerifyCodeAuthenticationProvider.java index b0f64fbf6..177f833dd 100644 --- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/support/verify/VerifyCodeAuthenticationProvider.java +++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/support/verify/VerifyCodeAuthenticationProvider.java @@ -38,7 +38,7 @@ public class VerifyCodeAuthenticationProvider implements AuthenticationProvider @Override public Authentication authenticate(Authentication authentication) throws AuthenticationException { - Map params = (Map) authentication.getDetails(); + Map params = (Map) authentication.getDetails(); String phone = authentication.getName(); String code = (String) authentication.getCredentials(); String phoneAreaCode = (String) params.get(PHONE_AREA_CODE); diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/interceptor/SecurityInterceptor.java b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/interceptor/SecurityInterceptor.java index fae65374d..74aecfd29 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/interceptor/SecurityInterceptor.java +++ b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/interceptor/SecurityInterceptor.java @@ -75,12 +75,10 @@ public class SecurityInterceptor extends BasicInterceptor { * @return * @throws Exception */ - private boolean isLegalRequest(HttpServletRequest request) throws Exception { - TreeMap paramsMap = new TreeMap<>(); - paramsMap.putAll(request.getParameterMap()); + private boolean isLegalRequest(HttpServletRequest request) { + TreeMap paramsMap = new TreeMap<>(request.getParameterMap()); - - StringBuffer builder = new StringBuffer(); + StringBuilder builder = new StringBuilder(); Set> entries = paramsMap.entrySet(); for (Map.Entry entry : entries) { String name = entry.getKey(); @@ -110,16 +108,4 @@ public class SecurityInterceptor extends BasicInterceptor { String excludeUri = this.jedisService.hget(RedisKey.exclude_uri.getKey(), url); return StringUtils.isNotEmpty(excludeUri) && StringUtils.equalsIgnoreCase(excludeUri, Boolean.TRUE.toString()); } - - @Override - public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) - throws Exception { - - } - - @Override - public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception { - - } - }