diff --git a/inventory-dao/src/main/java/com/rzyc/bean/domin/SysUserDomin.java b/inventory-dao/src/main/java/com/rzyc/bean/domin/SysUserDomin.java index db6412e..c54aec0 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/domin/SysUserDomin.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/domin/SysUserDomin.java @@ -100,8 +100,6 @@ public class SysUserDomin { sysUser.setChinaname(name); sysUser.setCreatedby(currentUserName); sysUser.setCreatedon(new Date()); - String password = PasswdFactory.decryptPasswd(sysUser.getSysuserid(),sysUser.getSyspassword()); - sysUser.setSyspassword(PasswdFactory.encryptPasswd(sysUser.getSysuserid(),sysUser.getSysusername(),password)); //更新名称、密码以及修改人信息 sysUserMapper.updateByPrimaryKey(sysUser); } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index bc42e98..8c0a075 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -2653,9 +2653,6 @@ public class BaseController { sysUserMapper.insert(sysUser); }else{ - String password = PasswdFactory.decryptPasswd(sysUser.getSysuserid(),sysUser.getSyspassword()); - System.out.println(password); - sysUser.setSyspassword(PasswdFactory.encryptPasswd(sysUser.getSysuserid(), enterprese.getEntname(), password)); sysUser.setSysusername(enterprese.getEntname()); sysUser.setChinaname(enterprese.getEntname()); sysUserMapper.changeUserName(sysUser); diff --git a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java index 6496b22..4753f90 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/DataController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/DataController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.common.utils.RandomNumber; import com.common.utils.StringUtils; import com.common.utils.TypeConversion; +import com.common.utils.encryption.PasswdFactory; import com.common.utils.model.SingleResult; import com.rzyc.enums.DelState; import com.rzyc.model.*; @@ -570,5 +571,24 @@ public class DataController extends com.rzyc.controller.BaseController { return result; } + /** + * 修改密码 + * @version v1.0 + * @author dong + * @date 2022/8/5 13:36 + */ + @ApiOperation(value = "修改密码", notes = "修改密码") + @RequestMapping(value = "/changePasswd", method = RequestMethod.GET) + @ResponseBody + public SingleResult changePasswd()throws Exception{ + SingleResult result = new SingleResult<>(); + List sysUsers = sysUserMapper.findAll(); + if(null != sysUsers && sysUsers.size() > 0){ + for (SysUser sysUser : sysUsers){ + sysUserMapper.changePassword(sysUser.getSysuserid(), PasswdFactory.encryptPasswd(sysUser.getSysuserid(),"",constantsConfigure.getDefaultPasswd())); + } + } + return result; + } } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index d5bfd46..c6e7c44 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -831,8 +831,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { String passwd = PasswdFactory.encryptPasswd(sysUser.getSysuserid(), sysUser.getSysusername(), sysUser.getSyspassword()); sysUser.setSyspassword(passwd); }else{ - String passwd = PasswdFactory.decryptPasswd(sysUser.getSysuserid(),user.getSyspassword()); - passwd = PasswdFactory.encryptPasswd(sysUser.getSysuserid(), sysUser.getSysusername(), passwd); + String passwd = user.getSyspassword(); sysUser.setSyspassword(passwd); } diff --git a/inventory-gov/src/main/resources/application-dev.yml b/inventory-gov/src/main/resources/application-dev.yml index 746cded..5dee1d0 100644 --- a/inventory-gov/src/main/resources/application-dev.yml +++ b/inventory-gov/src/main/resources/application-dev.yml @@ -59,15 +59,15 @@ logging: #文件上传的配置 onstants: #上传文件存放地址 - file_location: /mnt/rzyc/resource/inventory/uploadFile/ + file_location: /home/rzyc/resource/inventory/uploadFile/ #上传文件公共地址 file_header: /resource/inventory/uploadFile/ #上传文件基础路径 - service_file_header: http://42.193.40.239/ + service_file_header: http://192.168.31.253/ #父级地区id superior_org_code: 512000 #动态详情基础地址 - html_header: http://42.193.40.239:7010/ + html_header: http://192.168.31.253:7010/ #logourl logo_url: http://42.193.40.239/resource/inventory/citysafe_logo.png #政府端帮助文档url @@ -83,11 +83,11 @@ onstants: #企业账号默认密码 default_passwd: csaq512000 #公示牌 - gsp_path: /mnt/rzyc/resource/inventory/gsp.xlsx + gsp_path: /home/rzyc/resource/inventory/gsp.xlsx #zip下载地址 - zip_path: /mnt/rzyc/resource/inventory/zip + zip_path: /home/rzyc/resource/inventory/zip #导出word模板路径 - word_tmp: /mnt/rzyc/resource/inventory/wordtmp + word_tmp: /home/rzyc/resource/inventory/wordtmp diff --git a/utils/src/main/java/com/common/utils/encryption/PasswdFactory.java b/utils/src/main/java/com/common/utils/encryption/PasswdFactory.java index cb0c974..5d13013 100644 --- a/utils/src/main/java/com/common/utils/encryption/PasswdFactory.java +++ b/utils/src/main/java/com/common/utils/encryption/PasswdFactory.java @@ -25,8 +25,13 @@ public class PasswdFactory { * @author dong * @date 2022/9/23 10:07 */ - public static String encryptPasswd(String id, String username, String passwd)throws Exception { - return MD5.md5(id+passwd); + public static String encryptPasswd(String id, String username, String passwd) { + try { + passwd = MD5.md5(id+passwd); + }catch (Exception e){ + e.printStackTrace(); + } + return passwd; }