diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java index 7738835c709011d3f94afb1eaedda93b65c874d4..8e95a7aad861344e7493d870e44dfa81b4bd06ee 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java @@ -19,7 +19,7 @@ import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.core.LocalVariableTableParameterNameDiscoverer; import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; @@ -191,13 +191,13 @@ public class AutoLogAspect { Result res = (Result)obj; String msg = res.getMessage(); String tableName = res.getOnlTable(); - if(oConvertUtils.isNotEmpty(tableName)){ + if(ConvertUtils.isNotEmpty(tableName)){ content+=",表名:"+tableName; } if(res.isSuccess()){ - content+= ","+(oConvertUtils.isEmpty(msg)?"操作成功":msg); + content+= ","+(ConvertUtils.isEmpty(msg)?"操作成功":msg); }else{ - content+= ","+(oConvertUtils.isEmpty(msg)?"操作失败":msg); + content+= ","+(ConvertUtils.isEmpty(msg)?"操作失败":msg); } } return content; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java index c5c289741ea9d4efb24ec90a371e10a24a496713..f9e3de2d5efce25a23e0ffa205cefa3923b71e6b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java @@ -16,7 +16,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.vo.DictModel; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.core.RedisTemplate; @@ -58,7 +58,7 @@ public class DictAspect { @Around("excudeService()") public Object doAround(ProceedingJoinPoint pjp) throws Throwable { - long time1=System.currentTimeMillis(); + long time1=System.currentTimeMillis(); Object result = pjp.proceed(); long time2=System.currentTimeMillis(); log.debug("获取JSON数据 耗时："+(time2-time1)+"ms"); @@ -127,9 +127,9 @@ public class DictAspect { //update-begin--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------ //for (Field field : record.getClass().getDeclaredFields()) { // 遍历所有字段，把字典Code取出来，放到 map 里 - for (Field field : oConvertUtils.getAllFields(record)) { + for (Field field : ConvertUtils.getAllFields(record)) { String value = item.getString(field.getName()); - if (oConvertUtils.isEmpty(value)) { + if (ConvertUtils.isEmpty(value)) { continue; } //update-end--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------ @@ -176,7 +176,7 @@ public class DictAspect { } String value = record.getString(field.getName()); - if (oConvertUtils.isNotEmpty(value)) { + if (ConvertUtils.isNotEmpty(value)) { List dictModels = translText.get(fieldDictCode); if(dictModels==null || dictModels.size()==0){ continue; @@ -242,7 +242,7 @@ public class DictAspect { String keyString = String.format("sys:cache:dictTable::SimpleKey [%s,%s]", dictCode, data); if (redisTemplate.hasKey(keyString)) { try { - String text = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); + String text = ConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); List list = translText.computeIfAbsent(dictCode, k -> new ArrayList<>()); list.add(new DictModel(data, text)); } catch (Exception e) { @@ -256,7 +256,7 @@ public class DictAspect { String keyString = String.format("sys:cache:dict::%s:%s", dictCode, data); if (redisTemplate.hasKey(keyString)) { try { - String text = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); + String text = ConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); List list = translText.computeIfAbsent(dictCode, k -> new ArrayList<>()); list.add(new DictModel(data, text)); } catch (Exception e) { @@ -361,7 +361,7 @@ public class DictAspect { */ @Deprecated private String translateDictValue(String code, String text, String table, String key) { - if(oConvertUtils.isEmpty(key)) { + if(ConvertUtils.isEmpty(key)) { return null; } StringBuffer textValue=new StringBuffer(); @@ -378,7 +378,7 @@ public class DictAspect { String keyString = String.format("sys:cache:dictTable::SimpleKey [%s,%s,%s,%s]",table,text,code,k.trim()); if (redisTemplate.hasKey(keyString)){ try { - tmpValue = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); + tmpValue = ConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); } catch (Exception e) { log.warn(e.getMessage()); } @@ -389,7 +389,7 @@ public class DictAspect { String keyString = String.format("sys:cache:dict::%s:%s",code,k.trim()); if (redisTemplate.hasKey(keyString)){ try { - tmpValue = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); + tmpValue = ConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); } catch (Exception e) { log.warn(e.getMessage()); } @@ -416,9 +416,9 @@ public class DictAspect { * @return */ private Boolean checkHasDict(List records){ - if(oConvertUtils.isNotEmpty(records) && records.size()>0){ - for (Field field : oConvertUtils.getAllFields(records.get(0))) { - if (oConvertUtils.isNotEmpty(field.getAnnotation(Dict.class))) { + if(ConvertUtils.isNotEmpty(records) && records.size()>0){ + for (Field field : ConvertUtils.getAllFields(records.get(0))) { + if (ConvertUtils.isNotEmpty(field.getAnnotation(Dict.class))) { return true; } } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java index ab2c940920f8754bfe0e8f254479d20a2f3f8964..425b35fddc12a53b10ea914c7d48f9b1a175634d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java @@ -16,7 +16,7 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.SysPermissionDataRuleModel; import org.jeecg.common.system.vo.SysUserCacheInfo; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -63,7 +63,7 @@ public class PermissionDataAspect { if(requestPath.indexOf(UrlMatchEnum.CGREPORT_DATA.getMatchUrl())>=0){ // 获取地址栏参数 String urlParamString = request.getParameter(CommonConstant.ONL_REP_URL_PARAM_STR); - if(oConvertUtils.isNotEmpty(urlParamString)){ + if(ConvertUtils.isNotEmpty(urlParamString)){ requestPath+="?"+urlParamString; } } @@ -85,7 +85,7 @@ public class PermissionDataAspect { private String filterUrl(String requestPath){ String url = ""; - if(oConvertUtils.isNotEmpty(requestPath)){ + if(ConvertUtils.isNotEmpty(requestPath)){ url = requestPath.replace("\\", "/"); url = url.replace("//", "/"); if(url.indexOf(SymbolConstant.DOUBLE_SLASH)>=0){ @@ -107,7 +107,7 @@ public class PermissionDataAspect { private String getJgAuthRequsetPath(HttpServletRequest request) { String queryString = request.getQueryString(); String requestPath = request.getRequestURI(); - if(oConvertUtils.isNotEmpty(queryString)){ + if(ConvertUtils.isNotEmpty(queryString)){ requestPath += "?" + queryString; } // 去掉其他参数(保留一个参数) 例如：loginController.do?login diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java index 6c2f170794b3392d70a710541f936c95c514b9bb..ff452840a85ee8b440b2427c1bf07e67f776c006 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java @@ -1,7 +1,7 @@ package org.jeecg.common.constant; import com.alibaba.fastjson.JSONObject; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.Resource; import org.springframework.stereotype.Component; @@ -129,7 +129,7 @@ public class ProvinceCityArea { if(this.areaList==null || this.areaList.size()==0){ this.areaList = new ArrayList(); try { - String jsonData = oConvertUtils.readStatic("classpath:static/pca.json"); + String jsonData = ConvertUtils.readStatic("classpath:static/pca.json"); JSONObject baseJson = JSONObject.parseObject(jsonData); //第一层 省 JSONObject provinceJson = baseJson.getJSONObject("86"); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java index b36c2f0e4599e910f05cb55eddaa95a09570ea0a..423bd4ea79a01c2d4213baece7623728fcac68b4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java @@ -1,6 +1,6 @@ package org.jeecg.common.constant.enums; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; /** * 文件类型 @@ -61,7 +61,7 @@ public enum FileTypeEnum { } public static FileTypeEnum getByType(String type){ - if (oConvertUtils.isEmpty(type)) { + if (ConvertUtils.isEmpty(type)) { return null; } for (FileTypeEnum val : values()) { diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java index 09d9c103d6b71042d35233fc2cd1055d7973e052..df3fbe5df15e4bedf5a573336a3b1d1ffe074899 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java @@ -1,6 +1,6 @@ package org.jeecg.common.constant.enums; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import java.util.List; @@ -68,7 +68,7 @@ public enum RoleIndexConfigEnum { public static String getIndexByRoles(List roles) { String[] rolesArray = roles.toArray(new String[roles.size()]); for (RoleIndexConfigEnum e : RoleIndexConfigEnum.values()) { - if (oConvertUtils.isIn(e.roleCode,rolesArray)){ + if (ConvertUtils.isIn(e.roleCode,rolesArray)){ return e.componentUrl; } } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java index 87c8993595ab784b307e5cdd140203f23c702a51..32dcae4f2f2fb8bd6003f42766324d9b9fb552f0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java @@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.desensitization.annotation.SensitiveField; import org.jeecg.common.desensitization.enums.SensitiveEnum; import org.jeecg.common.util.encryption.AesEncryptUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -65,7 +65,7 @@ public class SensitiveInfoUtil { public static Object handlerObject(Object obj, boolean isEncode) throws IllegalAccessException { log.debug(" obj --> "+ obj.toString()); long startTime=System.currentTimeMillis(); - if (oConvertUtils.isEmpty(obj)) { + if (ConvertUtils.isEmpty(obj)) { return obj; } // 判断是不是一个对象 @@ -138,7 +138,7 @@ public class SensitiveInfoUtil { log.debug("数据解密错误，原数据:"+data); } //解决debug模式下，加解密失效导致中文被解密变成空的问题 - if(oConvertUtils.isEmpty(result) && oConvertUtils.isNotEmpty(data)){ + if(ConvertUtils.isEmpty(result) && ConvertUtils.isNotEmpty(data)){ result = data; } return result; @@ -198,7 +198,7 @@ public class SensitiveInfoUtil { * @return <例子：李**> */ private static String chineseName(String fullName) { - if (oConvertUtils.isEmpty(fullName)) { + if (ConvertUtils.isEmpty(fullName)) { return ""; } return formatRight(fullName, 1); @@ -211,7 +211,7 @@ public class SensitiveInfoUtil { * @return <例子：李**> */ private static String chineseName(String familyName, String firstName) { - if (oConvertUtils.isEmpty(familyName) || oConvertUtils.isEmpty(firstName)) { + if (ConvertUtils.isEmpty(familyName) || ConvertUtils.isEmpty(firstName)) { return ""; } return chineseName(familyName + firstName); @@ -223,7 +223,7 @@ public class SensitiveInfoUtil { * @return <例子：*************5762> */ private static String idCardNum(String id) { - if (oConvertUtils.isEmpty(id)) { + if (ConvertUtils.isEmpty(id)) { return ""; } return formatLeft(id, 4); @@ -236,7 +236,7 @@ public class SensitiveInfoUtil { * @return <例子：****1234> */ private static String fixedPhone(String num) { - if (oConvertUtils.isEmpty(num)) { + if (ConvertUtils.isEmpty(num)) { return ""; } return formatLeft(num, 4); @@ -248,7 +248,7 @@ public class SensitiveInfoUtil { * @return <例子:138******1234> */ private static String mobilePhone(String num) { - if (oConvertUtils.isEmpty(num)) { + if (ConvertUtils.isEmpty(num)) { return ""; } int len = num.length(); @@ -265,7 +265,7 @@ public class SensitiveInfoUtil { * @return <例子：北京市海淀区****> */ private static String address(String address, int sensitiveSize) { - if (oConvertUtils.isEmpty(address)) { + if (ConvertUtils.isEmpty(address)) { return ""; } int len = address.length(); @@ -281,7 +281,7 @@ public class SensitiveInfoUtil { * @return <例子:g**@163.com> */ private static String email(String email) { - if (oConvertUtils.isEmpty(email)) { + if (ConvertUtils.isEmpty(email)) { return ""; } int index = email.indexOf("@"); @@ -300,7 +300,7 @@ public class SensitiveInfoUtil { * @return <例子:6222600**********1234> */ private static String bankCard(String cardNum) { - if (oConvertUtils.isEmpty(cardNum)) { + if (ConvertUtils.isEmpty(cardNum)) { return ""; } return formatBetween(cardNum, 6, 4); @@ -312,7 +312,7 @@ public class SensitiveInfoUtil { * @return <例子:12********> */ private static String cnapsCode(String code) { - if (oConvertUtils.isEmpty(code)) { + if (ConvertUtils.isEmpty(code)) { return ""; } return formatRight(code, 2); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java index e30a6c856c6f80f4518e1059ab139233b70505a8..ad0f2acc401f57cad303245df1b7286e9445f322 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.util.RestUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -211,7 +211,7 @@ public class JeecgElasticsearchTemplate { String url = this.getBaseUrl(indexName, typeName).append("/_mapping?").append(FORMAT_JSON).toString(); // 针对 es 7.x 版本做兼容 this.getElasticsearchVersion(); - if (oConvertUtils.isNotEmpty(this.version) && this.version.startsWith(IE_SEVEN)) { + if (ConvertUtils.isNotEmpty(this.version) && this.version.startsWith(IE_SEVEN)) { url += "&include_type_name=true"; } log.info("getIndexMapping-url:" + url); @@ -333,11 +333,11 @@ public class JeecgElasticsearchTemplate { for (String key : keys) { String value = data.getString(key); //1、剔除空值 - if (oConvertUtils.isEmpty(value) || "[]".equals(value)) { + if (ConvertUtils.isEmpty(value) || "[]".equals(value)) { emptyKeys.add(key); } //2、剔除上传控件值(会导致ES同步失败，报异常failed to parse field [ge_pic] of type [text] ) - if (oConvertUtils.isNotEmpty(value) && value.indexOf("[{")!=-1) { + if (ConvertUtils.isNotEmpty(value) && value.indexOf("[{")!=-1) { emptyKeys.add(key); log.info("-------剔除上传控件字段------------key: "+ key); } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java index fdb1506b6c0cf9d89f0fb46dcb4b6bb7eeaf0911..a97c268ee2924a88900be500328d574f364530ef 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java @@ -10,7 +10,7 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -55,7 +55,7 @@ public class JeecgController> { // 过滤选中数据 String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { + if (ConvertUtils.isNotEmpty(selections)) { List selectionList = Arrays.asList(selections.split(",")); queryWrapper.in("id",selectionList); } @@ -96,7 +96,7 @@ public class JeecgController> { //update-begin-author:liusq---date:20220629--for: 多sheet导出根据选择导出写法调整 --- // Step.3 过滤选中数据 String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { + if (ConvertUtils.isNotEmpty(selections)) { List selectionList = Arrays.asList(selections.split(",")); queryWrapper.in("id",selectionList); } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java index d19342de6859c599b33a3e3423e1837ef6981c53..1a084f96f942fd34d9c365c569e50b39a11eb9b4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java @@ -1,6 +1,6 @@ package org.jeecg.common.system.query; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; /** * 查询链接规则 @@ -25,14 +25,14 @@ public enum MatchTypeEnum { } public static MatchTypeEnum getByValue(Object value) { - if (oConvertUtils.isEmpty(value)) { + if (ConvertUtils.isEmpty(value)) { return null; } return getByValue(value.toString()); } public static MatchTypeEnum getByValue(String value) { - if (oConvertUtils.isEmpty(value)) { + if (ConvertUtils.isEmpty(value)) { return null; } for (MatchTypeEnum val : values()) { diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java index 45ac9b4ab189220301adc22864b6b75040c782de..23477343cc671c6295e94ae8779d97994d5e2ca5 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java @@ -23,7 +23,7 @@ import org.jeecg.common.system.vo.SysPermissionDataRuleModel; import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.SqlInjectionUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.util.NumberUtils; import com.alibaba.fastjson.JSON; @@ -124,7 +124,7 @@ public class QueryGenerator { //权限规则自定义SQL表达式 for (String c : ruleMap.keySet()) { - if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){ + if(ConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){ queryWrapper.and(i ->i.apply(getSqlRuleValue(ruleMap.get(c).getRuleValue()))); } } @@ -160,7 +160,7 @@ public class QueryGenerator { if (null != value && value.toString().startsWith(COMMA) && value.toString().endsWith(COMMA)) { String multiLikeval = value.toString().replace(",,", COMMA); String[] vals = multiLikeval.substring(1, multiLikeval.length()).split(COMMA); - final String field = oConvertUtils.camelToUnderline(column); + final String field = ConvertUtils.camelToUnderline(column); if(vals.length>1) { queryWrapper.and(j -> { log.info("---查询过滤器，Query规则---field:{}, rule:{}, value:{}", field, "like", vals[0]); @@ -239,7 +239,7 @@ public class QueryGenerator { order = parameterMap.get(ORDER_TYPE)[0]; } log.debug("排序规则>>列:" + column + ",排序方式:" + order); - if (oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) { + if (ConvertUtils.isNotEmpty(column) && ConvertUtils.isNotEmpty(order)) { //字典字段，去掉字典翻译文本后缀 if(column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) { column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX)); @@ -258,7 +258,7 @@ public class QueryGenerator { if (column.contains(",")) { List columnList = Arrays.asList(column.split(",")); String columnStrNew = columnList.stream().map(c -> fieldColumnMap.get(c)).collect(Collectors.joining(",")); - if (oConvertUtils.isNotEmpty(columnStrNew)) { + if (ConvertUtils.isNotEmpty(columnStrNew)) { column = columnStrNew; } }else{ @@ -274,13 +274,13 @@ public class QueryGenerator { // 将现有排序 _ 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1,column2 desc" // 修改为 _ 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1 desc,column2 desc" if (order.toUpperCase().indexOf(ORDER_TYPE_ASC)>=0) { - //queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column)); - String columnStr = oConvertUtils.camelToUnderline(column); + //queryWrapper.orderByAsc(ConvertUtils.camelToUnderline(column)); + String columnStr = ConvertUtils.camelToUnderline(column); String[] columnArray = columnStr.split(","); queryWrapper.orderByAsc(Arrays.asList(columnArray)); } else { - //queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column)); - String columnStr = oConvertUtils.camelToUnderline(column); + //queryWrapper.orderByDesc(ConvertUtils.camelToUnderline(column)); + String columnStr = ConvertUtils.camelToUnderline(column); String[] columnArray = columnStr.split(","); queryWrapper.orderByDesc(Arrays.asList(columnArray)); } @@ -330,9 +330,9 @@ public class QueryGenerator { } // update-begin-author:sunjianlei date:20220119 for: 【JTC-573】 过滤空条件查询，防止 sql 拼接多余的 and List filterConditions = conditions.stream().filter( - rule -> oConvertUtils.isNotEmpty(rule.getField()) - && oConvertUtils.isNotEmpty(rule.getRule()) - && oConvertUtils.isNotEmpty(rule.getVal()) + rule -> ConvertUtils.isNotEmpty(rule.getField()) + && ConvertUtils.isNotEmpty(rule.getRule()) + && ConvertUtils.isNotEmpty(rule.getVal()) ).collect(Collectors.toList()); if (filterConditions.size() == 0) { return; @@ -343,9 +343,9 @@ public class QueryGenerator { queryWrapper.and(andWrapper -> { for (int i = 0; i < filterConditions.size(); i++) { QueryCondition rule = filterConditions.get(i); - if (oConvertUtils.isNotEmpty(rule.getField()) - && oConvertUtils.isNotEmpty(rule.getRule()) - && oConvertUtils.isNotEmpty(rule.getVal())) { + if (ConvertUtils.isNotEmpty(rule.getField()) + && ConvertUtils.isNotEmpty(rule.getRule()) + && ConvertUtils.isNotEmpty(rule.getVal())) { log.debug("SuperQuery ==> " + rule.toString()); @@ -358,7 +358,7 @@ public class QueryGenerator { } // update-begin--author:sunjianlei date:20210702 for：【/issues/I3VR8E】高级查询没有类型转换，查询参数都是字符串类型 ---- String dbType = rule.getDbType(); - if (oConvertUtils.isNotEmpty(dbType)) { + if (ConvertUtils.isNotEmpty(dbType)) { try { String valueStr = String.valueOf(queryValue); switch (dbType.toLowerCase().trim()) { @@ -538,7 +538,7 @@ public class QueryGenerator { } private static void addQueryByRule(QueryWrapper queryWrapper,String name,String type,String value,QueryRuleEnum rule) throws ParseException { - if(oConvertUtils.isNotEmpty(value)) { + if(ConvertUtils.isNotEmpty(value)) { //update-begin--Author:sunjianlei Date:20220104 for：【JTC-409】修复逗号分割情况下没有转换类型，导致类型严格的数据库查询报错 ------------------- // 针对数字类型字段，多值查询 if(value.contains(COMMA)){ @@ -632,10 +632,10 @@ public class QueryGenerator { * @param value 查询条件值 */ public static void addEasyQuery(QueryWrapper queryWrapper, String name, QueryRuleEnum rule, Object value) { - if (value == null || rule == null || oConvertUtils.isEmpty(value)) { + if (value == null || rule == null || ConvertUtils.isEmpty(value)) { return; } - name = oConvertUtils.camelToUnderline(name); + name = ConvertUtils.camelToUnderline(name); log.info("---查询过滤器，Query规则---field:{}, rule:{}, value:{}",name,rule.getValue(),value); switch (rule) { case GT: @@ -759,7 +759,7 @@ public class QueryGenerator { * @Return: java.lang.String */ public static String trimSingleQuote(String ruleValue) { - if (oConvertUtils.isEmpty(ruleValue)) { + if (ConvertUtils.isEmpty(ruleValue)) { return ""; } if (ruleValue.startsWith(QueryGenerator.SQL_SQ)) { @@ -788,7 +788,7 @@ public class QueryGenerator { * 获取sql中的#{key} 这个key组成的set */ public static Set getSqlRuleParams(String sql) { - if(oConvertUtils.isEmpty(sql)){ + if(ConvertUtils.isEmpty(sql)){ return null; } Set varParams = new HashSet(); @@ -828,7 +828,7 @@ public class QueryGenerator { if (value == null) { return ""; } - field = alias+oConvertUtils.camelToUnderline(field); + field = alias+ConvertUtils.camelToUnderline(field); QueryRuleEnum rule = QueryGenerator.convert2Rule(value); return getSingleSqlByRule(rule, field, value, isString, dataBaseType); } @@ -1044,7 +1044,7 @@ public class QueryGenerator { PropertyDescriptor[] origDescriptors = PropertyUtils.getPropertyDescriptors(clazz); String sqlAnd = " and "; for (String c : ruleMap.keySet()) { - if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){ + if(ConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){ sb.append(sqlAnd+getSqlRuleValue(ruleMap.get(c).getRuleValue())); } } @@ -1069,7 +1069,7 @@ public class QueryGenerator { }else { value = NumberUtils.parseNumber(dataRule.getRuleValue(),propType); } - String filedSql = getSingleSqlByRule(rule, oConvertUtils.camelToUnderline(column), value,isString); + String filedSql = getSingleSqlByRule(rule, ConvertUtils.camelToUnderline(column), value,isString); sb.append(sqlAnd+filedSql); } } @@ -1088,7 +1088,7 @@ public class QueryGenerator { Map ruleMap = getRuleMap(); PropertyDescriptor[] origDescriptors = PropertyUtils.getPropertyDescriptors(clazz); for (String c : ruleMap.keySet()) { - if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){ + if(ConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){ queryWrapper.and(i ->i.apply(getSqlRuleValue(ruleMap.get(c).getRuleValue()))); } } @@ -1129,10 +1129,10 @@ public class QueryGenerator { for (String c : ruleMap.keySet()) { SysPermissionDataRuleModel dataRule = ruleMap.get(c); String ruleValue = dataRule.getRuleValue(); - if(oConvertUtils.isEmpty(ruleValue)){ + if(ConvertUtils.isEmpty(ruleValue)){ continue; } - if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){ + if(ConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){ sb.append(sqlAnd+getSqlRuleValue(ruleValue)); }else{ boolean isString = false; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java index c31bf2b31980ab458a6cec670a501cdb69444d66..e8456c751b1ce2f1fb083ce6624cf3328f0c37b7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java @@ -1,6 +1,6 @@ package org.jeecg.common.system.query; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; /** * Query 规则 常量 @@ -73,7 +73,7 @@ public enum QueryRuleEnum { } public static QueryRuleEnum getByValue(String value){ - if(oConvertUtils.isEmpty(value)) { + if(ConvertUtils.isEmpty(value)) { return null; } for(QueryRuleEnum val :values()){ diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java index 4c82608f8ef6517f29414395f4df1f4cde001b71..83f3043174115e82cd6d83092e260f0d93eb9939 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java @@ -26,7 +26,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.SysUserCacheInfo; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; /** * @Author Scott @@ -122,7 +122,7 @@ public class JwtUtil { public static String getUserNameByToken(HttpServletRequest request) throws JeecgBootException { String accessToken = request.getHeader("X-Access-Token"); String username = getUsername(accessToken); - if (oConvertUtils.isEmpty(username)) { + if (ConvertUtils.isEmpty(username)) { throw new JeecgBootException("未获取到用户"); } return username; @@ -146,7 +146,7 @@ public class JwtUtil { if (key.contains(wellNumber)) { key = key.substring(2,key.indexOf("}")); } - if (oConvertUtils.isNotEmpty(key)) { + if (ConvertUtils.isNotEmpty(key)) { HttpSession session = SpringContextUtils.getHttpServletRequest().getSession(); returnValue = (String) session.getAttribute(key); } @@ -236,7 +236,7 @@ public class JwtUtil { else if (key.equals(DataBaseConstant.TENANT_ID) || key.toLowerCase().equals(DataBaseConstant.TENANT_ID_TABLE)){ returnValue = sysUser.getRelTenantIds(); boolean flag = returnValue != null && returnValue.indexOf(SymbolConstant.COMMA) > 0; - if(oConvertUtils.isEmpty(returnValue) || flag){ + if(ConvertUtils.isEmpty(returnValue) || flag){ returnValue = SpringContextUtils.getHttpServletRequest().getHeader(CommonConstant.TENANT_ID); } } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java index de9f33183b0967ed0c61b58fc5fb55620c31f894..7061216ae029e2d4f42fd3db4eec2375e49cba80 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java @@ -3,7 +3,7 @@ package org.jeecg.common.system.util; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.annotation.EnumDict; import org.jeecg.common.system.vo.DictModel; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; @@ -73,7 +73,7 @@ public class ResourceUtil { if (enumDict != null) { EnumDict annotation = clazz.getAnnotation(EnumDict.class); String key = annotation.value(); - if(oConvertUtils.isNotEmpty(key)){ + if(ConvertUtils.isNotEmpty(key)){ List list = (List) clazz.getDeclaredMethod(METHOD_NAME).invoke(null); enumDictData.put(key, list); } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java index e2cc671f0ebce4c068dfd63ebf170f0b2bc81ea8..29034bfb87f6b9642d3dbb9f18f07ba6b9c5b0c2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java @@ -167,7 +167,7 @@ public class CommonUtils { File savefile = new File(savePath); FileCopyUtils.copy(mf.getBytes(), savefile); String dbpath = null; - if(oConvertUtils.isNotEmpty(bizPath)){ + if(ConvertUtils.isNotEmpty(bizPath)){ dbpath = bizPath + File.separator + fileName; }else{ dbpath = fileName; @@ -212,7 +212,7 @@ public class CommonUtils { */ @Deprecated public static String getDatabaseType() { - if(oConvertUtils.isNotEmpty(DB_TYPE)){ + if(ConvertUtils.isNotEmpty(DB_TYPE)){ return DB_TYPE; } DataSource dataSource = SpringContextUtils.getApplicationContext().getBean(DataSource.class); @@ -230,7 +230,7 @@ public class CommonUtils { * @return */ public static DbType getDatabaseTypeEnum() { - if (oConvertUtils.isNotEmpty(dbTypeEnum)) { + if (ConvertUtils.isNotEmpty(dbTypeEnum)) { return dbTypeEnum; } try { @@ -262,7 +262,7 @@ public class CommonUtils { * @throws SQLException */ public static Connection getDataSourceConnect(String sourceKey) throws SQLException { - if (oConvertUtils.isEmpty(sourceKey)) { + if (ConvertUtils.isEmpty(sourceKey)) { sourceKey = "master"; } DynamicDataSourceProperties prop = SpringContextUtils.getApplicationContext().getBean(DynamicDataSourceProperties.class); @@ -324,14 +324,14 @@ public class CommonUtils { public static String getBaseUrl(HttpServletRequest request) { //1.【兼容】兼容微服务下的 base path------- String xGatewayBasePath = request.getHeader(ServiceNameConstants.X_GATEWAY_BASE_PATH); - if(oConvertUtils.isNotEmpty(xGatewayBasePath)){ + if(ConvertUtils.isNotEmpty(xGatewayBasePath)){ log.info("x_gateway_base_path = "+ xGatewayBasePath); return xGatewayBasePath; } //2.【兼容】SSL认证之后，request.getScheme()获取不到https的问题 // https://blog.csdn.net/weixin_34376986/article/details/89767950 String scheme = request.getHeader(CommonConstant.X_FORWARDED_SCHEME); - if(oConvertUtils.isEmpty(scheme)){ + if(ConvertUtils.isEmpty(scheme)){ scheme = request.getScheme(); } @@ -351,4 +351,4 @@ public class CommonUtils { log.debug("-----Common getBaseUrl----- : " + baseDomainPath); return baseDomainPath; } -} \ No newline at end of file +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ConvertUtils.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ConvertUtils.java index e970ae7f47ad1f7d8dbadebf4cd51df608081707..40b124e22591701f1df2ae099abddc6f624d57ae 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ConvertUtils.java @@ -23,12 +23,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * - * @Author 张代浩 * + * @Author 张代浩 + * @since 2022-10-11 修改文件名称，由原来的ConvertUtils改为ConvertUtils */ @Slf4j -public class oConvertUtils { +public class ConvertUtils { public static boolean isEmpty(Object object) { if (object == null) { return (true); @@ -41,7 +41,7 @@ public class oConvertUtils { } return (false); } - + public static boolean isNotEmpty(Object object) { if (object != null && !"".equals(object) && !object.equals(CommonConstant.STRING_NULL)) { return (true); @@ -166,7 +166,7 @@ public class oConvertUtils { return (defval); } } - + public static Integer getInt(Object object) { if (isEmpty(object)) { return null; @@ -210,7 +210,7 @@ public class oConvertUtils { /*public static String escapeJava(Object s) { return StringEscapeUtils.escapeJava(getString(s)); }*/ - + public static String getString(Object object) { if (isEmpty(object)) { return ""; @@ -266,7 +266,7 @@ public class oConvertUtils { /** * 判断一个类是否为基本数据类型。 - * + * * @param clazz * 要判断的类。 * @return true 表示为基本数据类型。 @@ -334,7 +334,7 @@ public class oConvertUtils { /** * java去除字符串中的空格、回车、换行符、制表符 - * + * * @param str * @return */ @@ -352,7 +352,7 @@ public class oConvertUtils { /** * 判断元素是否在数组内 - * + * * @param substring * @param source * @return @@ -379,7 +379,7 @@ public class oConvertUtils { /** * SET转换MAP - * + * * @param str * @return */ @@ -424,12 +424,12 @@ public class oConvertUtils { private static boolean isInner(long userIp, long begin, long end) { return (userIp >= begin) && (userIp <= end); } - + /** * 将下划线大写方式命名的字符串转换为驼峰式。 * 如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。
* 例如：hello_world->helloWorld - * + * * @param name * 转换前的下划线大写方式命名的字符串 * @return 转换后的驼峰式命名的字符串 @@ -466,12 +466,12 @@ public class oConvertUtils { } return result.toString(); } - + /** * 将下划线大写方式命名的字符串转换为驼峰式。 * 如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。
* 例如：hello_world,test_id->helloWorld,testId - * + * * @param name * 转换前的下划线大写方式命名的字符串 * @return 转换后的驼峰式命名的字符串 @@ -489,13 +489,13 @@ public class oConvertUtils { String result = sf.toString(); return result.substring(0, result.length() - 1); } - + //update-begin--Author:zhoujf Date:20180503 for：TASK #2500 【代码生成器】代码生成器开发一通用模板生成功能 /** * 将下划线大写方式命名的字符串转换为驼峰式。(首字母写) * 如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。
* 例如：hello_world->HelloWorld - * + * * @param name * 转换前的下划线大写方式命名的字符串 * @return 转换后的驼峰式命名的字符串 @@ -524,7 +524,7 @@ public class oConvertUtils { return result.toString(); } //update-end--Author:zhoujf Date:20180503 for：TASK #2500 【代码生成器】代码生成器开发一通用模板生成功能 - + /** * 将驼峰命名转化成下划线 * @param para @@ -533,19 +533,19 @@ public class oConvertUtils { public static String camelToUnderline(String para){ int length = 3; if(para.length()> select = new ArrayList<>(); for (Map row : list) { Map resultMap = new HashMap<>(5); - Set keySet = row.keySet(); - for (String key : keySet) { - String newKey = key.toLowerCase(); - resultMap.put(newKey, row.get(key)); + Set keySet = row.keySet(); + for (String key : keySet) { + String newKey = key.toLowerCase(); + resultMap.put(newKey, row.get(key)); } select.add(resultMap); } @@ -670,7 +670,7 @@ public class oConvertUtils { String json = ""; try { //换个写法，解决springboot读取jar包中文件的问题 - InputStream stream = oConvertUtils.class.getClassLoader().getResourceAsStream(url.replace("classpath:", "")); + InputStream stream = ConvertUtils.class.getClassLoader().getResourceAsStream(url.replace("classpath:", "")); json = IOUtils.toString(stream,"UTF-8"); } catch (IOException e) { log.error(e.getMessage(),e); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java index f4bbd43e5a1e0b53177c6e7ce96f8d420ba332b0..be6f1c8d7c39899b68fa443667cecd88daf68d34 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java @@ -64,7 +64,7 @@ public class MinioUtil { //update-end-author:liusq date:20210809 for: 过滤上传文件类型 String newBucket = bucketName; - if(oConvertUtils.isNotEmpty(customBucket)){ + if(ConvertUtils.isNotEmpty(customBucket)){ newBucket = customBucket; } try { diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java index 20289b60a4df19e5428e434de52a1f666e93d5bf..a216f90f9f9cfb97a6243515731c0d34ac2aa4d3 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java @@ -67,7 +67,7 @@ public class MyClassLoader extends ClassLoader { start = end + 1; end = packName.indexOf(".", start); } - if(oConvertUtils.isNotEmpty(pathBuilder.toString())){ + if(ConvertUtils.isNotEmpty(pathBuilder.toString())){ path = pathBuilder.toString(); } path = path + packName.substring(start) + "/"; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java index d684346942bd15d544b6914c543c636fb08bcdc0..10fe263d953d82f856d6830f0a23bb830f9ae32f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java @@ -19,7 +19,7 @@ public class RestDesformUtil { static { domain = SpringContextUtils.getDomain(); - path = oConvertUtils.getString(SpringContextUtils.getApplicationContext().getEnvironment().getProperty("server.servlet.context-path")); + path = ConvertUtils.getString(SpringContextUtils.getApplicationContext().getEnvironment().getProperty("server.servlet.context-path")); } /** @@ -118,4 +118,4 @@ public class RestDesformUtil { return headers; } -} \ No newline at end of file +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java index 6495fb7adc533f5a9d5857ea13d0ab8d4fb62f1f..788e6dae616cab89944449aa45a5d740c2024fd4 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java @@ -43,7 +43,7 @@ public class RestUtil { if (path == null) { path = SpringContextUtils.getApplicationContext().getEnvironment().getProperty("server.servlet.context-path"); } - return oConvertUtils.getString(path); + return ConvertUtils.getString(path); } public static String getBaseUrl() { @@ -55,7 +55,7 @@ public class RestUtil { } //定时任务情况下，通过request是获取不到domain的，这种情况下通过配置获取pc后台域名 - if(oConvertUtils.isEmpty(basepath)){ + if(ConvertUtils.isEmpty(basepath)){ JeecgBaseConfig jeecgBaseConfig = SpringContextUtils.getBean(JeecgBaseConfig.class); basepath = jeecgBaseConfig.getDomainUrl().getPc(); } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java index cd3d878379237d20c83973e3c19318b80449933d..86039ecc00426711e02c18ef1e504e8fbc2aa7b3 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java @@ -58,7 +58,7 @@ public class SpringContextUtils implements ApplicationContextAware { StringBuffer url = request.getRequestURL(); //微服务情况下，获取gateway的basePath String basePath = request.getHeader(ServiceNameConstants.X_GATEWAY_BASE_PATH); - if(oConvertUtils.isNotEmpty(basePath)){ + if(ConvertUtils.isNotEmpty(basePath)){ return basePath; }else{ return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString(); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java index 99c4caf253254d0a442027083ee4b1a4ec4d1d74..af12b4911e403082ec9c83871e5a6bfb7999680a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java @@ -224,7 +224,7 @@ public class SqlInjectionUtil { Field[] fields = clazz.getDeclaredFields(); for(int i=0;i> list; list = findList(dbKey, sql, param); - if (oConvertUtils.listIsEmpty(list)) { + if (ConvertUtils.listIsEmpty(list)) { log.error("Except one, but not find actually"); return null; } @@ -180,7 +180,7 @@ public class DynamicDBUtil { public static Object findOneByHash(final String dbKey, String sql, HashMap data) { List> list; list = findListByHash(dbKey, sql, data); - if (oConvertUtils.listIsEmpty(list)) { + if (ConvertUtils.listIsEmpty(list)) { log.error("Except one, but not find actually"); } if (list.size() > 1) { diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java index 2405c6c784b4888fc5b1002554bd342c7d07a7fa..2793770df710097413898b77d2b919c7348d19b5 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java @@ -13,7 +13,7 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.filter.FileTypeFilter; import org.jeecg.common.util.filter.StrAttackFilter; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.web.multipart.MultipartFile; import java.io.BufferedInputStream; @@ -104,7 +104,7 @@ public class OssBootUtil { initOss(endPoint, accessKeyId, accessKeySecret); StringBuilder fileUrl = new StringBuilder(); String newBucket = bucketName; - if(oConvertUtils.isNotEmpty(customBucket)){ + if(ConvertUtils.isNotEmpty(customBucket)){ newBucket = customBucket; } try { @@ -129,7 +129,7 @@ public class OssBootUtil { //update-end-author:wangshuai date:20201012 for: 过滤上传文件夹名特殊字符，防止攻击 fileUrl = fileUrl.append(fileDir + fileName); - if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith(CommonConstant.STR_HTTP)) { + if (ConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith(CommonConstant.STR_HTTP)) { filePath = staticDomain + SymbolConstant.SINGLE_SLASH + fileUrl; } else { filePath = "https://" + newBucket + "." + endPoint + SymbolConstant.SINGLE_SLASH + fileUrl; @@ -157,7 +157,7 @@ public class OssBootUtil { */ public static String getOriginalUrl(String url) { String originalDomain = "https://" + bucketName + "." + endPoint; - if(oConvertUtils.isNotEmpty(staticDomain) && url.indexOf(staticDomain)!=-1){ + if(ConvertUtils.isNotEmpty(staticDomain) && url.indexOf(staticDomain)!=-1){ url = url.replace(staticDomain,originalDomain); } return url; @@ -194,7 +194,7 @@ public class OssBootUtil { } fileDir = StrAttackFilter.filter(fileDir); fileUrl = fileUrl.append(fileDir + fileName); - if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith(CommonConstant.STR_HTTP)) { + if (ConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith(CommonConstant.STR_HTTP)) { filePath = staticDomain + SymbolConstant.SINGLE_SLASH + fileUrl; } else { filePath = "https://" + bucketName + "." + endPoint + SymbolConstant.SINGLE_SLASH + fileUrl; @@ -226,11 +226,11 @@ public class OssBootUtil { */ public static void deleteUrl(String url,String bucket) { String newBucket = bucketName; - if(oConvertUtils.isNotEmpty(bucket)){ + if(ConvertUtils.isNotEmpty(bucket)){ newBucket = bucket; } String bucketUrl = ""; - if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith(CommonConstant.STR_HTTP)) { + if (ConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith(CommonConstant.STR_HTTP)) { bucketUrl = staticDomain + SymbolConstant.SINGLE_SLASH ; } else { bucketUrl = "https://" + newBucket + "." + endPoint + SymbolConstant.SINGLE_SLASH; @@ -259,7 +259,7 @@ public class OssBootUtil { InputStream inputStream = null; try{ String newBucket = bucketName; - if(oConvertUtils.isNotEmpty(bucket)){ + if(ConvertUtils.isNotEmpty(bucket)){ newBucket = bucket; } initOss(endPoint, accessKeyId, accessKeySecret); @@ -334,7 +334,7 @@ public class OssBootUtil { String filePath = null; String fileUrl = relativePath; initOss(endPoint, accessKeyId, accessKeySecret); - if (oConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith(CommonConstant.STR_HTTP)) { + if (ConvertUtils.isNotEmpty(staticDomain) && staticDomain.toLowerCase().startsWith(CommonConstant.STR_HTTP)) { filePath = staticDomain + SymbolConstant.SINGLE_SLASH + relativePath; } else { filePath = "https://" + bucketName + "." + endPoint + SymbolConstant.SINGLE_SLASH + fileUrl; @@ -358,11 +358,11 @@ public class OssBootUtil { */ private static String replacePrefix(String objectName,String customBucket){ log.info("------replacePrefix---替换前---objectName:{}",objectName); - if(oConvertUtils.isNotEmpty(staticDomain)){ + if(ConvertUtils.isNotEmpty(staticDomain)){ objectName= objectName.replace(staticDomain+SymbolConstant.SINGLE_SLASH,""); }else{ String newBucket = bucketName; - if(oConvertUtils.isNotEmpty(customBucket)){ + if(ConvertUtils.isNotEmpty(customBucket)){ newBucket = customBucket; } String path ="https://" + newBucket + "." + endPoint + SymbolConstant.SINGLE_SLASH; @@ -371,4 +371,4 @@ public class OssBootUtil { log.info("------replacePrefix---替换后---objectName:{}",objectName); return objectName; } -} \ No newline at end of file +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java index ab948f70bcfb08b5919bce6f1c0badb4d2024acb..81b015e55fd04c5c816a84bec7cdd222bc354789 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java @@ -1,7 +1,7 @@ package org.jeecg.common.util.security; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; /** * jdbc连接校验 @@ -24,7 +24,7 @@ public class JdbcSecurityUtil { * @return */ public static void validate(String jdbcUrl){ - if(oConvertUtils.isEmpty(jdbcUrl)){ + if(ConvertUtils.isEmpty(jdbcUrl)){ return; } String urlConcatChar = "?"; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java index 0bfb9d821964a2c27774b496cca25dea10dccbc1..4423d0e0077a6af8cb51e87fb61b97338b041eb7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java @@ -1,6 +1,6 @@ //package org.jeecg.common.util.superSearch; // -//import org.jeecg.common.util.oConvertUtils; +//import org.jeecg.common.util.ConvertUtils; // ///** // * Query 规则 常量 @@ -58,7 +58,7 @@ // } // // public static QueryRuleEnum getByValue(String value){ -// if(oConvertUtils.isEmpty(value)) { +// if(ConvertUtils.isEmpty(value)) { // return null; // } // for(QueryRuleEnum val :values()){ diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java index 12c4fd862fd307e196c98d1a6195abb11c213f93..177bfb3385db58f283902ded6b9fa493ac50809a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java @@ -7,7 +7,7 @@ import javax.annotation.Resource; import org.jeecg.common.api.CommonAPI; import org.jeecg.common.system.vo.DictModel; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecgframework.dict.service.AutoPoiDictServiceI; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -19,9 +19,9 @@ import lombok.extern.slf4j.Slf4j; * 举例： @Excel(name = "性别", width = 15, dicCode = "sex") * 1、导出的时候会根据字典配置，把值1,2翻译成：男、女; * 2、导入的时候，会把男、女翻译成1,2存进数据库; - * - * @Author:scott - * @since：2019-04-09 + * + * @Author:scott + * @since：2019-04-09 * @Version:1.0 */ @Slf4j @@ -36,8 +36,8 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { /** * 通过字典查询easypoi，所需字典文本 - * - * @Author:scott + * + * @Author:scott * @since：2019-04-09 * @return */ @@ -46,11 +46,11 @@ public class AutoPoiDictConfig implements AutoPoiDictServiceI { List dictReplaces = new ArrayList(); List dictList = null; // step.1 如果没有字典表则使用系统字典表 - if (oConvertUtils.isEmpty(dicTable)) { + if (ConvertUtils.isEmpty(dicTable)) { dictList = commonApi.queryDictItemsByCode(dicCode); } else { try { - dicText = oConvertUtils.getString(dicText, dicCode); + dicText = ConvertUtils.getString(dicText, dicCode); dictList = commonApi.queryTableDictItemsByCode(dicTable, dicText, dicCode); } catch (Exception e) { log.error(e.getMessage(),e); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java index 55417e153b72fb16b9aedbe83d98833f4830c4fb..07cee2583e06cd441ee3b92370211518c0866a02 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java @@ -5,7 +5,7 @@ import org.jeecg.common.api.CommonAPI; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.TokenUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; @@ -42,8 +42,8 @@ public class WebsocketFilter implements Filter { try { TokenUtils.verifyToken(token, commonApi, redisUtil); } catch (Exception exception) { - //log.error("Websocket连接 Token安全校验失败，IP:{}, Token:{}, Path = {}，异常：{}", oConvertUtils.getIpAddrByRequest(request), token, request.getRequestURI(), exception.getMessage()); - log.debug("Websocket连接 Token安全校验失败，IP:{}, Token:{}, Path = {}，异常：{}", oConvertUtils.getIpAddrByRequest(request), token, request.getRequestURI(), exception.getMessage()); + //log.error("Websocket连接 Token安全校验失败，IP:{}, Token:{}, Path = {}，异常：{}", ConvertUtils.getIpAddrByRequest(request), token, request.getRequestURI(), exception.getMessage()); + log.debug("Websocket连接 Token安全校验失败，IP:{}, Token:{}, Path = {}，异常：{}", ConvertUtils.getIpAddrByRequest(request), token, request.getRequestURI(), exception.getMessage()); return; } HttpServletResponse response = (HttpServletResponse)servletResponse; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java index c9dc36f1c89e9e0119e49dac28484b2d24875c82..800cf03d5e47510d5a03c585821d4a9f1461904b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java @@ -8,7 +8,7 @@ import org.apache.ibatis.mapping.SqlCommandType; import org.apache.ibatis.plugin.*; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.stereotype.Component; import java.lang.reflect.Field; @@ -40,7 +40,7 @@ public class MybatisInterceptor implements Interceptor { } if (SqlCommandType.INSERT == sqlCommandType) { LoginUser sysUser = this.getLoginUser(); - Field[] fields = oConvertUtils.getAllFields(parameter); + Field[] fields = ConvertUtils.getAllFields(parameter); for (Field field : fields) { log.debug("------field.name------" + field.getName()); try { @@ -106,9 +106,9 @@ public class MybatisInterceptor implements Interceptor { } //update-end-author:scott date:20190729 for:更新指定字段时报错 issues/#516- - fields = oConvertUtils.getAllFields(parameter); + fields = ConvertUtils.getAllFields(parameter); } else { - fields = oConvertUtils.getAllFields(parameter); + fields = ConvertUtils.getAllFields(parameter); } for (Field field : fields) { diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java index f7aff806a0bd82bda23305d706ebef9103f73792..87987da9be0cbb22bbd57da1998943cca7177787 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java @@ -7,7 +7,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -54,7 +54,7 @@ public class MybatisPlusSaasConfig { interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new TenantLineHandler() { @Override public Expression getTenantId() { - String tenantId = oConvertUtils.getString(TenantContext.getTenant(),"0"); + String tenantId = ConvertUtils.getString(TenantContext.getTenant(),"0"); return new LongValue(tenantId); } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index c2a52c1df5158b09e50a670b9d823f33bf7f711e..8fb7d981b74fbc31fd3f91dc219b9a4de16449f8 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -14,7 +14,7 @@ import org.crazycake.shiro.RedisCacheManager; import org.crazycake.shiro.RedisClusterManager; import org.crazycake.shiro.RedisManager; import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.shiro.filters.CustomShiroFilterFactoryBean; import org.jeecg.config.shiro.filters.JwtFilter; @@ -68,7 +68,7 @@ public class ShiroConfig { //支持yml方式，配置拦截排除 if(jeecgBaseConfig!=null && jeecgBaseConfig.getShiro()!=null){ String shiroExcludeUrls = jeecgBaseConfig.getShiro().getExcludeUrls(); - if(oConvertUtils.isNotEmpty(shiroExcludeUrls)){ + if(ConvertUtils.isNotEmpty(shiroExcludeUrls)){ String[] permissionUrl = shiroExcludeUrls.split(","); for(String url : permissionUrl){ filterChainDefinitionMap.put(url,"anon"); @@ -261,7 +261,7 @@ public class ShiroConfig { Set portSet = new HashSet<>(); lettuceConnectionFactory.getClusterConfiguration().getClusterNodes().forEach(node -> portSet.add(new HostAndPort(node.getHost() , node.getPort()))); //update-begin--Author:scott Date:20210531 for：修改集群模式下未设置redis密码的bug issues/I3QNIC - if (oConvertUtils.isNotEmpty(lettuceConnectionFactory.getPassword())) { + if (ConvertUtils.isNotEmpty(lettuceConnectionFactory.getPassword())) { JedisCluster jedisCluster = new JedisCluster(portSet, 2000, 2000, 5, lettuceConnectionFactory.getPassword(), new GenericObjectPoolConfig()); redisManager.setPassword(lettuceConnectionFactory.getPassword()); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java index 35502829c402d99b379a7c59ea2539b2d51821ba..ddc2453d31d8d9ce08ff46e646adddff0afa61fb 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java @@ -17,7 +17,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.TokenUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -94,7 +94,7 @@ public class ShiroRealm extends AuthorizingRealm { String token = (String) auth.getCredentials(); if (token == null) { HttpServletRequest req = SpringContextUtils.getHttpServletRequest(); - log.info("————————身份认证失败——————————IP地址: "+ oConvertUtils.getIpAddrByRequest(req) +"，URL:"+req.getRequestURI()); + log.info("————————身份认证失败——————————IP地址: "+ ConvertUtils.getIpAddrByRequest(req) +"，URL:"+req.getRequestURI()); throw new AuthenticationException("token为空!"); } // 校验token有效性 @@ -138,13 +138,13 @@ public class ShiroRealm extends AuthorizingRealm { } //update-begin-author:taoyan date:20210609 for:校验用户的tenant_id和前端传过来的是否一致 String userTenantIds = loginUser.getRelTenantIds(); - if(oConvertUtils.isNotEmpty(userTenantIds)){ + if(ConvertUtils.isNotEmpty(userTenantIds)){ String contextTenantId = TenantContext.getTenant(); String str ="0"; - if(oConvertUtils.isNotEmpty(contextTenantId) && !str.equals(contextTenantId)){ + if(ConvertUtils.isNotEmpty(contextTenantId) && !str.equals(contextTenantId)){ //update-begin-author:taoyan date:20211227 for: /issues/I4O14W 用户租户信息变更判断漏洞 String[] arr = userTenantIds.split(","); - if(!oConvertUtils.isIn(contextTenantId, arr)){ + if(!ConvertUtils.isIn(contextTenantId, arr)){ throw new AuthenticationException("用户租户信息变更,请重新登陆!"); } //update-end-author:taoyan date:20211227 for: /issues/I4O14W 用户租户信息变更判断漏洞 @@ -169,7 +169,7 @@ public class ShiroRealm extends AuthorizingRealm { */ public boolean jwtTokenRefresh(String token, String userName, String passWord) { String cacheToken = String.valueOf(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + token)); - if (oConvertUtils.isNotEmpty(cacheToken)) { + if (ConvertUtils.isNotEmpty(cacheToken)) { // 校验token有效性 if (!JwtUtil.verify(cacheToken, userName, passWord)) { String newAuthorization = JwtUtil.sign(userName, passWord); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java index 2e527c0753b5f90b8bcd03aaf917cec89cd24ab4..02ddbdbefb53bfda23f47e11693622ca0755aeab 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java @@ -6,7 +6,7 @@ import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter; import org.jeecg.common.config.TenantContext; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.config.shiro.JwtToken; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -64,7 +64,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { HttpServletRequest httpServletRequest = (HttpServletRequest) request; String token = httpServletRequest.getHeader(CommonConstant.X_ACCESS_TOKEN); // update-begin--Author:lvdandan Date:20210105 for：JT-355 OA聊天添加token验证，获取token参数 - if (oConvertUtils.isEmpty(token)) { + if (ConvertUtils.isEmpty(token)) { token = httpServletRequest.getParameter("token"); } // update-end--Author:lvdandan Date:20210105 for：JT-355 OA聊天添加token验证，获取token参数 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java index 94fe002cba58dd5a02aa06636638433533e13ecd..e826a79d49dcacce9f0fad3b9e25896e9f50060f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.constant.SymbolConstant; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.http.HttpMethod; import com.alibaba.fastjson.JSONObject; @@ -144,7 +144,7 @@ public class HttpUtils { */ public static Map getUrlParams(HttpServletRequest request) { Map result = new HashMap<>(16); - if (oConvertUtils.isEmpty(request.getQueryString())) { + if (ConvertUtils.isEmpty(request.getQueryString())) { return result; } String param = ""; @@ -168,7 +168,7 @@ public class HttpUtils { */ public static Map getUrlParams(String queryString) { Map result = new HashMap<>(16); - if (oConvertUtils.isEmpty(queryString)) { + if (ConvertUtils.isEmpty(queryString)) { return result; } String param = ""; @@ -184,4 +184,4 @@ public class HttpUtils { } return result; } -} \ No newline at end of file +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java index a85a4663b60c98a4acf7c1de0223b099ca4c2b64..2926a569bff4fd5f1907bb96ac3a91d629819fb0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java @@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.springframework.util.DigestUtils; import org.springframework.util.StringUtils; @@ -52,7 +52,7 @@ public class SignUtil { JeecgBaseConfig jeecgBaseConfig = SpringContextUtils.getBean(JeecgBaseConfig.class); String signatureSecret = jeecgBaseConfig.getSignatureSecret(); String curlyBracket = SymbolConstant.DOLLAR + SymbolConstant.LEFT_CURLY_BRACKET; - if(oConvertUtils.isEmpty(signatureSecret) || signatureSecret.contains(curlyBracket)){ + if(ConvertUtils.isEmpty(signatureSecret) || signatureSecret.contains(curlyBracket)){ throw new JeecgBootException("签名密钥 ${jeecg.signatureSecret} 缺少配置 ！！"); } try { @@ -63,4 +63,4 @@ public class SignUtil { return null; } } -} \ No newline at end of file +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java index 3bd057c518e50a7a73f1ab5a6ff821d03859d4c3..8dfdbb37614876a22d490472ee0e380a2923750f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java @@ -9,7 +9,7 @@ import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -29,7 +29,7 @@ public class BaseCommonServiceImpl implements BaseCommonService { @Override public void addLog(LogDTO logDTO) { - if(oConvertUtils.isEmpty(logDTO.getId())){ + if(ConvertUtils.isEmpty(logDTO.getId())){ logDTO.setId(String.valueOf(IdWorker.getId())); } //保存日志（异常捕获处理，防止数据太大存储失败，导致业务失败）JT-238 diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java index fe2dd68da5878272d22d68e25c4d78de5c9926ad..5ad1983e5a3a917c1a8f8ae10e2eacf2c811a8dc 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.DictModel; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -88,7 +88,7 @@ public class OnlCgformDemoController { * 直接返回错误状态即可 */ String phone = record.getString("phone"); - if (oConvertUtils.isEmpty(phone)) { + if (ConvertUtils.isEmpty(phone)) { return Result.error("手机号不能为空！"); } /* diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java index bfb9ea535837cd408b01b3ab1d2aef70a91c43f3..03373c8604e8abdbbe54d3b2bb796583dabd1454 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java @@ -13,7 +13,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.demo.test.entity.JeecgDemo; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; import org.jeecg.modules.demo.test.entity.JeecgOrderMain; diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java index c375ebc9162667ff5769907e6f5c798d5334bbae..c419280ef5414473943cc6687f1eb64a8390b20d 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java @@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.demo.test.entity.JoaDemo; import org.jeecg.modules.demo.test.service.IJoaDemoService; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -184,7 +184,7 @@ public class JoaDemoController { QueryWrapper queryWrapper = null; try { String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { + if (ConvertUtils.isNotEmpty(paramsStr)) { String deString = URLDecoder.decode(paramsStr, "UTF-8"); JoaDemo joaDemo = JSON.parseObject(deString, JoaDemo.class); queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, request.getParameterMap()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java index 3325b88600011e3ae46c4c098611b20b67fa6fea..8b243552b5b56f0a18f327eb4ce278027069b8a9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java @@ -11,7 +11,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.message.entity.MsgParams; import org.jeecg.modules.message.entity.SysMessageTemplate; import org.jeecg.modules.message.service.ISysMessageTemplateService; @@ -166,7 +166,7 @@ public class SysMessageTemplateController extends JeecgController data = JSON.parseObject(testData, Map.class); md.setData(data); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java index a47b7e2711ded620fcacee04f6635072db50206e..d623bc7846b25453a0418cca3683cdce7b8e796d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java @@ -1,6 +1,6 @@ package org.jeecg.modules.message.handle.enums; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; /** * 发送消息类型枚举 @@ -51,7 +51,7 @@ public enum SendMsgTypeEnum { } public static SendMsgTypeEnum getByType(String type) { - if (oConvertUtils.isEmpty(type)) { + if (ConvertUtils.isEmpty(type)) { return null; } for (SendMsgTypeEnum val : values()) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java index 8ab0e0428be0c1453b863c216d4717a8581125e0..99772a68e6c5a519374294816c0009f03ba851be 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java @@ -7,7 +7,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.config.StaticConfig; import org.jeecg.modules.message.handle.ISendMsgHandle; import org.jeecg.modules.system.entity.SysUser; @@ -50,7 +50,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle { MimeMessage message = mailSender.createMimeMessage(); MimeMessageHelper helper = null; //update-begin-author：taoyan date:20200811 for:配置类数据获取 - if(oConvertUtils.isEmpty(emailFrom)){ + if(ConvertUtils.isEmpty(emailFrom)){ StaticConfig staticConfig = SpringContextUtils.getBean(StaticConfig.class); setEmailFrom(staticConfig.getEmailFrom()); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java index 321f1329c8da7860d6f4b735c365aa07f3710233..044ccc62506448c92c46d6bb56bfd682db107eeb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java @@ -7,7 +7,7 @@ import org.jeecg.common.constant.WebsocketConst; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.message.enums.Vue3MessageHrefEnum; import org.jeecg.modules.message.handle.ISendMsgHandle; import org.jeecg.modules.message.websocket.WebSocket; @@ -53,7 +53,7 @@ public class SystemSendMsgHandle implements ISendMsgHandle { */ @Override public void sendMsg(String esReceiver, String esTitle, String esContent) { - if(oConvertUtils.isEmpty(esReceiver)){ + if(ConvertUtils.isEmpty(esReceiver)){ throw new JeecgBootException("被发送人不能为空"); } ISysBaseAPI sysBaseApi = SpringContextUtils.getBean(ISysBaseAPI.class); @@ -109,7 +109,7 @@ public class SystemSendMsgHandle implements ISendMsgHandle { String[] userIds = userId.split(","); String anntId = announcement.getId(); for(int i=0;i entry : info.entrySet()) { redisInfo = new RedisInfo(); - redisInfo.setKey(oConvertUtils.getString(entry.getKey())); - redisInfo.setValue(oConvertUtils.getString(entry.getValue())); + redisInfo.setKey(ConvertUtils.getString(entry.getKey())); + redisInfo.setValue(ConvertUtils.getString(entry.getValue())); infoList.add(redisInfo); } return infoList; @@ -73,7 +73,7 @@ public class RedisServiceImpl implements RedisService { Map map = null; Properties info = redisConnectionFactory.getConnection().info(); for (Map.Entry entry : info.entrySet()) { - String key = oConvertUtils.getString(entry.getKey()); + String key = ConvertUtils.getString(entry.getKey()); if ("used_memory".equals(key)) { map = new HashMap(5); map.put("used_memory", entry.getValue()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java index bcad44acfe0f4e95ab195260eba7d4a137a76697..d2a2bb9c7be83f0b3a6bdf27e13e96963e43206e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.ngalain.service.NgAlainService; import org.jeecg.modules.system.entity.SysPermission; import org.jeecg.modules.system.mapper.SysDictMapper; @@ -88,12 +88,12 @@ public class NgAlainServiceImpl implements NgAlainService { } String tempPid = permission.getParentId(); JSONObject json = getPermissionJsonObject(permission); - if(parentJson==null && oConvertUtils.isEmpty(tempPid)) { + if(parentJson==null && ConvertUtils.isEmpty(tempPid)) { jsonArray.add(json); if(!permission.isLeaf()) { getPermissionJsonArray(jsonArray, metaList, json); } - }else if(parentJson!=null && oConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))){ + }else if(parentJson!=null && ConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))){ if(permission.getMenuType()==0) { JSONObject metaJson = parentJson.getJSONObject("meta"); if(metaJson.containsKey("permissionList")) { @@ -152,12 +152,12 @@ public class NgAlainServiceImpl implements NgAlainService { json.put("component", permission.getComponent()); JSONObject meta = new JSONObject(); meta.put("title", permission.getName()); - if(oConvertUtils.isEmpty(permission.getParentId())) { + if(ConvertUtils.isEmpty(permission.getParentId())) { //一级菜单跳转地址 json.put("redirect",permission.getRedirect()); - meta.put("icon", oConvertUtils.getString(permission.getIcon(), "")); + meta.put("icon", ConvertUtils.getString(permission.getIcon(), "")); }else { - meta.put("icon", oConvertUtils.getString(permission.getIcon(), "")); + meta.put("icon", ConvertUtils.getString(permission.getIcon(), "")); } if(flag) { meta.put("url", permission.getUrl()); @@ -174,7 +174,7 @@ public class NgAlainServiceImpl implements NgAlainService { * @return */ private String urlToRouteName(String url) { - if(oConvertUtils.isNotEmpty(url)) { + if(ConvertUtils.isNotEmpty(url)) { if(url.startsWith(SymbolConstant.SINGLE_SLASH)) { url = url.substring(1); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java index 24c4a77e59f2c466ea654cd5af7207b7f4781f59..6dfcfb908c5b5cfa57af32425c5ae9563bb5cb7c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java @@ -10,7 +10,7 @@ import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.RestUtil; import org.jeecg.common.util.TokenUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -72,7 +72,7 @@ public class CommonController { String bizPath = request.getParameter("biz"); //LOWCOD-2580 sys/common/upload接口存在任意文件上传漏洞 - if (oConvertUtils.isNotEmpty(bizPath)) { + if (ConvertUtils.isNotEmpty(bizPath)) { if(bizPath.contains(SymbolConstant.SPOT_SINGLE_SLASH) || bizPath.contains(SymbolConstant.SPOT_DOUBLE_BACKSLASH)){ throw new JeecgBootException("上传目录bizPath，格式非法！"); } @@ -81,7 +81,7 @@ public class CommonController { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; // 获取上传文件对象 MultipartFile file = multipartRequest.getFile("file"); - if(oConvertUtils.isEmpty(bizPath)){ + if(ConvertUtils.isEmpty(bizPath)){ if(CommonConstant.UPLOAD_TYPE_OSS.equals(uploadType)){ //未指定目录，则用阿里云默认目录 upload bizPath = "upload"; @@ -99,7 +99,7 @@ public class CommonController { /** 富文本编辑器及markdown本地上传时，采用返回链接方式 //针对jeditor编辑器如何使 lcaol模式，采用 base64格式存储 String jeditor = request.getParameter("jeditor"); - if(oConvertUtils.isNotEmpty(jeditor)){ + if(ConvertUtils.isNotEmpty(jeditor)){ result.setMessage(CommonConstant.UPLOAD_TYPE_LOCAL); result.setSuccess(true); return result; @@ -112,7 +112,7 @@ public class CommonController { savePath = CommonUtils.upload(file, bizPath, uploadType); //update-end-author:taoyan date:20200814 for:文件上传改造 } - if(oConvertUtils.isNotEmpty(savePath)){ + if(ConvertUtils.isNotEmpty(savePath)){ result.setMessage(savePath); result.setSuccess(true); }else { @@ -149,7 +149,7 @@ public class CommonController { File savefile = new File(savePath); FileCopyUtils.copy(mf.getBytes(), savefile); String dbpath = null; - if(oConvertUtils.isNotEmpty(bizPath)){ + if(ConvertUtils.isNotEmpty(bizPath)){ dbpath = bizPath + File.separator + fileName; }else{ dbpath = fileName; @@ -172,7 +172,7 @@ public class CommonController { // String fileName = null; // String bizPath = "files"; // String tempBizPath = request.getParameter("biz"); -// if(oConvertUtils.isNotEmpty(tempBizPath)){ +// if(ConvertUtils.isNotEmpty(tempBizPath)){ // bizPath = tempBizPath; // } // String nowday = new SimpleDateFormat("yyyyMMdd").format(new Date()); @@ -212,7 +212,7 @@ public class CommonController { public void view(HttpServletRequest request, HttpServletResponse response) { // ISO-8859-1 ==> UTF-8 进行编码转换 String imgPath = extractPathFromPattern(request); - if(oConvertUtils.isEmpty(imgPath) || CommonConstant.STRING_NULL.equals(imgPath)){ + if(ConvertUtils.isEmpty(imgPath) || CommonConstant.STRING_NULL.equals(imgPath)){ return; } // 其余处理略 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index 519764ad217f4078a17064485686107ce0271410..8fe07bca3babe05387bc86bf8bee1a8508f93810 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -143,7 +143,7 @@ public class LoginController { public Result getUserInfo(HttpServletRequest request){ Result result = new Result(); String username = JwtUtil.getUserNameByToken(request); - if(oConvertUtils.isNotEmpty(username)) { + if(ConvertUtils.isNotEmpty(username)) { // 根据用户名查询用户信息 SysUser sysUser = sysUserService.getUserByName(username); JSONObject obj=new JSONObject(); @@ -152,7 +152,7 @@ public class LoginController { String version = request.getHeader(CommonConstant.VERSION); //update-begin---author:liusq ---date:2022-06-29 for：接口返回值修改，同步修改这里的判断逻辑----------- SysRoleIndex roleIndex = sysUserService.getDynamicIndexByUserRole(username, version); - if (oConvertUtils.isNotEmpty(version) && roleIndex != null && oConvertUtils.isNotEmpty(roleIndex.getUrl())) { + if (ConvertUtils.isNotEmpty(version) && roleIndex != null && ConvertUtils.isNotEmpty(roleIndex.getUrl())) { String homePath = roleIndex.getUrl(); if (!homePath.startsWith(SymbolConstant.SINGLE_SLASH)) { homePath = SymbolConstant.SINGLE_SLASH + homePath; @@ -181,7 +181,7 @@ public class LoginController { public Result logout(HttpServletRequest request,HttpServletResponse response) { //用户退出逻辑 String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN); - if(oConvertUtils.isEmpty(token)) { + if(ConvertUtils.isEmpty(token)) { return Result.error("退出登录失败！"); } String username = JwtUtil.getUsername(token); @@ -253,7 +253,7 @@ public class LoginController { calendar.add(Calendar.DAY_OF_MONTH, -7); Date dayStart = calendar.getTime(); List> list = logService.findVisitCount(dayStart, dayEnd); - result.setResult(oConvertUtils.toLowerCasePageList(list)); + result.setResult(ConvertUtils.toLowerCasePageList(list)); return result; } @@ -267,7 +267,7 @@ public class LoginController { public Result selectDepart(@RequestBody SysUser user) { Result result = new Result(); String username = user.getUsername(); - if(oConvertUtils.isEmpty(username)) { + if(ConvertUtils.isEmpty(username)) { LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); username = sysUser.getUsername(); } @@ -293,7 +293,7 @@ public class LoginController { //手机号模式 登录模式: "2" 注册模式: "1" String smsmode=jsonObject.get("smsmode").toString(); log.info(mobile); - if(oConvertUtils.isEmpty(mobile)){ + if(ConvertUtils.isEmpty(mobile)){ result.setMessage("手机号不允许为空！"); result.setSuccess(false); return result; @@ -436,7 +436,7 @@ public class LoginController { // update-begin--Author:sunjianlei Date:20210802 for：获取用户租户信息 String tenantIds = sysUser.getRelTenantIds(); - if (oConvertUtils.isNotEmpty(tenantIds)) { + if (ConvertUtils.isNotEmpty(tenantIds)) { List tenantIdList = new ArrayList<>(); for(String id: tenantIds.split(SymbolConstant.COMMA)){ tenantIdList.add(Integer.valueOf(id)); @@ -465,7 +465,7 @@ public class LoginController { //查询当前是否有登录部门 // update-begin--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去 SysUser sysUserById = sysUserService.getById(sysUser.getId()); - if(oConvertUtils.isEmpty(sysUserById.getOrgCode())){ + if(ConvertUtils.isEmpty(sysUserById.getOrgCode())){ sysUserService.updateUserDepart(username, departs.get(0).getOrgCode()); } // update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去 @@ -564,7 +564,7 @@ public class LoginController { } String orgCode = sysUser.getOrgCode(); - if(oConvertUtils.isEmpty(orgCode)) { + if(ConvertUtils.isEmpty(orgCode)) { //如果当前用户无选择部门 查看部门关联信息 List departs = sysDepartService.queryUserDeparts(sysUser.getId()); //update-begin-author:taoyan date:20220117 for: JTC-1068【app】新建用户，没有设置部门及角色，点击登录提示暂未归属部，一直在登录页面 使用手机号登录 可正常 @@ -638,7 +638,7 @@ public class LoginController { @PostMapping("/scanLoginQrcode") public Result scanLoginQrcode(@RequestParam String qrcodeId, @RequestParam String token) { Object check = redisUtil.get(CommonConstant.LOGIN_QRCODE + qrcodeId); - if (oConvertUtils.isNotEmpty(check)) { + if (ConvertUtils.isNotEmpty(check)) { //存放token给前台读取 redisUtil.set(CommonConstant.LOGIN_QRCODE_TOKEN+qrcodeId, token, 60); } else { @@ -657,12 +657,12 @@ public class LoginController { Object token = redisUtil.get(CommonConstant.LOGIN_QRCODE_TOKEN + qrcodeId); Map result = new HashMap(5); Object qrcodeIdExpire = redisUtil.get(CommonConstant.LOGIN_QRCODE + qrcodeId); - if (oConvertUtils.isEmpty(qrcodeIdExpire)) { + if (ConvertUtils.isEmpty(qrcodeIdExpire)) { //二维码过期通知前台刷新 result.put("token", "-2"); return Result.OK(result); } - if (oConvertUtils.isNotEmpty(token)) { + if (ConvertUtils.isNotEmpty(token)) { result.put("success", true); result.put("token", token); } else { @@ -671,4 +671,4 @@ public class LoginController { return Result.OK(result); } -} \ No newline at end of file +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java index fcb98c6d38baf982b6fe7b405fd5e240a98374c0..f2906fa3bfccd22439f57828f92d4949410f410c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java @@ -20,7 +20,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.TokenUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.message.enums.RangeDateEnum; import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.modules.system.entity.SysAnnouncement; @@ -102,11 +102,11 @@ public class SysAnnouncementController { //排序逻辑 处理 // String column = req.getParameter("column"); // String order = req.getParameter("order"); -// if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) { +// if(ConvertUtils.isNotEmpty(column) && ConvertUtils.isNotEmpty(order)) { // if("asc".equals(order)) { -// queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column)); +// queryWrapper.orderByAsc(ConvertUtils.camelToUnderline(column)); // }else { -// queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column)); +// queryWrapper.orderByDesc(ConvertUtils.camelToUnderline(column)); // } // } //update-end-author:lvdandan date:20211229 for: sqlserver mssql-jdbc 8.2.2.jre8版本下系统公告列表查询报错 查询SQL中生成了两个create_time DESC；故注释此段代码 @@ -304,7 +304,7 @@ public class SysAnnouncementController { boolean ok = sysAnnouncementService.updateById(sysAnnouncement); if(ok) { result.success("该系统通知撤销成功"); - if (oConvertUtils.isNotEmpty(sysAnnouncement.getDtTaskId())) { + if (ConvertUtils.isNotEmpty(sysAnnouncement.getDtTaskId())) { try { dingtalkService.recallMessage(sysAnnouncement.getDtTaskId()); } catch (Exception e) { @@ -462,7 +462,7 @@ public class SysAnnouncementController { }else { // 2.插入用户通告阅读标记表记录 String userId = sysAnnouncement.getUserIds(); - if(oConvertUtils.isNotEmpty(userId)){ + if(ConvertUtils.isNotEmpty(userId)){ String[] userIds = userId.substring(0, (userId.length()-1)).split(","); obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER); obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId()); @@ -525,10 +525,10 @@ public class SysAnnouncementController { // 后台获取开始时间/结束时间 Date bd=null, ed=null; if(RangeDateEnum.ZDY.getKey().equals(rangeDateKey)){ - if(oConvertUtils.isNotEmpty(beginDate)){ + if(ConvertUtils.isNotEmpty(beginDate)){ bd = DateUtils.parseDatetime(beginDate); } - if(oConvertUtils.isNotEmpty(endDate)){ + if(ConvertUtils.isNotEmpty(endDate)){ ed = DateUtils.parseDatetime(endDate); } }else{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java index 72462d19e605813ddaebd764cd5a68be10b27551..138f90e2393e47e3f4f02d59deb05d7ca84c9dea 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java @@ -12,7 +12,7 @@ import org.jeecg.common.constant.DataBaseConstant; import org.jeecg.common.constant.WebsocketConst; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SqlInjectionUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.modules.system.entity.SysAnnouncementSend; import org.jeecg.modules.system.model.AnnouncementSendModel; @@ -76,11 +76,11 @@ public class SysAnnouncementSendController { SqlInjectionUtil.filterContent(column); SqlInjectionUtil.filterContent(order); - if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) { + if(ConvertUtils.isNotEmpty(column) && ConvertUtils.isNotEmpty(order)) { if(DataBaseConstant.SQL_ASC.equals(order)) { - queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column)); + queryWrapper.orderByAsc(ConvertUtils.camelToUnderline(column)); }else { - queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column)); + queryWrapper.orderByDesc(ConvertUtils.camelToUnderline(column)); } } IPage pageList = sysAnnouncementSendService.page(page, queryWrapper); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java index 9ab89a74452effdbe3dbb09b8941903dffbbfe9e..4194ace5ec3addca0b4690797ac6baf14a4739f8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java @@ -15,7 +15,7 @@ import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.SqlInjectionUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysCategory; import org.jeecg.modules.system.model.TreeSelectModel; import org.jeecg.modules.system.service.ISysCategoryService; @@ -67,7 +67,7 @@ public class SysCategoryController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - if(oConvertUtils.isEmpty(sysCategory.getPid())){ + if(ConvertUtils.isEmpty(sysCategory.getPid())){ sysCategory.setPid("0"); } Result> result = new Result>(); @@ -206,7 +206,7 @@ public class SysCategoryController { ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); // 过滤选中数据 String selections = request.getParameter("selections"); - if(oConvertUtils.isEmpty(selections)) { + if(ConvertUtils.isEmpty(selections)) { mv.addObject(NormalExcelConstants.DATA_LIST, pageList); }else { List selectionList = Arrays.asList(selections.split(",")); @@ -387,10 +387,10 @@ public class SysCategoryController { */ @GetMapping(value = "/checkCode") public Result checkCode(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="code",required = false) String code) { - if(oConvertUtils.isEmpty(code)){ + if(ConvertUtils.isEmpty(code)){ return Result.error("错误,类型编码为空!"); } - if(oConvertUtils.isEmpty(pid)){ + if(ConvertUtils.isEmpty(pid)){ return Result.ok(); } SysCategory parent = this.sysCategoryService.getById(pid); @@ -414,8 +414,8 @@ public class SysCategoryController { public Result> loadDict(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="pcode",required = false) String pcode, @RequestParam(name="condition",required = false) String condition) { Result> result = new Result>(); //pid如果传值了 就忽略pcode的作用 - if(oConvertUtils.isEmpty(pid)){ - if(oConvertUtils.isEmpty(pcode)){ + if(ConvertUtils.isEmpty(pid)){ + if(ConvertUtils.isEmpty(pcode)){ result.setSuccess(false); result.setMessage("加载分类字典树参数有误.[null]!"); return result; @@ -425,7 +425,7 @@ public class SysCategoryController { }else{ pid = this.sysCategoryService.queryIdByCode(pcode); } - if(oConvertUtils.isEmpty(pid)){ + if(ConvertUtils.isEmpty(pid)){ result.setSuccess(false); result.setMessage("加载分类字典树参数有误.[code]!"); return result; @@ -433,7 +433,7 @@ public class SysCategoryController { } } Map query = null; - if(oConvertUtils.isNotEmpty(condition)) { + if(ConvertUtils.isNotEmpty(condition)) { query = JSON.parseObject(condition, Map.class); } List ls = sysCategoryService.queryListByPid(pid,query); @@ -474,7 +474,7 @@ public class SysCategoryController { public Result> loadAllData(@RequestParam(name="code",required = true) String code) { Result> result = new Result>(); LambdaQueryWrapper query = new LambdaQueryWrapper(); - if(oConvertUtils.isNotEmpty(code) && !CATEGORY_ROOT_CODE.equals(code)){ + if(ConvertUtils.isNotEmpty(code) && !CATEGORY_ROOT_CODE.equals(code)){ query.likeRight(SysCategory::getCode,code); } List list = this.sysCategoryService.list(query); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java index 9523e70c14336637a2eb8b1326dbf1cc30bbfa46..4755e59d56527cad64674c37bf6c365dc34f0835 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysDataLog; import org.jeecg.modules.system.service.ISysDataLogService; import org.springframework.beans.factory.annotation.Autowired; @@ -89,7 +89,7 @@ public class SysDataLogController { queryWrapper.eq("data_id", dataId); //update-begin-author:taoyan date:2022-7-26 for: 新增查询条件-type String type = req.getParameter("type"); - if (oConvertUtils.isNotEmpty(type)) { + if (ConvertUtils.isNotEmpty(type)) { queryWrapper.eq("type", type); } // 按时间倒序排 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index fcfd21a80c0f887ae9c0bb8443f21e92cf683563..fd7b926ba6df1a9c49ec5d4e96e08b3a4a7182f8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -15,7 +15,7 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.ImportExcelUtil; import org.jeecg.common.util.YouBianCodeUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.model.DepartIdModel; @@ -71,7 +71,7 @@ public class SysDepartController { Result> result = new Result<>(); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); try { - if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ + if(ConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ //update-begin--Author:liusq Date:20210624 for:部门查询ids为空后的前端显示问题 issues/I3UD06 String departIds = user.getDepartIds(); if(StringUtils.isNotBlank(departIds)){ @@ -105,7 +105,7 @@ public class SysDepartController { // if (CollectionUtils.isEmpty(list)) { // list = sysDepartService.queryTreeList(); // } - if(oConvertUtils.isNotEmpty(ids)){ + if(ConvertUtils.isNotEmpty(ids)){ List departList = sysDepartService.queryTreeList(ids); result.setResult(departList); }else{ @@ -152,9 +152,9 @@ public class SysDepartController { ) { try { JSONObject data; - if (oConvertUtils.isNotEmpty(departId)) { + if (ConvertUtils.isNotEmpty(departId)) { data = sysDepartService.queryAllParentIdByDepartId(departId); - } else if (oConvertUtils.isNotEmpty(orgCode)) { + } else if (ConvertUtils.isNotEmpty(orgCode)) { data = sysDepartService.queryAllParentIdByOrgCode(orgCode); } else { return Result.error("departId 和 orgCode 不能都为空！"); @@ -320,7 +320,7 @@ public class SysDepartController { //部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String departIds = null; - if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ + if(ConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){ departIds = user.getDepartIds(); } List treeList = this.sysDepartService.searchByKeyWord(keyWord,myDeptSearch,departIds); @@ -423,7 +423,7 @@ public class SysDepartController { //update-end---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------ sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); //update-begin---author:wangshuai ---date:20220105 for：[JTC-363]部门导入 机构类别没有时导入失败，赋默认值------------ - if(oConvertUtils.isEmpty(sysDepart.getOrgCategory())){ + if(ConvertUtils.isEmpty(sysDepart.getOrgCategory())){ sysDepart.setOrgCategory("1"); } //update-end---author:wangshuai ---date:20220105 for：[JTC-363]部门导入 机构类别没有时导入失败，赋默认值------------ @@ -460,7 +460,7 @@ public class SysDepartController { Result> result = new Result<>(); LambdaQueryWrapper query = new LambdaQueryWrapper(); query.orderByAsc(SysDepart::getOrgCode); - if(oConvertUtils.isNotEmpty(id)){ + if(ConvertUtils.isNotEmpty(id)){ String[] arr = id.split(","); query.in(SysDepart::getId,arr); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java index 219be7feb2307f5be50c3de75328d13635412892..7fd508b7f1cadba272c1860b9445f333ff55ff0f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java @@ -14,7 +14,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.entity.SysDepartPermission; import org.jeecg.modules.system.entity.SysDepartRolePermission; @@ -191,7 +191,7 @@ public class SysDepartPermissionController extends JeecgController page = new Page(pageNo, pageSize); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List deptIds = null; -// if(oConvertUtils.isEmpty(deptId)){ -// if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2) ){ +// if(ConvertUtils.isEmpty(deptId)){ +// if(ConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2) ){ // deptIds = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); // }else{ // return Result.ok(null); @@ -243,7 +243,7 @@ public class SysDepartRoleController extends JeecgController query = new LambdaQueryWrapper<>(); // 构造查询条件 String dictName = sysDict.getDictName(); - if(oConvertUtils.isNotEmpty(dictName)) { + if(ConvertUtils.isNotEmpty(dictName)) { query.like(true, SysDict::getDictName, dictName); } query.orderByDesc(true, SysDict::getCreateTime); @@ -319,7 +319,7 @@ public class SysDictController { @RequestParam(value = "sign",required = false) String sign,HttpServletRequest request) { Result> result = new Result>(); Map query = null; - if(oConvertUtils.isNotEmpty(condition)) { + if(ConvertUtils.isNotEmpty(condition)) { query = JSON.parseObject(condition, Map.class); } // SQL注入漏洞 sign签名校验(表名,label字段,val字段,条件) @@ -426,7 +426,7 @@ public class SysDictController { @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); - if(oConvertUtils.isEmpty(ids)) { + if(ConvertUtils.isEmpty(ids)) { result.error500("参数不识别！"); }else { sysDictService.removeByIds(Arrays.asList(ids.split(","))); @@ -543,7 +543,7 @@ public class SysDictController { errorLines++; int lineNumber = i + 1; //update-begin---author:wangshuai ---date:20220209 for：[JTC-1168]字典编号不能为空------------ - if(oConvertUtils.isEmpty(po.getDictCode())){ + if(ConvertUtils.isEmpty(po.getDictCode())){ errorMessage.add("第 " + lineNumber + " 行：字典编码不能为空，忽略导入。"); }else{ errorMessage.add("第 " + lineNumber + " 行：字典编码已经存在，忽略导入。"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java index 64b4ff2ade7fa55b62d1dfea6128f7d2538aa8aa..0ddc9a65f9db71e58b104543059a5ea519ce6544 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java @@ -14,7 +14,7 @@ import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysDictItem; import org.jeecg.modules.system.service.ISysDictItemService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java index dde34ad5e85763237fee1085a443812d52320559..ba34faede6295a3d3fceef98d0d0a05a763b36f8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysGatewayRoute; import org.jeecg.modules.system.service.ISysGatewayRouteService; import org.springframework.beans.factory.annotation.Autowired; @@ -44,10 +44,10 @@ public class SysGatewayRouteController extends JeecgController page = new Page(pageNo, pageSize); //日志关键词 String keyWord = req.getParameter("keyWord"); - if(oConvertUtils.isNotEmpty(keyWord)) { + if(ConvertUtils.isNotEmpty(keyWord)) { queryWrapper.like("log_content",keyWord); } //TODO 过滤逻辑处理 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java index 9f6083ace9e921c679d91b6ad8ecf983feb843d8..3fa6a820fcd009de9cf81fd754d5c892d4a3ccb4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java @@ -15,7 +15,7 @@ import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.constant.enums.RoleIndexConfigEnum; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.Md5Util; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.entity.*; @@ -87,14 +87,14 @@ public class SysPermissionController { query.orderByAsc(SysPermission::getSortNo); //支持通过菜单名字，模糊查询 - if(oConvertUtils.isNotEmpty(sysPermission.getName())){ + if(ConvertUtils.isNotEmpty(sysPermission.getName())){ query.like(SysPermission::getName, sysPermission.getName()); } List list = sysPermissionService.list(query); List treeList = new ArrayList<>(); //如果有菜单名查询条件，则平铺数据 不做上下级 - if(oConvertUtils.isNotEmpty(sysPermission.getName())){ + if(ConvertUtils.isNotEmpty(sysPermission.getName())){ if(list!=null && list.size()>0){ treeList = list.stream().map(e -> { e.setLeaf(true); @@ -241,7 +241,7 @@ public class SysPermissionController { try { //直接获取当前用户不适用前端token LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (oConvertUtils.isEmpty(loginUser)) { + if (ConvertUtils.isEmpty(loginUser)) { return Result.error("请登录系统！"); } List metaList = sysPermissionService.queryByUser(loginUser.getUsername()); @@ -266,7 +266,7 @@ public class SysPermissionController { String component = roleIndex.getComponent(); String routeUrl = roleIndex.getUrl(); boolean route = roleIndex.isRoute(); - if(oConvertUtils.isNotEmpty(routeUrl)){ + if(ConvertUtils.isNotEmpty(routeUrl)){ menus.get(0).setComponent(component); menus.get(0).setRoute(route); menus.get(0).setUrl(routeUrl); @@ -318,7 +318,7 @@ public class SysPermissionController { try { // 直接获取当前用户 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (oConvertUtils.isEmpty(loginUser)) { + if (ConvertUtils.isEmpty(loginUser)) { return Result.error("请登录系统！"); } // 获取当前用户的权限集合 @@ -424,7 +424,7 @@ public class SysPermissionController { try { String[] arr = ids.split(","); for (String id : arr) { - if (oConvertUtils.isNotEmpty(id)) { + if (ConvertUtils.isNotEmpty(id)) { sysPermissionService.deletePermission(id); } } @@ -543,7 +543,7 @@ public class SysPermissionController { for (SysPermission permission : metaList) { String tempPid = permission.getParentId(); SysPermissionTree tree = new SysPermissionTree(permission); - if (temp == null && oConvertUtils.isEmpty(tempPid)) { + if (temp == null && ConvertUtils.isEmpty(tempPid)) { treeList.add(tree); if (!tree.getIsLeaf()) { getTreeList(treeList, metaList, tree); @@ -562,7 +562,7 @@ public class SysPermissionController { for (SysPermission permission : metaList) { String tempPid = permission.getParentId(); TreeModel tree = new TreeModel(permission); - if (temp == null && oConvertUtils.isEmpty(tempPid)) { + if (temp == null && ConvertUtils.isEmpty(tempPid)) { treeList.add(tree); if (!tree.getIsLeaf()) { getTreeModelList(treeList, metaList, tree); @@ -656,12 +656,12 @@ public class SysPermissionController { if(json==null) { continue; } - if (parentJson == null && oConvertUtils.isEmpty(tempPid)) { + if (parentJson == null && ConvertUtils.isEmpty(tempPid)) { jsonArray.add(json); if (!permission.isLeaf()) { getPermissionJsonArray(jsonArray, metaList, json); } - } else if (parentJson != null && oConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))) { + } else if (parentJson != null && ConvertUtils.isNotEmpty(tempPid) && tempPid.equals(parentJson.getString("id"))) { // 类型( 0：一级菜单 1：子菜单 2：按钮 ) if (permission.getMenuType().equals(CommonConstant.MENU_TYPE_2)) { JSONObject metaJson = parentJson.getJSONObject("meta"); @@ -721,7 +721,7 @@ public class SysPermissionController { } // 重要规则：路由name (通过URL生成路由name,路由name供前端开发，页面跳转使用) - if (oConvertUtils.isNotEmpty(permission.getComponentName())) { + if (ConvertUtils.isNotEmpty(permission.getComponentName())) { json.put("name", permission.getComponentName()); } else { json.put("name", urlToRouteName(permission.getUrl())); @@ -759,19 +759,19 @@ public class SysPermissionController { //update-begin--Author:scott Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842 String component = permission.getComponent(); - if(oConvertUtils.isNotEmpty(permission.getComponentName()) || oConvertUtils.isNotEmpty(component)){ - meta.put("componentName", oConvertUtils.getString(permission.getComponentName(),component.substring(component.lastIndexOf("/")+1))); + if(ConvertUtils.isNotEmpty(permission.getComponentName()) || ConvertUtils.isNotEmpty(component)){ + meta.put("componentName", ConvertUtils.getString(permission.getComponentName(),component.substring(component.lastIndexOf("/")+1))); } //update-end--Author:scott Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842 - if (oConvertUtils.isEmpty(permission.getParentId())) { + if (ConvertUtils.isEmpty(permission.getParentId())) { // 一级菜单跳转地址 json.put("redirect", permission.getRedirect()); - if (oConvertUtils.isNotEmpty(permission.getIcon())) { + if (ConvertUtils.isNotEmpty(permission.getIcon())) { meta.put("icon", permission.getIcon()); } } else { - if (oConvertUtils.isNotEmpty(permission.getIcon())) { + if (ConvertUtils.isNotEmpty(permission.getIcon())) { meta.put("icon", permission.getIcon()); } } @@ -810,7 +810,7 @@ public class SysPermissionController { * @return */ private String urlToRouteName(String url) { - if (oConvertUtils.isNotEmpty(url)) { + if (ConvertUtils.isNotEmpty(url)) { if (url.startsWith(SymbolConstant.SINGLE_SLASH)) { url = url.substring(1); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java index bdefe44d89e2a5e434583a6ff12a2388c5997b6b..d784ea4ed418195d0cb5f4ec0aa6e4bfc66b3a37 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java @@ -15,7 +15,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.ImportExcelUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.quartz.service.IQuartzJobService; import org.jeecg.modules.system.entity.SysPosition; import org.jeecg.modules.system.service.ISysPositionService; @@ -198,7 +198,7 @@ public class SysPositionController { QueryWrapper queryWrapper = null; try { String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { + if (ConvertUtils.isNotEmpty(paramsStr)) { String deString = URLDecoder.decode(paramsStr, "UTF-8"); SysPosition sysPosition = JSON.parseObject(deString, SysPosition.class); queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, request.getParameterMap()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java index 55012e1913cd1bf17fcf0f95954fe5849c50bee3..c674c08156aa0cc80d2f708db8c130dc853e5ece 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java @@ -19,7 +19,7 @@ import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.PmsUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysPermission; import org.jeecg.modules.system.entity.SysPermissionDataRule; import org.jeecg.modules.system.entity.SysRole; @@ -168,7 +168,7 @@ public class SysRoleController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); - if(oConvertUtils.isEmpty(ids)) { + if(ConvertUtils.isEmpty(ids)) { result.error500("未选中角色！"); }else { sysRoleService.deleteBatchRole(ids.split(",")); @@ -219,7 +219,7 @@ public class SysRoleController { log.info("--验证角色编码是否唯一---id:"+id+"--roleCode:"+roleCode); try { SysRole role = null; - if(oConvertUtils.isNotEmpty(id)) { + if(ConvertUtils.isNotEmpty(id)) { role = sysRoleService.getById(id); } SysRole newRole = sysRoleService.getOne(new QueryWrapper().lambda().eq(SysRole::getRoleCode, roleCode)); @@ -320,7 +320,7 @@ public class SysRoleController { //return Result.error("未找到角色菜单配置信息"); }else { String drChecked = sysRolePermission.getDataRuleIds(); - if(oConvertUtils.isNotEmpty(drChecked)) { + if(ConvertUtils.isNotEmpty(drChecked)) { map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); } } @@ -394,7 +394,7 @@ public class SysRoleController { for (SysPermission permission : metaList) { String tempPid = permission.getParentId(); TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf()); - if(temp==null && oConvertUtils.isEmpty(tempPid)) { + if(temp==null && ConvertUtils.isEmpty(tempPid)) { treeList.add(tree); if(!tree.getIsLeaf()) { getTreeModelList(treeList, metaList, tree); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java index 7897bdcef0a34dae56334babb23a380fb7f0bd96..2a46c5127469421c68003a0036ccfadd667b31d0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java @@ -12,7 +12,7 @@ import org.jeecg.common.aspect.annotation.PermissionData; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysTenant; import org.jeecg.modules.system.service.ISysTenantService; import org.springframework.beans.factory.annotation.Autowired; @@ -49,7 +49,7 @@ public class SysTenantController { //---author:zhangyafei---date:20210916-----for: 租户管理添加日期范围查询--- Date beginDate=null; Date endDate=null; - if(oConvertUtils.isNotEmpty(sysTenant)) { + if(ConvertUtils.isNotEmpty(sysTenant)) { beginDate=sysTenant.getBeginDate(); endDate=sysTenant.getEndDate(); sysTenant.setBeginDate(null); @@ -58,9 +58,9 @@ public class SysTenantController { //---author:zhangyafei---date:20210916-----for: 租户管理添加日期范围查询--- QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysTenant, req.getParameterMap()); //---author:zhangyafei---date:20210916-----for: 租户管理添加日期范围查询--- - if(oConvertUtils.isNotEmpty(sysTenant)){ - queryWrapper.ge(oConvertUtils.isNotEmpty(beginDate),"begin_date",beginDate); - queryWrapper.le(oConvertUtils.isNotEmpty(endDate),"end_date",endDate); + if(ConvertUtils.isNotEmpty(sysTenant)){ + queryWrapper.ge(ConvertUtils.isNotEmpty(beginDate),"begin_date",beginDate); + queryWrapper.le(ConvertUtils.isNotEmpty(endDate),"end_date",endDate); } //---author:zhangyafei---date:20210916-----for: 租户管理添加日期范围查询--- Page page = new Page(pageNo, pageSize); @@ -129,7 +129,7 @@ public class SysTenantController { @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result<>(); - if(oConvertUtils.isEmpty(ids)) { + if(ConvertUtils.isEmpty(ids)) { result.error500("未选中租户！"); }else { String[] ls = ids.split(","); @@ -183,7 +183,7 @@ public class SysTenantController { Result> result = new Result>(); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysTenant::getStatus, 1); - if(oConvertUtils.isNotEmpty(ids)){ + if(ConvertUtils.isNotEmpty(ids)){ query.in(SysTenant::getId, ids.split(",")); } //此处查询忽略时间条件 @@ -203,7 +203,7 @@ public class SysTenantController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String tenantIds = sysUser.getRelTenantIds(); Map map = new HashMap(5); - if (oConvertUtils.isNotEmpty(tenantIds)) { + if (ConvertUtils.isNotEmpty(tenantIds)) { List tenantIdList = new ArrayList<>(); for(String id: tenantIds.split(SymbolConstant.COMMA)){ tenantIdList.add(Integer.valueOf(id)); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java index a6e2535064cc8536e764ba99eb1b799beebf2591..fbc8c585ce95f987851f118292a461e4169a6ec1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java @@ -5,7 +5,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.MinioUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.oss.entity.OssFile; import org.jeecg.modules.oss.service.IOssFileService; import org.springframework.beans.factory.annotation.Autowired; @@ -38,12 +38,12 @@ public class SysUploadController { String bizPath = request.getParameter("biz"); //LOWCOD-2580 sys/common/upload接口存在任意文件上传漏洞 - boolean flag = oConvertUtils.isNotEmpty(bizPath) && (bizPath.contains("../") || bizPath.contains("..\\")); + boolean flag = ConvertUtils.isNotEmpty(bizPath) && (bizPath.contains("../") || bizPath.contains("..\\")); if (flag) { throw new JeecgBootException("上传目录bizPath，格式非法！"); } - if(oConvertUtils.isEmpty(bizPath)){ + if(ConvertUtils.isEmpty(bizPath)){ bizPath = ""; } MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; @@ -53,7 +53,7 @@ public class SysUploadController { String orgName = file.getOriginalFilename(); orgName = CommonUtils.getFileName(orgName); String fileUrl = MinioUtil.upload(file,bizPath); - if(oConvertUtils.isEmpty(fileUrl)){ + if(ConvertUtils.isEmpty(fileUrl)){ return Result.error("上传失败,请检查配置信息是否正确!"); } //保存文件信息 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java index cd6daeed114a26e963c0ed817b7946199b87b3ad..c122dc48b3e091b18653b0bdc40c1432cfa82674 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java @@ -14,7 +14,7 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysUserAgent; import org.jeecg.modules.system.service.ISysUserAgentService; import org.jeecgframework.poi.excel.ExcelImportUtil; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 2d44d608453a10944b79e48e6a3389b8b7db8e03..8b0ca369c64074caebd0905e7059ead764b6db0a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -110,13 +110,13 @@ public class SysUserController { //update-begin-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户，通过code查询id //部门ID String departId = req.getParameter("departId"); - if(oConvertUtils.isNotEmpty(departId)){ + if(ConvertUtils.isNotEmpty(departId)){ LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysUserDepart::getDepId,departId); List list = sysUserDepartService.list(query); List userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList()); //update-begin---author:wangshuai ---date:20220322 for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------ - if(oConvertUtils.listIsNotEmpty(userIds)){ + if(ConvertUtils.listIsNotEmpty(userIds)){ queryWrapper.in("id",userIds); }else{ return Result.OK(); @@ -125,7 +125,7 @@ public class SysUserController { } //用户ID String code = req.getParameter("code"); - if(oConvertUtils.isNotEmpty(code)){ + if(ConvertUtils.isNotEmpty(code)){ queryWrapper.in("id",Arrays.asList(code.split(","))); pageSize = code.split(",").length; } @@ -133,7 +133,7 @@ public class SysUserController { //update-begin-author:taoyan--date:20220104--for: JTC-372 【用户冻结问题】 online授权、用户组件，选择用户都能看到被冻结的用户 String status = req.getParameter("status"); - if(oConvertUtils.isNotEmpty(status)){ + if(ConvertUtils.isNotEmpty(status)){ queryWrapper.eq("status", Integer.parseInt(status)); } //update-end-author:taoyan--date:20220104--for: JTC-372 【用户冻结问题】 online授权、用户组件，选择用户都能看到被冻结的用户 @@ -169,7 +169,7 @@ public class SysUserController { try { SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); user.setCreateTime(new Date());//设置创建时间 - String salt = oConvertUtils.randomGen(8); + String salt = ConvertUtils.randomGen(8); user.setSalt(salt); String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt); user.setPassword(passwordEncode); @@ -205,7 +205,7 @@ public class SysUserController { user.setPassword(sysUser.getPassword()); String roles = jsonObject.getString("selectedroles"); String departs = jsonObject.getString("selecteddeparts"); - if(oConvertUtils.isEmpty(departs)){ + if(ConvertUtils.isEmpty(departs)){ //vue3.0前端只传递了departIds departs=user.getDepartIds(); } @@ -258,7 +258,7 @@ public class SysUserController { String status = jsonObject.getString("status"); String[] arr = ids.split(","); for (String id : arr) { - if(oConvertUtils.isNotEmpty(id)) { + if(ConvertUtils.isNotEmpty(id)) { this.sysUserService.update(new SysUser().setStatus(Integer.parseInt(status)), new UpdateWrapper().lambda().eq(SysUser::getId,id)); } @@ -470,7 +470,7 @@ public class SysUserController { ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); //update-begin--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据-------------------- String selections = request.getParameter("selections"); - if(!oConvertUtils.isEmpty(selections)){ + if(!ConvertUtils.isEmpty(selections)){ queryWrapper.in("id",selections.split(",")); } //update-end--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据---------------------- @@ -518,7 +518,7 @@ public class SysUserController { sysUserExcel.setPassword("123456"); } // 密码加密加盐 - String salt = oConvertUtils.randomGen(8); + String salt = ConvertUtils.randomGen(8); sysUserExcel.setSalt(salt); String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt); sysUserExcel.setPassword(passwordEncode); @@ -718,10 +718,10 @@ public class SysUserController { //根据部门ID查询,当前和下级所有的部门IDS List subDepids = new ArrayList<>(); //部门id为空时，查询我的部门下所有用户 - if(oConvertUtils.isEmpty(depId)){ + if(ConvertUtils.isEmpty(depId)){ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); int userIdentity = user.getUserIdentity() != null?user.getUserIdentity():CommonConstant.USER_IDENTITY_1; - if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 ){ + if(ConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 ){ subDepids = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); } }else{ @@ -941,12 +941,12 @@ public class SysUserController { String username = jsonObject.getString("username"); //未设置用户名，则用手机号作为用户名 - if(oConvertUtils.isEmpty(username)){ + if(ConvertUtils.isEmpty(username)){ username = phone; } //未设置密码，则随机生成一个密码 String password = jsonObject.getString("password"); - if(oConvertUtils.isEmpty(password)){ + if(ConvertUtils.isEmpty(password)){ password = RandomUtil.randomString(8); } String email = jsonObject.getString("email"); @@ -963,7 +963,7 @@ public class SysUserController { return result; } - if(oConvertUtils.isNotEmpty(email)){ + if(ConvertUtils.isNotEmpty(email)){ SysUser sysUser3 = sysUserService.getUserByEmail(email); if (sysUser3 != null) { result.setMessage("邮箱已被注册"); @@ -984,7 +984,7 @@ public class SysUserController { try { user.setCreateTime(new Date());// 设置创建时间 - String salt = oConvertUtils.randomGen(8); + String salt = ConvertUtils.randomGen(8); String passwordEncode = PasswordUtil.encrypt(username, password, salt); user.setSalt(salt); user.setUsername(username); @@ -1014,7 +1014,7 @@ public class SysUserController { // String username = sysUser.getUsername(); // Result> result = new Result>(); // Map map = new HashMap(); -// if (oConvertUtils.isNotEmpty(phone)) { +// if (ConvertUtils.isNotEmpty(phone)) { // SysUser user = sysUserService.getUserByPhone(phone); // if(user!=null) { // map.put("username",user.getUsername()); @@ -1024,7 +1024,7 @@ public class SysUserController { // return result; // } // } -// if (oConvertUtils.isNotEmpty(username)) { +// if (ConvertUtils.isNotEmpty(username)) { // SysUser user = sysUserService.getUserByName(username); // if(user!=null) { // map.put("username",user.getUsername()); @@ -1080,7 +1080,7 @@ public class SysUserController { @RequestParam(name="smscode")String smscode, @RequestParam(name="phone") String phone) { Result result = new Result(); - if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(password) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone) ) { + if(ConvertUtils.isEmpty(username) || ConvertUtils.isEmpty(password) || ConvertUtils.isEmpty(smscode) || ConvertUtils.isEmpty(phone) ) { result.setMessage("重置密码失败！"); result.setSuccess(false); return result; @@ -1107,7 +1107,7 @@ public class SysUserController { result.setSuccess(false); return result; } else { - String salt = oConvertUtils.randomGen(8); + String salt = ConvertUtils.randomGen(8); sysUser.setSalt(salt); String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt); sysUser.setPassword(passwordEncode); @@ -1132,7 +1132,7 @@ public class SysUserController { try { String username = null; // 如果没有传递token，就从header中获取token并获取用户信息 - if (oConvertUtils.isEmpty(token)) { + if (ConvertUtils.isEmpty(token)) { username = JwtUtil.getUserNameByToken(request); } else { username = JwtUtil.getUsername(token); @@ -1173,11 +1173,11 @@ public class SysUserController { try { //TODO 从查询效率上将不要用mp的封装的page分页查询 建议自己写分页语句 LambdaQueryWrapper query = new LambdaQueryWrapper(); - if(oConvertUtils.isNotEmpty(syncFlow)){ + if(ConvertUtils.isNotEmpty(syncFlow)){ query.eq(SysUser::getActivitiSync, CommonConstant.ACT_SYNC_1); } query.eq(SysUser::getDelFlag,CommonConstant.DEL_FLAG_0); - if(oConvertUtils.isNotEmpty(username)){ + if(ConvertUtils.isNotEmpty(username)){ if(username.contains(",")){ query.in(SysUser::getUsername,username.split(",")); }else{ @@ -1419,7 +1419,7 @@ public class SysUserController { Result result = new Result(); //获取登录用户名 String username = JwtUtil.getUserNameByToken(request); - if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone)) { + if(ConvertUtils.isEmpty(username) || ConvertUtils.isEmpty(smscode) || ConvertUtils.isEmpty(phone)) { result.setMessage("修改手机号失败！"); result.setSuccess(false); return result; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java index 3222bf68984b66eacec5d7bb614047cefc22293b..2bfcdd9476c7a8139e4f52acac921a76b4686793 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java @@ -10,7 +10,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.RedisUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.service.impl.SysBaseApiImpl; @@ -66,7 +66,7 @@ public class SysUserOnlineController { //验证用户名是否与传过来的用户名相同 boolean isMatchUsername=true; //判断用户名是否为空，并且当前循环的用户不包含传过来的用户名，那么就设成false - if(oConvertUtils.isNotEmpty(username) && !loginUser.getUsername().contains(username)){ + if(ConvertUtils.isNotEmpty(username) && !loginUser.getUsername().contains(username)){ isMatchUsername = false; } if(isMatchUsername){ @@ -106,7 +106,7 @@ public class SysUserOnlineController { @RequestMapping(value = "/forceLogout",method = RequestMethod.POST) public Result forceLogout(@RequestBody SysUserOnlineVO online) { //用户退出逻辑 - if(oConvertUtils.isEmpty(online.getToken())) { + if(ConvertUtils.isEmpty(online.getToken())) { return Result.error("退出登录失败！"); } String username = JwtUtil.getUsername(online.getToken()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java index 9e8a0f6abac83119c33c80e372a57a2c80a7645e..376d84a2601440cec4afe3948d6d4d1b441b52f2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java @@ -15,7 +15,7 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.RestUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.config.thirdapp.ThirdAppConfig; import org.jeecg.config.thirdapp.ThirdAppTypeItemVo; import org.jeecg.modules.base.service.BaseCommonService; @@ -104,7 +104,7 @@ public class ThirdLoginController { } // 生成token //update-begin-author:wangshuai date:20201118 for:从第三方登录查询是否存在用户id，不存在绑定手机号 - if(oConvertUtils.isNotEmpty(user.getSysUserId())) { + if(ConvertUtils.isNotEmpty(user.getSysUserId())) { String sysUserId = user.getSysUserId(); SysUser sysUser = sysUserService.getById(sysUserId); String token = saveToken(sysUser); @@ -142,7 +142,7 @@ public class ThirdLoginController { //创建新账号 //update-begin-author:wangshuai date:20201118 for:修改成从第三方登录查出来的user_id，在查询用户表尽行token SysThirdAccount user = sysThirdAccountService.saveThirdUser(model); - if(oConvertUtils.isNotEmpty(user.getSysUserId())){ + if(ConvertUtils.isNotEmpty(user.getSysUserId())){ String sysUserId = user.getSysUserId(); SysUser sysUser = sysUserService.getById(sysUserId); // 生成token @@ -227,10 +227,10 @@ public class ThirdLoginController { query.eq(SysThirdAccount::getSysUserId,sysUser.getId()); query.eq(SysThirdAccount::getThirdType,thirdType); SysThirdAccount account = sysThirdAccountService.getOne(query); - if(oConvertUtils.isEmpty(sysUser.getRealname())){ + if(ConvertUtils.isEmpty(sysUser.getRealname())){ sysUser.setRealname(account.getRealname()); } - if(oConvertUtils.isEmpty(sysUser.getAvatar())){ + if(ConvertUtils.isEmpty(sysUser.getAvatar())){ sysUser.setAvatar(account.getAvatar()); } //update-end-author:wangshuai date:20201118 for:如果真实姓名和头像不存在就取第三方登录的 @@ -264,7 +264,7 @@ public class ThirdLoginController { String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE+phone; Object captchaCache = redisUtil.get(redisKey); //update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906 - if (oConvertUtils.isEmpty(captcha) || !captcha.equals(captchaCache)) { + if (ConvertUtils.isEmpty(captcha) || !captcha.equals(captchaCache)) { result.setMessage("验证码错误"); result.setSuccess(false); return result; @@ -418,4 +418,4 @@ public class ThirdLoginController { } } -} \ No newline at end of file +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java index 9a23fcaaefd0c0a36e0862f9ab118d1aa9e21143..b7c4b9577e745f82d00f955ab5b98260ce4a6e5a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java @@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.handler.IFillRuleHandler; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.YouBianCodeUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysCategory; import org.jeecg.modules.system.mapper.SysCategoryMapper; @@ -31,13 +31,13 @@ public class CategoryCodeRule implements IFillRuleHandler { if (formData != null && formData.size() > 0) { Object obj = formData.get("pid"); - if (oConvertUtils.isNotEmpty(obj)) { + if (ConvertUtils.isNotEmpty(obj)) { categoryPid = obj.toString(); } } else { if (params != null) { Object obj = params.get("pid"); - if (oConvertUtils.isNotEmpty(obj)) { + if (ConvertUtils.isNotEmpty(obj)) { categoryPid = obj.toString(); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java index 53f2e7c1747865edec6e8b1caacfb956b680785c..83504a4e51203b35202a9b65723f53aec555ed7a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.security; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.common.util.security.AbstractQueryBlackListHandler; import org.springframework.stereotype.Component; @@ -34,7 +34,7 @@ public class DictQueryBlackListHandler extends AbstractQueryBlackListHandler { // 无论什么场景 第二、三个元素一定是表的字段，直接add table.addField(arr[1].trim()); String filed = arr[2].trim(); - if (oConvertUtils.isNotEmpty(filed)) { + if (ConvertUtils.isNotEmpty(filed)) { table.addField(filed); } List list = new ArrayList<>(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java index 0934d2e0f49e9debd297e34f4770149315cb3115..51d91f49d4b9d4cd8291bb3365f4a4c3bdd3346f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysAnnouncement; import org.jeecg.modules.system.entity.SysAnnouncementSend; import org.jeecg.modules.system.mapper.SysAnnouncementMapper; @@ -71,7 +71,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl queryPermissionDataRule(String component, String requestPath, String username) { List currentSyspermission = null; - if(oConvertUtils.isNotEmpty(component)) { + if(ConvertUtils.isNotEmpty(component)) { //1.通过注解属性pageComponent 获取菜单 LambdaQueryWrapper query = new LambdaQueryWrapper(); query.eq(SysPermission::getDelFlag,0); @@ -164,7 +164,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { // update-end-author:taoyan date:20211027 for: online菜单如果配置成一级菜单 权限查询不到 取消menuType = 1 queryQserMatch.eq(SysPermission::getDelFlag, 0); queryQserMatch.eq(SysPermission::getUrl, userMatchUrl); - if(oConvertUtils.isNotEmpty(userMatchUrl)){ + if(ConvertUtils.isNotEmpty(userMatchUrl)){ currentSyspermission = sysPermissionMapper.selectList(queryQserMatch); } } @@ -184,7 +184,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { List temp = sysPermissionDataRuleService.queryPermissionDataRules(username, sysPermission.getId()); if(temp!=null && temp.size()>0) { //dataRules.addAll(temp); - dataRules = oConvertUtils.entityListToModelList(temp,SysPermissionDataRuleModel.class); + dataRules = ConvertUtils.entityListToModelList(temp,SysPermissionDataRuleModel.class); } // update-end--Author:scott Date:20191119 for：数据权限规则编码不规范，项目存在相同包名和类名 #722 } @@ -252,7 +252,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public LoginUser getUserById(String id) { - if(oConvertUtils.isEmpty(id)) { + if(ConvertUtils.isEmpty(id)) { return null; } LoginUser loginUser = new LoginUser(); @@ -377,7 +377,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { if(map!=null) { for (Map.Entry entry : map.entrySet()) { String str = "${" + entry.getKey() + "}"; - if(oConvertUtils.isNotEmpty(title)){ + if(ConvertUtils.isNotEmpty(title)){ title = title.replace(str, entry.getValue()); } content = content.replace(str, entry.getValue()); @@ -400,7 +400,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { String[] userIds = userId.split(","); String anntId = announcement.getId(); for(int i=0;i queryAllSysCategory() { List ls = categoryMapper.selectList(null); - List res = oConvertUtils.entityListToModelList(ls,SysCategoryModel.class); + List res = ConvertUtils.entityListToModelList(ls,SysCategoryModel.class); return res; } @@ -632,7 +632,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { model.setTitle(user.getRealname()); model.setId(user.getId()); model.setEmail(user.getEmail()); - if(oConvertUtils.isNotEmpty(userIds)){ + if(ConvertUtils.isNotEmpty(userIds)){ String[] temp = userIds.split(","); for(int i = 0; i listIds = departMapper.getSubDepIdsByOrgCodes(orgCodes.split(",")); List userList = sysUserDepartService.list(new QueryWrapper().in("dep_id",listIds)); @@ -851,10 +851,10 @@ public class SysBaseApiImpl implements ISysBaseAPI { List permissionList = sysPermissionMapper.queryByUser(username); for (SysPermission po : permissionList) { // // TODO URL规则有问题？ -// if (oConvertUtils.isNotEmpty(po.getUrl())) { +// if (ConvertUtils.isNotEmpty(po.getUrl())) { // permissionSet.add(po.getUrl()); // } - if (oConvertUtils.isNotEmpty(po.getPerms())) { + if (ConvertUtils.isNotEmpty(po.getPerms())) { permissionSet.add(po.getPerms()); } } @@ -980,7 +980,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { String[] userIds = userId.split(","); String anntId = announcement.getId(); for(int i=0;i queryListByCode(String pcode) throws JeecgBootException{ String pid = ROOT_PID_VALUE; - if(oConvertUtils.isNotEmpty(pcode)) { + if(ConvertUtils.isNotEmpty(pcode)) { List list = baseMapper.selectList(new LambdaQueryWrapper().eq(SysCategory::getCode, pcode)); if(list==null || list.size() ==0) { throw new JeecgBootException("该编码【"+pcode+"】不存在，请核实!"); @@ -94,7 +94,7 @@ public class SysCategoryServiceImpl extends ServiceImpl queryListByPid(String pid) { - if(oConvertUtils.isEmpty(pid)) { + if(ConvertUtils.isEmpty(pid)) { pid = ROOT_PID_VALUE; } return baseMapper.queryListByPid(pid,null); @@ -102,7 +102,7 @@ public class SysCategoryServiceImpl extends ServiceImpl queryListByPid(String pid, Map condition) { - if(oConvertUtils.isEmpty(pid)) { + if(ConvertUtils.isEmpty(pid)) { pid = ROOT_PID_VALUE; } return baseMapper.queryListByPid(pid,condition); @@ -121,7 +121,7 @@ public class SysCategoryServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper() .lambda() .in(SysCategory::getId,Arrays.asList(pids.split(","))) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java index 9516c737d60970055a83b7d25a3c4344d7ecf173..8545944aa4d09682ccfdfa7a536bd8efc74a2747 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCommentServiceImpl.java @@ -12,7 +12,7 @@ import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.CommonUtils; import org.jeecg.common.util.RedisUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysComment; import org.jeecg.modules.system.entity.SysFiles; import org.jeecg.modules.system.entity.SysFormFile; @@ -80,10 +80,10 @@ public class SysCommentServiceImpl extends ServiceImpl personSet = new HashSet<>(); if(list!=null && list.size()>0){ for(SysCommentVO vo: list){ - if(oConvertUtils.isNotEmpty(vo.getFromUserId())){ + if(ConvertUtils.isNotEmpty(vo.getFromUserId())){ personSet.add(vo.getFromUserId()); } - if(oConvertUtils.isNotEmpty(vo.getToUserId())){ + if(ConvertUtils.isNotEmpty(vo.getToUserId())){ personSet.add(vo.getToUserId()); } } @@ -95,14 +95,14 @@ public class SysCommentServiceImpl extends ServiceImpl0) { List list = new ArrayList(); for (String p : add) { - if(oConvertUtils.isNotEmpty(p)) { + if(ConvertUtils.isNotEmpty(p)) { SysDepartPermission rolepms = new SysDepartPermission(departId, p); list.add(rolepms); } @@ -69,7 +69,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl getPermRuleListByDeptIdAndPermId(String departId, String permissionId) { SysDepartPermission departPermission = this.getOne(new QueryWrapper().lambda().eq(SysDepartPermission::getDepartId, departId).eq(SysDepartPermission::getPermissionId, permissionId)); - if(departPermission != null && oConvertUtils.isNotEmpty(departPermission.getDataRuleIds())){ + if(departPermission != null && ConvertUtils.isNotEmpty(departPermission.getDataRuleIds())){ LambdaQueryWrapper query = new LambdaQueryWrapper(); query.in(SysPermissionDataRule::getId, Arrays.asList(departPermission.getDataRuleIds().split(","))); query.orderByDesc(SysPermissionDataRule::getCreateTime); @@ -87,10 +87,10 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl getDiff(String main,String diff){ - if(oConvertUtils.isEmpty(diff)) { + if(ConvertUtils.isEmpty(diff)) { return null; } - if(oConvertUtils.isEmpty(main)) { + if(ConvertUtils.isEmpty(main)) { return Arrays.asList(diff.split(",")); } @@ -102,7 +102,7 @@ public class SysDepartPermissionServiceImpl extends ServiceImpl res = new ArrayList(); for (String key : diffArr) { - if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { + if(ConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { res.add(key); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java index 10c19db220292f2a12e57e83400285cc5cd70a6d..00072f8d5f72679cbc21cfbd24a308f6276838e7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java @@ -3,7 +3,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysDepartRolePermission; import org.jeecg.modules.system.mapper.SysDepartRolePermissionMapper; import org.jeecg.modules.system.service.ISysDepartRolePermissionService; @@ -38,7 +38,7 @@ public class SysDepartRolePermissionServiceImpl extends ServiceImpl0) { List list = new ArrayList(); for (String p : add) { - if(oConvertUtils.isNotEmpty(p)) { + if(ConvertUtils.isNotEmpty(p)) { SysDepartRolePermission rolepms = new SysDepartRolePermission(roleId, p); rolepms.setOperateDate(new Date()); rolepms.setOperateIp(ip); @@ -63,10 +63,10 @@ public class SysDepartRolePermissionServiceImpl extends ServiceImpl getDiff(String main, String diff){ - if(oConvertUtils.isEmpty(diff)) { + if(ConvertUtils.isEmpty(diff)) { return null; } - if(oConvertUtils.isEmpty(main)) { + if(ConvertUtils.isEmpty(main)) { return Arrays.asList(diff.split(",")); } @@ -78,7 +78,7 @@ public class SysDepartRolePermissionServiceImpl extends ServiceImpl res = new ArrayList(); for (String key : diffArr) { - if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { + if(ConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { res.add(key); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java index bf49e3aaaa520cd4aa106b4cdc584250bd220fa3..bae04fa464040c752c39ce9ec063e62963100946 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRoleUserServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysDepartRole; import org.jeecg.modules.system.entity.SysDepartRoleUser; import org.jeecg.modules.system.mapper.SysDepartRoleMapper; @@ -33,7 +33,7 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl0) { List list = new ArrayList<>(); for (String roleId : add) { - if(oConvertUtils.isNotEmpty(roleId)) { + if(ConvertUtils.isNotEmpty(roleId)) { SysDepartRoleUser rolepms = new SysDepartRoleUser(userId, roleId); list.add(rolepms); } @@ -69,10 +69,10 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl getDiff(String main, String diff){ - if(oConvertUtils.isEmpty(diff)) { + if(ConvertUtils.isEmpty(diff)) { return null; } - if(oConvertUtils.isEmpty(main)) { + if(ConvertUtils.isEmpty(main)) { return Arrays.asList(diff.split(",")); } @@ -84,7 +84,7 @@ public class SysDepartRoleUserServiceImpl extends ServiceImpl res = new ArrayList(); for (String key : diffArr) { - if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { + if(ConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { res.add(key); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 17b7440ac57097354639ecdc9e9edf0abe6a5674..7b55d9cb52e4a023b0ba44d883ec09c0a85da4be 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -14,7 +14,7 @@ import org.jeecg.common.constant.FillRuleConstant; import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.util.FillRuleUtil; import org.jeecg.common.util.YouBianCodeUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.model.DepartIdModel; @@ -105,7 +105,7 @@ public class SysDepartServiceImpl extends ServiceImpl listResult=new ArrayList<>(); LambdaQueryWrapper query = new LambdaQueryWrapper(); query.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()); - if(oConvertUtils.isNotEmpty(ids)){ + if(ConvertUtils.isNotEmpty(ids)){ query.in(true,SysDepart::getId,ids.split(",")); } query.orderByAsc(SysDepart::getDepartOrder); @@ -157,7 +157,7 @@ public class SysDepartServiceImpl extends ServiceImpl queryTreeListByPid(String parentId,String ids, String primaryKey) { Consumer> square = i -> { - if (oConvertUtils.isNotEmpty(ids)) { + if (ConvertUtils.isNotEmpty(ids)) { if (CommonConstant.DEPART_KEY_ORG_CODE.equals(primaryKey)) { i.in(SysDepart::getOrgCode, ids.split(SymbolConstant.COMMA)); } else { i.in(SysDepart::getId, ids.split(SymbolConstant.COMMA)); } } else { - if(oConvertUtils.isEmpty(parentId)){ + if(ConvertUtils.isEmpty(parentId)){ i.and(q->q.isNull(true,SysDepart::getParentId).or().eq(true,SysDepart::getParentId,"")); }else{ i.eq(true,SysDepart::getParentId,parentId); @@ -601,7 +601,7 @@ public class SysDepartServiceImpl extends ServiceImpl !oldDirectorIds.contains(item)).collect(Collectors.joining(",")); - if(oConvertUtils.isNotEmpty(addUserIds)){ + if(ConvertUtils.isNotEmpty(addUserIds)){ this.addDepartByUserIds(sysDepart,addUserIds); } } @@ -715,7 +715,7 @@ public class SysDepartServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.like(SysUser::getDepartIds,departId); //删除全部的情况下用户id不存在 - if(oConvertUtils.isNotEmpty(userId)){ + if(ConvertUtils.isNotEmpty(userId)){ query.eq(SysUser::getId,userId); } List userList = sysUserMapper.selectList(query); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java index e48ac9d87933b81eead6c171f94b5ee18dad287a..6ee93a1e32e057ebfffb5b914eea2f3456be81e7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java @@ -16,7 +16,7 @@ import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictModelMany; import org.jeecg.common.system.vo.DictQuery; import org.jeecg.common.util.SqlInjectionUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysDict; import org.jeecg.modules.system.entity.SysDictItem; import org.jeecg.modules.system.mapper.SysDictItemMapper; @@ -204,7 +204,7 @@ public class SysDictServiceImpl extends ServiceImpl impl //@Cacheable(value = CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE) //update-end--Author:lvdandan Date:20201204 for：JT-36【online】树形列表bug修改后，还是显示原来值 暂时去掉缓存 public List queryTableDictByKeys(String table, String text, String code, String keys, boolean delNotExist) { - if(oConvertUtils.isEmpty(keys)){ + if(ConvertUtils.isEmpty(keys)){ return null; } String[] keyArray = keys.split(","); @@ -253,7 +253,7 @@ public class SysDictServiceImpl extends ServiceImpl impl if (sysDictItemList != null) { for (SysDictItem entity : sysDictItemList) { //update-begin---author:wangshuai ---date:20220211 for：[JTC-1168]如果字典项值为空，则字典项忽略导入------------ - if(oConvertUtils.isEmpty(entity.getItemValue())){ + if(ConvertUtils.isEmpty(entity.getItemValue())){ return -1; } //update-end---author:wangshuai ---date:20220211 for：[JTC-1168]如果字典项值为空，则字典项忽略导入------------ @@ -314,7 +314,7 @@ public class SysDictServiceImpl extends ServiceImpl impl //update-begin-author:taoyan date:2022-8-15 for: 下拉搜索组件 支持传入排序信息 查询排序 String orderField = "", orderType = ""; - if (oConvertUtils.isNotEmpty(keyword)) { + if (ConvertUtils.isNotEmpty(keyword)) { // 关键字里面如果写入了 排序信息 xxxxx[orderby:create_time,desc] String orderKey = "[orderby"; if (keyword.indexOf(orderKey) >= 0 && keyword.endsWith("]")) { @@ -325,7 +325,7 @@ public class SysDictServiceImpl extends ServiceImpl impl orderType = orderInfoArray[1]; } - if (oConvertUtils.isNotEmpty(keyword)) { + if (ConvertUtils.isNotEmpty(keyword)) { // 判断是否是多选 if (keyword.contains(SymbolConstant.COMMA)) { //update-begin--author:scott--date:20220105--for：JTC-529【表单设计器】 编辑页面报错，in参数采用双引号导致 ---- @@ -338,16 +338,16 @@ public class SysDictServiceImpl extends ServiceImpl impl } } //update-end-author:taoyan date:2022-8-15 for: 下拉搜索组件 支持传入排序信息 查询排序 - if(oConvertUtils.isNotEmpty(condition) && oConvertUtils.isNotEmpty(keywordSql)){ + if(ConvertUtils.isNotEmpty(condition) && ConvertUtils.isNotEmpty(keywordSql)){ filterSql+= sqlWhere + condition + " and " + keywordSql; - }else if(oConvertUtils.isNotEmpty(condition)){ + }else if(ConvertUtils.isNotEmpty(condition)){ filterSql+= sqlWhere + condition; - }else if(oConvertUtils.isNotEmpty(keywordSql)){ + }else if(ConvertUtils.isNotEmpty(keywordSql)){ filterSql+= sqlWhere + keywordSql; } //update-begin-author:taoyan date:2022-8-15 for: 下拉搜索组件 支持传入排序信息 查询排序 // 增加排序逻辑 - if (oConvertUtils.isNotEmpty(orderField)) { + if (ConvertUtils.isNotEmpty(orderField)) { filterSql += " order by " + orderField + " " + orderType; } //update-end-author:taoyan date:2022-8-15 for: 下拉搜索组件 支持传入排序信息 查询排序 @@ -453,7 +453,7 @@ public class SysDictServiceImpl extends ServiceImpl impl } // 字典Code格式不正确 [表名为空] - if(oConvertUtils.isEmpty(params[0])){ + if(ConvertUtils.isEmpty(params[0])){ return null; } List ls; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java index 1853103969addb6540ce7e493a3704055dd82c44..442a52571081faa7be92f1c3ac350a91248bccec 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.java @@ -10,7 +10,7 @@ import org.jeecg.common.base.BaseMap; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.GlobalConstants; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysGatewayRoute; import org.jeecg.modules.system.mapper.SysGatewayRouteMapper; import org.jeecg.modules.system.service.ISysGatewayRouteService; @@ -59,7 +59,7 @@ public class SysGatewayRouteServiceImpl extends ServiceImpl set = new HashSet(); for (String ids : idsList) { - if(oConvertUtils.isEmpty(ids)) { + if(ConvertUtils.isEmpty(ids)) { continue; } String[] arr = ids.split(","); for (String id : arr) { - if(oConvertUtils.isNotEmpty(id) && !set.contains(id)) { + if(ConvertUtils.isNotEmpty(id) && !set.contains(id)) { set.add(id); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java index b4220f8231d8aa475e1585f076a8ff791fc35a79..461577bdd3d98bcd8817d78b7db1603028dbf718 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java @@ -10,7 +10,7 @@ import javax.annotation.Resource; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysPermission; import org.jeecg.modules.system.entity.SysPermissionDataRule; import org.jeecg.modules.system.mapper.SysDepartPermissionMapper; @@ -78,7 +78,7 @@ public class SysPermissionServiceImpl extends ServiceImpl().lambda().eq(SysPermission::getParentId, pid)); if(count==1) { //若父节点无其他子节点，则该父节点是叶子节点 @@ -172,7 +172,7 @@ public class SysPermissionServiceImpl extends ServiceImpl().lambda().eq(SysPermission::getParentId, p.getParentId())); if(cc==0) { - if(oConvertUtils.isNotEmpty(p.getParentId())) { + if(ConvertUtils.isNotEmpty(p.getParentId())) { this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java index 6103c56afd9a1eab1443d6f4dfb258228f963e72..f6e78696ea58bc7cd7c594a9732d63096dea5a01 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java @@ -4,7 +4,7 @@ import java.util.*; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysRolePermission; import org.jeecg.modules.system.mapper.SysRolePermissionMapper; import org.jeecg.modules.system.service.ISysRolePermissionService; @@ -44,7 +44,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl list = new ArrayList(); String[] arr = permissionIds.split(","); for (String p : arr) { - if(oConvertUtils.isNotEmpty(p)) { + if(ConvertUtils.isNotEmpty(p)) { SysRolePermission rolepms = new SysRolePermission(roleId, p); rolepms.setOperateDate(new Date()); rolepms.setOperateIp(ip); @@ -69,7 +69,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl0) { List list = new ArrayList(); for (String p : add) { - if(oConvertUtils.isNotEmpty(p)) { + if(ConvertUtils.isNotEmpty(p)) { SysRolePermission rolepms = new SysRolePermission(roleId, p); rolepms.setOperateDate(new Date()); rolepms.setOperateIp(ip); @@ -94,10 +94,10 @@ public class SysRolePermissionServiceImpl extends ServiceImpl getDiff(String main,String diff){ - if(oConvertUtils.isEmpty(diff)) { + if(ConvertUtils.isEmpty(diff)) { return null; } - if(oConvertUtils.isEmpty(main)) { + if(ConvertUtils.isEmpty(main)) { return Arrays.asList(diff.split(",")); } @@ -109,7 +109,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl res = new ArrayList(); for (String key : diffArr) { - if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { + if(ConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { res.add(key); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java index 8d2345c0919499659f97bd8f78a1769c7cae4715..20fd491431a0f2d27aecdc5a96782e7900836a43 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java @@ -7,7 +7,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.UUIDGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysRole; import org.jeecg.modules.system.entity.SysThirdAccount; import org.jeecg.modules.system.entity.SysUser; @@ -86,7 +86,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl queryUserByDepCode(String depCode,String realname) { //update-begin-author:taoyan date:20210422 for: 根据部门选择用户接口代码优化 - if(oConvertUtils.isNotEmpty(realname)){ + if(ConvertUtils.isNotEmpty(realname)){ realname = realname.trim(); } List userList = this.baseMapper.queryDepartUserList(depCode, realname); @@ -128,16 +128,16 @@ public class SysUserDepartServiceImpl extends ServiceImpl pageList = null; // 部门ID不存在 直接查询用户表即可 Page page = new Page(pageNo, pageSize); - if(oConvertUtils.isEmpty(departId)){ + if(ConvertUtils.isEmpty(departId)){ LambdaQueryWrapper query = new LambdaQueryWrapper<>(); //update-begin---author:wangshuai ---date:20220104 for：[JTC-297]已冻结用户仍可设置为代理人------------ query.eq(SysUser::getStatus,Integer.parseInt(CommonConstant.STATUS_1)); //update-end---author:wangshuai ---date:20220104 for：[JTC-297]已冻结用户仍可设置为代理人------------ - if(oConvertUtils.isNotEmpty(username)){ + if(ConvertUtils.isNotEmpty(username)){ query.like(SysUser::getUsername, username); } //update-begin---author:wangshuai ---date:20220608 for：[VUEN-1238]邮箱回复时，发送到显示的为用户id------------ - if(oConvertUtils.isNotEmpty(id)){ + if(ConvertUtils.isNotEmpty(id)){ query.eq(SysUser::getId, id); } //update-end---author:wangshuai ---date:20220608 for：[VUEN-1238]邮箱回复时，发送到显示的为用户id------------ @@ -177,7 +177,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(oConvertUtils.isEmpty(departId)){ + if(ConvertUtils.isEmpty(departId)){ LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysUser::getStatus,Integer.parseInt(CommonConstant.STATUS_1)); query.ne(SysUser::getUsername,"_reserve_user_external"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index c9e14c76cdd9d1b8da352e144ea7368e51c2cd65..30b38443fd6896802eff90fde247b989b6231131 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -15,7 +15,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.SysUserCacheInfo; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.UUIDGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.mapper.*; @@ -80,7 +80,7 @@ public class SysUserServiceImpl extends ServiceImpl impl if (!user.getPassword().equals(passwordEncode)) { return Result.error("旧密码输入错误!"); } - if (oConvertUtils.isEmpty(newpassword)) { + if (ConvertUtils.isEmpty(newpassword)) { return Result.error("新密码不允许为空!"); } if (!newpassword.equals(confirmpassword)) { @@ -94,7 +94,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) public Result changePassword(SysUser sysUser) { - String salt = oConvertUtils.randomGen(8); + String salt = ConvertUtils.randomGen(8); sysUser.setSalt(salt); String password = sysUser.getPassword(); String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt); @@ -131,7 +131,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void addUserWithRole(SysUser user, String roles) { this.save(user); - if(oConvertUtils.isNotEmpty(roles)) { + if(ConvertUtils.isNotEmpty(roles)) { String[] arr = roles.split(","); for (String roleId : arr) { SysUserRole userRole = new SysUserRole(user.getId(), roleId); @@ -147,7 +147,7 @@ public class SysUserServiceImpl extends ServiceImpl impl this.updateById(user); //先删后加 sysUserRoleMapper.delete(new QueryWrapper().lambda().eq(SysUserRole::getUserId, user.getId())); - if(oConvertUtils.isNotEmpty(roles)) { + if(ConvertUtils.isNotEmpty(roles)) { String[] arr = roles.split(","); for (String roleId : arr) { SysUserRole userRole = new SysUserRole(user.getId(), roleId); @@ -174,7 +174,7 @@ public class SysUserServiceImpl extends ServiceImpl impl String componentUrl = RoleIndexConfigEnum.getIndexByRoles(roles); SysRoleIndex roleIndex = new SysRoleIndex(componentUrl); //只有 X-Version=v3 的时候，才读取sys_role_index表获取角色首页配置 - if (oConvertUtils.isNotEmpty(version) && roles!=null && roles.size()>0) { + if (ConvertUtils.isNotEmpty(version) && roles!=null && roles.size()>0) { LambdaQueryWrapper routeIndexQuery = new LambdaQueryWrapper(); //用户所有角色 routeIndexQuery.in(SysRoleIndex::getRoleCode, roles); @@ -189,7 +189,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } //如果componentUrl为空，则返回空 - if(oConvertUtils.isEmpty(roleIndex.getComponent())){ + if(ConvertUtils.isEmpty(roleIndex.getComponent())){ return null; } return roleIndex; @@ -220,10 +220,10 @@ public class SysUserServiceImpl extends ServiceImpl impl List permissionList = sysPermissionMapper.queryByUser(username); for (SysPermission po : permissionList) { // // TODO URL规则有问题？ -// if (oConvertUtils.isNotEmpty(po.getUrl())) { +// if (ConvertUtils.isNotEmpty(po.getUrl())) { // permissionSet.add(po.getUrl()); // } - if (oConvertUtils.isNotEmpty(po.getPerms())) { + if (ConvertUtils.isNotEmpty(po.getPerms())) { permissionSet.add(po.getPerms()); } } @@ -242,7 +242,7 @@ public class SysUserServiceImpl extends ServiceImpl impl public SysUserCacheInfo getCacheUser(String username) { SysUserCacheInfo info = new SysUserCacheInfo(); info.setOneDepart(true); - if(oConvertUtils.isEmpty(username)) { + if(ConvertUtils.isEmpty(username)) { return null; } @@ -364,7 +364,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void addUserWithDepart(SysUser user, String selectedParts) { // this.save(user); //保存角色的时候已经添加过一次了 - if(oConvertUtils.isNotEmpty(selectedParts)) { + if(ConvertUtils.isNotEmpty(selectedParts)) { String[] arr = selectedParts.split(","); for (String deaprtId : arr) { SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId); @@ -381,7 +381,7 @@ public class SysUserServiceImpl extends ServiceImpl impl //更新角色的时候已经更新了一次了，可以再跟新一次 this.updateById(user); String[] arr = {}; - if(oConvertUtils.isNotEmpty(departs)){ + if(ConvertUtils.isNotEmpty(departs)){ arr = departs.split(","); } //查询已关联部门 @@ -402,7 +402,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } //先删后加 sysUserDepartMapper.delete(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); - if(oConvertUtils.isNotEmpty(departs)) { + if(ConvertUtils.isNotEmpty(departs)) { for (String departId : arr) { SysUserDepart userDepart = new SysUserDepart(user.getId(), departId); sysUserDepartMapper.insert(userDepart); @@ -520,7 +520,7 @@ public class SysUserServiceImpl extends ServiceImpl impl //step.1 保存用户 this.save(user); //step.2 保存角色 - if(oConvertUtils.isNotEmpty(selectedRoles)) { + if(ConvertUtils.isNotEmpty(selectedRoles)) { String[] arr = selectedRoles.split(","); for (String roleId : arr) { SysUserRole userRole = new SysUserRole(user.getId(), roleId); @@ -528,7 +528,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } } //step.3 保存所属部门 - if(oConvertUtils.isNotEmpty(selectedDeparts)) { + if(ConvertUtils.isNotEmpty(selectedDeparts)) { String[] arr = selectedDeparts.split(","); for (String deaprtId : arr) { SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId); @@ -546,7 +546,7 @@ public class SysUserServiceImpl extends ServiceImpl impl //step.2 修改角色 //处理用户角色 先删后加 sysUserRoleMapper.delete(new QueryWrapper().lambda().eq(SysUserRole::getUserId, user.getId())); - if(oConvertUtils.isNotEmpty(roles)) { + if(ConvertUtils.isNotEmpty(roles)) { String[] arr = roles.split(","); for (String roleId : arr) { SysUserRole userRole = new SysUserRole(user.getId(), roleId); @@ -556,7 +556,7 @@ public class SysUserServiceImpl extends ServiceImpl impl //step.3 修改部门 String[] arr = {}; - if(oConvertUtils.isNotEmpty(departs)){ + if(ConvertUtils.isNotEmpty(departs)){ arr = departs.split(","); } //查询已关联部门 @@ -577,7 +577,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } //先删后加 sysUserDepartMapper.delete(new QueryWrapper().lambda().eq(SysUserDepart::getUserId, user.getId())); - if(oConvertUtils.isNotEmpty(departs)) { + if(ConvertUtils.isNotEmpty(departs)) { for (String departId : arr) { SysUserDepart userDepart = new SysUserDepart(user.getId(), departId); sysUserDepartMapper.insert(userDepart); @@ -602,7 +602,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Cacheable(cacheNames=CacheConstant.SYS_USERS_CACHE, key="#username") @SensitiveEncode public LoginUser getEncodeUserInfo(String username){ - if(oConvertUtils.isEmpty(username)) { + if(ConvertUtils.isEmpty(username)) { return null; } LoginUser loginUser = new LoginUser(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java index e1d122cc234ab5e27af817d6f34a79d27bf80099..b6f9455faddb5c25bb96b6da954a1b8f27a026b8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java @@ -28,7 +28,7 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.RestUtil; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.config.thirdapp.ThirdAppConfig; import org.jeecg.config.thirdapp.ThirdAppTypeItemVo; import org.jeecg.modules.system.entity.*; @@ -337,14 +337,14 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { * 2. 本地表里没有，就先用手机号判断，不通过再用username(用户账号)判断。 */ SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId(), THIRD_TYPE); - if (sysThirdAccount != null && oConvertUtils.isNotEmpty(sysThirdAccount.getThirdUserId())) { + if (sysThirdAccount != null && ConvertUtils.isNotEmpty(sysThirdAccount.getThirdUserId())) { // sys_third_account 表匹配成功，通过第三方userId查询出第三方userInfo dtUserInfo = JdtUserAPI.getUserById(sysThirdAccount.getThirdUserId(), accessToken); } else { // 手机号匹配 Response thirdUserId = JdtUserAPI.getUseridByMobile(sysUser.getPhone(), accessToken); // 手机号匹配成功 - if (thirdUserId.isSuccess() && oConvertUtils.isNotEmpty(thirdUserId.getResult())) { + if (thirdUserId.isSuccess() && ConvertUtils.isNotEmpty(thirdUserId.getResult())) { // 通过查询到的userId查询用户详情 dtUserInfo = JdtUserAPI.getUserById(thirdUserId.getResult(), accessToken); } else { @@ -372,7 +372,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { } // api 接口执行成功，并且 sys_third_account 表匹配失败，就向 sys_third_account 里插入一条数据 - boolean flag = (sysThirdAccount == null || oConvertUtils.isEmpty(sysThirdAccount.getThirdUserId())); + boolean flag = (sysThirdAccount == null || ConvertUtils.isEmpty(sysThirdAccount.getThirdUserId())); if (apiSuccess && flag) { if (sysThirdAccount == null) { sysThirdAccount = new SysThirdAccount(); @@ -540,7 +540,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { user.setTelephone(sysUser.getTelephone()); user.setJob_number(sysUser.getWorkNo()); // 职务翻译 - if (oConvertUtils.isNotEmpty(sysUser.getPost())) { + if (ConvertUtils.isNotEmpty(sysUser.getPost())) { SysPosition position = sysPositionService.getByCode(sysUser.getPost()); if (position != null) { user.setTitle(position.getName()); @@ -561,7 +561,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { user.setDept_id_list(departmentIdList.toArray(new Integer[]{})); user.setDept_order_list(null); } - if (oConvertUtils.isEmpty(user.getDept_id_list())) { + if (ConvertUtils.isEmpty(user.getDept_id_list())) { // 没有找到匹配部门，同步到根部门下 user.setDept_id_list(1); user.setDept_order_list(null); @@ -583,7 +583,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { // 通过 username 来关联 sysUser.setUsername(dtUser.getUserid()); // 密码默认为 “123456”，随机加盐 - String password = "123456", salt = oConvertUtils.randomGen(8); + String password = "123456", salt = ConvertUtils.randomGen(8); String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt); sysUser.setSalt(salt); sysUser.setPassword(passwordEncode); @@ -603,19 +603,19 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { sysUser.setTelephone(dtUser.getTelephone()); // 因为唯一键约束的原因，如果原数据和旧数据相同，就不更新 - if (oConvertUtils.isNotEmpty(dtUser.getEmail()) && !dtUser.getEmail().equals(sysUser.getEmail())) { + if (ConvertUtils.isNotEmpty(dtUser.getEmail()) && !dtUser.getEmail().equals(sysUser.getEmail())) { sysUser.setEmail(dtUser.getEmail()); } else { sysUser.setEmail(null); } // 因为唯一键约束的原因，如果原数据和旧数据相同，就不更新 - if (oConvertUtils.isNotEmpty(dtUser.getMobile()) && !dtUser.getMobile().equals(sysUser.getPhone())) { + if (ConvertUtils.isNotEmpty(dtUser.getMobile()) && !dtUser.getMobile().equals(sysUser.getPhone())) { sysUser.setPhone(dtUser.getMobile()); } else { sysUser.setPhone(null); } // 设置工号，如果工号为空，则使用username - if (oConvertUtils.isEmpty(dtUser.getJob_number())) { + if (ConvertUtils.isEmpty(dtUser.getJob_number())) { sysUser.setWorkNo(dtUser.getUserid()); } else { sysUser.setWorkNo(dtUser.getJob_number()); @@ -713,7 +713,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { List thirdUserIdList = thirdAccountList.stream().map(SysThirdAccount::getThirdUserId).collect(Collectors.toList()); for (String thirdUserId : thirdUserIdList) { - if (oConvertUtils.isNotEmpty(thirdUserId)) { + if (ConvertUtils.isNotEmpty(thirdUserId)) { // 没有批量删除的接口 Response response = JdtUserAPI.delete(thirdUserId, accessToken); if (response.getErrcode() == 0) { @@ -846,7 +846,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { return null; } int agentId = thirdAppConfig.getDingtalk().getAgentIdInt(); - String markdown = "### " + announcement.getTitile() + "\n" + oConvertUtils.getString(announcement.getMsgAbstract(),"空"); + String markdown = "### " + announcement.getTitile() + "\n" + ConvertUtils.getString(announcement.getMsgAbstract(),"空"); ActionCardMessage actionCard = new ActionCardMessage(markdown); actionCard.setTitle(announcement.getTitile()); actionCard.setSingle_title("详情"); @@ -859,7 +859,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { // 将userId转为username String[] userIds = null; String userId = announcement.getUserIds(); - if(oConvertUtils.isNotEmpty(userId)){ + if(ConvertUtils.isNotEmpty(userId)){ userIds = userId.substring(0, (userId.length() - 1)).split(","); }else{ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -946,7 +946,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { */ private SysUser getSysUserByThird(SysThirdAccount thirdAccount, User appUser, String appUserId, String accessToken) { String sysUserId = thirdAccount.getSysUserId(); - if (oConvertUtils.isNotEmpty(sysUserId)) { + if (ConvertUtils.isNotEmpty(sysUserId)) { return userMapper.selectById(sysUserId); } else { // 如果没有 sysUserId ，说明没有绑定账号，获取到手机号之后进行绑定 @@ -971,4 +971,4 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { } } -} \ No newline at end of file +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java index bf6e54d1605b2eb9e5c173b221e82b389f3e6ce9..e4324a34bc33cc18cf3c27b707f203a389d3bc07 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java @@ -20,7 +20,7 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.PasswordUtil; import org.jeecg.common.util.RestUtil; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.config.thirdapp.ThirdAppConfig; import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper; @@ -90,7 +90,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { String corpId = thirdAppConfig.getWechatEnterprise().getClientId(); String secret = thirdAppConfig.getWechatEnterprise().getAgentAppSecret(); // 如果没有配置APP秘钥，就说明是老企业，可以通用秘钥 - if (oConvertUtils.isEmpty(secret)) { + if (ConvertUtils.isEmpty(secret)) { secret = thirdAppConfig.getWechatEnterprise().getClientSecret(); } @@ -334,13 +334,13 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { User qwUser; SysThirdAccount sysThirdAccount = sysThirdAccountService.getOneBySysUserId(sysUser.getId(), THIRD_TYPE); for (User qwUserTemp : qwUsers) { - if (sysThirdAccount == null || oConvertUtils.isEmpty(sysThirdAccount.getThirdUserId()) || !sysThirdAccount.getThirdUserId().equals(qwUserTemp.getUserid())) { + if (sysThirdAccount == null || ConvertUtils.isEmpty(sysThirdAccount.getThirdUserId()) || !sysThirdAccount.getThirdUserId().equals(qwUserTemp.getUserid())) { // sys_third_account 表匹配失败，尝试用手机号匹配 String phone = sysUser.getPhone(); - if (!(oConvertUtils.isEmpty(phone) || phone.equals(qwUserTemp.getMobile()))) { + if (!(ConvertUtils.isEmpty(phone) || phone.equals(qwUserTemp.getMobile()))) { // 手机号匹配失败，再尝试用username匹配 String username = sysUser.getUsername(); - if (!(oConvertUtils.isEmpty(username) || username.equals(qwUserTemp.getUserid()))) { + if (!(ConvertUtils.isEmpty(username) || username.equals(qwUserTemp.getUserid()))) { // username 匹配失败，直接跳到下一次循环继续 continue; } @@ -526,12 +526,12 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { List isLeaderInDept = new ArrayList<>(); // 当前用户管理的部门 List manageDepartIdList = new ArrayList<>(); - if (oConvertUtils.isNotEmpty(sysUser.getDepartIds())) { + if (ConvertUtils.isNotEmpty(sysUser.getDepartIds())) { manageDepartIdList = Arrays.asList(sysUser.getDepartIds().split(",")); } for (SysDepart sysDepart : departList) { // 企业微信的部门id - if (oConvertUtils.isNotEmpty(sysDepart.getQywxIdentifier())) { + if (ConvertUtils.isNotEmpty(sysDepart.getQywxIdentifier())) { try { departmentIdList.add(Integer.parseInt(sysDepart.getQywxIdentifier())); } catch (NumberFormatException ignored) { @@ -556,7 +556,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { user.setIs_leader_in_dept(new Integer[]{0}); } // 职务翻译 - if (oConvertUtils.isNotEmpty(sysUser.getPost())) { + if (ConvertUtils.isNotEmpty(sysUser.getPost())) { SysPosition position = sysPositionService.getByCode(sysUser.getPost()); if (position != null) { user.setPosition(position.getName()); @@ -617,7 +617,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { // 通过 username 来关联 sysUser.setUsername(user.getUserid()); // 密码默认为 “123456”，随机加盐 - String password = "123456", salt = oConvertUtils.randomGen(8); + String password = "123456", salt = ConvertUtils.randomGen(8); String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt); sysUser.setSalt(salt); sysUser.setPassword(passwordEncode); @@ -633,7 +633,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { sysUser.setRealname(qwUser.getName()); sysUser.setPost(qwUser.getPosition()); // 设置工号，由于企业微信没有工号的概念，所以只能用 userId 代替 - if (oConvertUtils.isEmpty(sysUser.getWorkNo())) { + if (ConvertUtils.isEmpty(sysUser.getWorkNo())) { sysUser.setWorkNo(qwUser.getUserid()); } try { @@ -641,13 +641,13 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { } catch (NumberFormatException ignored) { } // 因为唯一键约束的原因，如果原数据和旧数据相同，就不更新 - if (oConvertUtils.isNotEmpty(qwUser.getEmail()) && !qwUser.getEmail().equals(sysUser.getEmail())) { + if (ConvertUtils.isNotEmpty(qwUser.getEmail()) && !qwUser.getEmail().equals(sysUser.getEmail())) { sysUser.setEmail(qwUser.getEmail()); } else { sysUser.setEmail(null); } // 因为唯一键约束的原因，如果原数据和旧数据相同，就不更新 - if (oConvertUtils.isNotEmpty(qwUser.getMobile()) && !qwUser.getMobile().equals(sysUser.getPhone())) { + if (ConvertUtils.isNotEmpty(qwUser.getMobile()) && !qwUser.getMobile().equals(sysUser.getPhone())) { sysUser.setPhone(qwUser.getMobile()); } else { sysUser.setPhone(null); @@ -725,7 +725,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { List thirdUserIdList = thirdAccountList.stream().map(SysThirdAccount::getThirdUserId).collect(Collectors.toList()); for (String thirdUserId : thirdUserIdList) { - if (oConvertUtils.isNotEmpty(thirdUserId)) { + if (ConvertUtils.isNotEmpty(thirdUserId)) { // 没有批量删除的接口 int err = JwUserAPI.deleteUser(thirdUserId, accessToken); if (err == 0) { @@ -814,7 +814,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { // 将userId转为username String userId = announcement.getUserIds(); String[] userIds = null; - if(oConvertUtils.isNotEmpty(userId)){ + if(ConvertUtils.isNotEmpty(userId)){ userIds = userId.substring(0, (userId.length() - 1)).split(","); }else{ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -833,7 +833,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { textCard.setTouser(this.getTouser(usernameString, isToAll)); TextCardEntity entity = new TextCardEntity(); entity.setTitle(announcement.getTitile()); - entity.setDescription(oConvertUtils.getString(announcement.getMsgAbstract(),"空")); + entity.setDescription(ConvertUtils.getString(announcement.getMsgAbstract(),"空")); entity.setUrl(RestUtil.getBaseUrl() + "/sys/annountCement/show/" + announcement.getId()); textCard.setTextcard(entity); return JwMessageAPI.sendTextCardMessage(textCard, accessToken); @@ -909,7 +909,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService { */ private SysUser getSysUserByThird(SysThirdAccount thirdAccount, User appUser, String appUserId, String accessToken) { String sysUserId = thirdAccount.getSysUserId(); - if (oConvertUtils.isNotEmpty(sysUserId)) { + if (ConvertUtils.isNotEmpty(sysUserId)) { return userMapper.selectById(sysUserId); } else { // 如果没有 sysUserId ，说明没有绑定账号，获取到手机号之后进行绑定 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java index 4bf73bfcdb2475790c5cc4c2d5c86bcd33a53ba4..d8471c2d5a86f69989aa31e6d91d3b27b63e3ed5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java @@ -2,7 +2,7 @@ package org.jeecg.modules.system.util; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.util.RedisUtil; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysDepartTreeModel; @@ -74,7 +74,7 @@ public class FindsDepartsChildrenUtil { List treeList = new ArrayList<>(); for (int i = 0; i < recordList.size(); i++) { SysDepartTreeModel branch = recordList.get(i); - if (oConvertUtils.isEmpty(branch.getParentId())) { + if (ConvertUtils.isEmpty(branch.getParentId())) { treeList.add(branch); DepartIdModel departIdModel = new DepartIdModel().convert(branch); departIdList.add(departIdModel); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java index 211740af150a412ba70a557e3de698d51cef9ef4..d4b4a8e0d991d02c9e257edd943236d98c235213 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java @@ -4,7 +4,7 @@ import java.util.List; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.SymbolConstant; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.modules.system.entity.SysPermission; /** @@ -39,7 +39,7 @@ public class PermissionDataUtil { } // 组件 - if (oConvertUtils.isNotEmpty(permission.getComponent())) { + if (ConvertUtils.isNotEmpty(permission.getComponent())) { String component = permission.getComponent(); if (component.startsWith(SymbolConstant.SINGLE_SLASH)) { component = component.substring(1); @@ -57,7 +57,7 @@ public class PermissionDataUtil { } // 请求URL - if (oConvertUtils.isNotEmpty(permission.getUrl())) { + if (ConvertUtils.isNotEmpty(permission.getUrl())) { String url = permission.getUrl(); if (url.endsWith(VUE_SUFFIX)) { url = url.replace(VUE_SUFFIX, ""); @@ -69,7 +69,7 @@ public class PermissionDataUtil { } // 一级菜单默认组件 - if (0 == permission.getMenuType() && oConvertUtils.isEmpty(permission.getComponent())) { + if (0 == permission.getMenuType() && ConvertUtils.isEmpty(permission.getComponent())) { // 一级菜单默认组件 permission.setComponent("layouts/RouteView"); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index d12e75ced75693efbb7823ffebacf3b39963de88..fae5ae0fd79f72f8196daf77f3a05021ace1e547 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; @@ -55,7 +55,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class ${entityName}Controller extends JeecgController<${entityName}, I${entityName}Service> { @Autowired private I${entityName}Service ${entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -77,7 +77,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -95,7 +95,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.save(${entityName?uncap_first}); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -110,7 +110,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -125,7 +125,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.removeById(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -140,7 +140,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } - + /** * 通过id查询 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 18a8a09947779d198d56f9666437388c7f532406..ed500147e4763caf861e157b48539a7b1e185cdd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -21,7 +21,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; <#list subTables as sub> import ${bussiPackage}.${entityPackage}.entity.${sub.entityName}; @@ -69,7 +69,7 @@ public class ${entityName}Controller { @Autowired private I${sub.entityName}Service ${sub.entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -91,7 +91,7 @@ public class ${entityName}Controller { IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -111,7 +111,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -132,7 +132,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -147,7 +147,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.delMain(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -162,7 +162,7 @@ public class ${entityName}Controller { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * @@ -180,7 +180,7 @@ public class ${entityName}Controller { return Result.OK(${entityName?uncap_first}); } - + <#list subTables as sub> /** * 通过id查询 @@ -212,7 +212,7 @@ public class ${entityName}Controller { //配置选中数据查询条件 String selections = request.getParameter("selections"); - if(oConvertUtils.isNotEmpty(selections)) { + if(ConvertUtils.isNotEmpty(selections)) { List selectionList = Arrays.asList(selections.split(",")); queryWrapper.in("id",selectionList); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 47a9aae59aacd94d9fc729d1c3e81dbb18b0db93..b4a86d12b82454f5486ecbd12b3a2a4213095d4f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; @@ -82,7 +82,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e return Result.OK(pageList); }else{ String parentId = ${entityName?uncap_first}.get${pidFieldName?cap_first}(); - if (oConvertUtils.isEmpty(parentId)) { + if (ConvertUtils.isEmpty(parentId)) { parentId = "0"; } ${entityName?uncap_first}.set${pidFieldName?cap_first}(null); @@ -197,7 +197,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e return Result.error("批量查询子节点失败：" + e.getMessage()); } } - + /** * 添加 * @@ -212,7 +212,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.add${entityName}(${entityName?uncap_first}); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -227,7 +227,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.update${entityName}(${entityName?uncap_first}); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -242,7 +242,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.delete${entityName}(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -257,7 +257,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index 33ef42f525c693a6ac9b65f037da452a055d0380..ed6e42b68f5278fc7019f03d5cf03970f2f912bd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -2,7 +2,7 @@ package ${bussiPackage}.${entityPackage}.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper; @@ -39,7 +39,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ public void add${entityName}(${entityName} ${entityName?uncap_first}) { //新增时设置hasChild为0 ${entityName?uncap_first}.set${hasChildrenField?cap_first}(I${entityName}Service.NOCHILD); - if(oConvertUtils.isEmpty(${entityName?uncap_first}.get${pidFieldName?cap_first}())){ + if(ConvertUtils.isEmpty(${entityName?uncap_first}.get${pidFieldName?cap_first}())){ ${entityName?uncap_first}.set${pidFieldName?cap_first}(I${entityName}Service.ROOT_PID_VALUE); }else{ //如果当前节点父ID不为空 则设置父节点的hasChildren 为1 @@ -51,7 +51,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ } baseMapper.insert(${entityName?uncap_first}); } - + @Override public void update${entityName}(${entityName} ${entityName?uncap_first}) { ${entityName} entity = this.getById(${entityName?uncap_first}.getId()); @@ -62,7 +62,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ String new_pid = ${entityName?uncap_first}.get${pidFieldName?cap_first}(); if(!old_pid.equals(new_pid)) { updateOldParentNode(old_pid); - if(oConvertUtils.isEmpty(new_pid)){ + if(ConvertUtils.isEmpty(new_pid)){ ${entityName?uncap_first}.set${pidFieldName?cap_first}(I${entityName}Service.ROOT_PID_VALUE); } if(!I${entityName}Service.ROOT_PID_VALUE.equals(${entityName?uncap_first}.get${pidFieldName?cap_first}())) { @@ -71,7 +71,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ } baseMapper.updateById(${entityName?uncap_first}); } - + @Override @Transactional(rollbackFor = Exception.class) public void delete${entityName}(String id) throws JeecgBootException { @@ -109,7 +109,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ baseMapper.deleteById(id); } } - + @Override public List<${entityName}> queryTreeListNoPage(QueryWrapper<${entityName}> queryWrapper) { List<${entityName}> dataList = baseMapper.selectList(queryWrapper); @@ -134,7 +134,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ @Override public List queryListByCode(String parentCode) { String pid = ROOT_PID_VALUE; - if (oConvertUtils.isNotEmpty(parentCode)) { + if (ConvertUtils.isNotEmpty(parentCode)) { LambdaQueryWrapper<${entityName}> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(${entityName}::get${pidFieldName?cap_first}, parentCode); List<${entityName}> list = baseMapper.selectList(queryWrapper); @@ -151,7 +151,7 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ @Override public List queryListByPid(String pid) { - if (oConvertUtils.isEmpty(pid)) { + if (ConvertUtils.isEmpty(pid)) { pid = ROOT_PID_VALUE; } return baseMapper.queryListByPid(pid, null); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 0434cc0e241c0fd1a619a0b9d47bd1b100a6495d..8675cd3d7087fba16eb25702335c6e6f8f8ee87b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.web.servlet.ModelAndView; import java.util.Arrays; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; <#list subTables as sub> import ${bussiPackage}.${entityPackage}.entity.${sub.entityName}; @@ -159,7 +159,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e return super.importExcel(request, response, ${entityName}.class); } /*---------------------------------主表处理-end-------------------------------------*/ - + <#list subTables as sub> /*--------------------------------子表处理-${sub.ftlDescription}-begin----------------------------------------------*/ @@ -248,7 +248,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e // 过滤选中数据 String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { + if (ConvertUtils.isNotEmpty(selections)) { List selectionList = Arrays.asList(selections.split(",")); exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } else { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 6a92cd93475ed45f5e91e22e2f8b0df9aa149661..2d4a48cd44d03a24f9e663242cac151f18914c24 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -21,7 +21,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; <#list subTables as sub> import ${bussiPackage}.${entityPackage}.entity.${sub.entityName}; @@ -63,7 +63,7 @@ public class ${entityName}Controller { @Autowired private I${sub.entityName}Service ${sub.entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -85,7 +85,7 @@ public class ${entityName}Controller { IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -102,7 +102,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -123,7 +123,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -138,7 +138,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.delMain(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -153,7 +153,7 @@ public class ${entityName}Controller { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * @@ -171,7 +171,7 @@ public class ${entityName}Controller { return Result.OK(${entityName?uncap_first}); } - + <#list subTables as sub> /** * 通过id查询 @@ -207,7 +207,7 @@ public class ${entityName}Controller { //配置选中数据查询条件 String selections = request.getParameter("selections"); - if(oConvertUtils.isNotEmpty(selections)) { + if(ConvertUtils.isNotEmpty(selections)) { List selectionList = Arrays.asList(selections.split(",")); queryWrapper.in("id",selectionList); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index ff7cf50109fc9eddd32ccf0d7a130e10919c0fc4..bb56f8304b5048759e4e74d142ace56c08ec4045 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -21,7 +21,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; <#list subTables as sub> import ${bussiPackage}.${entityPackage}.entity.${sub.entityName}; @@ -69,7 +69,7 @@ public class ${entityName}Controller { @Autowired private I${sub.entityName}Service ${sub.entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -91,7 +91,7 @@ public class ${entityName}Controller { IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -111,7 +111,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -132,7 +132,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -147,7 +147,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.delMain(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -162,7 +162,7 @@ public class ${entityName}Controller { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * @@ -180,7 +180,7 @@ public class ${entityName}Controller { return Result.OK(${entityName?uncap_first}); } - + <#list subTables as sub> /** * 通过id查询 @@ -212,7 +212,7 @@ public class ${entityName}Controller { //配置选中数据查询条件 String selections = request.getParameter("selections"); - if(oConvertUtils.isNotEmpty(selections)) { + if(ConvertUtils.isNotEmpty(selections)) { List selectionList = Arrays.asList(selections.split(",")); queryWrapper.in("id",selectionList); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 77fbc8426e5480d4a4737882d5a541fbd6b2cee1..9fe09dcb49d66cad356c9e0976382afd56f69e9f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -21,7 +21,7 @@ import org.jeecg.common.system.vo.LoginUser; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; <#list subTables as sub> import ${bussiPackage}.${entityPackage}.entity.${sub.entityName}; @@ -63,7 +63,7 @@ public class ${entityName}Controller { @Autowired private I${sub.entityName}Service ${sub.entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -85,7 +85,7 @@ public class ${entityName}Controller { IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -102,7 +102,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -123,7 +123,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -138,7 +138,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.delMain(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -153,7 +153,7 @@ public class ${entityName}Controller { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * @@ -171,7 +171,7 @@ public class ${entityName}Controller { return Result.OK(${entityName?uncap_first}); } - + <#list subTables as sub> /** * 通过id查询 @@ -203,7 +203,7 @@ public class ${entityName}Controller { //配置选中数据查询条件 String selections = request.getParameter("selections"); - if(oConvertUtils.isNotEmpty(selections)) { + if(ConvertUtils.isNotEmpty(selections)) { List selectionList = Arrays.asList(selections.split(",")); queryWrapper.in("id",selectionList); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 60900d2a354d3a1834b403f9993626f5db3c1040..a7729873d300271ef7294cc9b0bada1ff4cc2133 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import ${bussiPackage}.${entityPackage}.entity.${entityName}; import ${bussiPackage}.${entityPackage}.service.I${entityName}Service; import java.util.Date; @@ -48,7 +48,7 @@ import io.swagger.annotations.ApiOperation; public class ${entityName}Controller extends JeecgController<${entityName}, I${entityName}Service> { @Autowired private I${entityName}Service ${entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -70,7 +70,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -84,7 +84,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.save(${entityName?uncap_first}); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -98,7 +98,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -112,7 +112,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.removeById(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -126,7 +126,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai index 57b69becd28330d6b692f68bb21c7e03fd57f427..fa6f89ce88d444c133c69b71b0eb776f5e9614ec 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai @@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import ${bussiPackage}.entity.${entityPackage}.${entityName}; import ${bussiPackage}.service.${entityPackage}.I${entityName}Service; import org.jeecg.common.system.base.controller.JeecgController; @@ -52,7 +52,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class ${entityName}Controller extends JeecgController<${entityName}, I${entityName}Service> { @Autowired private I${entityName}Service ${entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -75,7 +75,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e return Result.OK(pageList); } - + /** * 添加 * @param ${entityName?uncap_first} @@ -88,7 +88,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.save(${entityName?uncap_first}); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -102,7 +102,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @param id @@ -115,7 +115,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e ${entityName?uncap_first}Service.removeById(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -129,7 +129,7 @@ public class ${entityName}Controller extends JeecgController<${entityName}, I${e this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 8a2535028938b526624951f7fbf438c418a2c5bd..83431dab5af0a5a5bed20cafe7c3bd685f8d84eb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -20,7 +20,7 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; <#list subTables as sub> import ${bussiPackage}.${entityPackage}.entity.${sub.entityName}; @@ -62,7 +62,7 @@ public class ${entityName}Controller { @Autowired private I${sub.entityName}Service ${sub.entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -84,7 +84,7 @@ public class ${entityName}Controller { IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -100,7 +100,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("添加成功!"); } - + /** * 编辑 * @@ -116,7 +116,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -130,7 +130,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.delMain(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -144,7 +144,7 @@ public class ${entityName}Controller { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * @@ -158,7 +158,7 @@ public class ${entityName}Controller { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); return Result.OK(${entityName?uncap_first}); } - + <#list subTables as sub> /** * 通过id查询 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index 9ed4850c8a4b649e41bf5d88916169304bfc03e6..6e6249608f11188b8452fc98e9774361b5dc7ee4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -19,7 +19,7 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; <#list subTables as sub> import ${bussiPackage}.${entityPackage}.entity.${sub.entityName}; @@ -61,7 +61,7 @@ public class ${entityName}Controller { @Autowired private I${sub.entityName}Service ${sub.entityName?uncap_first}Service; - + /** * 分页列表查询 * @@ -83,7 +83,7 @@ public class ${entityName}Controller { IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -99,7 +99,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.save(${entityName?uncap_first}); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -115,7 +115,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.updateById(${entityName?uncap_first}); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -129,7 +129,7 @@ public class ${entityName}Controller { ${entityName?uncap_first}Service.delMain(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -143,7 +143,7 @@ public class ${entityName}Controller { this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** * 通过id查询 * @@ -157,9 +157,9 @@ public class ${entityName}Controller { ${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id); return Result.OK(${entityName?uncap_first}); } - + //===========================以下是子表信息操作相关API==================================== - + <#list subTables as sub> /** * 通过主表id查询${sub.ftlDescription} @@ -200,7 +200,7 @@ ${sub.entityName?uncap_first}.get${key}()!=null<#rt/> } } <#-- update-end--Author:kangxiaolin Date:20190905 for：[442]主子表分开维护，生成的代码子表的分页改为真实的分页-------------------- --> - + /** * 添加${sub.ftlDescription} * @@ -214,7 +214,7 @@ ${sub.entityName?uncap_first}.get${key}()!=null<#rt/> ${sub.entityName?uncap_first}Service.save(${sub.entityName?uncap_first}); return Result.OK("添加${sub.ftlDescription}成功！"); } - + /** * 编辑${sub.ftlDescription} * @@ -228,7 +228,7 @@ ${sub.entityName?uncap_first}.get${key}()!=null<#rt/> ${sub.entityName?uncap_first}Service.updateById(${sub.entityName?uncap_first}); return Result.OK("编辑${sub.ftlDescription}成功！"); } - + /** * 通过id删除${sub.ftlDescription} * @@ -242,7 +242,7 @@ ${sub.entityName?uncap_first}.get${key}()!=null<#rt/> ${sub.entityName?uncap_first}Service.removeById(id); return Result.OK("删除${sub.ftlDescription}成功！"); } - + /** * 批量删除${sub.ftlDescription} * @@ -255,12 +255,12 @@ ${sub.entityName?uncap_first}.get${key}()!=null<#rt/> public Result deleteBatch${sub.entityName}(@RequestParam(name = "ids", required = true) String ids) { if (ids == null || "".equals(ids.trim())) { return Result.error("参数不识别！"); - } + } this.${sub.entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功！"); } - + /** diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java index 5dd72be09661fea1ea2dc46716bcca01223e6ecc..f56e5e7af78699e8241aadec5bd5164ae50ba9d3 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java @@ -1,7 +1,7 @@ package org.jeecg; import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -33,7 +33,7 @@ public class JeecgSystemApplication extends SpringBootServletInitializer { Environment env = application.getEnvironment(); String ip = InetAddress.getLocalHost().getHostAddress(); String port = env.getProperty("server.port"); - String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); + String path = ConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + "Application Jeecg-Boot is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/\n\t" + @@ -43,4 +43,4 @@ public class JeecgSystemApplication extends SpringBootServletInitializer { } -} \ No newline at end of file +} diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java index c5e887d2f04af31e1a22fe0bfe4fd8aca71c6427..c5b1683817e75e31d0f5697655966775cb6e2494 100644 --- a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java +++ b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java @@ -3,7 +3,7 @@ package org.jeecg; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.base.BaseMap; import org.jeecg.common.constant.GlobalConstants; -import org.jeecg.common.util.oConvertUtils; +import org.jeecg.common.util.ConvertUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; @@ -43,7 +43,7 @@ public class JeecgSystemCloudApplication extends SpringBootServletInitializer im Environment env = application.getEnvironment(); String ip = InetAddress.getLocalHost().getHostAddress(); String port = env.getProperty("server.port"); - String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); + String path = ConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + "Application Jeecg-Boot is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/doc.html\n" + @@ -66,4 +66,4 @@ public class JeecgSystemCloudApplication extends SpringBootServletInitializer im //刷新网关 redisTemplate.convertAndSend(GlobalConstants.REDIS_TOPIC_NAME, params); } -} \ No newline at end of file +}