diff --git a/src/main/java/com/example/demo/Export/ExportServiceImpl.java b/src/main/java/com/example/demo/Export/ExportServiceImpl.java index b822651..b3aeaf9 100644 --- a/src/main/java/com/example/demo/Export/ExportServiceImpl.java +++ b/src/main/java/com/example/demo/Export/ExportServiceImpl.java @@ -61,7 +61,7 @@ public class ExportServiceImpl implements ExportService{ "充值明细", admin, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); - System.out.println(fileName); +// System.out.println(fileName); dto.setUrl(""); dto.setFileName(fileName); dto.setDataNum(0); diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index 3b18177..0a89bb8 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -178,7 +178,7 @@ public class MysqlServiceImpl implements MysqlService { String country = "未知"; BaseDES des = new BaseDES(); String desjwcode= des.encrypt(String.valueOf(jwcode)); - System.out.println("desjwcode:"+desjwcode); +// System.out.println("desjwcode:"+desjwcode); // 创建 JSON 请求体 Map requestBody = new HashMap<>(); diff --git a/src/main/java/com/example/demo/Util/JWTUtil.java b/src/main/java/com/example/demo/Util/JWTUtil.java index 373f780..8c70bab 100644 --- a/src/main/java/com/example/demo/Util/JWTUtil.java +++ b/src/main/java/com/example/demo/Util/JWTUtil.java @@ -47,8 +47,8 @@ public class JWTUtil { ObjectMapper mapper = new ObjectMapper(); try { String json = mapper.writeValueAsString(user); - System.out.println("用户的JSON"); - System.out.println(json); +// System.out.println("用户的JSON"); +// System.out.println(json); return createJWT(json, JWT_TTL); } catch (JsonProcessingException e) { throw new RuntimeException(e); @@ -142,7 +142,7 @@ public class JWTUtil { */ public static Claims parseJWT(String jwt) throws Exception { SecretKey secretKey = generalKey(); - System.out.println(jwt); +// System.out.println(jwt); return Jwts.parser() .setSigningKey(secretKey) .parseClaimsJws(jwt) diff --git a/src/main/java/com/example/demo/controller/AdminController.java b/src/main/java/com/example/demo/controller/AdminController.java index 0af8e9f..c95afe1 100644 --- a/src/main/java/com/example/demo/controller/AdminController.java +++ b/src/main/java/com/example/demo/controller/AdminController.java @@ -43,7 +43,7 @@ public class AdminController { try { admin = adminService.login(admin); String token = JWTUtil.createJWT(admin); - System.out.println(token); +// System.out.println(token); admin.setPassword(null); return Result.success(token, admin); @@ -59,9 +59,9 @@ public class AdminController { //String token = token1.getToken(); String token = token1; - System.out.println("1/*/*/*/*//*-*-*-*-*-*-1" + token); + try { - System.out.println("/+/+/+/+/+/+/+//" + JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class)); + return JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); } catch (Exception e) { diff --git a/src/main/java/com/example/demo/controller/GoldDetailController.java b/src/main/java/com/example/demo/controller/GoldDetailController.java index 54143af..7a7aad6 100644 --- a/src/main/java/com/example/demo/controller/GoldDetailController.java +++ b/src/main/java/com/example/demo/controller/GoldDetailController.java @@ -105,7 +105,7 @@ public class GoldDetailController { } @PostMapping("/getGold") public Result getGold(@RequestBody Page page) throws Exception { - System.out.println( page); +// System.out.println( page); if(ObjectUtils.isEmpty(page.getPageNum())){ return Result.error("页码数为空！"); } @@ -174,7 +174,7 @@ public class GoldDetailController { } public Result ExcelGold(@RequestBody Page page) throws Exception { - System.out.println( page); +// System.out.println( page); if(ObjectUtils.isEmpty(page.getPageNum())){ return Result.error("页码数为空！"); } diff --git a/src/main/java/com/example/demo/controller/PermissionController.java b/src/main/java/com/example/demo/controller/PermissionController.java index 27c2bf7..b3482f4 100644 --- a/src/main/java/com/example/demo/controller/PermissionController.java +++ b/src/main/java/com/example/demo/controller/PermissionController.java @@ -64,7 +64,7 @@ public class PermissionController { //新增用户 @PostMapping("/addPermission") public Result addPermission(@RequestBody Admin admin) throws Exception { - System.out.println( admin); +// System.out.println( admin); try { return Result.success(permissionService.addpermission(admin)); } diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java index a5c500c..959f37c 100644 --- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java @@ -37,7 +37,7 @@ public class AdminServiceImpl implements AdminService { } Admin adminInDB = adminMapper.getAdmin(account); - System.out.println("adminInDB:" + adminInDB); +// System.out.println("adminInDB:" + adminInDB); if (adminInDB == null) { throw new RuntimeException("无此精网号"); } @@ -48,14 +48,14 @@ public class AdminServiceImpl implements AdminService { } try { - System.out.println("admin:" + account); - System.out.println("admin:" + admin.getPassword()); +// System.out.println("admin:" + account); +// System.out.println("admin:" + admin.getPassword()); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(account, admin.getPassword()); Authentication authentication = authenticationManager.authenticate(token); SecurityContextHolder.getContext().setAuthentication(authentication); // 存储认证信息 Admin authenticatedAdmin = (Admin) authentication.getPrincipal(); - System.out.println("authenticatedAdmin markets: " + authenticatedAdmin.getMarkets()); // 添加日志检查 +// System.out.println("authenticatedAdmin markets: " + authenticatedAdmin.getMarkets()); // 添加日志检查 return authenticatedAdmin; } catch (Exception e) { diff --git a/src/main/java/com/example/demo/serviceImpl/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ExportExcelServiceImpl.java index 1d90a00..e4c38c7 100644 --- a/src/main/java/com/example/demo/serviceImpl/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ExportExcelServiceImpl.java @@ -76,6 +76,7 @@ public class ExportExcelServiceImpl implements ExportExcelService { private ExportMapper exportMapper; + @Transactional @Override public Exception handleExcelExportData(String message) throws Exception { @@ -87,6 +88,7 @@ public class ExportExcelServiceImpl implements ExportExcelService { OutputStream outputStream = null; ExcelWriter excelWriter = null; + try { // 1. 解析JSON任务 JsonNode rootNode = objectMapper.readTree(message); diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index c5f4a63..a8602b2 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -139,7 +139,7 @@ public class GeneralServiceImpl implements GeneralService { return list; } catch (Exception e) { // 记录日志 - log.error("获取地区权限失败", e); +// log.error("获取地区权限失败", e); // 重新抛出异常，或者根据需要返回一个默认值或空列表 throw new RuntimeException("获取地区权限失败", e); } @@ -162,7 +162,7 @@ public class GeneralServiceImpl implements GeneralService { return list; } catch (Exception e) { // 记录日志 - log.error("获取地区权限失败", e); +// log.error("获取地区权限失败", e); // 重新抛出异常，或者根据需要返回一个默认值或空列表 throw new RuntimeException("获取地区权限失败", e); } @@ -187,7 +187,7 @@ public class GeneralServiceImpl implements GeneralService { return list; } catch (Exception e) { // 记录日志 - log.error("获取地区权限失败", e); +// log.error("获取地区权限失败", e); // 重新抛出异常，或者根据需要返回一个默认值或空列表 throw new RuntimeException("获取地区权限失败", e); } diff --git a/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java index f1fc02c..ed51f40 100644 --- a/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java @@ -49,7 +49,7 @@ public class GoldDetailServiceImpl implements GoldDetailService { @Override public PageInfo getGoldDetail(Integer pageNum, Integer pageSize, GoldDetail goldDetail) { PageHelper.startPage(pageNum, pageSize); - System.out.println(goldDetail.getMarkets()); +// System.out.println(goldDetail.getMarkets()); List list = goldDetailMapper.getGoldDetail(goldDetail); return new PageInfo<>(list); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 25718af..9e0b8a1 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -45,17 +45,6 @@ spring: max-wait: -1 max-idle: 5 -mybatis: - configuration: - mysql1: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - sqlserver1: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -upload: - path: D:\upload - file: upload: url: http://39.101.133.168:8828/hljw/api/aws/upload diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index ad43c0f..f1d908d 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -35,9 +35,9 @@ spring: data: redis: database: 2 - host: 18.143.76.3 - port: 10703 - password: Ngc0FYUTA6h3wC5J + host: localhost + port: 6379 + password: 123456 lettuce: pool: @@ -45,20 +45,10 @@ spring: max-wait: -1 max-idle: 5 -mybatis: - configuration: - mysql1: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - sqlserver1: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -upload: - path: D:\upload file: upload: - url: https://api.homilychart.com/hljw/api/aws/upload + url: http://api.homilychart.com/hljw/api/aws/upload feishu: webhook: url: https://open.feishu.cn/open-apis/bot/v2/hook/1a515b19-b64f-46b7-9486-35842b9539fe @@ -66,7 +56,7 @@ feishu: server: - port: 10705 + port: 8081 logging: level: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 9fd308f..612d4bd 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -45,16 +45,6 @@ spring: max-wait: -1 max-idle: 5 -mybatis: - configuration: - mysql1: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - sqlserver1: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -upload: - path: D:\upload file: upload: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 024f557..06fbadb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -84,10 +84,10 @@ mybatis: configuration: mysql1: map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl sqlserver1: map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # mysql2: # map-underscore-to-camel-case: true # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl