update lang.StringUtils 改为 lang3.StringUtils
This commit is contained in:
+60
-1
@@ -1,4 +1,63 @@
|
|||||||
/target/
|
/target/
|
||||||
/.idea/
|
/.idea/
|
||||||
|
jeecg-boot-module-demo
|
||||||
|
rebel.xml
|
||||||
|
|
||||||
|
#java
|
||||||
|
*.class
|
||||||
|
|
||||||
|
#package file
|
||||||
|
*.war
|
||||||
|
*.ear
|
||||||
|
*.zip
|
||||||
|
*.tar.gz
|
||||||
|
*.rar
|
||||||
|
#maven ignore
|
||||||
|
target/
|
||||||
|
build/
|
||||||
|
|
||||||
|
#eclipse ignore
|
||||||
|
.settings/
|
||||||
|
.project
|
||||||
|
.classpatch
|
||||||
|
|
||||||
|
#Intellij idea
|
||||||
|
.idea/
|
||||||
|
/idea/
|
||||||
|
out/
|
||||||
|
logs/
|
||||||
|
*.ipr
|
||||||
*.iml
|
*.iml
|
||||||
rebel.xml
|
*.iws
|
||||||
|
|
||||||
|
# temp file
|
||||||
|
*.log
|
||||||
|
*.cache
|
||||||
|
*.diff
|
||||||
|
*.patch
|
||||||
|
*.tmp
|
||||||
|
|
||||||
|
.DS_Store
|
||||||
|
node_modules
|
||||||
|
/node_modules/
|
||||||
|
/dist
|
||||||
|
|
||||||
|
|
||||||
|
# local env files
|
||||||
|
.env.local
|
||||||
|
.env.*.local
|
||||||
|
|
||||||
|
# Log files
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
pnpm-debug.log*
|
||||||
|
|
||||||
|
# Editor directories and files
|
||||||
|
.idea
|
||||||
|
.vscode
|
||||||
|
*.suo
|
||||||
|
*.ntvs*
|
||||||
|
*.njsproj
|
||||||
|
*.sln
|
||||||
|
*.sw?
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@
|
|||||||
package com.jero.config.filter.xss;
|
package com.jero.config.filter.xss;
|
||||||
|
|
||||||
import com.jero.common.exception.JeroBootException;
|
import com.jero.common.exception.JeroBootException;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
public class SqlFilter {
|
public class SqlFilter {
|
||||||
private SqlFilter(){
|
private SqlFilter(){
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@
|
|||||||
package com.jero.config.filter.xss;
|
package com.jero.config.filter.xss;
|
||||||
|
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import javax.servlet.ReadListener;
|
import javax.servlet.ReadListener;
|
||||||
import javax.servlet.ServletInputStream;
|
import javax.servlet.ServletInputStream;
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@ import com.jero.codegenerate.generate.util.TableConvert;
|
|||||||
import com.jero.codegenerate.properties.CodeConfigProperties;
|
import com.jero.codegenerate.properties.CodeConfigProperties;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.ArrayUtils;
|
import org.apache.commons.lang.ArrayUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.sql.*;
|
import java.sql.*;
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package com.jero.codegenerate.database.util;
|
package com.jero.codegenerate.database.util;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
public class CodeStringUtils {
|
public class CodeStringUtils {
|
||||||
private CodeStringUtils() {
|
private CodeStringUtils() {
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import com.jero.codegenerate.generate.pojo.TableVo;
|
|||||||
import com.jero.codegenerate.generate.util.NonceUtils;
|
import com.jero.codegenerate.generate.util.NonceUtils;
|
||||||
import com.jero.codegenerate.properties.CodeConfigProperties;
|
import com.jero.codegenerate.properties.CodeConfigProperties;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ import com.jero.codegenerate.generate.pojo.onetomany.SubTableVo;
|
|||||||
import com.jero.codegenerate.generate.util.NonceUtils;
|
import com.jero.codegenerate.generate.util.NonceUtils;
|
||||||
import com.jero.codegenerate.properties.CodeConfigProperties;
|
import com.jero.codegenerate.properties.CodeConfigProperties;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@ import java.util.Comparator;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class FileHelper {
|
public class FileHelper {
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
package com.jero.codegenerate.generate.util;
|
package com.jero.codegenerate.generate.util;
|
||||||
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
public class TableConvert {
|
public class TableConvert {
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ import com.jero.common.system.query.QueryGenerator;
|
|||||||
import com.jero.generater.modules.online.cgform.entity.OnlCgformButton;
|
import com.jero.generater.modules.online.cgform.entity.OnlCgformButton;
|
||||||
import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService;
|
import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService;
|
|||||||
import com.jero.generater.modules.online.cgform.util.CgformUtil;
|
import com.jero.generater.modules.online.cgform.util.CgformUtil;
|
||||||
import com.jero.generater.modules.online.config.exception.DBException;
|
import com.jero.generater.modules.online.config.exception.DBException;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import com.jero.common.system.query.QueryGenerator;
|
|||||||
import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex;
|
import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex;
|
||||||
import com.jero.generater.modules.online.cgform.service.IOnlCgformIndexService;
|
import com.jero.generater.modules.online.cgform.service.IOnlCgformIndexService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ package com.jero.generater.modules.online.cgform.rule;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.commons.lang.math.RandomUtils;
|
import org.apache.commons.lang.math.RandomUtils;
|
||||||
import com.jero.common.handler.IFillRuleHandler;
|
import com.jero.common.handler.IFillRuleHandler;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService;
|
|||||||
import com.jero.generater.modules.online.cgform.service.IOnlineService;
|
import com.jero.generater.modules.online.cgform.service.IOnlineService;
|
||||||
import com.jero.generater.modules.online.cgform.util.CgformUtil;
|
import com.jero.generater.modules.online.cgform.util.CgformUtil;
|
||||||
import com.jero.generater.modules.online.cgform.util.EnhanceJsUtil;
|
import com.jero.generater.modules.online.cgform.util.EnhanceJsUtil;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
|
|||||||
import com.jero.generater.modules.online.config.exception.DBException;
|
import com.jero.generater.modules.online.config.exception.DBException;
|
||||||
import com.jero.generater.modules.online.config.util.DbTableUtil;
|
import com.jero.generater.modules.online.config.util.DbTableUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
|
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|||||||
+1
-1
@@ -22,7 +22,7 @@ import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamServi
|
|||||||
import com.jero.generater.modules.online.cgreport.service.a.OnlCgreportHeadServiceImpl;
|
import com.jero.generater.modules.online.cgreport.service.a.OnlCgreportHeadServiceImpl;
|
||||||
import com.jero.generater.modules.online.cgreport.util.SqlUtil;
|
import com.jero.generater.modules.online.cgreport.util.SqlUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.usermodel.Workbook;
|
import org.apache.poi.ss.usermodel.Workbook;
|
||||||
import org.jeecgframework.poi.excel.ExcelExportUtil;
|
import org.jeecgframework.poi.excel.ExcelExportUtil;
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemServic
|
|||||||
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
|
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
|
||||||
import com.jero.modules.base.service.BaseCommonService;
|
import com.jero.modules.base.service.BaseCommonService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import com.jero.common.system.query.QueryGenerator;
|
|||||||
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem;
|
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem;
|
||||||
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService;
|
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import com.jero.common.system.query.QueryGenerator;
|
|||||||
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportParam;
|
import com.jero.generater.modules.online.cgreport.entity.OnlCgreportParam;
|
||||||
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
|
import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
|
|||||||
|
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.jero.common.exception.JeroBootException;
|
import com.jero.common.exception.JeroBootException;
|
||||||
import com.jero.common.system.api.ISysBaseAPI;
|
import com.jero.common.system.api.ISysBaseAPI;
|
||||||
import com.jero.common.system.query.QueryGenerator;
|
import com.jero.common.system.query.QueryGenerator;
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
package com.jero.generater.modules.online.config.service.a;
|
package com.jero.generater.modules.online.config.service.a;
|
||||||
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.jero.generater.modules.online.config.util.ColumnMeta;
|
import com.jero.generater.modules.online.config.util.ColumnMeta;
|
||||||
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
package com.jero.generater.modules.online.config.service.a;
|
package com.jero.generater.modules.online.config.service.a;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.jero.generater.modules.online.config.util.ColumnMeta;
|
import com.jero.generater.modules.online.config.util.ColumnMeta;
|
||||||
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
package com.jero.generater.modules.online.config.service.a;
|
package com.jero.generater.modules.online.config.service.a;
|
||||||
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.jero.generater.modules.online.config.util.ColumnMeta;
|
import com.jero.generater.modules.online.config.util.ColumnMeta;
|
||||||
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
package com.jero.generater.modules.online.config.service.a;
|
package com.jero.generater.modules.online.config.service.a;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.jero.generater.modules.online.config.util.ColumnMeta;
|
import com.jero.generater.modules.online.config.util.ColumnMeta;
|
||||||
import com.jero.generater.modules.online.config.exception.DBException;
|
import com.jero.generater.modules.online.config.exception.DBException;
|
||||||
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
package com.jero.generater.modules.online.config.util;
|
package com.jero.generater.modules.online.config.util;
|
||||||
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
public class ColumnMeta {
|
public class ColumnMeta {
|
||||||
private String a;
|
private String a;
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import com.jero.generater.modules.online.config.exception.DBException;
|
|||||||
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
import com.jero.generater.modules.online.config.service.DbTableHandleI;
|
||||||
import freemarker.template.TemplateException;
|
import freemarker.template.TemplateException;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.hibernate.HibernateException;
|
import org.hibernate.HibernateException;
|
||||||
import org.hibernate.boot.Metadata;
|
import org.hibernate.boot.Metadata;
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ import io.swagger.annotations.Api;
|
|||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import io.swagger.annotations.ApiParam;
|
import io.swagger.annotations.ApiParam;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ import com.jero.modules.demo.test.service.IJeroOrderMainService;
|
|||||||
import com.jero.modules.demo.test.service.IJeroOrderTicketService;
|
import com.jero.modules.demo.test.service.IJeroOrderTicketService;
|
||||||
import com.jero.modules.demo.test.vo.JeroOrderMainPage;
|
import com.jero.modules.demo.test.vo.JeroOrderMainPage;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ import com.jero.modules.demo.test.service.IJeroOrderCustomerService;
|
|||||||
import com.jero.modules.demo.test.service.IJeroOrderMainService;
|
import com.jero.modules.demo.test.service.IJeroOrderMainService;
|
||||||
import com.jero.modules.demo.test.service.IJeroOrderTicketService;
|
import com.jero.modules.demo.test.service.IJeroOrderTicketService;
|
||||||
import com.jero.modules.demo.test.vo.JeroOrderMainPage;
|
import com.jero.modules.demo.test.vo.JeroOrderMainPage;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ import com.jero.common.system.query.QueryGenerator;
|
|||||||
import com.jero.common.util.oConvertUtils;
|
import com.jero.common.util.oConvertUtils;
|
||||||
import com.jero.modules.demo.test.entity.JoaDemo;
|
import com.jero.modules.demo.test.entity.JoaDemo;
|
||||||
import com.jero.modules.demo.test.service.IJoaDemoService;
|
import com.jero.modules.demo.test.service.IJoaDemoService;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import com.jero.modules.system.entity.SysUser;
|
|||||||
import com.jero.modules.system.service.ISysDepartService;
|
import com.jero.modules.system.service.ISysDepartService;
|
||||||
import com.jero.modules.system.service.ISysUserService;
|
import com.jero.modules.system.service.ISysUserService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.http.HttpEntity;
|
import org.springframework.http.HttpEntity;
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import com.jero.common.system.query.QueryGenerator;
|
|||||||
import com.jero.modules.message.entity.SysMessage;
|
import com.jero.modules.message.entity.SysMessage;
|
||||||
import com.jero.modules.message.service.ISysMessageService;
|
import com.jero.modules.message.service.ISysMessageService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ import com.jero.modules.message.entity.SysMessageTemplate;
|
|||||||
import com.jero.modules.message.service.ISysMessageTemplateService;
|
import com.jero.modules.message.service.ISysMessageTemplateService;
|
||||||
import com.jero.modules.message.util.PushMsgUtil;
|
import com.jero.modules.message.util.PushMsgUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@ import com.jero.common.system.query.QueryGenerator;
|
|||||||
import com.jero.modules.oss.entity.OSSFile;
|
import com.jero.modules.oss.entity.OSSFile;
|
||||||
import com.jero.modules.oss.service.IOSSFileService;
|
import com.jero.modules.oss.service.IOSSFileService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
|
|||||||
+1
-1
@@ -246,7 +246,7 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
|
|||||||
|
|
||||||
OSSFile oSSFile = new OSSFile();
|
OSSFile oSSFile = new OSSFile();
|
||||||
String ctxPath = uploadCospath;
|
String ctxPath = uploadCospath;
|
||||||
if (org.apache.commons.lang.StringUtils.isNotBlank(bizPath)) {
|
if (StringUtils.isNotBlank(bizPath)) {
|
||||||
ctxPath += bizPath;
|
ctxPath += bizPath;
|
||||||
}
|
}
|
||||||
String fileName = null;
|
String fileName = null;
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ import com.jero.modules.quartz.service.IQuartzJobService;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
|
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import com.jero.common.util.PasswordUtil;
|
import com.jero.common.util.PasswordUtil;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.jero.common.util.SqlInjectionUtil;
|
import com.jero.common.util.SqlInjectionUtil;
|
||||||
import com.jero.modules.system.mapper.SysDictMapper;
|
import com.jero.modules.system.mapper.SysDictMapper;
|
||||||
import com.jero.modules.system.model.DuplicateCheckVo;
|
import com.jero.modules.system.model.DuplicateCheckVo;
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import com.jero.modules.system.service.ISysAnnouncementSendService;
|
|||||||
import com.jero.modules.system.service.ISysAnnouncementService;
|
import com.jero.modules.system.service.ISysAnnouncementService;
|
||||||
import com.jero.modules.system.util.XSSUtils;
|
import com.jero.modules.system.util.XSSUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import com.jero.modules.system.entity.SysAnnouncementSend;
|
|||||||
import com.jero.modules.system.model.AnnouncementSendModel;
|
import com.jero.modules.system.model.AnnouncementSendModel;
|
||||||
import com.jero.modules.system.service.ISysAnnouncementSendService;
|
import com.jero.modules.system.service.ISysAnnouncementSendService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ import com.jero.modules.system.entity.SysCategory;
|
|||||||
import com.jero.modules.system.model.TreeSelectModel;
|
import com.jero.modules.system.model.TreeSelectModel;
|
||||||
import com.jero.modules.system.service.ISysCategoryService;
|
import com.jero.modules.system.service.ISysCategoryService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import com.jero.modules.system.service.ISysCheckRuleService;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ import com.jero.modules.system.util.SecurityUtil;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -216,7 +216,7 @@ public class SysDepartController {
|
|||||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||||
public Result<Object> delete(@RequestBody Map<String,String> map) {
|
public Result<Object> delete(@RequestBody Map<String,String> map) {
|
||||||
String id = map.get("id");
|
String id = map.get("id");
|
||||||
if(org.apache.commons.lang.StringUtils.isBlank(id)){
|
if(StringUtils.isBlank(id)){
|
||||||
return Result.error("参数不识别!");
|
return Result.error("参数不识别!");
|
||||||
}
|
}
|
||||||
SysDepart sysDepart = sysDepartService.getById(id);
|
SysDepart sysDepart = sysDepartService.getById(id);
|
||||||
|
|||||||
+1
-1
@@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import com.jero.modules.system.service.ISysPermissionDataRuleService;
|
import com.jero.modules.system.service.ISysPermissionDataRuleService;
|
||||||
import com.jero.modules.system.service.ISysPermissionService;
|
import com.jero.modules.system.service.ISysPermissionService;
|
||||||
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ import com.jero.modules.system.vo.SysDictPage;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import com.jero.common.constant.CacheConstant;
|
import com.jero.common.constant.CacheConstant;
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ import com.jero.modules.system.service.ISysFillRuleService;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ import com.jero.modules.system.entity.SysGatewayRoute;
|
|||||||
import com.jero.modules.system.service.ISysGatewayRouteService;
|
import com.jero.modules.system.service.ISysGatewayRouteService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ import com.jero.common.util.oConvertUtils;
|
|||||||
import com.jero.modules.system.entity.SysLog;
|
import com.jero.modules.system.entity.SysLog;
|
||||||
import com.jero.modules.system.service.ISysLogService;
|
import com.jero.modules.system.service.ISysLogService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ import com.jero.modules.system.service.ISysPermissionService;
|
|||||||
import com.jero.modules.system.service.ISysRolePermissionService;
|
import com.jero.modules.system.service.ISysRolePermissionService;
|
||||||
import com.jero.modules.system.util.PermissionDataUtil;
|
import com.jero.modules.system.util.PermissionDataUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
|
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import com.jero.common.system.base.controller.JeroController;
|
import com.jero.common.system.base.controller.JeroController;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import com.jero.common.constant.CommonConstant;
|
import com.jero.common.constant.CommonConstant;
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ import com.jero.common.util.oConvertUtils;
|
|||||||
import com.jero.modules.system.entity.SysTenant;
|
import com.jero.modules.system.entity.SysTenant;
|
||||||
import com.jero.modules.system.service.ISysTenantService;
|
import com.jero.modules.system.service.ISysTenantService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ import com.jero.modules.system.vo.SysUserRoleVO;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import com.jero.modules.base.service.BaseCommonService;
|
|||||||
import com.jero.modules.system.service.ISysUserService;
|
import com.jero.modules.system.service.ISysUserService;
|
||||||
import com.jero.modules.system.vo.SysUserOnlineVO;
|
import com.jero.modules.system.vo.SysUserOnlineVO;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package com.jero.modules.system.rule;
|
package com.jero.modules.system.rule;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.commons.lang.math.RandomUtils;
|
import org.apache.commons.lang.math.RandomUtils;
|
||||||
import com.jero.common.handler.IFillRuleHandler;
|
import com.jero.common.handler.IFillRuleHandler;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@ import com.jero.modules.system.mapper.*;
|
|||||||
import com.jero.modules.system.service.*;
|
import com.jero.modules.system.service.*;
|
||||||
import com.jero.modules.system.util.SecurityUtil;
|
import com.jero.modules.system.util.SecurityUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.jero.modules.system.entity.SysCheckRule;
|
import com.jero.modules.system.entity.SysCheckRule;
|
||||||
import com.jero.modules.system.mapper.SysCheckRuleMapper;
|
import com.jero.modules.system.mapper.SysCheckRuleMapper;
|
||||||
import com.jero.modules.system.service.ISysCheckRuleService;
|
import com.jero.modules.system.service.ISysCheckRuleService;
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@ import com.alibaba.fastjson.JSONObject;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.jero.common.system.vo.SysDepartTreeModel;
|
import com.jero.common.system.vo.SysDepartTreeModel;
|
||||||
import com.jero.common.util.oConvertUtils;
|
import com.jero.common.util.oConvertUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.jero.common.constant.CacheConstant;
|
import com.jero.common.constant.CacheConstant;
|
||||||
import com.jero.common.constant.CommonConstant;
|
import com.jero.common.constant.CommonConstant;
|
||||||
import com.jero.common.constant.FillRuleConstant;
|
import com.jero.common.constant.FillRuleConstant;
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import com.jero.common.aspect.annotation.AutoLog;
|
import com.jero.common.aspect.annotation.AutoLog;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
|
|
||||||
<#assign bpm_flag=false>
|
<#assign bpm_flag=false>
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ import org.activiti.engine.runtime.ProcessInstance;
|
|||||||
import org.activiti.engine.task.Task;
|
import org.activiti.engine.task.Task;
|
||||||
import org.activiti.engine.task.TaskQuery;
|
import org.activiti.engine.task.TaskQuery;
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
+1
-1
@@ -546,7 +546,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
|
|||||||
cell.setCellValue("点击查看详情");
|
cell.setCellValue("点击查看详情");
|
||||||
//新开sheet生成表格
|
//新开sheet生成表格
|
||||||
log.info("-------------------------开始生成表格----------------------------");
|
log.info("-------------------------开始生成表格----------------------------");
|
||||||
if (org.apache.commons.lang.StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("<tbody>") < 0) {
|
if (StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("<tbody>") < 0) {
|
||||||
if (tableHtml.indexOf("<thead>") < 0) {
|
if (tableHtml.indexOf("<thead>") < 0) {
|
||||||
tableHtml = tableHtml.replaceFirst("<tr>", "<tbody><tr>");
|
tableHtml = tableHtml.replaceFirst("<tr>", "<tbody><tr>");
|
||||||
tableHtml = tableHtml.replaceFirst("</table>", "</tbody></table>");
|
tableHtml = tableHtml.replaceFirst("</table>", "</tbody></table>");
|
||||||
|
|||||||
+1
-1
@@ -5485,7 +5485,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
|||||||
} else if (cellType == CellType.FORMULA) { // 公式
|
} else if (cellType == CellType.FORMULA) { // 公式
|
||||||
value = cell.getCellFormula() + "";
|
value = cell.getCellFormula() + "";
|
||||||
}
|
}
|
||||||
if (org.apache.commons.lang.StringUtils.isEmpty(value)) {
|
if (StringUtils.isEmpty(value)) {
|
||||||
nullCellNum++;
|
nullCellNum++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ import com.jero.modules.extRepo.service.IExtRepoFolderService;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@ import com.jero.modules.extRepo.mapper.ExtRepoDataMapper;
|
|||||||
import com.jero.modules.extRepo.service.IExtRepoDataService;
|
import com.jero.modules.extRepo.service.IExtRepoDataService;
|
||||||
import com.jero.modules.oss.entity.OSSFile;
|
import com.jero.modules.oss.entity.OSSFile;
|
||||||
import com.jero.modules.oss.service.IOSSFileService;
|
import com.jero.modules.oss.service.IOSSFileService;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import com.jero.modules.extRepo.mapper.ExtRepoFolderMapper;
|
|||||||
import com.jero.modules.extRepo.service.IExtRepoFolderService;
|
import com.jero.modules.extRepo.service.IExtRepoFolderService;
|
||||||
import com.jero.modules.system.entity.SysUserRole;
|
import com.jero.modules.system.entity.SysUserRole;
|
||||||
import com.jero.modules.system.service.ISysUserRoleService;
|
import com.jero.modules.system.service.ISysUserRoleService;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.commons.lang3.ObjectUtils;
|
import org.apache.commons.lang3.ObjectUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import com.jero.modules.laws.regulation.service.ILawsBasicInfoService;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import com.jero.modules.laws.regulation.service.ILawsDateRelationService;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import com.jero.modules.laws.regulation.service.ILawsFileRelationService;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ import com.jero.modules.ocr.service.IOcrRecordEOService;
|
|||||||
import com.jero.modules.ocr.util.LineHumpUtil;
|
import com.jero.modules.ocr.util.LineHumpUtil;
|
||||||
import com.jero.modules.system.entity.SysDictItem;
|
import com.jero.modules.system.entity.SysDictItem;
|
||||||
import com.jero.modules.system.service.ISysDictItemService;
|
import com.jero.modules.system.service.ISysDictItemService;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ import io.swagger.annotations.Api;
|
|||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.collections.CollectionUtils;
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.commons.lang3.StringEscapeUtils;
|
import org.apache.commons.lang3.StringEscapeUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ import com.jero.modules.split.service.ISarFileSplitInfoService;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@ import com.jero.modules.split.page.SarFileSplitItemsValEOPage;
|
|||||||
import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
|
import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
|
|||||||
import com.jero.modules.split.util.FileSplitUtils;
|
import com.jero.modules.split.util.FileSplitUtils;
|
||||||
import com.jero.modules.split.util.ReadWordTable;
|
import com.jero.modules.split.util.ReadWordTable;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.xwpf.usermodel.*;
|
import org.apache.poi.xwpf.usermodel.*;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.apache.xmlbeans.XmlCursor;
|
import org.apache.xmlbeans.XmlCursor;
|
||||||
|
|||||||
+3
-3
@@ -3337,7 +3337,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
OutputStream excelOS = null;
|
OutputStream excelOS = null;
|
||||||
HSSFWorkbook workbook = new HSSFWorkbook();
|
HSSFWorkbook workbook = new HSSFWorkbook();
|
||||||
String fileOriName = "拆分条款信息";
|
String fileOriName = "拆分条款信息";
|
||||||
if (org.apache.commons.lang.StringUtils.isNotEmpty(exportName)) {
|
if (StringUtils.isNotEmpty(exportName)) {
|
||||||
fileOriName = exportName;
|
fileOriName = exportName;
|
||||||
}
|
}
|
||||||
try{
|
try{
|
||||||
@@ -3459,7 +3459,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
HSSFCell cell2 = row1.createCell(cellNum);
|
HSSFCell cell2 = row1.createCell(cellNum);
|
||||||
row1.getCell(cellNum).setCellStyle(cellStyle);
|
row1.getCell(cellNum).setCellStyle(cellStyle);
|
||||||
String content = valList.get(valRow).getValContent();
|
String content = valList.get(valRow).getValContent();
|
||||||
if (org.apache.commons.lang.StringUtils.isNotEmpty(content)) {
|
if (StringUtils.isNotEmpty(content)) {
|
||||||
content = content.replaceAll("null","");
|
content = content.replaceAll("null","");
|
||||||
if (content.lastIndexOf("\n") > -1) {
|
if (content.lastIndexOf("\n") > -1) {
|
||||||
content = content.substring(0,content.lastIndexOf("\n"));
|
content = content.substring(0,content.lastIndexOf("\n"));
|
||||||
@@ -3554,7 +3554,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
// HSSFSheet sheetTable = workbook.createSheet(tableExportDto.getTableName());
|
// HSSFSheet sheetTable = workbook.createSheet(tableExportDto.getTableName());
|
||||||
String tableName = tableExportDto.getTableName();
|
String tableName = tableExportDto.getTableName();
|
||||||
String tableHtml = tableExportDto.getTableHtCon();
|
String tableHtml = tableExportDto.getTableHtCon();
|
||||||
if (org.apache.commons.lang.StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("<tbody>") < 0) {
|
if (StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("<tbody>") < 0) {
|
||||||
if (tableHtml.indexOf("<thead>") < 0) {
|
if (tableHtml.indexOf("<thead>") < 0) {
|
||||||
tableHtml = tableHtml.replaceFirst("<tr>","<tbody><tr>");
|
tableHtml = tableHtml.replaceFirst("<tr>","<tbody><tr>");
|
||||||
tableHtml = tableHtml.replaceFirst("</table>","</tbody></table>");
|
tableHtml = tableHtml.replaceFirst("</table>","</tbody></table>");
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ import com.jero.modules.split.service.IFileSplitItemsEOService;
|
|||||||
import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
|
import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
|
||||||
import com.jero.modules.split.util.FileSplitUtils;
|
import com.jero.modules.split.util.FileSplitUtils;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ import com.jero.modules.split.service.ISarFileSplitInfoService;
|
|||||||
import com.jero.modules.split.service.ISarFileSplitMenuEOService;
|
import com.jero.modules.split.service.ISarFileSplitMenuEOService;
|
||||||
import com.jero.modules.system.entity.SysDictItem;
|
import com.jero.modules.system.entity.SysDictItem;
|
||||||
import com.jero.modules.system.service.ISysDictItemService;
|
import com.jero.modules.system.service.ISysDictItemService;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Propagation;
|
import org.springframework.transaction.annotation.Propagation;
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ import com.jero.modules.split.page.SarFileSplitMenuEOPage;
|
|||||||
import com.jero.modules.split.service.IFileSplitItemsEOService;
|
import com.jero.modules.split.service.IFileSplitItemsEOService;
|
||||||
import com.jero.modules.split.service.ISarFileSplitMenuEOService;
|
import com.jero.modules.split.service.ISarFileSplitMenuEOService;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package com.jero.modules.split.util;/**
|
|||||||
* Created by Administrator on 2018/12/20 16:42
|
* Created by Administrator on 2018/12/20 16:42
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
||||||
import org.apache.poi.ss.usermodel.*;
|
import org.apache.poi.ss.usermodel.*;
|
||||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ import com.google.common.collect.Lists;
|
|||||||
import com.jero.common.constant.CacheConstant;
|
import com.jero.common.constant.CacheConstant;
|
||||||
import com.jero.common.util.RedisUtil;
|
import com.jero.common.util.RedisUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import com.jero.config.GatewayRoutersConfiguration;
|
import com.jero.config.GatewayRoutersConfiguration;
|
||||||
import com.jero.config.RouterDataType;
|
import com.jero.config.RouterDataType;
|
||||||
import org.springframework.cloud.gateway.event.RefreshRoutesEvent;
|
import org.springframework.cloud.gateway.event.RefreshRoutesEvent;
|
||||||
|
|||||||
Reference in New Issue
Block a user