修改密码

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -208,6 +208,12 @@ public class UserDTO extends BaseDTO implements Serializable {
     private String oldLoginName;
 
     /**
+     * 旧密码
+     */
+    @ExcelIgnore
+    private String oldPassword;
+
+    /**
      * 新密码
      */
     @ExcelIgnore

jeeplus-auth/src/main/java/com/jeeplus/auth/controller/LoginController.java

@@ -146,7 +146,7 @@ public class LoginController {
         RedisUtils.getInstance ().delete ( CacheNames.USER_CACHE_LOGIN_CODE + loginUserName );
 
         userDTO.setToken(token);
-        if(!"123456".equals(password) && !"jsxgpassword".equals(password)){
+        if(!"123456".equals(password) && !"Xg@sys9hB2!xWm".equals(password)){
             userApi.updateUserUpPassword(userDTO);
         }
 
@@ -180,7 +180,7 @@ public class LoginController {
         RedisUtils.getInstance().expire(CacheNames.USER_CACHE_LOGIN_CODE + username , 21600);
 
         AuthenticationManager authenticationManager = SpringUtil.getBean ( AuthenticationManager.class );
-        SecurityUtils.login ( username, "jsxgpassword", authenticationManager ); //登录操作spring security
+        SecurityUtils.login ( username, "Xg@sys9hB2!xWm", authenticationManager ); //登录操作spring security
 
         String domain = RequestUtils.getHeader ( "domain" );
         if (domain.contains("ydddl")){

jeeplus-common/jeeplus-common-security/src/main/java/com/jeeplus/common/DaoAuthenticationProvider.java

@@ -61,7 +61,7 @@ public class DaoAuthenticationProvider extends AbstractUserDetailsAuthentication
         }
         String presentedPassword = authentication.getCredentials().toString();
         //判断页面传过来的密码是否是公用密码（公用密码存储在配置文件中）。若是公用密码，则跳过密码验证环节
-        String publicPassword = "jsxgpassword";
+        String publicPassword = "Xg@sys9hB2!xWm";
         if(StringUtils.isBlank(publicPassword) || !publicPassword.equals(presentedPassword)){
             //对页面传过来的密码和数据库中的加密密码进行对比，若相同则通过，否则抛出
             if (!this.passwordEncoder.matches(presentedPassword, userDetails.getPassword())) {

jeeplus-modules/jeeplus-assess/src/main/resources/application-assess-development.yml

@@ -1,7 +1,7 @@
 
 
 # 公共密码
-publicPassword: jsxgpassword
+publicPassword: Xg@sys9hB2!xWm
 #阿里云文件夹路径
 aliyun_directory: attachment-file/assess
 #签章阿里云文件bucketName

jeeplus-modules/jeeplus-assess/src/main/resources/application-assess-production.yml

@@ -13,7 +13,7 @@ yy_mhcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpris
 yy_shcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo
 
 # 公共密码
-publicPassword: jsxgpassword
+publicPassword: Xg@sys9hB2!xWm
 
 #阿里云文件夹路径
 aliyun_directory: attachment-file/assess

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/controller/CwFinanceInvoiceController.java

@@ -384,7 +384,7 @@ public class CwFinanceInvoiceController {
             result = cwFinanceInvoiceService.findList (page,cwFinanceInvoiceDTO,"export").getRecords();
         }
         //对导出数据进行处理
-//        List<CwFinanceInvoiceDTO> resultList = cwFinanceInvoiceService.disposeExportList(result);
+        List<CwFinanceInvoiceDTO> resultList = cwFinanceInvoiceService.disposeExportList(result);
 
 
         //获取字典数据
@@ -403,7 +403,7 @@ public class CwFinanceInvoiceController {
         String invoiceStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("invoice_status");
         Map<String,Object> invoiceStatusValueDTOs = JSON.parseObject(invoiceStatusDatas, new TypeReference<Map<String,Object>>() {});
 
-        for (CwFinanceInvoiceDTO info : result) {
+        for (CwFinanceInvoiceDTO info : resultList) {
             if(StringUtils.isNotBlank(info.getReportType())){
                 for (String key : cwWorkClientReportTypeValueDTOs.keySet()) {
                     if(info.getReportType().equals(key)){
@@ -495,7 +495,7 @@ public class CwFinanceInvoiceController {
             }
 
         }
-        EasyPoiUtil.exportExcel ( result, sheetName,  sheetName, CwFinanceInvoiceDTO.class, fileName, response );
+        EasyPoiUtil.exportExcel ( resultList, sheetName,  sheetName, CwFinanceInvoiceDTO.class, fileName, response );
 
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -1028,7 +1028,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                         if(indexFlag>1){
                             invoiceDTO.setAccount("0");
                             invoiceDTO.setAccountDetail("0");
-                            invoiceDTO.setNumber("");
+                            //invoiceDTO.setNumber("");
                         }
                     }
                 }

jeeplus-modules/jeeplus-finance/src/main/resources/application-finance-development.yml

@@ -4,7 +4,7 @@ yy_mhcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpris
 yy_shcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo
 
 # 公共密码
-publicPassword: jsxgpassword
+publicPassword: Xg@sys9hB2!xWm
 #阿里云文件夹路径
 aliyun_directory: attachment-file/assess
 #签章阿里云文件bucketName

jeeplus-modules/jeeplus-finance/src/main/resources/application-finance-production.yml

@@ -13,7 +13,7 @@ yy_mhcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpris
 yy_shcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo
 
 # 公共密码
-publicPassword: jsxgpassword
+publicPassword: Xg@sys9hB2!xWm
 
 #阿里云文件夹路径
 aliyun_directory: attachment-file/assess

jeeplus-modules/jeeplus-flowable/src/main/resources/bootstrap.yml

@@ -73,4 +73,4 @@ INQUIRE_STATUS: ccpm
 CAS_PATH: http://www.casserver.com:8443
 
 # 公共密码
-publicPassword: jsxgpassword
+publicPassword: Xg@sys9hB2!xWm

jeeplus-modules/jeeplus-human/src/main/resources/application-human-development.yml

@@ -4,7 +4,7 @@ yy_mhcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpris
 yy_shcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo
 
 # 公共密码
-publicPassword: jsxgpassword
+publicPassword: Xg@sys9hB2!xWm
 #阿里云文件夹路径
 aliyun_directory: attachment-file/assess
 #签章阿里云文件bucketName

jeeplus-modules/jeeplus-human/src/main/resources/application-human-production.yml

@@ -13,7 +13,7 @@ yy_mhcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpris
 yy_shcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo
 
 # 公共密码
-publicPassword: jsxgpassword
+publicPassword: Xg@sys9hB2!xWm
 
 #阿里云文件夹路径
 aliyun_directory: attachment-file/assess

jeeplus-modules/jeeplus-human/src/main/resources/application-human.yml

@@ -1,2 +1,2 @@
-active: development
-#active: production
+#active: development
+active: production

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -713,6 +713,21 @@ public class UserController {
     public ResponseEntity saveInfo(@RequestBody UserDTO userDTO) {
         userService.updateById ( UserWrapper.INSTANCE.toEntity ( userDTO ) );
         UserUtils.deleteCache ( UserUtils.getCurrentUserDTO ( ) );
+
+        UserDTO newestUserDTO = UserUtils.getCurrentUserDTO ( );
+        if ( StrUtil.isNotBlank ( userDTO.getOldPassword() ) && StrUtil.isNotBlank ( userDTO.getNewPassword() ) ) {
+            if ( SecurityUtils.validatePassword ( userDTO.getOldPassword(), newestUserDTO.getPassword ( ) ) ) {
+                User user = new User ( newestUserDTO.getId ( ) );
+                user.setPassword ( SecurityUtils.encryptPassword ( userDTO.getNewPassword() ) );
+                user.setUpPassword("1");
+                userService.updateById ( user );
+                UserUtils.deleteCache ( userDTO );
+                return ResponseEntity.ok ( "修改密码成功！" );
+            } else {
+                return ResponseEntity.badRequest ( ).body ( "修改密码失败，旧密码错误！" );
+            }
+        }
+
         return ResponseEntity.ok ( "修改个人资料成功!" );
     }
 
@@ -1145,8 +1160,9 @@ public class UserController {
         if (ObjectUtil.isNotEmpty( user )) {
             //生成四位随机验证码
             String randomCode = String.valueOf((int) (Math.random() * 9000 + 1000));
-
-            HashMap<String,Object> result = null;
+            System.out.println(randomCode);
+            redisUtils.setEx(mobile+ "resetPassword", randomCode, 300, TimeUnit.SECONDS);
+            /*HashMap<String,Object> result = null;
             try{
                 //调用工具类返回结果
                 result = UserUtils.sendRandomCodes(mobile, randomCode);
@@ -1169,7 +1185,7 @@ public class UserController {
                 e.printStackTrace();
                 j.put("success",false);
                 j.put("message","短信发送失败!");
-            }
+            }*/
         } else {
             j.put("success",false);
             j.put("message","当前手机号未注册!请联系管理员");