From c3a965a08a4fefc08d0de69a6a8e0cab2ccc3340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 13 Feb 2025 10:46:15 +0800 Subject: [PATCH] =?UTF-8?q?sa=E4=B8=A4=E5=A5=97=E9=89=B4=E6=9D=83=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E4=B8=BA=E4=B8=80=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AuthorizationController.java | 3 +- .../czg/controller/user/UserController.java | 42 +++++++++++++++ .../com/czg/annotation/SaAdminCheckLogin.java | 3 +- .../annotation/SaAdminCheckPermission.java | 3 +- .../com/czg/annotation/SaAdminCheckRole.java | 3 +- .../java/com/czg/config/SaTokenConfigure.java | 22 ++++---- .../java/com/czg/config/StpInterfaceImpl.java | 2 +- .../src/main/java/com/czg/sa/MyStpLogic.java | 51 ++++++++++++++++--- .../src/main/java/com/czg/sa/StpKit.java | 9 +++- .../impl/AuthorizationServiceImpl.java | 9 ++-- .../service/impl/CommonServiceImpl.java | 4 +- .../service/impl/ShopInfoServiceImpl.java | 8 +-- .../service/impl/ShopMerchantServiceImpl.java | 6 +-- .../service/impl/ShopStaffServiceImpl.java | 8 +-- .../service/impl/SysMenuServiceImpl.java | 2 +- .../service/impl/SysRoleServiceImpl.java | 10 ++-- .../service/impl/SysUserServiceImpl.java | 4 +- .../impl/UserAuthorizationServiceImpl.java | 3 +- .../service/impl/ShopProdUnitServiceImpl.java | 14 ++--- .../service/impl/SysParamsServiceImpl.java | 4 +- .../service/impl/VersionServiceImpl.java | 4 +- 21 files changed, 149 insertions(+), 65 deletions(-) create mode 100644 cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java index edd48ec10..724de6018 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java @@ -50,9 +50,8 @@ public class AuthorizationController { return CzgResult.success(); } - @SaAdminCheckPermission("/adadas") @GetMapping("test") public CzgResult login() { - return CzgResult.success(Map.of("token", StpKit.ADMIN.getShopId())); + return CzgResult.success(Map.of("token", StpKit.USER.getShopId())); } } diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java new file mode 100644 index 000000000..aa71022eb --- /dev/null +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java @@ -0,0 +1,42 @@ +package com.czg.controller.user; + +import cn.dev33.satoken.stp.StpUtil; +import com.czg.account.entity.UserInfo; +import com.czg.account.service.UserInfoService; +import com.czg.resp.CzgResult; +import com.czg.sa.StpKit; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 用户信息管理 + * @author Administrator + */ +@RestController +@RequestMapping("/user") +public class UserController { + @Resource + private UserInfoService userInfoService; + + /** + * 用户信息获取 + * @return 用户信息 + */ + @GetMapping + public CzgResult get() { + return CzgResult.success(userInfoService.getById(StpKit.USER.getLoginIdAsLong())); + } + + /** + * 用户信息获取 + * @return 用户信息 + */ +// @GetMapping +// public CzgResult get() { +// return CzgResult.success(userInfoService.getById(StpKit.USER.getLoginIdAsLong())); +// } + + +} diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckLogin.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckLogin.java index 514167f32..0f642ec27 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckLogin.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckLogin.java @@ -11,7 +11,8 @@ import java.lang.annotation.Target; * 校验后台是否登录 * @author Administrator */ -@SaCheckLogin(type = "admin") +//@SaCheckLogin(type = "admin") +@SaCheckLogin(type = "user") @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE}) public @interface SaAdminCheckLogin { diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckPermission.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckPermission.java index ec392df9d..f9e6f0fae 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckPermission.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckPermission.java @@ -15,7 +15,8 @@ import java.lang.annotation.Target; * @author click33 * */ -@SaCheckPermission(type = "admin") +//@SaCheckPermission(type = "admin") +@SaCheckPermission(type = "user") @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE}) public @interface SaAdminCheckPermission { diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckRole.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckRole.java index 591aabd30..c4324a812 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckRole.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/annotation/SaAdminCheckRole.java @@ -15,7 +15,8 @@ import java.lang.annotation.Target; * @author click33 * */ -@SaCheckRole(type = "admin") +@SaCheckRole(type = "user") +//@SaCheckRole(type = "admin") @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE}) public @interface SaAdminCheckRole { diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java index 0b86aa548..5b6079c7c 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java @@ -25,11 +25,11 @@ public class SaTokenConfigure implements WebMvcConfigurer { @PostConstruct public void setSaTokenConfig() { // admin配置 - SaTokenConfig adminConfig = new SaTokenConfig(); - adminConfig.setTokenName("token"); +// SaTokenConfig adminConfig = new SaTokenConfig(); +// adminConfig.setTokenName("token"); // config1.setTimeout(1000); - adminConfig.setTokenStyle("simple-uuid"); - StpKit.ADMIN.setConfig(adminConfig); +// adminConfig.setTokenStyle("simple-uuid"); +// StpKit.ADMIN.setConfig(adminConfig); // 小程序配置 SaTokenConfig userConfig = new SaTokenConfig(); @@ -54,14 +54,14 @@ public class SaTokenConfigure implements WebMvcConfigurer { // 重置根路径，防止satoken切割根路径导致匹配不到路径 ApplicationInfo.routePrefix = ""; - SaRouter.match("/user/**").notMatch("/user/login") - .check(r -> StpKit.USER.checkLogin()) - .setHit(true) + SaRouter.match("/**").notMatch("/user/login", "/admin/auth/**") + .check(r -> StpKit.USER.checkLogin()); +// .setHit(true) // .match("/**") - .notMatch("/user/**") - .notMatch("/admin/auth/**") - .notMatch("/admin/feign/**") - .check(r -> StpKit.ADMIN.checkLogin()); +// .notMatch("/user/**") +// .notMatch("/admin/auth/**") +// .notMatch("/admin/feign/**") +// .check(r -> StpKit.ADMIN.checkLogin()); })).addPathPatterns("/**"); } diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/StpInterfaceImpl.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/StpInterfaceImpl.java index a5bf098bd..21554be65 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/StpInterfaceImpl.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/StpInterfaceImpl.java @@ -32,7 +32,7 @@ public class StpInterfaceImpl implements StpInterface { } private static @Nullable List getCashInfo(String key) { - Object value = StpKit.ADMIN.getSession().get(key); + Object value = StpKit.USER.getSession().get(key); if (value instanceof List list) { return (List) list; } diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java index a1f81dd10..6b3754042 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java @@ -1,5 +1,7 @@ package com.czg.sa; +import cn.dev33.satoken.context.SaHolder; +import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpLogic; import com.czg.exception.ApiNotPrintException; import lombok.Getter; @@ -23,15 +25,48 @@ public class MyStpLogic extends StpLogic { } /** - * 获取店铺id - * @return 返回店铺id，不存在抛出异常 + * + * @param id 登录账号id + * @param shopId 店铺id + * @param isManager true 管理端 false 用户端 + * @param isAdmin 是否为管理员账号 */ - public Long getShopId() { - Object object = StpKit.ADMIN.getSession().get("shopId"); - if (object == null) { - throw new ApiNotPrintException("shopId获取失败"); + public void login(Long id, Long shopId, boolean isManager, boolean isAdmin) { + super.login(id); + login(id); + if (isManager && shopId == null) { + throw new ApiNotPrintException("管理端登录必须传递店铺id"); } - return (Long) object; + SaSession session = getSession().set("userId", id).set("isAdmin", isAdmin).set("isManager", isManager); + if (shopId != null) { + session.set("shopId", shopId); + } + } + + /** + * 获取店铺id + * @param defaultValue 默认值,传递多个只取第一个 + * @return 返回店铺id，不存在抛出异常，如果传递了默认值不存在返回默认值 + */ + public Long getShopId(Long... defaultValue) { + Long defaultVal = defaultValue.length > 0 ? defaultValue[0] : null; + Object object = StpKit.USER.getSession().get("isManager"); + Long shopId; + int errType; + if (object instanceof Boolean t && t) { + Object info = StpKit.USER.getSession().get("shopId"); + shopId = info instanceof Long l ? l : null; + errType = 0; + }else { + String header = SaHolder.getRequest().getHeader("shopId"); + shopId = header == null ? null : Long.parseLong(header); + errType = 1; + } + + if (defaultValue.length == 0 && shopId == null) { + throw new ApiNotPrintException(errType == 0 ? "shopId获取失败" : "客户端请求头未携带shopId"); + } + return shopId == null ? defaultVal : shopId; } /** @@ -39,7 +74,7 @@ public class MyStpLogic extends StpLogic { * @return 布尔值 */ public boolean isAdmin() { - Object object = StpKit.ADMIN.getSession().get("isAdmin"); + Object object = StpKit.USER.getSession().get("isAdmin"); return object instanceof Boolean t && t; } diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/StpKit.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/StpKit.java index a9d4d4c91..d88c18aa0 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/StpKit.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/StpKit.java @@ -1,6 +1,7 @@ package com.czg.sa; -import cn.dev33.satoken.stp.StpLogic; + +import cn.dev33.satoken.stp.StpUtil; /** * StpLogic 门面类，管理项目中所有的 StpLogic 账号体系 @@ -11,11 +12,15 @@ public class StpKit { /** * Admin 会话对象，管理 Admin 表所有账号的登录、权限认证 */ - public static final MyStpLogic ADMIN = new MyStpLogic("admin"); +// public static final MyStpLogic ADMIN = new MyStpLogic("admin"); /** * User 会话对象，管理 User 表所有账号的登录、权限认证 */ public static final MyStpLogic USER = new MyStpLogic("user"); + +// public StpKit() { +// wait(); +// } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index 5340e6c73..d41bfdd8c 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -100,15 +100,14 @@ public class AuthorizationServiceImpl implements AuthorizationService { } } - StpKit.ADMIN.login(user.getId()); - StpKit.ADMIN.getSession().set("userId", user.getId()).set("shopId", shopInfo.getId()).set("isAdmin", user.getIsAdmin()); + StpKit.USER.login(user.getId(), shopInfo.getId(), true, user.getIsAdmin()); // 查询角色 List roleList = sysRoleService.getByUserId(user.getId()); List roleNames = roleList.stream().map(SysRole::getName).collect(Collectors.toList()); - StpKit.ADMIN.addRoleList(roleNames); + StpKit.USER.addRoleList(roleNames); // 权限赋予 List promissionList = sysMenuMapper.selectByUserId(user.getId(), null).stream().map(SysMenu::getPermission).filter(StrUtil::isNotBlank).collect(Collectors.toList()); - StpKit.ADMIN.addPermissionList(promissionList); - return new LoginVO(StpKit.ADMIN.getTokenInfo(), promissionList, loginDTO.loginType(), shopInfo); + StpKit.USER.addPermissionList(promissionList); + return new LoginVO(StpKit.USER.getTokenInfo(), promissionList, loginDTO.loginType(), shopInfo); } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CommonServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CommonServiceImpl.java index 3d5dd4c32..7deb2b42b 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CommonServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CommonServiceImpl.java @@ -28,7 +28,7 @@ public class CommonServiceImpl implements CommonService { @Override public Boolean sendSms(String type) { - SysUser sysUser = sysUserService.queryChain().eq(SysUser::getId, StpKit.ADMIN.getLoginIdAsLong()).one(); + SysUser sysUser = sysUserService.queryChain().eq(SysUser::getId, StpKit.USER.getLoginIdAsLong()).one(); if (StrUtil.isBlank(sysUser.getPhone())) { throw new ApiNotPrintException("账号未绑定手机号"); } @@ -40,7 +40,7 @@ public class CommonServiceImpl implements CommonService { @Override public Boolean checkSmsCode(String type, String code) { - SysUser sysUser = sysUserService.queryChain().eq(SysUser::getId, StpKit.ADMIN.getLoginIdAsLong()).one(); + SysUser sysUser = sysUserService.queryChain().eq(SysUser::getId, StpKit.USER.getLoginIdAsLong()).one(); if (StrUtil.isBlank(sysUser.getPhone())) { throw new ApiNotPrintException("账号未绑定手机号"); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index 6d2837521..cabb32e84 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -79,10 +79,10 @@ public class ShopInfoServiceImpl extends ServiceImpl i @Override public Boolean edit(ShopInfoEditDTO shopInfoEditDTO) { ShopInfo shopInfo; - if (!StpKit.ADMIN.isAdmin()) { - shopInfo = queryChain().eq(ShopInfo::getId, StpKit.ADMIN.getLoginIdAsLong()).one(); + if (!StpKit.USER.isAdmin()) { + shopInfo = queryChain().eq(ShopInfo::getId, StpKit.USER.getLoginIdAsLong()).one(); }else { - shopInfo = getById(StpKit.ADMIN.getLoginIdAsLong()); + shopInfo = getById(StpKit.USER.getLoginIdAsLong()); } if (shopInfo == null) { throw new CzgException("店铺不存在"); @@ -97,6 +97,6 @@ public class ShopInfoServiceImpl extends ServiceImpl i @Override public ShopInfo detail() { - return queryChain().eq(ShopInfo::getId, StpKit.ADMIN.getLoginIdAsLong()).one(); + return queryChain().eq(ShopInfo::getId, StpKit.USER.getLoginIdAsLong()).one(); } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java index 606ecfe3f..3a673389c 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java @@ -20,16 +20,16 @@ public class ShopMerchantServiceImpl extends ServiceImpl impl @Override public Object getMenu() { - long sysUserId = StpKit.ADMIN.getLoginIdAsLong(); + long sysUserId = StpKit.USER.getLoginIdAsLong(); List allMenus = mapper.selectByUserId(sysUserId, null); List rootMenus = new ArrayList<>(); List allMenuVos = new ArrayList<>(); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index c3c926447..223488829 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -48,8 +48,8 @@ public class SysRoleServiceImpl extends ServiceImpl imp @Override public Page getList(PageDTO pageDTO, String key, String startTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper(); - if (!StpKit.ADMIN.isAdmin()) { - queryWrapper.eq(SysRole::getCreateUserId, StpKit.ADMIN.getLoginIdAsLong()); + if (!StpKit.USER.isAdmin()) { + queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()); } if (StrUtil.isNotBlank(key)) { @@ -92,8 +92,8 @@ public class SysRoleServiceImpl extends ServiceImpl imp sysRole.setName(roleAddDTO.name()); sysRole.setLevel(roleAddDTO.level()); sysRole.setDescription(roleAddDTO.description()); - sysRole.setShopId(StpKit.ADMIN.getLoginIdAsLong()); - sysRole.setCreateUserId(StpKit.ADMIN.getLoginIdAsLong()); + sysRole.setShopId(StpKit.USER.getLoginIdAsLong()); + sysRole.setCreateUserId(StpKit.USER.getLoginIdAsLong()); sysRole.setCreateTime(DateUtil.date().toLocalDateTime()); boolean save = save(sysRole); if (save) { @@ -106,7 +106,7 @@ public class SysRoleServiceImpl extends ServiceImpl imp @Override @Transactional(rollbackFor = Exception.class) public Boolean edit(RoleEditDTO roleEditDTO) { - SysRole role = queryChain().eq(SysRole::getId, roleEditDTO.getId()).eq(SysRole::getCreateUserId, StpKit.ADMIN.getLoginIdAsLong()).one(); + SysRole role = queryChain().eq(SysRole::getId, roleEditDTO.getId()).eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()).one(); if (role == null) { throw new ApiNotPrintException("角色不存在"); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java index 39fd37546..f6e0ae21e 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysUserServiceImpl.java @@ -38,13 +38,13 @@ public class SysUserServiceImpl extends ServiceImpl imp sysUser.setNickName(nickname); sysUser.setPhone(phone); sysUser.setStauts(1); - sysUser.setCreateUserId(StpKit.ADMIN.getLoginIdAsLong()); + sysUser.setCreateUserId(StpKit.USER.getLoginIdAsLong()); save(sysUser); sysUser.setPassword(SecureUtil.md5(sysUser.getId() + accountPwd)); updateById(sysUser); // 绑定角色 - long roleCount = sysRoleMapper.selectCountByQuery(new QueryWrapper().eq(SysRole::getId, roleId).eq(SysRole::getCreateUserId, StpKit.ADMIN.getLoginIdAsLong())); + long roleCount = sysRoleMapper.selectCountByQuery(new QueryWrapper().eq(SysRole::getId, roleId).eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong())); if (roleCount == 0) { throw new CzgException("角色不存在"); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java index 376532ef2..b1c7facd4 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java @@ -62,7 +62,8 @@ public class UserAuthorizationServiceImpl implements UserAuthorizationService { userInfo.setLastLoginTime(DateUtil.date().toLocalDateTime()); userInfoService.saveOrUpdate(userInfo); - StpKit.USER.login(userInfo.getId()); +// StpKit.USER.login(userInfo.getId()); + StpKit.USER.login(userInfo.getId(), null, false, false); return new LoginTokenDTO(StpKit.USER.getTokenValue(), userInfo); } } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java index 8d0f83531..008293468 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java @@ -35,7 +35,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl impl } version = BeanUtil.toBean(versionDTO, Version.class); - version.setUpdateUserId(StpKit.ADMIN.getLoginId(1L)); + version.setUpdateUserId(StpKit.USER.getLoginId(1L)); save(version); return CzgResult.success(version.getId()); } @@ -62,7 +62,7 @@ public class VersionServiceImpl extends ServiceImpl impl } version.setIsForce(versionDTO.getIsForce()); version.setMessage(versionDTO.getMessage()); - version.setUpdateUserId(StpKit.ADMIN.getLoginId(1L)); + version.setUpdateUserId(StpKit.USER.getLoginId(1L)); updateById(version); return CzgResult.success(version.getId());