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

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

sso-server/src/main/java/com/uas/sso/controller/UserspaceManagerController.java

@@ -2,20 +2,11 @@ package com.uas.sso.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.uas.account.ResultWrap;
 import com.uas.account.entity.AppCreateInfo;
-import com.uas.account.entity.MasterInfo;
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.account.util.AccountUtils;
-import com.uas.sso.common.util.HttpUtil;
 import com.uas.sso.core.Const;
-import com.uas.sso.core.Status;
 import com.uas.sso.dao.UserspaceDao;
 import com.uas.sso.entity.App;
 import com.uas.sso.entity.User;
-import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.Userspace;
 import com.uas.sso.service.AppService;
 import com.uas.sso.service.ApplyUserSpaceService;
@@ -27,18 +18,14 @@ import com.uas.sso.util.HttpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
-import java.net.URLEncoder;
-import java.sql.Timestamp;
 import java.util.*;
 
 import static com.alibaba.fastjson.JSON.parseObject;
-import static com.uas.sso.service.impl.UserspaceServiceImpl.SPACE_INIT_UU;
 
 /**
  * 企业信息管理controller

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

@@ -20,9 +20,6 @@ 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;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -32,8 +29,6 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import com.uas.sso.exception.AccountException;
-
 import javax.persistence.criteria.*;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -254,7 +249,6 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @Cacheable(value = "UserCache", key = "'user:' + #userUU")
     public User findOne(Long userUU) {
         return userDao.findOne(userUU);
     }
@@ -295,7 +289,6 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @CacheEvict(value = "UserCache", key = "'user:' + #userUU")
     public void updateMobile(Long userUU, String newMobile) {
         // 获取用户信息
         User user = userDao.findOne(userUU);
@@ -322,7 +315,6 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @CacheEvict(value = "UserCache", key = "'user:' + #userUU")
     public void updateEmail(Long userUU, String newEmail) {
         // 获取用户信息
         User user = userDao.findOne(userUU);
@@ -461,7 +453,6 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @CacheEvict(value = "UserCache", key = "'user:' + #userUU")
     public void setQuestion(Long userUU, List<UserQuestion> questions) {
         // 找到用户密保
         User user = userDao.findOne(userUU);
@@ -499,7 +490,6 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @CacheEvict(value = "UserCache", key = "'user:' + #userUU")
     public User updatePassword(Long userUU, String noEncryPwd) {
         User user = userDao.findOne(userUU);
         if (user == null) {

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

@@ -15,8 +15,6 @@ import com.uas.sso.util.ChineseUtils;
 import com.uas.sso.util.ExecuteUtils;
 import com.uas.sso.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -242,7 +240,6 @@ public class UserspaceServiceImpl implements UserspaceService {
     }
 
     @Override
-    @Cacheable(value = "UserSpaceCache", key = "'userspace:' + #spaceUU" )
     public Userspace findOne(Long spaceUU) {
         return userspaceDao.findOne(spaceUU);
     }
@@ -311,7 +308,6 @@ public class UserspaceServiceImpl implements UserspaceService {
     }
 
     @Override
-    @CacheEvict(value = "UserSpaceCache", key = "'userspace:' + userspace.getSpaceUU() || 'userspace:' + userspace.getSpaceName()")
     public Userspace save(Userspace userspace) {
         return userspaceDao.save(userspace);
     }