From 6fe8080e69a328ab3bc3146fdd6ff84b096048a3 Mon Sep 17 00:00:00 2001 From: lzx_mac <2602107437@qq.com> Date: Thu, 29 Aug 2024 15:31:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/system/api/ISysBaseAPI.java | 9 ++++++ .../system/api/fallback/SysBaseAPIFallback.java | 8 +++++ .../main/java/org/jeecg/common/api/CommonAPI.java | 8 +++++ .../java/org/jeecg/config/shiro/ShiroRealm.java | 36 +++++++++++++++++++++ .../classes/org/jeecg/common/api/CommonAPI.class | Bin 2386 -> 2436 bytes .../org/jeecg/config/shiro/ShiroRealm.class | Bin 7680 -> 8089 bytes .../entity/HanHaiRealEnterprise.class | Bin 6828 -> 8519 bytes .../apiservice/impl/IndexApiServiceImpl.java | 2 +- .../apiservice/impl/InfoApiServiceImpl.java | 30 ++++++++--------- .../system/service/impl/SysBaseApiImpl.java | 20 ++++++++++++ 10 files changed, 97 insertions(+), 16 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index 4b0218a..79f2b17 100644 --- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -379,6 +379,15 @@ public interface ISysBaseAPI extends CommonAPI { HanHaiMember getUserByNameHanHaiAccount(@RequestParam("username") String username); + /** + * 小程序用户登录的token验证 + * @param username + * @return + */ + @Override + @GetMapping("/sys/api/getUserByNameHanHaiXcxOpenId") + public HanHaiMember getUserByNameHanHaiXcxOpenId(String username); + // /** // * 小程序用户登录的token验证 // * @param username diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java index 5975029..84ff59d 100644 --- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java +++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java @@ -234,6 +234,14 @@ public class SysBaseAPIFallback implements ISysBaseAPI { log.error("服务节点不通，导致获取登录用户信息失败： " + cause.getMessage(), cause); return null; } + + @Override + public HanHaiMember getUserByNameHanHaiXcxOpenId(String username) { + log.error("服务节点不通，导致获取登录用户信息失败： " + cause.getMessage(), cause); + return null; + } + + // // @Override // public DbMumber getUserByName3(String username,Integer isOrgan) { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java index dddf9d3..dbd2d47 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java @@ -64,6 +64,14 @@ public interface CommonAPI { public HanHaiMember getUserByNameHanHaiAccount(String username); + /** + * 小程序验证 - 小程序openid验证 + * @param username + * @return + * */ + public HanHaiMember getUserByNameHanHaiXcxOpenId(String username); + + /** * 6字典表的 翻译 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java index e84fd1f..50e37f5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java @@ -192,6 +192,42 @@ public class ShiroRealm extends AuthorizingRealm { + + + /** + * 校验token的有效性 + * + * @param token + */ + public HanHaiMember checkUserTokenIsEffectHanHaiOpenId(String token) throws AuthenticationException { + Result result = new Result(); + // 解密获得username，用于和数据库进行对比 + String openid = JwtUtil.getUsername(token); + if (openid == null) { + throw new AuthenticationException("token非法无效!"); + } + + // 查询用户信息 + log.debug("———校验token是否有效————checkUserTokenIsEffect——————— "+ token); + HanHaiMember user = commonApi.getUserByNameHanHaiXcxOpenId(openid); + if (user == null || user.getAppletOpenid() == null) { + throw new AuthenticationException("用户不存在!"); + } +// // 判断用户状态 +// if (user.getDeleteFlag().equals("Y")) { +// throw new AuthenticationException("账号已被注销,请联系管理员!"); +// } + // 校验token是否超时失效 & 或者账号密码是否错误 + if (!jwtTokenRefresh(token, openid, openid)) { + throw new JeecgBoot401Exception(CommonConstant.TOKEN_IS_INVALID_MSG); + } + return user; + } + + + + + /** * JWTToken刷新生命周期 （实现： 用户在线操作不掉线功能） * 1、登录成功后将用户的JWT生成的Token作为k、v存储到cache缓存里面(这时候k、v值一样)，缓存有效期设置为Jwt有效时间的2倍 diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/api/CommonAPI.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/common/api/CommonAPI.class index 7a5b8eab22acd6682a9c23847365d21615aa151a..cb34f8f55b2da3d094f1f11fa961d6237415d795 100644 GIT binary patch delta 367 zcmca4)FLc!>ff$?3=9k=45sW1#_S9x8wLI{D#)a#mV_3k7CBY=CFZ7jB<6V}W=14e z_!p$+d8RNjh)s@X6Wgr9G>w%}VDfJE_Ie=(Mg~@(DXfePYzz!6j0_?SqEI1076vh( zj5rWW0I?)kT8cp$D$U7+BrL-q%fJLSh?ki`4yallh=B$&umdp@g96ZCMFu5wyObH~ zRiN5{_Jb^eC|3n4S7X2_rH*VFvJ)Y?HGsM`8ML4V1D&Z2G*}02xGqpyk3k(ybeScqX0DSlg8-?xJehJ}*d&|A-)t+fFV#pRpYcw zjBBVvep8tg8gw@)i&B(Ci^(=RI%$dsanwamr#OmkMD9SsBkTWTF&ZR~B`e0qhD?tz g)|**#!mU%iU1CN&$3o+uPtxY-&P%pkF(tA708rBt?EnA( diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroRealm.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/config/shiro/ShiroRealm.class index 5d4f1136d6e66caac11615081085375e3ba1a4e1..475a99ee3ccca67651037d403095d84a5b26d4dd 100644 GIT binary patch delta 2463 zcma)8X;_t25Ps)w=eyrMfC92z6;X48q=G`pBrO$}L=n?A1r-f5M8wjztL=+g@!6v7 zi$$fCQGj9lzPYt8mMv<#ZMI_dp6>$j!>8hT?sv|aIWzA&b7tmY>5$b0k(d8`^l<>W zQf%XR)G6E(L<#P-a9;@Pus($Q@qogEHWW4}JY*w?I&-5wgop7+5DjRw(S(gQ9!0a! zZZe9;% zD12(+GjrZ$fOgy1gU>BQzOa#kFD-m!)~}7~8w=km?6pyVI^*;^8{gvxg&%DkgY8E0 zlacH*S@_w)FE)O~Z^rs}!{!h3X)&_>3V-^UTK;wIVFZ6!0w!5RiN_YN_>}nT7mDMR z=jxR|TSDSd5@50!cm1%y1W|hx@1mzOF_6@yu&lDMtfHu@ymIs`L0~>N6|?HEQQaj_ ziZVgEvmiFv*=pI|DVXZ)u%^aZT7qIL32D(1A8(N!}WWs^Q8`CRhL)bv%UNkxck3+&De0r7uk;hBy_=R#E*_V! zq`#H{F0B+N-P_3-5lRb{5+2L3LXhoj^CUaVLTT}t5~oorSsD&jX^EACo%NyWUIWdo zPJ33>?Y^|}v!)fh)?dHt#yWy#%OOe*)pD5RIKy?Om21pz#7)j3J-+YZJjfA}r(}?p z!4fBsL$u^e9yeK9j+7xBhjdNcy!h!oh>t+e#r$916;^vPNP93<}+TJfe4mTy8v-mhV$uZE-@~^g|q`TZCsb)A~)bfMp@x@pJS8(Q-?n2|)eEx~Zq(!%FvC<*=+B#>7Na!4&P zsRbiUzB;f=pzGEb71O^iJ3G9L?3RafTz0uc0^hDJH&w0p7Axu+T+0`VVF6u7R4>s7 zx_OP_C&0HKVTJ44D69@9bOi5+y(WsyBzei+MQnzX5_Bm5rt)_G0qd)?OW!~Y9_eMra8 z?8#qoD1O5r{DH}6VJ7xtr37%5*lq@gGMqsXj`NL4I#!p~CW+NuG%{q<-Gc_TJEZ#01 zMpmGmOrUkzu>VYfo6%t5&h` D+(^jd delta 2144 zcmZ`)d0bRg6#mX^_syF-D2pJBiYQ_Nf(D6@Nou(JlTbrj3|b_OP;tpj8_jabCF5C% zTDD+WVX317ifOcIrk19uWo0H>SuT~WsGa+UA^x!W{do7>bM86ccg{WMQl34lhj;ho zt=j>l(?A`=Q6aF#i9Ecb;Z+yb;x!ju#~T8bIt11Uys5*93U%Tw7uI8g6C2^vu?d@X z_)(>-)yl9%Nn4e!M#DB0>1_?$UD$zl1Zs7>i}wWH*Ae4Ig@zAUz=t|^VwZ-GT-c3| zm1eWR9u0eSw8K7~AwLoLRIU4UB;bIOKGQK62Q?hh@VSCLtl@}adQ`_3_)^0$wfRb& z{951}4ae2~TLpAN$9FiX!CR-JB~EELt=8|A=?4uz3Y^iAjS3a?CmlcItiU-PeXvjE zeqO@`9lzjL<@1~3a8Z4JSGqq0{~MNA@-b47F3CkwkXup+H51faQYbkEg-Hr0 zo1_S8At{oiq$p~sbkRnro@p&58{>_Phol%{cFo5XPAyC=E-WcZ9X7diY)O$IkEB-A znh;eM7G)gQN49N4v4Yx4ilcU%&be)iM&u3764YK&e2`cNW2P%c8_mFY0t=1RuJo`D z%6;_*V{}z z!(T=3WF7Ybe+!JIk&)g)KI`Be5Rbd~D^1ysyKxWi2=`(PM=fAElXn(g?Mbz;RI*^f zf6i&9b7bH^gEJpR5$IOMN7y(K&EUl>4m6G-X5&$I1Mh=W zXJL++bp)qTWKtcDWISf3q@dftQja`_zJeC82|O+^mv;j5Kmzlzz$8NaVsYIaVl#Nfkjx%#hc3sFJVkOpH9V-EIHV>rjc8X$%xqQZzy9X z^AB?Cjiu~iGYb?6dp*LLS3T00T0~?$a#XpRunXtV4cAI);7oQiJ+qnJ6;GPUE}fCU zNWt1nXu#LFLI#%c1-aSwG^1M48!2X81Nh;vU4lp8nIMH{o#9Qvn_~0GHndc0X0I|X zOWfo|P7Pv4RlyV1*N@go{O3oUAN{J)Kg$+vt42mSilc4GovSfm1q#$UFw35}>8gIw zc0UH?|Bo>OL;M(;zY*3TVy++FAmkR4n0b_F|ukE_<=M<-A~^yF0qawH~I;pPo21;$*xEx>uc&I?UO-O)(K(J-If xvZ^O|m~yx=UkJQ3tczn5^>c>hRb!YBRu!6>yddov;6>J1@RIqMsYmH$;9nGfh93X` diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.class index 7b36a924a1666f280647c97787e862a1aaba9b43..692098a05e79b09c2d1e0e583844801f00ecb9e7 100644 GIT binary patch literal 8519 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 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java index aacc353..c7921a8 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java @@ -98,7 +98,7 @@ public class IndexApiServiceImpl implements IndexApiService { //获取代表作品带分页 @Override public Result getWorkPage(String token, WaterPageBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page pageList = atMasterPieceService .lambdaQuery() diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java index dbac442..420d999 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java @@ -82,14 +82,14 @@ public class InfoApiServiceImpl implements InfoApiService { //获取个人信息接口 @Override public Result getInfo(String token){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); return Result.OK("查询成功", hanHaiMember); } //修改个人信息接口 @Override public Result updateInfo(String token, HanHaiMember bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); bean.setId(hanHaiMember.getId()); hanHaiMemberService.updateById(bean); return Result.OK("修改成功"); @@ -140,7 +140,7 @@ public class InfoApiServiceImpl implements InfoApiService { //获取收益记录带分页 @Override public Result getIncomePage(String token, HanHaiWaterBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page pageList = hanHaiWaterService .lambdaQuery() @@ -153,7 +153,7 @@ public class InfoApiServiceImpl implements InfoApiService { //获取提现记录带分页 @Override public Result getWithdrawPage(String token, HanHaiWaterBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page pageList = hanHaiWaterService .lambdaQuery() @@ -167,7 +167,7 @@ public class InfoApiServiceImpl implements InfoApiService { //个人认证提交 @Override public Result submitCertification(String token, HanHaiRealNameBean hanHaiRealNameBean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); String imageStraight = hanHaiRealNameBean.getImageStraight(); String imageReverseSide = hanHaiRealNameBean.getImageReverseSide(); @@ -211,7 +211,7 @@ public class InfoApiServiceImpl implements InfoApiService { //企业认证提交 @Override public Result submitCompanyCertification(String token, HanHaiRealEnterpriseBean hanHaiRealEnterpriseBean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); String imageStraight = hanHaiRealEnterpriseBean.getImageStraight(); String imageReverseSide = hanHaiRealEnterpriseBean.getImageReverseSide(); @@ -265,7 +265,7 @@ public class InfoApiServiceImpl implements InfoApiService { //获取个人认证信息 @Override public Result getCertification(String token){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); HanHaiRealName one = hanHaiRealNameService .lambdaQuery() .eq(HanHaiRealName::getUserId, hanHaiMember.getId()) @@ -276,7 +276,7 @@ public class InfoApiServiceImpl implements InfoApiService { //获取企业认证信息 @Override public Result getCompanyCertification(String token){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); List list = hanHaiRealEnterpriseService .lambdaQuery() .list(); @@ -286,7 +286,7 @@ public class InfoApiServiceImpl implements InfoApiService { //获取我的发布列表 @Override public Result getMyReleasePage(String token,MyReleasePageBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(bean.getPageNo(), bean.getPageSize()); atTrendsService.lambdaQuery() .eq(AtTrends::getUserId,hanHaiMember.getId()) @@ -298,7 +298,7 @@ public class InfoApiServiceImpl implements InfoApiService { //获取我的发布详情 @Override public Result getMyReleaseDetail(String token,String id){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); AtTrends one = atTrendsService.lambdaQuery() .eq(AtTrends::getId, id) .one(); @@ -308,7 +308,7 @@ public class InfoApiServiceImpl implements InfoApiService { //获取推广记录列表 @Override public Result getPromotionPage(String token, PromotionPageBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page page1 = atPromotionService.lambdaQuery() .orderByDesc(AtPromotion::getCreateTime) @@ -319,7 +319,7 @@ public class InfoApiServiceImpl implements InfoApiService { //获取推广记录详情 @Override public Result getPromotionDetail(String token,String id){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); AtPromotion one = atPromotionService.lambdaQuery() .eq(AtPromotion::getId, id) .one(); @@ -330,7 +330,7 @@ public class InfoApiServiceImpl implements InfoApiService { //用户提现 @Override public Result withdraw(String token){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); return Result.OK(); } @@ -343,7 +343,7 @@ public class InfoApiServiceImpl implements InfoApiService { //加油小程序-获取订单流水信息 @Override public Result getOrderWaterPage(String token, OrderWaterPageBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page page1 = cheerWaterService.lambdaQuery() .eq(CheerWater::getUserId, hanHaiMember.getId()) @@ -357,7 +357,7 @@ public class InfoApiServiceImpl implements InfoApiService { //加油小程序-用户输入支付创建支付订单并且支付 @Override public Result createOrderPay(String token, OrderPayBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //判断输入金额是否为空 if(bean.getMoney() == null){ return Result.error("支付金额不能为空"); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 6932f0b..6e802b1 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -145,6 +145,26 @@ public class SysBaseApiImpl implements ISysBaseAPI { } + /** + * 公共验证--根据账号查询验证用户信息-客户端 + * @param username + * @return + * */ + @Override + public HanHaiMember getUserByNameHanHaiXcxOpenId(String username){ + if(oConvertUtils.isEmpty(username)) { + return null; + } + HanHaiMember user = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,username).one(); + if(user==null) { + return null; + } + return user; + } + + + + @Override public String translateDictFromTable(String table, String text, String code, String key) { return sysDictService.queryTableDictTextByKey(table, text, code, key);