修改网关层

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/BillController.java

@@ -2,7 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.config.entity.UserElement;
+import com.community.commom.session.UserElement;
 import com.community.huiju.service.BillServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java

@@ -2,7 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.config.entity.UserElement;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -2,7 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.config.entity.UserElement;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpTicket;

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -2,7 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.config.entity.UserElement;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTransaction;
@@ -43,6 +43,7 @@ public class TicketController {
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
+    @Deprecated
     public ResponseBean getService(@PathVariable(value = "communityId") String communityId,
                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize,

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -3,8 +3,8 @@ package com.community.huiju.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.common.code.cache.AppkeyCache;
-import com.community.huiju.config.entity.UserElement;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.service.ITaUserService;
@@ -75,6 +75,9 @@ public class UserController {
     }
 
     @ApiOperation(value = "查看房屋成员列表", notes = "查看房屋成员列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
     @RequestMapping(value = "/roomUserList", method = RequestMethod.GET)
     public ResponseBean accessTicket(HttpSession session){
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
@@ -109,7 +112,7 @@ public class UserController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userId(租客或者家属) type(1启用 0停用)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
-    @RequestMapping(value = "/user/update/dependentsOrTenants",method = RequestMethod.PUT)
+    @RequestMapping(value = "/user/dependentsOrTenants",method = RequestMethod.PUT)
     public ResponseBean updateDependentsOrTenants(@RequestBody String parameter,
                                                 HttpSession session){
         ResponseBean response = new ResponseBean();
@@ -132,7 +135,7 @@ public class UserController {
                     "type(1家属 0租客)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
-    @RequestMapping(value = "/user/update/addTenantsOrDependents",method = RequestMethod.POST)
+    @RequestMapping(value = "/user/addTenantsOrDependents",method = RequestMethod.POST)
     public ResponseBean addTenantsOrDependents(@RequestBody String parameter,
                                                HttpSession session){
         ResponseBean response = new ResponseBean();
@@ -154,7 +157,7 @@ public class UserController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "headPortrait(用户头像)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
-    @RequestMapping(value = "/user/update/modifyUserHeadPortrait",method = RequestMethod.PUT)
+    @RequestMapping(value = "/user/modifyUserHeadPortrait",method = RequestMethod.PUT)
     public ResponseBean modifyUserHeadPortrait(@RequestBody String parameter,
                                                HttpSession session){
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -228,7 +228,7 @@ public class TaUserServiceImpl implements ITaUserService {
     @Override
     public ResponseBean startOrEndUsingUser(Integer currentUserId, Integer userId, Integer type) {
         ResponseBean response = null;
-        if ("1".equals(type)){
+        if (Constant.EFFECTIVE.equals(type)){
             response = startAndEnd(currentUserId,userId,true);
         } else {
             response = startAndEnd(currentUserId,userId,false);
@@ -319,7 +319,9 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setVerifyStatus("1");
         user.setAcceptAgreementStatus("1");
         user.setRemark("这是业主添加的!");
-        user.setUserName(user.getLoginName());
+        if (StringUtils.isEmpty(userName)) {
+            user.setUserName(user.getLoginName());
+        }
         user.setBuildingOwnerInfoId(taUser.getBuildingOwnerInfoId());
         user.setCommunityId(taUser.getCommunityId());
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/entity/UserElement.java → CODE/smart-community/community-common/src/main/java/com/community/commom/session/UserElement.java

@@ -1,11 +1,10 @@
-package com.community.huiju.config.entity;
+package com.community.commom.session;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * session 基础类
@@ -15,6 +14,9 @@ import java.util.Date;
 @NoArgsConstructor
 public class UserElement implements Serializable {
 
+
+
+
     /** 用户唯一标识符 **/
     private Integer id;
 
@@ -30,5 +32,8 @@ public class UserElement implements Serializable {
     /** 用户状态 **/
     private String status;
 
+    /** 登陆类型 **/
+    private String loginType;
+
 
 }

CODE/smart-community/zuul/src/main/java/com/community/huiju/config/entity/UserElement.java

@@ -1,33 +0,0 @@
-package com.community.huiju.config.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * session 基础类
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserElement implements Serializable {
-
-    /** 用户唯一标识符 **/
-    private Integer id;
-
-    /** 用户名 **/
-    private String userName;
-
-    /** 登陆名 **/
-    private String loginName;
-
-    /** 邮箱 **/
-    private String email;
-
-    /** 用户状态 **/
-    private String status;
-
-
-}

CODE/smart-community/zuul/src/main/java/com/community/huiju/constant/Status.java

@@ -7,7 +7,7 @@ public enum Status {
 
     RESPONSE_STATUS_400("400","请求无法被理解!"),
 
-    RESPONSE_STATUS_401("401","无访问权限!"),
+    RESPONSE_STATUS_888("888","无访问权限!"),
 
     RESPONSE_STATUS_500("500","服务器错误!"),
 

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/RestAuthenticationEntryPoint.java

@@ -31,11 +31,13 @@ public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
             if (Status.RESPONSE_STATUS_800.getValue().equals(headerError)) {
                 result.addError(Status.RESPONSE_STATUS_800.getValue(),Status.RESPONSE_STATUS_800.getComment());
             } else if (Status.RESPONSE_STATUS_801.getValue().equals(headerError)) {
-                result.addError("401","请您登陆!");
+                result.addError(Status.RESPONSE_STATUS_801.getValue(),Status.RESPONSE_STATUS_801.getComment());
+            }else if (Status.RESPONSE_STATUS_803.getValue().equals(headerError)) {
+                result.addError(Status.RESPONSE_STATUS_803.getValue(),Status.RESPONSE_STATUS_803.getComment());
             }
         }
 //        else {
-//            result.addError("403",Status.RESPONSE_STATUS_401.getComment());
+//            result.addError(Status.RESPONSE_STATUS_888.getValue(),Status.RESPONSE_STATUS_888.getComment());
 //        }
 
         try {

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/RestPreAuthenticateManager.java

@@ -1,30 +0,0 @@
-package com.community.huiju.security;
-
-import com.community.huiju.exception.WisdomSecurityException;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
-import org.springframework.stereotype.Component;
-
-public class RestPreAuthenticateManager implements AuthenticationManager {
-
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        if (authentication instanceof PreAuthenticatedAuthenticationToken) {
-            PreAuthenticatedAuthenticationToken preAuthrentication = (PreAuthenticatedAuthenticationToken) authentication;
-            if (null != preAuthrentication.getAuthorities() && preAuthrentication.getAuthorities().size() > 0) {
-                preAuthrentication.setAuthenticated(true);
-                return preAuthrentication;
-            }
-        } else if (authentication instanceof  TokenAuthrentication) {
-            TokenAuthrentication tokenAuthrentication = (TokenAuthrentication) authentication;
-            if (null != tokenAuthrentication.getAuthorities() && tokenAuthrentication.getAuthorities().size() > 0) {
-                tokenAuthrentication.setAuthenticated(true);
-                return tokenAuthrentication;
-            }
-        }
-
-        throw new WisdomSecurityException("没有授权角色!");
-    }
-}

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/RestPreAuthenticateProvider.java

@@ -8,6 +8,7 @@ import org.springframework.security.web.authentication.preauth.PreAuthenticatedA
 
 /**
  * 授权过程
+ *
  * @author weiximei
  */
 public class RestPreAuthenticateProvider implements AuthenticationProvider {
@@ -15,25 +16,20 @@ public class RestPreAuthenticateProvider implements AuthenticationProvider {
     @Override
     public Authentication authenticate(Authentication authentication) throws AuthenticationException {
 
-        if (authentication instanceof  PreAuthenticatedAuthenticationToken) {
-            PreAuthenticatedAuthenticationToken preAuthrentication = (PreAuthenticatedAuthenticationToken) authentication;
-            if (null != preAuthrentication.getAuthorities() && preAuthrentication.getAuthorities().size() > 0) {
-                preAuthrentication.setAuthenticated(true);
-                return preAuthrentication;
-            }
-        } else if (authentication instanceof  TokenAuthrentication) {
-            TokenAuthrentication tokenAuthrentication = (TokenAuthrentication) authentication;
-            if (null != tokenAuthrentication.getAuthorities() && tokenAuthrentication.getAuthorities().size() > 0) {
-                tokenAuthrentication.setAuthenticated(true);
-                return tokenAuthrentication;
-            }
+
+        TokenAuthrentication tokenAuthrentication = (TokenAuthrentication) authentication.getPrincipal();
+        if (null != tokenAuthrentication.getAuthorities() && tokenAuthrentication.getAuthorities().size() > 0) {
+            tokenAuthrentication.setAuthenticated(true);
+            return tokenAuthrentication;
         }
 
+
         throw new WisdomSecurityException("没有授权角色!");
     }
 
     /**
      * 是否授权过程
+     *
      * @param authentication
      * @return
      */

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/RestPreAuthenticatedProcessingFilter.java

@@ -1,7 +1,7 @@
 package com.community.huiju.security;
 
 import com.community.commom.constant.Constant;
-import com.community.huiju.config.entity.UserElement;
+import com.community.commom.session.UserElement;
 import com.community.huiju.constant.Header;
 import com.community.huiju.constant.Status;
 import com.community.huiju.dto.RoleDTO;
@@ -68,6 +68,9 @@ public class RestPreAuthenticatedProcessingFilter extends AbstractPreAuthenticat
         if (null == request.getAttribute(Header.HEADER_ERROR.getValue())){
             try {
                 UserElement userElement = getUserElement(loginType, request);
+                if (null == userElement) {
+                    request.setAttribute(Header.HEADER_ERROR.getValue(), Status.RESPONSE_STATUS_803.getValue());
+                }
                 List<RoleDTO> roleDTOList = Lists.newArrayList();
                 if (Constant.APP_LOGIN_TYPE.equals(loginType)) {
                     roleDTOList = iRoleService.getAppUserRoleByUserId(userElement.getId());

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/WisdomSecurityConfig.java

@@ -36,21 +36,9 @@ public class WisdomSecurityConfig extends WebSecurityConfigurerAdapter {
     private RestPreAuthenticatedProcessingFilter getPreAuthenticatedProcessingFilter() throws Exception {
         RestPreAuthenticatedProcessingFilter filter = new RestPreAuthenticatedProcessingFilter(parametes.getNoneSercurityPath(),iRoleService);
         filter.setAuthenticationManager(this.authenticationManagerBean());
-        //filter.setAuthenticationManager(new RestPreAuthenticateManager());
         return filter;
     }
 
-    /**
-     * user-detail服务
-     * @param auth
-     * @throws Exception
-     */
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.authenticationProvider(new RestPreAuthenticateProvider());
-        //super.configure(auth);
-    }
-
     /**
      * 安全策略
      * @param http
@@ -60,7 +48,7 @@ public class WisdomSecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
 
         http.csrf().disable();
-        http
+        http.authenticationProvider(new RestPreAuthenticateProvider())
                 .authorizeRequests()
                 .antMatchers(parametes.getNoneSercurityPath().toArray(new String[parametes.getNoneSercurityPath().size()])).permitAll() // 不要授权
                 .anyRequest()// 任何请求需要授权
@@ -70,7 +58,7 @@ public class WisdomSecurityConfig extends WebSecurityConfigurerAdapter {
 //                .antMatchers(parametes.getAppSercurityPath().get(2).split("=")[1]).hasRole(parametes.getAppSercurityPath().get(2).split("=")[0])
                 .antMatchers("/app-api/tickets/**").hasRole("OWNER")
                .and()
-                .sessionManagement()
+                .sessionManagement().sessionFixation().none()
                 .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
                .and()
                 .httpBasic().authenticationEntryPoint(new RestAuthenticationEntryPoint())

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/dome/TokenAuthrentication.java

@@ -1,88 +0,0 @@
-package com.community.huiju.security.dome;
-
-import org.springframework.security.authentication.AbstractAuthenticationToken;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.SpringSecurityCoreVersion;
-
-import java.util.Collection;
-
-/**
- * 认证
- * @author weiximei
- */
-public class TokenAuthrentication extends AbstractAuthenticationToken {
-
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
-
-    // ~ Instance fields
-    // ================================================================================================
-
-    private final Object principal; // 存储认证信息的
-    //private Object credentials; // 存放密码
-
-    // ~ Constructors
-    // ===================================================================================================
-
-    /**
-     * This constructor can be safely used by any code that wishes to create a
-     * <code>SmsCodeAuthenticationToken</code>, as the {@link #isAuthenticated()}
-     * will return <code>false</code>.
-     *
-     */
-    public TokenAuthrentication(String token) {
-        super(null);
-        this.principal = token; // 存放token
-        //this.credentials = credentials;
-        // 是否认证
-        setAuthenticated(false);
-    }
-
-    /**
-     * This constructor should only be used by <code>AuthenticationManager</code> or
-     * <code>AuthenticationProvider</code> implementations that are satisfied with
-     * producing a trusted (i.e. {@link #isAuthenticated()} = <code>true</code>)
-     * authentication token.
-     *
-     * @param principal
-     * @param authorities
-     */
-    // principal 用户认证信息，authorities用户的权限
-    public TokenAuthrentication(Object principal,
-                                      Collection<? extends GrantedAuthority> authorities) {
-        super(authorities);
-        this.principal = principal; // 登录成功，存放用户信息
-        // this.credentials = credentials;
-        // 是否认证
-        super.setAuthenticated(true); // must use super, as we override
-    }
-
-    // ~ Methods
-    // ========================================================================================================
-    @Override
-    public Object getCredentials() {
-        //return this.credentials;
-        return null;
-    }
-
-    @Override
-    public Object getPrincipal() {
-        return this.principal;
-    }
-
-    @Override
-    public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
-        if (isAuthenticated) {
-            throw new IllegalArgumentException(
-                    "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead");
-        }
-
-        super.setAuthenticated(false);
-    }
-
-    @Override
-    public void eraseCredentials() {
-        super.eraseCredentials();
-        // credentials = null;
-    }
-
-}