change model

src/main/java/com/cnooc/expert/auth/service/impl/LoginServiceImpl.java

@@ -158,7 +158,7 @@ public class LoginServiceImpl implements LoginService {
         if(expertInfoResp == null){
             return "用户信息不存在";
         }
-        ExpertInfoAppResp expertInfoAppResp = loginServicesClient.getZhuanJiaInfoAppById(expertInfoResp.getBaseGuid());
+        ExpertInfoAppResp expertInfoAppResp = loginServicesClient.getZhuanJiaInfoAppById(expertInfoResp.getZhuanJiaGuid());
         if(expertInfoAppResp == null){
             return "该用户还没有设置密码";
         }
@@ -184,9 +184,9 @@ public class LoginServiceImpl implements LoginService {
         String uuidKey = UUID.randomUUID().toString();
 
         ZhuanJiaUser zhuanJiaUser = convert2ZhuanjiaUser( expertInfoResp );
-        redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getBaseGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
+        redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getZhuanJiaGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
 
-        String token = JwtUtils.createToken(expertInfoResp.getBaseGuid(),uuidKey);
+        String token = JwtUtils.createToken(expertInfoResp.getZhuanJiaGuid(),uuidKey);
         //6.返回token
         return token;
     }
@@ -216,9 +216,9 @@ public class LoginServiceImpl implements LoginService {
         String uuidKey = UUID.randomUUID().toString();
 
         ZhuanJiaUser zhuanJiaUser = convert2ZhuanjiaUser( expertInfoResp );
-        redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getBaseGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
+        redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getZhuanJiaGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
 
-        String token = JwtUtils.createToken(expertInfoResp.getBaseGuid(),uuidKey);
+        String token = JwtUtils.createToken(expertInfoResp.getZhuanJiaGuid(),uuidKey);
 
         return token;
     }
@@ -235,17 +235,21 @@ public class LoginServiceImpl implements LoginService {
 
 
       private ZhuanJiaUser convert2ZhuanjiaUser(ExpertInfoResp expertInfoResp){
-        if( expertInfoResp == null ){
-            return null;
-        }
-
-        ZhuanJiaUser zhuanJiaUser = new ZhuanJiaUser();
-
-
-
-
-//      TODO weisong
-
-        return zhuanJiaUser;
+          if( expertInfoResp == null ){
+              return null;
+          }
+
+          ZhuanJiaUser zhuanJiaUser = new ZhuanJiaUser();
+          zhuanJiaUser.setZhuanJiaGuid(expertInfoResp.getZhuanJiaGuid());
+          zhuanJiaUser.setMobile(expertInfoResp.getMobile());
+          zhuanJiaUser.setShenFenZheng(expertInfoResp.getShenFenZheng());
+          zhuanJiaUser.setShiFouYiFaZhuanJia(expertInfoResp.getShiFouYiFaZhuanJia());
+          zhuanJiaUser.setZhuanJiaCode(expertInfoResp.getZhuanJiaCode());
+          zhuanJiaUser.setSuoShuBuMeng(expertInfoResp.getSuoShuBuMeng());
+          zhuanJiaUser.setZhuanJiaName(expertInfoResp.getZhuanJiaName());
+          zhuanJiaUser.setZhuanJiaShiXiangGuid(expertInfoResp.getZhuanJiaShiXiangGuid());
+          zhuanJiaUser.setZhuanJiaZhuangTai(expertInfoResp.getZhuanJiaZhuangTai());
+
+          return zhuanJiaUser;
       }
 }