From d966e615a489c5d5d79f80d2500f5bf247c5f545 Mon Sep 17 00:00:00 2001 From: fengjianhuang <729846467@qq.com> Date: Mon, 5 Jun 2023 10:37:05 +0800 Subject: [PATCH] feat: admin login userlogin config --- .../g3fo/admin/dto/req/AdminLoginRequest.java | 20 +++ .../g3fo/admin/dto/req/CreateUserRequest.java | 63 +++++++ .../admin/dto/resp/AdminLoginRespond.java | 21 +++ .../com/afe/g3fo/admin/enums/AdminEnum.java | 34 ++++ .../g3fo/admin/facade/AdminLoginFacade.java | 23 +++ g3fo-admin-service/pom.xml | 4 - .../java/com/afe/g3fo/admin/biz/UserBiz.java | 39 ++++ .../config/UserGlobalExceptionHandler.java | 43 ----- .../afe/g3fo/admin/entity/AdminLoginInfo.java | 49 ++++++ .../facade/impl/AdminLoginFacadeImpl.java | 59 +++++++ .../admin/mapper/AdminLoginInfoMapper.java | 17 ++ .../admin/service/AdminLoginInfoService.java | 28 +++ .../impl/AdminLoginInfoServiceImpl.java | 21 +++ .../admin/util/PasswordEncryptionUtils.java | 51 ++++++ .../src/main/resources/bootstrap.yml | 3 +- .../main/resources/mapper/UserInfoMapper.xml | 5 - .../resources/mapper/UserLoginInfoMapper.xml | 166 ------------------ .../src/test/com/afe/g3fo/user/LoginTest.java | 43 +---- .../src/test/com/afe/g3fo/user/UserTest.java | 72 ++++---- 19 files changed, 469 insertions(+), 292 deletions(-) create mode 100644 g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/req/AdminLoginRequest.java create mode 100644 g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/req/CreateUserRequest.java create mode 100644 g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/resp/AdminLoginRespond.java create mode 100644 g3fo-admin-api/src/main/java/com/afe/g3fo/admin/enums/AdminEnum.java create mode 100644 g3fo-admin-api/src/main/java/com/afe/g3fo/admin/facade/AdminLoginFacade.java create mode 100644 g3fo-admin-service/src/main/java/com/afe/g3fo/admin/biz/UserBiz.java delete mode 100644 g3fo-admin-service/src/main/java/com/afe/g3fo/admin/config/UserGlobalExceptionHandler.java create mode 100644 g3fo-admin-service/src/main/java/com/afe/g3fo/admin/entity/AdminLoginInfo.java create mode 100644 g3fo-admin-service/src/main/java/com/afe/g3fo/admin/facade/impl/AdminLoginFacadeImpl.java create mode 100644 g3fo-admin-service/src/main/java/com/afe/g3fo/admin/mapper/AdminLoginInfoMapper.java create mode 100644 g3fo-admin-service/src/main/java/com/afe/g3fo/admin/service/AdminLoginInfoService.java create mode 100644 g3fo-admin-service/src/main/java/com/afe/g3fo/admin/service/impl/AdminLoginInfoServiceImpl.java create mode 100644 g3fo-admin-service/src/main/java/com/afe/g3fo/admin/util/PasswordEncryptionUtils.java delete mode 100644 g3fo-admin-service/src/main/resources/mapper/UserInfoMapper.xml delete mode 100644 g3fo-admin-service/src/main/resources/mapper/UserLoginInfoMapper.xml diff --git a/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/req/AdminLoginRequest.java b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/req/AdminLoginRequest.java new file mode 100644 index 0000000..8b1d489 --- /dev/null +++ b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/req/AdminLoginRequest.java @@ -0,0 +1,20 @@ +package com.afe.g3fo.admin.dto.req; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：fengjianhuang + * @Package：com.afe.g3fo.admin.dto.req + * @Project：g3fo-admin + * @name：AdminLoginRequest + * @Date：2023/5/26 15:02 + * @Filename：AdminLoginRequest + */ +@Data +public class AdminLoginRequest implements Serializable { + private String userName; + private String loginPassword; + private String loginChannel; +} diff --git a/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/req/CreateUserRequest.java b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/req/CreateUserRequest.java new file mode 100644 index 0000000..35d372e --- /dev/null +++ b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/req/CreateUserRequest.java @@ -0,0 +1,63 @@ +package com.afe.g3fo.admin.dto.req; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.NonNull; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @Author：jim.feng + * @name：CreateUserRequest + * @Date：2023/6/2 16:15 + */ +@Data +public class CreateUserRequest { + @Schema(description = "user ID") + @NotBlank + private String userName; + @Schema(description = "chinese name") + @NotBlank + private String localName; + @Schema(description = "english name") + @NotBlank + private String engName; + + private Integer userType; + @Schema(description = "参考用户配置接口") + @NotNull + private Integer userStatus; + + private String title; + @Schema(description = "参考用户配置接口") + private Integer branch; + @Schema(description = "参考用户配置接口") + private Integer department; + + private String mobileNo; + + private String email; + + private LocalDateTime expiryDate; + + + private Integer tradeOddlotFlg; + + private BigDecimal maxClientPct; + + private BigDecimal maxDeductPct; + + private BigDecimal cnySingleOrderLimit; + + private BigDecimal cnySingleOverrideLimit; + @Schema(description = "参考用户配置接口") + private Integer otpLogon; + @Schema(description = "参考用户配置接口") + private Integer otpChgpwd; + @Schema(description = "参考用户配置接口") + private Integer otpMethod; + +} diff --git a/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/resp/AdminLoginRespond.java b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/resp/AdminLoginRespond.java new file mode 100644 index 0000000..46339f6 --- /dev/null +++ b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/dto/resp/AdminLoginRespond.java @@ -0,0 +1,21 @@ +package com.afe.g3fo.admin.dto.resp; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author：jim.feng + * @name：AdminLoginRespond + * @Date：2023/5/26 16:38 + */ +@Data +public class AdminLoginRespond implements Serializable { + private String userName; + + private String loginChannel; + + private Long userId; +} + diff --git a/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/enums/AdminEnum.java b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/enums/AdminEnum.java new file mode 100644 index 0000000..c3b308e --- /dev/null +++ b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/enums/AdminEnum.java @@ -0,0 +1,34 @@ +package com.afe.g3fo.admin.enums; + +import com.afe.g3fo.framework.exception.IException; + +/** + * @Author：jim.feng + * @name：AdminEnum + * @Date：2023/5/30 9:36 + */ +public enum AdminEnum implements IException { + + USERORPASSWORDERROR(15000,""); + + + + private Integer errorId; + + /** 错误消息 */ + private String message; + AdminEnum(Integer errorId, String message) { + this.errorId = errorId; + this.message = message; + } + + @Override + public Integer getErrorId() { + return errorId; + } + + @Override + public String getMessage() { + return message; + } +} diff --git a/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/facade/AdminLoginFacade.java b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/facade/AdminLoginFacade.java new file mode 100644 index 0000000..7f88c54 --- /dev/null +++ b/g3fo-admin-api/src/main/java/com/afe/g3fo/admin/facade/AdminLoginFacade.java @@ -0,0 +1,23 @@ +package com.afe.g3fo.admin.facade; + +import com.afe.g3fo.admin.dto.req.AdminLoginRequest; +import com.afe.g3fo.admin.dto.resp.AdminLoginRespond; +import com.afe.g3fo.framework.common.Result; + +/** + * @Author：fengjianhuang + * @Package：com.afe.g3fo.admin.facade + * @Project：g3fo-admin + * @name：AdminLoginFacade + * @Date：2023/5/26 15:01 + * @Filename：AdminLoginFacade + */ +public interface AdminLoginFacade { + + /** admin登录 + * @param adminLoginRequest + * @return + */ + Result adminLogin(AdminLoginRequest adminLoginRequest) ; + +} diff --git a/g3fo-admin-service/pom.xml b/g3fo-admin-service/pom.xml index baa6efb..bb2b8c6 100644 --- a/g3fo-admin-service/pom.xml +++ b/g3fo-admin-service/pom.xml @@ -48,11 +48,7 @@ test - - com.afe.g3fo - g3fo-framework-service - diff --git a/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/biz/UserBiz.java b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/biz/UserBiz.java new file mode 100644 index 0000000..7f8a008 --- /dev/null +++ b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/biz/UserBiz.java @@ -0,0 +1,39 @@ +package com.afe.g3fo.admin.biz; + +import com.afe.g3fo.base.dto.response.SystemCodeResponse; +import com.afe.g3fo.base.facade.SystemCodeFacade; +import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * @Author：jim.feng + * @name：UserBiz + * @Date：2023/6/1 17:55 + */ +@Component +public class UserBiz { + + static List userType= List.of("USST","DEPT","CARO","OTPL","OTPP","OTPM"); + @DubboReference + SystemCodeFacade systemCodeFacade; + + public Map> getCreateUserConfig(){ +// List systemCodeResponses=new ArrayList<>(); +// userType.stream().forEach( tye->{ +// systemCodeResponses.addAll(systemCodeFacade.getByCodeType(tye)) ; +// }); + List byCodeByTypes = systemCodeFacade.getByCodeByTypes(userType); + Map> collect = byCodeByTypes.stream() + .collect(Collectors.groupingBy(SystemCodeResponse::getCodeType)); + return collect; + } + + + +} diff --git a/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/config/UserGlobalExceptionHandler.java b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/config/UserGlobalExceptionHandler.java deleted file mode 100644 index 531b304..0000000 --- a/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/config/UserGlobalExceptionHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.afe.g3fo.admin.config; - -import com.afe.g3fo.admin.exception.AdminBizException; -import com.afe.g3fo.framework.common.Result; -import com.afe.g3fo.framework.service.exception.GlobalExceptionHandler; -import com.afe.g3fo.plugin.dubbo.exception.DubboException; -import jakarta.servlet.http.HttpServletRequest; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * @Author：fengjianhuang - * @Package：com.afe.g3fo.user.exception - * @Project：g3fo-user - * @name：UserGlobalExceptionHandler - * @Date：2023/5/15 14:00 - * @Filename：UserGlobalExceptionHandler - */ -@ControllerAdvice -@Slf4j -public class UserGlobalExceptionHandler extends GlobalExceptionHandler { - @ResponseBody - @ExceptionHandler(DubboException.class) - public Result handleRpcException(DubboException e, HttpServletRequest request) { - log.error(e.getMessage(), e); - String code = String.valueOf(e.getCode()); - return StringUtils.isNotBlank(code) ? Result.error(code, e.getMessage()) : Result.error(e.getMessage()); - } - - /** - * 业务异常 - */ - @ResponseBody - @ExceptionHandler(AdminBizException.class) - public Result handleServiceException(AdminBizException e, HttpServletRequest request) { - log.error(e.getMessage(), e); - String code = e.getCode(); - return StringUtils.isNotBlank(code) ? Result.error(code, e.getMessage()) : Result.error(e.getMessage()); - } -} diff --git a/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/entity/AdminLoginInfo.java b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/entity/AdminLoginInfo.java new file mode 100644 index 0000000..e52b41e --- /dev/null +++ b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/entity/AdminLoginInfo.java @@ -0,0 +1,49 @@ +package com.afe.g3fo.admin.entity; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +import java.io.Serializable; + +/** + * (MAdminLoginInfo)表实体类 + * + * @author makejava + * @since 2023-05-26 14:54:10 + */ +@SuppressWarnings("serial") +@Data +@TableName("m_admin_login_info") +public class AdminLoginInfo extends Model { + + private Long loginInfoId; + + private Long userId; + + private String userName; + + private String loginChannel; + + private Integer loginStatus; + + private String loginPassword; + + private Integer retryCount; + + private Date pwdExpiryDate; + + private Date lastLoginDate; + + private String createBy; + + private Date createOn; + + private String updateBy; + + private Date updateOn; + + } + diff --git a/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/facade/impl/AdminLoginFacadeImpl.java b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/facade/impl/AdminLoginFacadeImpl.java new file mode 100644 index 0000000..0a553d2 --- /dev/null +++ b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/facade/impl/AdminLoginFacadeImpl.java @@ -0,0 +1,59 @@ +package com.afe.g3fo.admin.facade.impl; + +import cn.hutool.core.bean.BeanUtil; + +import com.afe.g3fo.admin.dto.req.AdminLoginRequest; +import com.afe.g3fo.admin.dto.resp.AdminLoginRespond; +import com.afe.g3fo.admin.entity.AdminLoginInfo; +import com.afe.g3fo.admin.enums.AdminEnum; +import com.afe.g3fo.admin.facade.AdminLoginFacade; +import com.afe.g3fo.admin.service.AdminLoginInfoService; +import com.afe.g3fo.admin.util.PasswordEncryptionUtils; +import com.afe.g3fo.framework.common.Result; + +import com.afe.g3fo.plugin.dubbo.exception.AssertsDubo; + +import com.afe.g3fo.plugin.dubbo.exception.DubboException; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboService; + +import java.time.LocalDateTime; + +/** + * @Author：fengjianhuang + * @Package：com.afe.g3fo.admin.facade + * @Project：g3fo-admin + * @name：AdminLoginFacade + * @Date：2023/5/26 15:01 + * @Filename：AdminLoginFacade + */ +@DubboService +@AllArgsConstructor +public class AdminLoginFacadeImpl implements AdminLoginFacade { + + private final AdminLoginInfoService adminLoginInfoService; + + @Override + public Result adminLogin(AdminLoginRequest adminLoginRequest) { + + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(AdminLoginInfo::getUserName,adminLoginRequest.getUserName()); + queryWrapper.lambda().eq(AdminLoginInfo::getLoginChannel,adminLoginRequest.getLoginChannel()); + AdminLoginInfo userLoginInfo = adminLoginInfoService.getOne(queryWrapper); + AssertsDubo.notNull(userLoginInfo, AdminEnum.USERORPASSWORDERROR); + try { + if(PasswordEncryptionUtils.encrypt(adminLoginRequest.getLoginPassword()).equals(userLoginInfo.getLoginPassword())){ + AdminLoginRespond adminLoginRespond = BeanUtil.copyProperties(userLoginInfo,AdminLoginRespond.class); + + return Result.ok(adminLoginRespond); + } + + } catch (Exception e) { + throw new DubboException(e); + } + + + return null; + } +} diff --git a/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/mapper/AdminLoginInfoMapper.java b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/mapper/AdminLoginInfoMapper.java new file mode 100644 index 0000000..bac6ea4 --- /dev/null +++ b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/mapper/AdminLoginInfoMapper.java @@ -0,0 +1,17 @@ +package com.afe.g3fo.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.afe.g3fo.admin.entity.AdminLoginInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * (MAdminLoginInfo)表数据库访问层 + * + * @author makejava + * @since 2023-05-26 14:54:10 + */ +@Mapper +public interface AdminLoginInfoMapper extends BaseMapper { + +} + diff --git a/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/service/AdminLoginInfoService.java b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/service/AdminLoginInfoService.java new file mode 100644 index 0000000..541da69 --- /dev/null +++ b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/service/AdminLoginInfoService.java @@ -0,0 +1,28 @@ +package com.afe.g3fo.admin.service; + +import com.afe.g3fo.admin.mapper.AdminLoginInfoMapper; +import com.afe.g3fo.base.dto.response.SystemCodeResponse; +import com.afe.g3fo.base.facade.SystemCodeFacade; +import com.baomidou.mybatisplus.extension.service.IService; +import com.afe.g3fo.admin.entity.AdminLoginInfo; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * (MAdminLoginInfo)表服务接口 + * + * @author makejava + * @since 2023-05-26 14:54:10 + */ +@Service +public class AdminLoginInfoService extends ServiceImpl { + + + + +} + diff --git a/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/service/impl/AdminLoginInfoServiceImpl.java b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/service/impl/AdminLoginInfoServiceImpl.java new file mode 100644 index 0000000..c1fc1e7 --- /dev/null +++ b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/service/impl/AdminLoginInfoServiceImpl.java @@ -0,0 +1,21 @@ +//package com.afe.g3fo.admin.service.impl; +// +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import com.afe.g3fo.admin.mapper.AdminLoginInfoMapper; +//import com.afe.g3fo.admin.entity.AdminLoginInfo; +//import com.afe.g3fo.admin.service.AdminLoginInfoService; +//import org.springframework.stereotype.Service; +// +///** +// * (MAdminLoginInfo)表服务实现类 +// * +// * @author makejava +// * @since 2023-05-26 14:54:10 +// */ +//@Service +//public class AdminLoginInfoServiceImpl extends ServiceImpl implements AdminLoginInfoService { +// +// +// +//} +// diff --git a/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/util/PasswordEncryptionUtils.java b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/util/PasswordEncryptionUtils.java new file mode 100644 index 0000000..012a458 --- /dev/null +++ b/g3fo-admin-service/src/main/java/com/afe/g3fo/admin/util/PasswordEncryptionUtils.java @@ -0,0 +1,51 @@ +package com.afe.g3fo.admin.util; + +import javax.crypto.Cipher; +import javax.crypto.spec.SecretKeySpec; +import java.security.Key; + +public class PasswordEncryptionUtils { + + private static final String ALGORITHM = "AES"; + private static final byte[] KEY_VALUE = new byte[] { 'T', 'h', 'i', 's', 'I', 's', 'A', 'S', + 'e', 'c', 'r', 'e', 't', 'K', 'e', 'y' }; // 16字节 + + public static String encrypt(String password) throws Exception { + Key key = generateKey(); + Cipher cipher = Cipher.getInstance(ALGORITHM); + cipher.init(Cipher.ENCRYPT_MODE, key); + byte[] encryptedByteValue = cipher.doFinal(password.getBytes("UTF-8")); + return bytesToHex(encryptedByteValue); + } + + public static String decrypt(String password) throws Exception { + Key key = generateKey(); + Cipher cipher = Cipher.getInstance(ALGORITHM); + cipher.init(Cipher.DECRYPT_MODE, key); + byte[] decryptedByteValue = cipher.doFinal(hexToBytes(password)); + return new String(decryptedByteValue,"UTF-8"); + } + + private static Key generateKey() throws Exception { + return new SecretKeySpec(KEY_VALUE, ALGORITHM); + } + + private static String bytesToHex(byte[] bytes) { + StringBuilder result = new StringBuilder(); + for (byte b : bytes) { + result.append(String.format("%02x", b)); + } + return result.toString(); + } + + private static byte[] hexToBytes(String hexString) { + int length = hexString.length(); + byte[] data = new byte[length/2]; + + for (int i=0; i - - - - \ No newline at end of file diff --git a/g3fo-admin-service/src/main/resources/mapper/UserLoginInfoMapper.xml b/g3fo-admin-service/src/main/resources/mapper/UserLoginInfoMapper.xml deleted file mode 100644 index efcd924..0000000 --- a/g3fo-admin-service/src/main/resources/mapper/UserLoginInfoMapper.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/g3fo-admin-service/src/test/com/afe/g3fo/user/LoginTest.java b/g3fo-admin-service/src/test/com/afe/g3fo/user/LoginTest.java index fdb858d..eb2cac6 100644 --- a/g3fo-admin-service/src/test/com/afe/g3fo/user/LoginTest.java +++ b/g3fo-admin-service/src/test/com/afe/g3fo/user/LoginTest.java @@ -1,6 +1,8 @@ package com.afe.g3fo.user; import cn.hutool.core.bean.BeanUtil; +import com.afe.g3fo.admin.entity.AdminLoginInfo; +import com.afe.g3fo.admin.service.AdminLoginInfoService; import com.afe.g3fo.framework.common.Result; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jakarta.annotation.Resource; @@ -8,6 +10,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import java.time.LocalDateTime; +import java.util.List; /** * @Author：fengjianhuang @@ -21,46 +24,12 @@ import java.time.LocalDateTime; @SpringBootTest public class LoginTest { @Resource - UserLoginInfoService userLoginInfoService; - @Resource - UserInfoService userInfoService; - @Resource - UserLoginInfoMapper userLoginInfoMapper; - @Resource - UserLoginFacade userLoginFacade; + AdminLoginInfoService adminLoginInfoService; + @Test void insertData() throws Exception { - UserLoginInfo userLoginInfo =new UserLoginInfo(); - userLoginInfo.setLoginChannel("PT"); - userLoginInfo.setUserName("jim"); - userLoginInfo.setLoginPassword(PasswordEncryptionUtils.encrypt("Afe12345")); - userLoginInfo.setLoginStatus(1); - userLoginInfo.setUserId(231313131133l); - userLoginInfo.setLastLoginDate(LocalDateTime.now()); - userLoginInfo.setPwdExpiryDate(LocalDateTime.now()); -// int insert = userLoginInfoMapper.insert(userLoginInfo); - userLoginInfoService.save(userLoginInfo); -// List list = userInfoService.list(); + List list = adminLoginInfoService.list(); System.currentTimeMillis(); } - @Test - void login(){ - UserLoginReq userLoginReq=new UserLoginReq(); - userLoginReq.setLoginPassword("Afe12345"); - userLoginReq.setUserName("jim"); - userLoginReq.setLoginChannel("PT"); - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(UserLoginInfo::getUserName,userLoginReq.getUserName()); - queryWrapper.lambda().eq(UserLoginInfo::getLoginChannel,userLoginReq.getLoginChannel()); - UserLoginInfo userLoginInfo = userLoginInfoService.getOne(queryWrapper); - try { - if(PasswordEncryptionUtils.encrypt(userLoginReq.getLoginPassword()).equals(userLoginInfo.getLoginPassword())){ - UserLoginRsp userLoginRsp= BeanUtil.copyProperties(userLoginInfo,UserLoginRsp.class); - return; - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } } diff --git a/g3fo-admin-service/src/test/com/afe/g3fo/user/UserTest.java b/g3fo-admin-service/src/test/com/afe/g3fo/user/UserTest.java index dbd515f..d9f3351 100644 --- a/g3fo-admin-service/src/test/com/afe/g3fo/user/UserTest.java +++ b/g3fo-admin-service/src/test/com/afe/g3fo/user/UserTest.java @@ -1,36 +1,36 @@ -package com.afe.g3fo.user; - -import jakarta.annotation.Resource; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -import java.time.LocalDateTime; - -/** - * @Author：fengjianhuang - * @Package：com.afe.g3fo.user - * @Project：g3fo-user - * @name：UserTest - * @Date：2023/5/9 16:32 - * @Filename：UserTest - */ -@SpringBootTest -public class UserTest { - @Resource - UserInfoService userInfoService; - - @Test - void insertData() throws Exception { - UserInfo userInfo =new UserInfo(); - userInfo.setCreateUser("sys"); - userInfo.setUserName("jim"); - userInfo.setLocalName("jim"); - userInfo.setEngName("jim"); - userInfo.setDepartment(""); - userInfo.setExpiryDate(LocalDateTime.now()); - userInfo.setCreatDate(LocalDateTime.now()); - userInfo.setUserStatus(1); - userInfo.setUserType(1); - userInfoService.save(userInfo); - } -} +//package com.afe.g3fo.user; +// +//import jakarta.annotation.Resource; +//import org.junit.jupiter.api.Test; +//import org.springframework.boot.test.context.SpringBootTest; +// +//import java.time.LocalDateTime; +// +///** +// * @Author：fengjianhuang +// * @Package：com.afe.g3fo.user +// * @Project：g3fo-user +// * @name：UserTest +// * @Date：2023/5/9 16:32 +// * @Filename：UserTest +// */ +//@SpringBootTest +//public class UserTest { +// @Resource +// UserInfoService userInfoService; +// +// @Test +// void insertData() throws Exception { +// UserInfo userInfo =new UserInfo(); +// userInfo.setCreateUser("sys"); +// userInfo.setUserName("jim"); +// userInfo.setLocalName("jim"); +// userInfo.setEngName("jim"); +// userInfo.setDepartment(""); +// userInfo.setExpiryDate(LocalDateTime.now()); +// userInfo.setCreatDate(LocalDateTime.now()); +// userInfo.setUserStatus(1); +// userInfo.setUserType(1); +// userInfoService.save(userInfo); +// } +//}