Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-28 b2a64967d13f68175cd0c47f1a5b6169c42ed8a9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java

@@ -71,7 +71,7 @@
                user.setName(comSanShuoIndustryCenterDTO.getName());
                user.setType(12);
                try {
                    user.setPassword(MyAESUtil.Encrypt(comSanShuoIndustryCenterDTO.getPassword(),"Ryo7M3n8loC5Abcd"));
                    user.setPassword(comSanShuoIndustryCenterDTO.getPassword());
                } catch (Exception e) {
                    e.printStackTrace();
                }
@@ -92,8 +92,7 @@
    @Override
    public R resetPassword(ComSanshuoIndustryCenter center) {
        try {
            String pass=MyAESUtil.Encrypt(center.getPassword(), "Ryo7M3n8loC5Abcd");
            return userService.sanShuoResetPassword(center.getAccount(), pass);
            return userService.sanShuoResetPassword(center.getAccount(), center.getPassword());
        } catch (Exception e) {
            e.printStackTrace();
        }