bug修改

src/main/java/com/neotel/smfcore/core/language/util/LanguageMsgService.java

@@ -430,9 +430,11 @@ public class LanguageMsgService {
             for (String lan :
             for (String lan :
                     lanCodeIndex.keySet()) {
                     lanCodeIndex.keySet()) {
                 int lanIndex=lanCodeIndex.get(lan);
                 int lanIndex=lanCodeIndex.get(lan);
-                String lanMsg=lineValues[lanIndex];
-                if(!lanMsg.isEmpty()){
-                    languageMsg.setContent(lan,lanMsg);
+                if(lineValues.length>lanIndex) {
+                    String lanMsg = lineValues[lanIndex];
+                    if (!lanMsg.isEmpty()) {
+                        languageMsg.setContent(lan, lanMsg);
+                    }
                 }
                 }
             }
             }
 
 

src/main/java/com/neotel/smfcore/security/rest/UserController.java

@@ -31,10 +31,8 @@ import com.neotel.smfcore.security.rest.bean.dto.UserDto;
 import com.neotel.smfcore.security.rest.bean.mapstruct.UserMapper;
 import com.neotel.smfcore.security.rest.bean.mapstruct.UserMapper;
 import com.neotel.smfcore.security.rest.bean.query.UserQueryCriteria;
 import com.neotel.smfcore.security.rest.bean.query.UserQueryCriteria;
 import com.neotel.smfcore.security.rest.bean.vo.UserPassVo;
 import com.neotel.smfcore.security.rest.bean.vo.UserPassVo;
-import com.neotel.smfcore.security.service.manager.IRoleManager;
+import com.neotel.smfcore.security.service.UserCacheClean;
 import com.neotel.smfcore.security.service.manager.IUserManager;
 import com.neotel.smfcore.security.service.manager.IUserManager;
-import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl;
-import com.neotel.smfcore.security.service.po.Role;
 import com.neotel.smfcore.security.service.po.User;
 import com.neotel.smfcore.security.service.po.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -73,11 +71,11 @@ public class UserController {
     private IUserManager userManager;
     private IUserManager userManager;
     @Autowired
     @Autowired
     private UserMapper userMapper;
     private UserMapper userMapper;
-    @Autowired
-    private IRoleManager roleManager;
 
 
     @Autowired
     @Autowired
     private final FileProperties properties;
     private final FileProperties properties;
+    @Autowired
+    private UserCacheClean userCacheClean;
 
 
     @ApiOperation("导出用户数据")
     @ApiOperation("导出用户数据")
     @GetMapping(value = "/download")
     @GetMapping(value = "/download")
@@ -127,7 +125,7 @@ public class UserController {
         if(resources.getCheckCode()==null){
         if(resources.getCheckCode()==null){
             resources.setCheckCode("");
             resources.setCheckCode("");
         }
         }
-        resources.setPassword(passwordEncoder.encode("Constants.USER_DEFAULTP_PWD"));
+        resources.setPassword(passwordEncoder.encode(Constants.USER_DEFAULTP_PWD));
         resources.setUpdateDate(new Date());
         resources.setUpdateDate(new Date());
         resources.setPwdResetTime(new Date());
         resources.setPwdResetTime(new Date());
         userManager.save(resources);
         userManager.save(resources);
@@ -165,6 +163,7 @@ public class UserController {
         resources.setPassword(passwordEncoder.encode(Constants.USER_DEFAULTP_PWD));
         resources.setPassword(passwordEncoder.encode(Constants.USER_DEFAULTP_PWD));
         resources.setPwdResetTime(new Date());
         resources.setPwdResetTime(new Date());
         userManager.update(resources);
         userManager.update(resources);
+        userCacheClean.cleanUserCache(resources.getUsername());
        return ResultBean.newOkResult("");
        return ResultBean.newOkResult("");
     }
     }
     @ApiOperation("个人中心：获取个人资料")
     @ApiOperation("个人中心：获取个人资料")
@@ -200,6 +199,7 @@ public class UserController {
             throw new ValidateException("smfcore.newPwdError","新密码不能与旧密码相同");
             throw new ValidateException("smfcore.newPwdError","新密码不能与旧密码相同");
         }
         }
         userManager.updatePass(user.getUsername(), passwordEncoder.encode(newPass));
         userManager.updatePass(user.getUsername(), passwordEncoder.encode(newPass));
+        userCacheClean.cleanUserCache(user.getUsername());
         return   ResultBean.newOkResult("");
         return   ResultBean.newOkResult("");
     }
     }