From 9af9ab4d7a638687024437a9e1d1e742fe1b4bb2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 11 May 2024 10:49:54 +0800
Subject: [PATCH] 香港新环境
---
src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java | 21 +++++----------------
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 7 +------
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java | 2 +-
src/main/java/cc/mrbird/febs/common/handler/GlobalExceptionHandler.java | 3 +--
4 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/handler/GlobalExceptionHandler.java b/src/main/java/cc/mrbird/febs/common/handler/GlobalExceptionHandler.java
index 91d008c..276a39c 100644
--- a/src/main/java/cc/mrbird/febs/common/handler/GlobalExceptionHandler.java
+++ b/src/main/java/cc/mrbird/febs/common/handler/GlobalExceptionHandler.java
@@ -1,6 +1,5 @@
package cc.mrbird.febs.common.handler;
-import cc.mrbird.febs.common.annotation.EncryptEnable;
import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.exception.FebsException;
@@ -32,7 +31,7 @@
* @author MrBird
*/
@Slf4j
-@EncryptEnable
+//@EncryptEnable
@RestControllerAdvice
@Order(value = Ordered.HIGHEST_PRECEDENCE)
public class GlobalExceptionHandler {
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
index a61ecf0..2e67efd 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -1,14 +1,12 @@
package cc.mrbird.febs.dapp.controller;
-import cc.mrbird.febs.common.annotation.EncryptEnable;
-import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.dapp.dto.*;
+import cc.mrbird.febs.dapp.dto.ConnectDto;
+import cc.mrbird.febs.dapp.dto.MallGoodsQueryDto;
+import cc.mrbird.febs.dapp.dto.NewsListDto;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.MallNewsInfo;
import cc.mrbird.febs.dapp.service.DappMemberService;
-import cc.mrbird.febs.dapp.service.DappSimulateDataService;
-import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.IMallNewsInfoService;
import cc.mrbird.febs.dapp.soccer.dto.GameApiDto;
import cc.mrbird.febs.dapp.soccer.dto.LeaguesApiDto;
@@ -18,10 +16,7 @@
import cc.mrbird.febs.dapp.soccer.mapper.SoccerLeaguesMapper;
import cc.mrbird.febs.dapp.vo.MallGoodsListVo;
import cc.mrbird.febs.dapp.vo.NewsListVo;
-import cc.mrbird.febs.dapp.vo.SimulateDataVo;
-import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -37,14 +32,8 @@
import io.swagger.annotations.ApiResponses;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.jline.utils.Log;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
@@ -53,7 +42,7 @@
* @date 2022-03-17
**/
@Slf4j
-@EncryptEnable
+//@EncryptEnable
@RequiredArgsConstructor
@CrossOrigin("*")
@RestController
@@ -214,7 +203,7 @@
@PostMapping(value = "/gameApi")
public FebsResponse gameApi(GameApiDto gameApiDto) {
HttpResponse<String> response = null;
- int league = ObjectUtil.isEmpty(gameApiDto.getLeague()) ? DateUtil.date().year() : gameApiDto.getSeason();
+ int league = ObjectUtil.isEmpty(gameApiDto.getLeague()) ? DateUtil.date().year() : gameApiDto.getLeague();
int season = ObjectUtil.isEmpty(gameApiDto.getSeason()) ? DateUtil.date().year() : gameApiDto.getSeason();
String fromDate = ObjectUtil.isEmpty(gameApiDto.getFromDate()) ? DateUtil.today() : gameApiDto.getFromDate();
String toDate = ObjectUtil.isEmpty(gameApiDto.getToDate()) ? DateUtil.today() : gameApiDto.getToDate();
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index e66749f..963eb2e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -1,7 +1,5 @@
package cc.mrbird.febs.dapp.controller;
-import cc.mrbird.febs.common.annotation.EncryptEnable;
-import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -9,12 +7,10 @@
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.DappAccountMoneyChangeEntity;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
-import cc.mrbird.febs.dapp.entity.DappNodeOrderEntity;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.vo.*;
-import cn.hutool.core.util.ObjectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -24,14 +20,13 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
-import java.util.HashMap;
/**
* @author
* @date 2022-03-17
**/
@Slf4j
-@EncryptEnable
+//@EncryptEnable
@RequiredArgsConstructor
@CrossOrigin("*")
@RestController
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java
index 134801f..be408f4 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java
@@ -32,7 +32,7 @@
* @date 2022-03-17
**/
@Slf4j
-@EncryptEnable
+//@EncryptEnable
@RequiredArgsConstructor
@CrossOrigin("*")
@RestController
--
Gitblit v1.9.1