diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java b/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java index 0fca8a99..d4ccd85a 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java @@ -244,8 +244,11 @@ public class CacheConfig extends CachingConfigurerSupport { @Override public void put(Object key, Object value) { + if (true){ + return; + } if (value == null) { return; } - System.out.println(value.getClass().getClassLoader()); + System.out.println("classLoader:"+value.getClass().getClassLoader()); redisCache.put(key, value); clearOtherJVM(); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java index ef025d7b..961876f1 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java @@ -30,7 +30,7 @@ public interface CoreDictDao extends BaseMapper { //根据表名、字段名查询 主键名和注释 和 字段名和注释 - @Cacheable(value = DICT_CACHE_FIND_PK_AND_VALUE, key = "#tableName + #columnNames") +// @Cacheable(value = DICT_CACHE_FIND_PK_AND_VALUE, key = "#tableName + #columnNames") List> findPkAndValue (String tableName, String columnNames); //根据表名、字段名查询 注释 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/gen/ConsoleTarget.java b/admin-core/src/main/java/com/ibeetl/admin/core/gen/ConsoleTarget.java index f907c4c5..30a7ab93 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/gen/ConsoleTarget.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/gen/ConsoleTarget.java @@ -14,7 +14,7 @@ public class ConsoleTarget extends BaseTarget { @Override public void flush(AutoGen gen, String content) { System.out.println("=========="+gen.getClass().getSimpleName()+"============="); - System.out.println(content); + System.out.println("content:"+content); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/gen/MavenProjectTarget.java b/admin-core/src/main/java/com/ibeetl/admin/core/gen/MavenProjectTarget.java index 086b41e5..43e6ff83 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/gen/MavenProjectTarget.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/gen/MavenProjectTarget.java @@ -70,7 +70,7 @@ public class MavenProjectTarget extends BaseTarget { fw = new FileWriter(new File(path)); fw.write(content); fw.close(); - System.out.println(path); + System.out.println("path:"+path); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseAnnotationParser.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseAnnotationParser.java index 30d6b377..07731c19 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseAnnotationParser.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseAnnotationParser.java @@ -55,6 +55,13 @@ public class CoreBaseAnnotationParser { list.parallelStream().forEach(this::queryEntityAfter); } } +// if(true){ +// +// }else { +// if (ObjectUtil.isNotEmpty(list)) { +// list.parallelStream().forEach(this::queryEntityAfter); +// } +// } } public void queryListAfter(List list, Boolean isDeep) { @@ -105,6 +112,8 @@ public class CoreBaseAnnotationParser { String display = ""; Object fieldValue = field.get(ext); if (fieldValue != null) { + String type = dict.type(); +// CoreDict dbDict = dictUtil.findCoreDict(dict.type(),fieldValue.toString()); CoreDict dbDict = dict.type().contains(".") ? dictUtil.findCoreDictByTable(dict.type(), fieldValue.toString()) : dictUtil.findCoreDict(dict.type(), fieldValue.toString()); display = dbDict != null ? dbDict.getName() : null; } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java index 574c6991..4362d527 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java @@ -62,11 +62,12 @@ public class CoreDictService extends CoreBaseService { * {@link Dict} 的最终实现方法 * @return List */ - @Cacheable(value = CorePlatformService.DICT_CACHE_TYPE, key="#type") +// @Cacheable(value = CorePlatformService.DICT_CACHE_TYPE, key="#type") public List findAllByTable(String type) { - + if(!type.contains("university")){ + return new ArrayList<>(); + } type = renderStringTemplate(type, null); - String[] str = type.split("\\."); String tableName = null,filedName = null,params = null; if(str.length>0) @@ -104,8 +105,8 @@ public class CoreDictService extends CoreBaseService { param[i] = param[i].contains("=") && !param[i].contains("find_in_set")?(param[i].replace("=","='").replace(",","',")+ (StringUtils.isBlank(param[i])?"":"'")):param[i]; } } - System.out.println("导致堆栈空间不足-----------------------------------------------------------------------------------"); - return dictDao.findALlListByTable(idName,filedName,tableCode,tableName,param); + List aLlListByTable = dictDao.findALlListByTable(idName, filedName, tableCode, tableName, param); + return aLlListByTable; }else { return new ArrayList<>(); } @@ -149,7 +150,6 @@ public class CoreDictService extends CoreBaseService { return resultScript; } }catch (Exception e) { - System.out.println(e.getMessage()); return script; } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java index 01f71892..90fb9e48 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java @@ -200,7 +200,7 @@ public class CorePlatformService { public MenuItem getMenuItem(long userId, long orgId) { CoreUserDao coreUserDao1 = SpringUtil.getBean("coreUserDao"); - System.out.println(coreUserDao1); + System.out.println("coreUserDao1:"+coreUserDao1); user = coreUserDao1.unique(userId); if (this.isSupperAdmin(user)) { return self.buildMenu(); diff --git a/web/src/main/java/cn/jlw/aliPay/AliPayController.java b/web/src/main/java/cn/jlw/aliPay/AliPayController.java index c4d5ad39..22e177d9 100644 --- a/web/src/main/java/cn/jlw/aliPay/AliPayController.java +++ b/web/src/main/java/cn/jlw/aliPay/AliPayController.java @@ -144,7 +144,7 @@ public class AliPayController extends AbstractAliPayApiController { String content = PayKit.createLinkString(paramsMap); - System.out.println(content); + System.out.println("wapPayNoSdk:"+content); String encrypt = RsaKit.encryptByPrivateKey(content, aliPayApiConfig.getPrivateKey()); System.out.println(encrypt); diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java index 8c598554..3364055d 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java @@ -135,12 +135,12 @@ public class ResourcesInfoService extends CoreBaseService { String fileName = path.substring(path.lastIndexOf("/") + 1); String formatSpot = fileName.substring(fileName.lastIndexOf(".")); - System.out.println(path); + System.out.println("getById:"+path); path = path .replace("/filesystem/temp/", "/filesystem/temp/" + fileName.replace(formatSpot, "") + "/") .replace("server/", "") .replace(formatSpot, ".m3u8"); - System.out.println(path); + System.out.println("getById:"+path); Boolean flag = booleanMap.get(fileName.replace(formatSpot, "")); if (null == flag) { diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java index a68c5fc9..f72b596d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java @@ -154,7 +154,6 @@ public class UniversityFacultyController extends BaseController { } /* 后台接口 */ - @PostMapping(MODEL + "/list.json") @Function("universityFaculty.query") @ResponseBody