merge dev

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java

@@ -18,7 +18,6 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.model.common.CloudPagerModel;
 import cn.estsh.i3plus.pojo.model.platform.MissResourceModel;
 import cn.estsh.i3plus.pojo.platform.bean.SysFile;
 import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
@@ -37,13 +36,26 @@ import org.apache.commons.collections4.ListUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.persistence.EntityManager;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -206,6 +218,7 @@ public class SysLocaleResourceController extends CoreBaseController {
      * @param pager 分页数据
      * @return 处理结果
      */
+    //TODO 暂时注释post
     @GetMapping(value = "/query")
     @ApiOperation(value = "语言资源复杂查询，分页，排序",notes = "语言资源复杂查询，分页，排序")
     public ResultBean querySysLocaleResourceByPager(SysLocaleResource sysLocaleResource, Pager pager){
@@ -218,8 +231,6 @@ public class SysLocaleResourceController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
-
-//
 //    @PostMapping(value = "/query")
 //    @ApiOperation(value = "语言资源复杂查询，分页，排序",notes = "语言资源复杂查询，分页，排序")
 //    public ResultBean querySysLocaleResourceByPager(@RequestBody CloudPagerModel<SysLocaleResource> pager){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserSavePasswordService.java

@@ -110,7 +110,7 @@ public class SysUserSavePasswordService extends CrudService<SysUserPassword> imp
     @Override
     public void updatePasswordWizoutSession(String loginName, String password, String newPwd) {
         SysUser user = userService.validatePasswordByLoginNameAndReturnUser(loginName, password);
-        user.setUserLoginPassword(password);
+        user.setUserLoginPassword(newPwd);
         userPasswordUtil.checkPasswordSave(user);
 
         userPasswordRDao.updateByProperties(