云中心接口调整

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

@@ -15,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-
 /**
  * @author wangmh
  * @create 2018-01-13 19:39
@@ -38,24 +36,38 @@ public class YunCenterController extends BaseController {
     @Autowired
     private UserAccountService userAccountService;
 
+    /**
+     * 获取登录用户信息
+     * @return
+     */
     @RequestMapping(value = "/user/info", method = RequestMethod.GET)
     public ModelMap findUserInfo() {
+        // 获得登录用户
         UserAccount userAccount = SystemSession.getUserAccount();
         if (userAccount == null) {
             return error("未登录");
         }
 
+        // 设置返回数据
         ModelMap data = new ModelMap();
         data.put("user", userAccount);
         if (userAccount.getSpaceUU() != null) {
             Userspace userspace = userspaceService.findOne(userAccount.getSpaceUU());
             data.put("userspace", userspace);
+            // 删除管理员的密码盐值,不返回给前端
+            userspace.getAdmin().setSalt(null);
+            userspace.getAdmin().setPassword(null);
         }
+
+        // 删除用户密码和盐值,不返回给前端
+        userAccount.setPassword(null);
+        userAccount.setSalt(null);
+
         return success(data);
     }
 
     /**
-     * 根据营业执照号分页查询申请信息
+     * 分页查询申请信息
      * @param page 页数
      * @param size 每页个数
      * @return
@@ -79,13 +91,13 @@ public class YunCenterController extends BaseController {
      */
     @RequestMapping(value = "/member/info", method = RequestMethod.GET)
     @ResponseBody
-    public ModelMap findMemberAll(@RequestParam(defaultValue = "0") int pageNumber, @RequestParam(defaultValue = "20") int pageSize) {
+    public ModelMap findMemberAll(@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int size) {
         UserAccount userAccount = getLoginUser();
         if (userAccount.getSpaceUU() == null) {
             return error(Const.SPACEUU_PERSONAL+"", "个人账号");
         }
 
-        Page<User> pUser = userService.findMemberBySpaceUU(pageNumber, pageSize, userAccount.getSpaceUU());
+        Page<User> pUser = userService.findMemberBySpaceUU(page, size, userAccount.getSpaceUU());
         return success(pUser);
     }
 
@@ -94,7 +106,7 @@ public class YunCenterController extends BaseController {
      * @param userUU 用户uu号
      * @return
      */
-    @RequestMapping(value = "/agree/apply", method = RequestMethod.GET)
+    @RequestMapping(value = "/agree/apply", method = RequestMethod.POST)
     @ResponseBody
     public ModelMap agreeApply(Long userUU, Long id) {
         // 获取登录用户
@@ -124,6 +136,10 @@ public class YunCenterController extends BaseController {
         return success();
     }
 
+    /**
+     * 获取登录账号
+     * @return
+     */
     private UserAccount getLoginUser() {
         UserAccount userAccount = SystemSession.getUserAccount();
         if (userAccount == null) {

sso-server/src/main/java/com/uas/sso/entity/ApplyUserSpace.java

@@ -1,6 +1,8 @@
 package com.uas.sso.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.sso.core.Status;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -35,12 +37,26 @@ public class ApplyUserSpace implements Serializable {
     @Column(name="useruu")
     private Long userUU;
 
+    /**
+     * 用户
+     */
+    @ManyToOne
+    @JoinColumn(name="useruu", insertable = false, updatable = false)
+    private User user;
+
     /**
      * 企业uu号
      */
     @Column(name="spaceuu")
     private Long spaceUU;
 
+    /**
+     * 企业信息
+     */
+    @ManyToOne
+    @JoinColumn(name="spaceuu", insertable = false, updatable = false)
+    private Userspace userspace;
+
     /**
      * 申请状态
      */
@@ -84,6 +100,13 @@ public class ApplyUserSpace implements Serializable {
         this.userUU = userUU;
     }
 
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
 
     public Long getSpaceUU() {
         return spaceUU;
@@ -93,6 +116,16 @@ public class ApplyUserSpace implements Serializable {
         this.spaceUU = spaceUU;
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
+    public Userspace getUserspace() {
+        return userspace;
+    }
+
+    public void setUserspace(Userspace userspace) {
+        this.userspace = userspace;
+    }
+
     public int getStatus() {
         return status;
     }

sso-server/src/main/java/com/uas/sso/entity/UserRecord.java

@@ -1,5 +1,8 @@
 package com.uas.sso.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -61,6 +64,8 @@ public class UserRecord implements Serializable {
         this.lastLoginTime = lastLoginTime;
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
     public User getUser() {
         return user;
     }

sso-server/src/main/java/com/uas/sso/entity/Userspace.java

@@ -424,6 +424,8 @@ public class Userspace implements Serializable {
         this.users = users;
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
     public List<App> getApps() {
         return apps;
     }

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

@@ -139,7 +139,7 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
 
         // 找到申请信息
         ApplyUserSpace applyUserSpace = applyUserSpaceDao.findOne(id);
-        if (!userUU.equals(applyUserSpace.getUserUU())) {
+        if (!userUU.equals(applyUserSpace.getUserUU()) || !loginUser.getSpaceUU().equals(applyUserSpace.getSpaceUU())) {
             // 简单的校验下参数
             throw new VisibleError("参数错误");
         }

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

@@ -336,7 +336,7 @@ public class UserServiceImpl implements UserService {
             @Override
             public Predicate toPredicate(Root<User> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                 List<Predicate> list = new ArrayList<>();
-                list.add(cb.equal(root.join("userspaces", JoinType.INNER).get("spaceUU").as(Long.class), spaceUU));
+                list.add(cb.equal(root.join("userSpaces", JoinType.INNER).get("spaceUU").as(Long.class), spaceUU));
                 Predicate[] predicates = new Predicate[list.size()];
                 predicates = list.toArray(predicates);
                 return cb.and(predicates);