改bug

src/main/java/org/rcisoft/business/system/user/controller/LoginController.java

@@ -75,12 +75,14 @@ public class LoginController extends PaginationController<SysUser> {
     @RequestMapping(value = "/loginWechat")
     @ResponseBody
     public Result loginWechat(@RequestBody SysUser user){
-        return Result.builder(userService.loginWechat(user));
+        Map<String, Object> result = userService.loginWechat(user);
+        return Result.builder(new PersistModel((Integer) result.get("line")), result.get("message").toString(), result.get("message").toString(), result.get("userNickName"));
     }
     @RequestMapping(value = "/openIdBindingFlag")
     @ResponseBody
-    public Object openIdBindingFlag(@RequestParam String openId){
-        return userService.getUserByOpenId(openId);
+    public Result openIdBindingFlag(@RequestParam String openId){
+        Map<String, Object> result = userService.getUserByOpenId(openId);
+        return Result.builder(new PersistModel((Integer) result.get("count")), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, result.get("userNickName"));
     }
 
 

src/main/java/org/rcisoft/business/system/user/service/UserService.java

@@ -105,9 +105,9 @@ public interface UserService {
 
      List<Map<String,Object>> listUserAllByPagination(PageUtil<SysUser> paginationUtility,String userTp);
 
-     PersistModel loginWechat(SysUser user);
+     Map<String, Object> loginWechat(SysUser user);
 
-     boolean getUserByOpenId(@Param("openId") String openId);
+     Map<String, Object> getUserByOpenId(@Param("openId") String openId);
 
 
 }

src/main/java/org/rcisoft/business/system/user/service/impl/UserServiceImpl.java

@@ -67,7 +67,6 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private SysUserProjectRepository sysUserProjectRepository;
 
-
     @Override
     public String login(String username, String password) {
         UsernamePasswordAuthenticationToken upToken = new UsernamePasswordAuthenticationToken(username, password);
@@ -354,10 +353,16 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public PersistModel loginWechat(SysUser user) {
+    public Map<String, Object> loginWechat(SysUser user) {
+        Map<String, Object> result = new HashMap<>();
         int line = 0;
         String message = "";
-        List<SysUser> list = userRepository.listByUserName(user.getUserNm());
+        Example example = new Example(SysUser.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("userNm", user.getUserNm());
+        criteria.andEqualTo("userTp", 5);
+        List<SysUser> list = userRepository.selectByExample(example);
+//        List<SysUser> list = userRepository.listByUserName(user.getUserNm());
         if(list!=null && list.size()==1){
             SysUser su = list.get(0);
             boolean flag = passwordEncoder.matches(user.getUserPwd(),su.getUserPwd());
@@ -366,6 +371,7 @@ public class UserServiceImpl implements UserService {
                 if(line<1){
                     message = "授权失败";
                 }else{
+                    result.put("userNickName", su.getUserNickName());
                     message = "授权成功";
                 }
             }else{
@@ -374,16 +380,22 @@ public class UserServiceImpl implements UserService {
         }else{
             message = "登录异常";
         }
-        return new PersistModel(line,message);
+        result.put("line", line);
+        result.put("message", message);
+        return result;
     }
 
     @Override
-    public boolean getUserByOpenId(String openId) {
+    public Map<String, Object> getUserByOpenId(String openId) {
+        Map<String, Object> result = new HashMap<>();
         List<Map<String,Object>> list = userRepository.getUserByOpenId(openId);
         if(list!=null && list.size()>0){
-            return true;
+            result.put("count", 1);
+            result.put("userNickName", list.get(0).get("USER_NICK_NAME"));
+        } else {
+            result.put("count", 0);
         }
-        return false;
+        return result;
     }
 
     public List<Map<String, Object>> handleMenu(List<Map<String, Object>> menuList){

src/main/java/org/rcisoft/wechat/WechatRedirectController.java

@@ -43,10 +43,10 @@ public class WechatRedirectController {
             WxMpUser wxUser = this.service.oauth2UserInfo(code);
             System.out.println("微信返回的code: " + code);
             System.out.println("WxPortalController授权完毕后获取到的OpenId是：" + wxUser.getOpenId());
-            return "redirect:http://weega.cn.tunnel.qydev.com/login.html?openId=" + wxUser.getOpenId();
+            return "redirect:http://www.renew-cloud.com/wechat/login.html?openId=" + wxUser.getOpenId();
         } catch (Exception exception) {
             exception.printStackTrace();
-            return "redirect:http://weega.cn.tunnel.qydev.com/error.html";
+            return "redirect:http://www.renew-cloud.com/wechat/error.html";
         }
     }
 

src/main/resources/mapper/sys/system/user/UserMapper.xml

@@ -4,7 +4,7 @@
 
 
     <select id="listByUserName" resultType="org.rcisoft.business.system.user.entity.SysUser">
-        SELECT USER_ID AS userId, USER_NM AS userNm, USER_PWD AS userPwd, USER_TP AS userTp FROM sys_user
+        SELECT USER_ID AS userId, USER_NM AS userNm, USER_PWD AS userPwd, USER_TP AS userTp, USER_NICK_NAME as userNickName FROM sys_user
         WHERE USER_NM = #{userName}
     </select>
     <select id="getUserInfo" resultType="map">