Merge remote-tracking branch 'origin/dev' into dev

sso-manage-console/src/main/java/com/uas/sso/sso/backend/config/SyncThreadPool.java

@@ -134,9 +134,9 @@ public class SyncThreadPool {
     private void syncToIm(JSONObject data, String message) {
         String appId = "im";
         JSONObject params = new JSONObject();
-        params.put("email", data.getString("email"));
+        params.put("email", StringUtils.isEmpty(data.getString("email")) ? "0" : data.getString("email"));
         params.put("idCard", data.getString("idCard"));
-        params.put("name", data.getString("vipName"));
+        params.put("realName", StringUtils.isEmpty(data.getString("realName")) ? data.getString("vipName") :data.getString("realName"));
         params.put("sex", data.getString("sex"));
         params.put("mobile", data.getString("mobile"));
         params.put("password", data.get("newPass"));

sso-server/src/main/java/com/uas/sso/service/impl/ApplyUserSpaceServiceImpl.java

@@ -210,7 +210,7 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
     }
 
     @Override
-    public Page<ApplyUserSpace> findApplyAllToMall(Integer pageNumber, Integer pageSize, Long spaceUU, Integer status, String keyword) {
+    public Page<ApplyUserSpace> findApplyAllToMall(Integer pageNumber, Integer pageSize, final Long spaceUU, final Integer status, final String keyword) {
         Pageable pageable = PageInfo.pageRequest(new PageRequest(pageNumber, pageSize));
         Page<ApplyUserSpace> page = applyUserSpaceDao.findAll(new Specification<ApplyUserSpace>() {
             @Override

sso-server/src/main/java/com/uas/sso/service/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@ import com.uas.sso.util.AccountTypeUtils;
 import com.uas.sso.util.ExecuteUtils;
 import com.uas.sso.util.PasswordLevelUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
@@ -460,7 +461,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @CachePut(value = "UserCache", key = "'user:' + #userUU")
+    @CacheEvict(value = "UserCache", key = "'user:' + #userUU")
     public void setQuestion(Long userUU, List<UserQuestion> questions) {
         // 找到用户密保
         User user = userDao.findOne(userUU);

sso-server/src/main/resources/spring/ehcache.xml

@@ -19,14 +19,14 @@
     <!-- User对象缓存 -->
     <cache name="UserCache"
            maxElementsInMemory="10000" eternal="false" overflowToDisk="false"
-           memoryStoreEvictionPolicy="LFU" timeToIdleSeconds="604800"
-           timeToLiveSeconds="604800" />
+           memoryStoreEvictionPolicy="LFU" timeToIdleSeconds="86400"
+           timeToLiveSeconds="86400" />
 
     <!-- UserSpace对象缓存 -->
     <cache name="UserSpaceCache"
            maxElementsInMemory="10000" eternal="false" overflowToDisk="false"
-           memoryStoreEvictionPolicy="LFU" timeToIdleSeconds="604800"
-           timeToLiveSeconds="604800" />
+           memoryStoreEvictionPolicy="LFU" timeToIdleSeconds="86400"
+           timeToLiveSeconds="86400" />
 
     <!-- 消息服务配置缓存 -->
     <cache name="setting"