省平台接口服务
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
jiazx0107@163.com
2023-10-23 e5c5137e91c04fff001d439d64ed5a253e3fc8da 
 src/main/java/com/fzzy/sys/UserPR.java


@@ -5,19 +5,13 @@


import com.bstek.dorado.annotation.Expose;


import com.bstek.dorado.data.entity.EntityState;


import com.bstek.dorado.data.entity.EntityUtils;


import com.fzzy.api.Constant;


import com.fzzy.sys.entity.SysUser;


import com.fzzy.sys.repository.UserRepository;


import org.apache.commons.lang.math.RandomUtils;


import org.bouncycastle.crypto.generators.BCrypt;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;


import org.springframework.security.crypto.password.PasswordEncoder;


import org.springframework.stereotype.Component;




import javax.annotation.Resource;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;




@@ -31,7 +25,6 @@


    @Autowired


    private UserRepository userRepository;




    private BCryptPasswordEncoder bCryptPasswordEncoder;




    /**


     * sys.userPR#findAll


@@ -65,10 +58,10 @@


            //密码加密


            int salt = RandomUtils.nextInt(27);


            salt += 4;


            bCryptPasswordEncoder = new BCryptPasswordEncoder(salt);


            String password = bCryptPasswordEncoder.encode(entity.getPassword());


//            bCryptPasswordEncoder = new BCryptPasswordEncoder(salt);


//            String password = bCryptPasswordEncoder.encode(entity.getPassword());


//            boolean b= bCryptPasswordEncoder.matches(entity.getPassword(),password);


            entity.setPassword(password);


            entity.setPassword(entity.getPassword());


            entity.setSalt(String.valueOf(salt));


        }


        // 手动将doradoEntity对象转换为标准Bean对象


@@ -101,9 +94,9 @@


        //密码加密


        int salt = RandomUtils.nextInt(27);


        salt += 4;


        bCryptPasswordEncoder = new BCryptPasswordEncoder(salt);


        String password = bCryptPasswordEncoder.encode(Constant.DEFAULT_USER_PASSWORD);


        entity.setPassword(password);


//        bCryptPasswordEncoder = new BCryptPasswordEncoder(salt);


//        String password = bCryptPasswordEncoder.encode(Constant.DEFAULT_USER_PASSWORD);


        entity.setPassword(entity.getPassword());


        entity.setSalt(String.valueOf(salt));




        SysUser data = new SysUser();