20191112 完善缓存刷新机制

server/src/main/java/com/pica/cloud/account/account/server/service/impl/AccountServiceImpl.java

@@ -135,10 +135,6 @@ public class AccountServiceImpl implements AccountService {
 //        PicaUser picaUser = cacheClient.getToken("F64279B337EA4AE3965853A7CCFDF5A3", PicaUser.class);
 //        logger.info("更新用户缓存信息已完成数量：", picaUser.toString());
         return map;
-
-
-
-
     }
 
     @Override

server/src/main/java/com/pica/cloud/account/account/server/util/TokenUtils.java

@@ -68,8 +68,8 @@ public class TokenUtils {
             String sourceType = AccountUtils.getSourceType(registerSource);
             cacheClient.set(value + "-" + sourceType, Key, expiredSeconds);
             //用户数据放入redis缓存
-            String userData = cacheClient.hget(value, "id");
-            if (org.apache.commons.lang3.StringUtils.isEmpty(userData)) {
+//            String userData = cacheClient.hget(value, "id");
+//            if (org.apache.commons.lang3.StringUtils.isEmpty(userData)) {
                 Map<String, String> data = new HashMap<>();
                 data.put("token", newToken);
                 data.put("id", account.getId() + "");
@@ -84,13 +84,13 @@ public class TokenUtils {
                 data.put("sysCode", sourceType);
                 if (account.getId()!=null){
                     Doctor doctor = doctorMapper.selectByPrimaryKey(account.getId().intValue());
-                    data.put("town", doctor.getTown() + "");
+                    data.put("town_id", doctor.getTown() + "");
                     data.put("town_name", doctor.getTownName()+"");
-                    data.put("county", doctor.getCounty() + "");
+                    data.put("county_id", doctor.getCounty() + "");
                     data.put("county_name", doctor.getCountyName()+"");
-                    data.put("city", doctor.getCity() + "");
+                    data.put("city_id", doctor.getCity() + "");
                     data.put("city_name", doctor.getCityName()+"");
-                    data.put("province", doctor.getProvince() + "");
+                    data.put("province_id", doctor.getProvince() + "");
                     data.put("province_name", doctor.getProvinceName() + "");
                     data.put("hospital", doctor.getHospital()+"");
                     data.put("hospital_id", doctor.getHospitalId() + "");
@@ -108,9 +108,9 @@ public class TokenUtils {
                     //存储token：(token-doctor-1：用户数据)
                     cacheClient.hset(value, key, valueInfo);
                 }
-            } else {
-                cacheClient.hset(value, "token", newToken);
-            }
+//            } else {
+//                cacheClient.hset(value, "token", newToken);
+//            }
         } catch (Exception ex) {
             logger.error("生成token异常：{}" + ex.getMessage(), ex);
         }