个人用户注册

PCS/src/main/java/cn/cslg/permission/common/model/vo/ApplicationVO.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author 沈永艺
  * @date 2022-8-3
@@ -50,4 +52,6 @@ public class ApplicationVO extends BaseVO {
      */
     private Integer tenant;
 
+    private List<String> applicationCodes;
+
 }

PCS/src/main/java/cn/cslg/permission/common/model/vo/LoginRecordVO.java

@@ -58,4 +58,5 @@ public class LoginRecordVO {
      */
     private String loginOs;
 
+
 }

PCS/src/main/java/cn/cslg/permission/controller/LoginController.java

@@ -89,6 +89,7 @@ public class LoginController {
         return loginService.functionByEncryption(vo);
     }
 
+
     @Operation(summary = "获取手机验证码")
     @PostMapping("/getPhoneCode")
     public String getPhoneCode(@RequestBody @Valid SendCodeDTO vo) {

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/QiaoApplitionController.java

@@ -0,0 +1,41 @@
+package cn.cslg.permission.controller.qiaobi;
+
+import cn.cslg.permission.common.core.base.Constants;
+import cn.cslg.permission.common.model.dto.PhoneLoginDTO;
+import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
+import cn.cslg.permission.common.model.vo.ApplicationVO;
+import cn.cslg.permission.common.model.vo.LoginVO;
+import cn.cslg.permission.common.model.vo.PersonnelVO;
+import cn.cslg.permission.common.utils.Response;
+import cn.cslg.permission.service.qiaobi.QiaoBiApplicationService;
+import cn.cslg.permission.service.qiaobi.QiaoBiPersonService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * @author 沈永艺
+ * @date 2022-8-3
+ * @description 应用类 Controller 层
+ */
+@Tag(name = "会员类型管理")
+@RestController
+@RequestMapping(Constants.PERMISSION_API + "/qiaoBiApplication")
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class QiaoApplitionController {
+    private final QiaoBiApplicationService qiaoBiApplicationService;
+    @PostMapping("/queryApplication")
+    @Operation(summary = "查询窍笔应用")
+    public String personnelSignUp(@RequestBody ApplicationVO applicationVO) {
+        qiaoBiApplicationService.queryQiaoBiApplication(applicationVO);
+        return Response.success();
+    }
+
+}

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/QiaoBiPersonController.java

@@ -1,10 +1,13 @@
 package cn.cslg.permission.controller.qiaobi;
 
 import cn.cslg.permission.common.core.base.Constants;
+import cn.cslg.permission.common.model.dto.PhoneLoginDTO;
 import cn.cslg.permission.common.model.personnel.UploadPersonnelConfigDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVIPTypeVO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVipTypeDTO;
+import cn.cslg.permission.common.model.vo.LoginVO;
+import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.service.qiaobi.AppVipTypeService;
 import cn.cslg.permission.service.qiaobi.QiaoBiPersonService;
@@ -17,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -36,4 +40,17 @@ public class QiaoBiPersonController {
         qiaoBiPersonService.personSignUp(qiaoBiPersonSignUpDTO);
         return Response.success();
     }
+    @PostMapping("/backAccountLogin")
+    @Operation(summary = "后台账号登录")
+    public String backAccountLogin(@RequestBody LoginVO loginVO) {
+       PersonnelVO personnelVO= qiaoBiPersonService.backAccountLogin(loginVO,4);
+        return Response.success(personnelVO);
+    }
+
+    @PostMapping("/backPhoneLogin")
+    @Operation(summary = "后台账号登录")
+    public String backPhoneLogin(@Valid @RequestBody PhoneLoginDTO vo) {
+        PersonnelVO personnelVO= qiaoBiPersonService.backPhoneLogin(vo,4);
+        return Response.success(personnelVO);
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/ApplicationService.java

@@ -236,4 +236,21 @@ public class ApplicationService extends ServiceImpl<ApplicationMapper, Applicati
 
         return applicationVOS;
     }
+
+    /**
+     * 查询应用
+     */
+    public String queryPageListWithCode(ApplicationVO applicationVO) {
+        List<String> applicationCodes = applicationVO.getApplicationCodes();
+        LambdaQueryWrapper<Application> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(Application::getApplicationCode, applicationCodes).and(i -> i.like(Application::getApplicationDescription, applicationVO.getName())
+                .or()
+                .like(Application::getApplicationName, applicationVO.getName()));
+
+
+        List<Application> applicationList = this.page(new Page<>(applicationVO.getCurrent(), applicationVO.getSize()), queryWrapper).getRecords();
+
+        return Response.success(setApplicationToVO(applicationList), DataUtils.setPageColumn(applicationVO.getSize(), applicationVO.getCurrent(), Math.toIntExact(this.count(queryWrapper))));
+    }
+
 }

PCS/src/main/java/cn/cslg/permission/service/LoginService.java

@@ -176,7 +176,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
      *
      * @author 沈永艺
      */
-    private PersonnelVO pushData(Personnel personnel) {
+    public PersonnelVO pushData(Personnel personnel) {
         //获取租户信息
         Tenant tenant = tenantService.getById(personnel.getTenantId());
         //用人员ID获取该人员拥有的角色信息List
@@ -420,7 +420,6 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
     }
 
     public void addLoginRecord(Personnel personnel,LoginRecordVO loginRecordVO) {
-        loginRecordVO.setLoginSystem(3);
         loginRecordVO.setPersonnelId(personnel.getId());
         loginRecordVO.setTenantId(personnel.getTenantId());
         //登录日志记录ip地址
@@ -462,6 +461,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
             throw new XiaoShiException(ExceptionEnum.THE_PERSONNEL_IS_NOT_EXIST);
         }
         LoginRecordVO loginRecordVO = new LoginRecordVO();
+          loginRecordVO.setLoginSystem(3);
         this.addLoginRecord(personnel, loginRecordVO);
         if (personnel.getPersonnelStatus().equals(0)) {
             loginRecordVO.setLoginResult("该用户不可用");
@@ -699,6 +699,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
             throw new XiaoShiException(ExceptionEnum.THE_PERSONNEL_IS_NOT_EXIST);
         }
         LoginRecordVO loginRecordVO = new LoginRecordVO();
+        loginRecordVO.setLoginSystem(3);
         this.addLoginRecord(person, loginRecordVO);
         if (person.getPersonnelStatus().equals(0)) {
             loginRecordVO.setLoginResult("该用户不可用");

PCS/src/main/java/cn/cslg/permission/service/PersonnelService.java

@@ -1,8 +1,12 @@
 package cn.cslg.permission.service;
 
 import cn.cslg.permission.common.core.base.RedisConf;
+import cn.cslg.permission.common.core.business.LoginCacheKeyUtil;
+import cn.cslg.permission.common.model.dto.PhoneLoginDTO;
 import cn.cslg.permission.common.model.personnel.UploadPersonnelConfigDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
+import cn.cslg.permission.common.model.vo.LoginRecordVO;
+import cn.cslg.permission.common.model.vo.LoginVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.model.vo.RoleVO;
 import cn.cslg.permission.common.utils.*;
@@ -14,6 +18,8 @@ import cn.cslg.permission.domain.associate.AssoDepartPos;
 import cn.cslg.permission.domain.associate.AssoPerDp;
 import cn.cslg.permission.domain.associate.AssoPersonRole;
 import cn.cslg.permission.domain.sys.SysDictItem;
+import cn.cslg.permission.exception.ExceptionEnum;
+import cn.cslg.permission.exception.XiaoShiException;
 import cn.cslg.permission.mapper.PersonnelMapper;
 import cn.cslg.permission.mapper.SysDictItemMapper;
 import cn.cslg.permission.service.associate.DepartPosiService;
@@ -55,6 +61,9 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
     private final RedisUtil redisUtil;
     private final SysDictItemMapper sysDictItemMapper;
     private final MessageUtils messageUtils;
+    private final LoginRecordService loginRecordService;
+    private final LoginService loginService;
+    private final SystemService systemService;
 
     @Transactional(rollbackFor = Exception.class)
     public Personnel addPersonnel(PersonnelVO personnelVO) {
@@ -579,4 +588,212 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
         qiaoBiPersonSignUpDTO.setId(personnel.getId());
         return qiaoBiPersonSignUpDTO;
     }
+
+
+    /**
+     * 校验登录账号密码
+     *
+     * @param loginVO
+     */
+    public Personnel checkLoginPersonAccount(LoginVO loginVO, Integer systemId) {
+        String userName = loginVO.getUsername();
+        String password = loginVO.getPassword();
+
+        LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Personnel::getPersonnelUserName, userName);
+        //获取一条
+        Personnel personnel = this.getOne(queryWrapper);
+
+        LoginRecordVO loginRecordVO = new LoginRecordVO();
+        loginService.addLoginRecord(personnel, loginRecordVO);
+        loginRecordVO.setLoginSystem(systemId);
+        //如果查不到 报错 用户名不存在
+        if (personnel == null) {
+            loginRecordVO.setLoginResult("用户名不存在");
+            loginRecordService.addLoginRecord(loginRecordVO);
+            throw new XiaoShiException(ExceptionEnum.THE_PERSONNEL_IS_NOT_EXIST);
+        }
+
+
+        boolean isPassword = personnel.getPersonnelPassword().equals(SecureUtil.md5(password));
+        if (!isPassword) {
+            //登录日志记录登录是否成功
+            loginRecordVO.setLoginResult("密码错误");
+            loginRecordService.addLoginRecord(loginRecordVO);
+            throw new XiaoShiException(ExceptionEnum.LOGIN_PASSWORD_MISTAKE);
+        }
+
+        return personnel;
+    }
+
+    /**
+     * 检查登录人信息
+     *
+     * @param personnel
+     * @return
+     */
+    public Personnel loginCheckPerson(Personnel personnel, Integer systemId) {
+        LoginRecordVO loginRecordVO = new LoginRecordVO();
+        loginService.addLoginRecord(personnel, loginRecordVO);
+        loginRecordVO.setLoginSystem(systemId);
+        if (personnel.getPersonnelStatus() != 1) {
+            //登录日志记录登录是否成功
+            loginRecordVO.setLoginResult("登录人账号本身未启用");
+            loginRecordService.addLoginRecord(loginRecordVO);
+            throw new XiaoShiException(ExceptionEnum.LOGIN_PASSWORD_MISTAKE);
+        }
+        return personnel;
+    }
+
+    /**
+     * 检查租户信息
+     *
+     * @param personnel
+     * @return
+     */
+    public Tenant loginCheckTenant(Personnel personnel, Integer systemId) {
+        LoginRecordVO loginRecordVO = new LoginRecordVO();
+        loginService.addLoginRecord(personnel, loginRecordVO);
+        loginRecordVO.setLoginSystem(systemId);
+        Tenant tenant = tenantService.getById(personnel.getTenantId());
+        if (tenant.getTenantStatus() != 1) {
+            //登录日志记录登录是否成功
+            loginRecordVO.setLoginResult("登录人所属的租户未启用");
+            loginRecordService.addLoginRecord(loginRecordVO);
+            throw new XiaoShiException(ExceptionEnum.LOGIN_ERROR, loginRecordVO.getLoginResult());
+
+        }
+        //判断登陆人所属的租户是否过期（截止日期与当前时间比较）
+        if (tenant.getDeadLine() != null && tenant.getDeadLine().compareTo(new Date()) < 0) {
+            //登录日志记录登录是否成功
+            loginRecordVO.setLoginResult("登陆人所属的租户过期");
+            loginRecordService.addLoginRecord(loginRecordVO);
+            throw new XiaoShiException(ExceptionEnum.LOGIN_ERROR, loginRecordVO.getLoginResult());
+        }
+        return tenant;
+    }
+
+    /**
+     * 填充人员数据
+     *
+     * @author 沈永艺
+     */
+    public PersonnelVO pushData(Personnel personnel) {
+        //获取租户信息
+        Tenant tenant = tenantService.getById(personnel.getTenantId());
+        //用人员ID获取该人员拥有的角色信息List
+        List<RoleVO> roleVOList = personRoleService.getRoleListByPersonnelId(personnel.getId());
+        List<PersonnelVO.PerRole> roleList = new ArrayList<>();
+        //设置标记 存储对登录人类型的判别状态
+        int flag = 0;
+        if (roleVOList.size() > 0) {
+            for (RoleVO roleVO : roleVOList) {
+                PersonnelVO.PerRole perRole = new PersonnelVO.PerRole();
+                perRole
+                        .setRoleId(roleVO.getId())
+                        .setRoleName(roleVO.getName());
+                //如果登录人的类型为 系统管理员1 租户管理员2
+                if (flag == 0 && roleVO.getRoleType().equals(1)) {
+                    flag = 1;
+                } else if (flag == 0 && roleVO.getRoleType().equals(2)) {
+                    flag = 2;
+                } else if (flag == 2 && roleVO.getRoleType().equals(1)) {
+                    flag = 1;
+                }
+                roleList.add(perRole);
+            }
+        }
+
+        //部门职位绑定信息
+        List<PersonnelVO.DP> dpList = perDpService.getDPBaseMessageByPersonnelId(personnel.getId());
+        List<Integer> dutyDeparts = systemService.getDutyDeparts(personnel.getId());
+        //填充数据
+        PersonnelVO personnelVO = new PersonnelVO();
+        personnelVO
+                .setId(personnel.getId().toString())
+                .setEmail(personnel.getPersonnelEmail())
+                .setQqNumber(personnel.getPersonnelQQ())
+                .setNail(personnel.getPersonnelDing())
+                .setWechat(personnel.getPersonnelWechat())
+                .setGender(personnel.getPersonnelUserSex())
+                .setRemark(personnel.getPersonnelDescription())
+                .setState(personnel.getPersonnelStatus())
+                .setName(personnel.getPersonnelName())
+                .setUsername(personnel.getPersonnelUserName())
+                .setTenantName(tenant.getTenantName())
+                .setTenantId(tenant.getId())
+                .setTenantType(tenant.getTenantType())
+                .setToken(StpUtil.getTokenValue())
+                .setRList(roleList)
+                .setDpList(dpList)
+                .setDutyDeparts(dutyDeparts);
+
+        if (flag == 1) {
+            personnelVO.setRoleType(1);
+        } else if (flag == 2) {
+            personnelVO.setRoleType(2);
+        } else {
+            personnelVO.setRoleType(0);
+        }
+        return personnelVO;
+    }
+
+    /**
+     * 人员登录成功返回
+     *
+     * @param personnel
+     * @param systemId
+     * @return
+     */
+    public PersonnelVO commonPersonLoginSuccess(Personnel personnel, Integer systemId) {
+        //Sa-token 登录方法 登录后 生成Token 如果集成了Redis的话 会自动存入Redis
+        StpUtil.login(personnel.getId());
+        //填充数据
+        PersonnelVO personnelVO = this.pushData(personnel);
+        //将用户信息数据存入Redis
+        cacheUtils.setLoginUser(personnelVO);
+        LoginRecordVO loginRecordVO = new LoginRecordVO();
+        loginService.addLoginRecord(personnel, loginRecordVO);
+        loginRecordVO.setLoginSystem(systemId);
+        loginRecordVO.setLoginResult("成功");
+        loginRecordService.addLoginRecord(loginRecordVO);
+
+        return personnelVO;
+    }
+
+    /**
+     * 手机号登录检查
+     *
+     * @param phoneLoginDTO
+     * @return
+     */
+    public Personnel loginPhoneCheck(PhoneLoginDTO phoneLoginDTO,Integer systemId) {
+        //查询用户
+        LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(phoneLoginDTO.getPhoneNum())) {
+            queryWrapper.eq(Personnel::getPersonnelPhone, phoneLoginDTO.getPhoneNum());
+        }
+        Personnel person = this.getOne(queryWrapper, false);
+        if (org.apache.commons.lang3.ObjectUtils.isEmpty(person)) {
+            throw new XiaoShiException(ExceptionEnum.LOGIN_ERROR, "用户不存在");
+        }
+        String code = redisUtil.get(LoginCacheKeyUtil.getLoginCaptcha(phoneLoginDTO.getPhoneNum()));
+        if (Boolean.TRUE.equals(StringUtils.isEmpty(code))) {
+
+            throw new XiaoShiException(ExceptionEnum.LOGIN_ERROR, "验证码不存在");
+        }
+        //校验验证码
+        if (Boolean.TRUE.equals(StringUtils.isEmpty(phoneLoginDTO.getPhoneCode()))) {
+            throw new XiaoShiException(ExceptionEnum.LOGIN_ERROR, "验证码不可为空");
+        }
+
+        if (!org.apache.commons.lang3.StringUtils.equals(code, phoneLoginDTO.getPhoneCode())) {
+
+            throw new XiaoShiException(ExceptionEnum.LOGIN_ERROR, "验证码错误");
+        }
+
+        //校验验证码成功后使其失效
+        redisUtil.delete(LoginCacheKeyUtil.getLoginCaptcha(phoneLoginDTO.getPhoneNum()));
+        return person;
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/TenantService.java

@@ -618,4 +618,5 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
         return sysDictItems;
     }
 
+
 }

PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiApplicationService.java

@@ -0,0 +1,19 @@
+package cn.cslg.permission.service.qiaobi;
+
+import cn.cslg.permission.common.model.vo.ApplicationVO;
+import cn.cslg.permission.service.ApplicationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+@Service
+public class QiaoBiApplicationService {
+@Autowired
+private ApplicationService applicationService;
+
+public String queryQiaoBiApplication(ApplicationVO applicationVO){
+    applicationVO.setApplicationCodes(Arrays.asList());
+  return   applicationService.queryPageListWithCode(applicationVO);
+}
+}

PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiPersonService.java

@@ -2,8 +2,11 @@ package cn.cslg.permission.service.qiaobi;
 
 import cn.cslg.permission.common.core.business.LoginCacheKeyUtil;
 import cn.cslg.permission.common.core.business.SmsService;
+import cn.cslg.permission.common.model.dto.PhoneLoginDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiVipTypeDTO;
+import cn.cslg.permission.common.model.vo.LoginVO;
+import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.RedisUtil;
 import cn.cslg.permission.common.utils.RegexUtil;
 import cn.cslg.permission.common.utils.StringUtils;
@@ -11,8 +14,10 @@ import cn.cslg.permission.domain.PersonInvitationCode;
 import cn.cslg.permission.domain.Personnel;
 import cn.cslg.permission.exception.ExceptionEnum;
 import cn.cslg.permission.exception.XiaoShiException;
+import cn.cslg.permission.service.LoginService;
 import cn.cslg.permission.service.PersonInvitationCodeService;
 import cn.cslg.permission.service.PersonnelService;
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.Data;
 import org.apache.commons.lang3.RegExUtils;
@@ -32,6 +37,8 @@ public class QiaoBiPersonService {
     private AssoPersonVipTypeService assoPersonVipTypeService;
     @Autowired
     private SmsService smsService;
+    @Autowired
+    private LoginService loginService;
 
     @Transactional(rollbackFor = Exception.class)
     public QiaoBiPersonSignUpDTO personSignUp(QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO) {
@@ -131,4 +138,41 @@ public class QiaoBiPersonService {
 
     }
 
+    /**
+     * 窍笔后台账号密码登录
+     * @param loginVO
+     * @param systemId
+     * @return
+     */
+    public PersonnelVO backAccountLogin(LoginVO loginVO,Integer systemId) {
+        String userName = loginVO.getUsername();
+        String password = loginVO.getPassword();
+        //检查账号密码
+        Personnel personnel = personnelService.checkLoginPersonAccount(loginVO,systemId);
+        //检查登录人信息
+        personnelService.loginCheckPerson(personnel,systemId);
+        //检查租户信息
+        personnelService.loginCheckTenant(personnel,systemId);
+        //Sa-token 登录方法 登录后 生成Token 如果集成了Redis的话 会自动存入Redis
+        PersonnelVO personnelVO= personnelService.commonPersonLoginSuccess(personnel,systemId);
+            return personnelVO;
+    }
+
+
+    /**
+     * 窍笔后台手机号登录
+     * @param phoneLoginDTO
+     * @param systemId
+     * @return
+     */
+
+    public PersonnelVO backPhoneLogin(PhoneLoginDTO phoneLoginDTO, Integer systemId) {
+      Personnel personnel=  personnelService.loginPhoneCheck(phoneLoginDTO,systemId);
+        //检查登录人信息
+        personnelService.loginCheckPerson(personnel,systemId);
+        //检查租户信息
+        personnelService.loginCheckTenant(personnel,systemId);
+        PersonnelVO personnelVO= personnelService.commonPersonLoginSuccess(personnel,systemId);
+        return personnelVO;
+    }
 }

PCS/src/test/java/cn/cslg/permission/WritingAidTest.java

@@ -46,13 +46,13 @@ public class WritingAidTest {
         EncryptionLoginDTO encryptionLoginDTO = new EncryptionLoginDTO();
         encryptionLoginDTO.setAppKey(appKey);
         //登录账号
-        encryptionLoginDTO.setUsername("admin");
+        encryptionLoginDTO.setUsername("mengdeyou@junlongip.com");
 //        encryptionLoginDTO.setUsername("zhuhao");
         //登录密码
-        encryptionLoginDTO.setPassword("xiaoshi221101");
+        encryptionLoginDTO.setPassword("Xiaoshi123*");
 //        encryptionLoginDTO.setPassword("xiaoshi221101");
         //本机器的机器码，此处为伪造
-        encryptionLoginDTO.setMachineCode("BFEBFBFF000A0654");
+        encryptionLoginDTO.setMachineCode("b4120f3606dfda03c341e8f8b1414ec3");
         long currentTimeMillis = System.currentTimeMillis();
         encryptionLoginDTO.setCurrentTimeMillis(currentTimeMillis);
         String appSecret = appKey + currentTimeMillis / 1000;