From 13ff86882b09a27cea8cfcb5fd582444d1d27c69 Mon Sep 17 00:00:00 2001 From: cuibaocheng Date: Thu, 23 Sep 2021 14:32:46 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E7=9A=84Bug=202.?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8A=A8=E6=80=81=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=9B=A0=E4=B8=BA=E5=BC=80=E5=90=AFcache=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=85=A8?= =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E7=9A=84Bug(=E4=B8=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=BC=93=E5=AD=98)=203.=20=E8=B0=83=E8=AF=95=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=85=8D=E7=BD=AE=204.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=BC=81=E4=B8=9A=E8=AE=A4=E8=AF=81=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apis/bigdatamodule/BigdataModuleController.java | 5 +++-- .../apis/bigdatatemplate/BigdataTemplateController.java | 5 +++-- .../bigdatatemplatearea/BigdataTemplateAreaController.java | 5 +++-- .../apis/picturestemplate/PicturesTemplateController.java | 5 +++-- .../picturestemplatearea/PicturesTemplateAreaController.java | 5 +++-- .../api/contentantistop/ContentAntistopController.java | 5 +++-- .../apis/templateconfig/TemplateConfigController.java | 5 +++-- .../apis/templaterecord/TemplateRecordController.java | 4 ++-- .../controller/api/newscontent/NewsContentController.java | 5 +++-- .../api/newscontentconfig/NewsContentConfigController.java | 5 +++-- .../api/newscontentcover/NewsContentCoverController.java | 5 +++-- .../api/newscontentfile/NewsContentFileController.java | 5 +++-- .../api/newsdirectories/NewsDirectoriesController.java | 5 +++-- .../news/controller/api/newslabel/NewsLabelController.java | 5 +++-- .../api/newslabelconfig/NewsLabelConfigController.java | 5 +++-- .../api/newstypesetting/NewsTypesettingController.java | 5 +++-- 16 files changed, 47 insertions(+), 32 deletions(-) diff --git a/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatamodule/BigdataModuleController.java b/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatamodule/BigdataModuleController.java index 794bbdd..a4edc63 100644 --- a/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatamodule/BigdataModuleController.java +++ b/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatamodule/BigdataModuleController.java @@ -11,6 +11,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -144,8 +145,8 @@ public class BigdataModuleController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatatemplate/BigdataTemplateController.java b/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatatemplate/BigdataTemplateController.java index 3c3b35b..e2f0adc 100644 --- a/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatatemplate/BigdataTemplateController.java +++ b/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatatemplate/BigdataTemplateController.java @@ -11,6 +11,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -145,8 +146,8 @@ public class BigdataTemplateController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatatemplatearea/BigdataTemplateAreaController.java b/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatatemplatearea/BigdataTemplateAreaController.java index a228f8f..3dd12c4 100644 --- a/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatatemplatearea/BigdataTemplateAreaController.java +++ b/module-bigdata/src/main/java/cn/com/tenlion/bigdata/controller/apis/bigdatatemplatearea/BigdataTemplateAreaController.java @@ -11,6 +11,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -147,8 +148,8 @@ public class BigdataTemplateAreaController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplate/PicturesTemplateController.java b/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplate/PicturesTemplateController.java index 1ba1d00..6aa9992 100644 --- a/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplate/PicturesTemplateController.java +++ b/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplate/PicturesTemplateController.java @@ -11,6 +11,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -155,8 +156,8 @@ public class PicturesTemplateController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java b/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java index a9aaea8..3206dd7 100644 --- a/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java +++ b/module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java @@ -12,6 +12,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -158,8 +159,8 @@ public class PicturesTemplateAreaController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-config-content/src/main/java/cn/com/tenlion/configcontent/controller/api/contentantistop/ContentAntistopController.java b/module-config-content/src/main/java/cn/com/tenlion/configcontent/controller/api/contentantistop/ContentAntistopController.java index fdf15e8..efb2a41 100644 --- a/module-config-content/src/main/java/cn/com/tenlion/configcontent/controller/api/contentantistop/ContentAntistopController.java +++ b/module-config-content/src/main/java/cn/com/tenlion/configcontent/controller/api/contentantistop/ContentAntistopController.java @@ -10,6 +10,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -134,8 +135,8 @@ public class ContentAntistopController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-freemarker/src/main/java/cn/com/tenlion/freemarker/controller/apis/templateconfig/TemplateConfigController.java b/module-freemarker/src/main/java/cn/com/tenlion/freemarker/controller/apis/templateconfig/TemplateConfigController.java index 94e2f95..b4d928c 100644 --- a/module-freemarker/src/main/java/cn/com/tenlion/freemarker/controller/apis/templateconfig/TemplateConfigController.java +++ b/module-freemarker/src/main/java/cn/com/tenlion/freemarker/controller/apis/templateconfig/TemplateConfigController.java @@ -11,6 +11,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -118,8 +119,8 @@ public class TemplateConfigController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-freemarker/src/main/java/cn/com/tenlion/freemarker/controller/apis/templaterecord/TemplateRecordController.java b/module-freemarker/src/main/java/cn/com/tenlion/freemarker/controller/apis/templaterecord/TemplateRecordController.java index 9e056ef..942e076 100644 --- a/module-freemarker/src/main/java/cn/com/tenlion/freemarker/controller/apis/templaterecord/TemplateRecordController.java +++ b/module-freemarker/src/main/java/cn/com/tenlion/freemarker/controller/apis/templaterecord/TemplateRecordController.java @@ -199,8 +199,8 @@ public class TemplateRecordController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } /** diff --git a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontent/NewsContentController.java b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontent/NewsContentController.java index 360855c..93a19a9 100644 --- a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontent/NewsContentController.java +++ b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontent/NewsContentController.java @@ -11,6 +11,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -124,8 +125,8 @@ public class NewsContentController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentconfig/NewsContentConfigController.java b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentconfig/NewsContentConfigController.java index 2db9c11..64ce2b7 100644 --- a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentconfig/NewsContentConfigController.java +++ b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentconfig/NewsContentConfigController.java @@ -12,6 +12,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -128,8 +129,8 @@ public class NewsContentConfigController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentcover/NewsContentCoverController.java b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentcover/NewsContentCoverController.java index 2378cc8..31efb25 100644 --- a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentcover/NewsContentCoverController.java +++ b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentcover/NewsContentCoverController.java @@ -10,6 +10,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -104,8 +105,8 @@ public class NewsContentCoverController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentfile/NewsContentFileController.java b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentfile/NewsContentFileController.java index 07eef61..4bdf7ee 100644 --- a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentfile/NewsContentFileController.java +++ b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newscontentfile/NewsContentFileController.java @@ -11,6 +11,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -104,8 +105,8 @@ public class NewsContentFileController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newsdirectories/NewsDirectoriesController.java b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newsdirectories/NewsDirectoriesController.java index 11752c4..a32da1c 100644 --- a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newsdirectories/NewsDirectoriesController.java +++ b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newsdirectories/NewsDirectoriesController.java @@ -11,6 +11,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; @@ -168,8 +169,8 @@ public class NewsDirectoriesController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newslabel/NewsLabelController.java b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newslabel/NewsLabelController.java index b7f8766..6f7476d 100644 --- a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newslabel/NewsLabelController.java +++ b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newslabel/NewsLabelController.java @@ -10,6 +10,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -113,8 +114,8 @@ public class NewsLabelController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newslabelconfig/NewsLabelConfigController.java b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newslabelconfig/NewsLabelConfigController.java index a8e89ab..de7f966 100644 --- a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newslabelconfig/NewsLabelConfigController.java +++ b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newslabelconfig/NewsLabelConfigController.java @@ -11,6 +11,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -105,8 +106,8 @@ public class NewsLabelConfigController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file diff --git a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newstypesetting/NewsTypesettingController.java b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newstypesetting/NewsTypesettingController.java index 8e6c8cc..8bde2c3 100644 --- a/module-news/src/main/java/cn/com/tenlion/news/controller/api/newstypesetting/NewsTypesettingController.java +++ b/module-news/src/main/java/cn/com/tenlion/news/controller/api/newstypesetting/NewsTypesettingController.java @@ -12,6 +12,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; @@ -118,8 +119,8 @@ public class NewsTypesettingController extends DefaultBaseController { @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") - public CurrentUserIdInfoDTO getCurrentUserIdInfo() { - return securityComponent.getCurrentUserIdInfo(); + public UserInfoBO getCurrentUserIdInfo() { + return securityComponent.getCurrentUser(); } } \ No newline at end of file