提交分支

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/impl/PhoneCodeImpl.java

@@ -1,7 +1,9 @@
 package com.community.huiju.common.code.impl;
 
 import com.community.commom.constant.Constant;
+import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.ICode;
+import com.community.huiju.common.code.cache.AppkeyCache;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,7 @@ public class PhoneCodeImpl implements ICode {
     @Override
     public boolean sendCode(String phone, String code) {
         boolean bool = false;
+
         try {
             String result = null;
             OkHttpClient client = getClient();

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

@@ -2,6 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.ICode;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import io.swagger.annotations.Api;
@@ -39,15 +40,22 @@ public class CodeController {
     @RequestMapping(value = "/code/sendCode",method = RequestMethod.POST)
     public ResponseBean sendCode(@RequestParam String phone, HttpSession session) {
         ResponseBean response = new ResponseBean();
+
+        log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
+        if (!AccountValidatorUtil.isPhone(phone)){
+            response.addError("请输入正取的手机号!");
+            return response;
+        }
+
         int code = (int) ((Math.random()*9+1)*1000);
-        boolean result = iCode.sendCode(phone,String.valueOf(code));
-        //boolean result = true;
+        //boolean result = iCode.sendCode(phone,String.valueOf(code));
+        boolean result = true;
         if (result) {
             log.info("{} 验证码: {}",phone,code);
             // 设置缓存
             AppkeyCache.setCache(phone,String.valueOf(code));
             //session.setAttribute(Constant.SESSION_PHONE_CODE,String.valueOf(code));
-            response.addSuccess("发送成功!");
+            response.addSuccess("发送成功!"+code);
         } else {
             response.addError("发送失败!");
         }

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

@@ -86,6 +86,18 @@ public class SocialController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取活动轮播图", notes = "获取活动轮播图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区id")
+    })
+    @RequestMapping(value = "/activity/Img/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getActivity(@PathVariable(value = "communityId") Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+        List<TpActivity> agreement = socialServiceI.getActivity(communityId);
+        responseBean.addSuccess(agreement);
+        return responseBean;
+    }
+
 
     @ApiOperation(value = "按小区获取分页活动列表", notes = "按小区获取分页活动列表,公告标题模糊查询")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
@@ -120,7 +132,7 @@ public class SocialController {
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
-    @RequestMapping(value = "/secondHand/{communityId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/getTransaction/{communityId}", method = RequestMethod.GET)
     public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
@@ -147,23 +159,23 @@ public class SocialController {
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "交易标题"),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionContent", value = "交易内容"),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "0:二手 1:求购  2:租赁"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "title:小区标题，content：小区类容, type"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
     @ResponseBody
-    public ResponseBean addTransaction(TpTransaction tpTransaction, HttpSession session) {
+    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.addAllTransaction(userId, tpTransaction);
+        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets);
         return response;
     }
 
     @ApiOperation(value = "获取我发布所有二手租赁帖子", notes = "获取我发布所有二手租赁帖子")
     @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
@@ -181,20 +193,16 @@ public class SocialController {
 
     @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "小区标题"),
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "transactionContent", value = "交易内容"),
-            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "Type", value = "0 代表，1求购，2租赁"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "id:小区id,title:小区标题，content：小区类容"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/updateTransaction/{Id}", method = RequestMethod.PUT)
-    public ResponseBean ubdateTransaction(HttpSession session, @PathVariable(value = "Id") Integer Id,
-                                          @RequestParam(value = "transactionTitle") String transactionTitle,
-                                          @RequestParam(value = "transactionContent") String transactionContent,
-                                          @RequestParam(value = "Type") Integer Type) {
+    public ResponseBean ubdateTransaction(HttpSession session, @RequestBody String paramets) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.updateTransaction(Id, transactionTitle, transactionContent, userId, Type);
+        ResponseBean response = socialServiceI.updateTransaction(paramets, userId);
         return response;
     }
 

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

@@ -104,7 +104,8 @@ public class TicketController {
 
     @ApiOperation(value = "回复 报修/投诉/联系单 追问接口", notes = "回复 报修/投诉/联系单 追问接口")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数", paramType = "body")})
+            @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数", paramType = "body"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     @RequestMapping(value = "/ticket/reply/{communityId}", method = RequestMethod.POST)
     public ResponseBean updateTicketsReply(@PathVariable(value = "communityId") Integer communityId, @RequestBody TpTicketRecordComment tpTicketRecordComment, HttpSession session){
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
@@ -122,7 +123,6 @@ public class TicketController {
 
     @ApiOperation(value = "添加报修", notes = "添加报修")
     @ApiImplicitParams({
-
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketContent",value = "工单内容"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketTitle",value = "工单标题"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "repairType",value = "报修房屋类型"),

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

@@ -61,8 +61,8 @@ public class UserController {
     }
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "登陆(手机号)"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "code",value = "验证码"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "phone",value = "phone：登陆(手机号)，code：(手机验证码)"),
+
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java

@@ -23,4 +23,12 @@ public interface TpActivityMapper {
     int updateByPrimaryKey(TpActivity record);
     
     List<TpActivity> getActivitys(@Param("communityId")Integer communityId,@Param("title") String title);
+
+    /**
+     * 获取活动轮播图
+     * @param communityId
+     * @param num
+     * @return
+     */
+    List<TpActivity> getActivity(@Param("communityId")Integer communityId, @Param("num")Integer num);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpCarouselSettingMapper.java

@@ -17,7 +17,7 @@ public interface TpCarouselSettingMapper {
 
     int updateByPrimaryKey(TpCarouselSetting record);
 
-     int getcarouselNum(String lease);
+     Integer getcarouselNum(String lease);
 
     Integer selectCarouselNum(String carouselType);
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -24,5 +24,7 @@ public interface TpTransactionMapper {
 
     List<TpTransaction> selectTransaction(@Param("userId")Integer userId, @Param("communityId")Integer communityId);
 
-    void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId,@Param("Type")Integer Type);
+    void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId);
+
+    TpTransaction getById(@Param("id")Integer id);
 }

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

@@ -69,7 +69,7 @@ public interface SocialServiceI {
 	/**
 	 * 添加二手租赁帖子
 	 */
-    ResponseBean addAllTransaction(Integer userId,  TpTransaction Transaction);
+    ResponseBean addAllTransaction(Integer userId, String paramets);
 
 	/**
 	 * 获取当前用户所有的帖子
@@ -81,7 +81,7 @@ public interface SocialServiceI {
 	/**
 	 * 修改当前帖子
 	 */
-	ResponseBean updateTransaction(Integer Id,String transactionTitle,String transactionContent,Integer userId,Integer Type);
+	ResponseBean updateTransaction(String paramets,Integer userId);
 
 	/**
 	 * 评价工单以及评分
@@ -90,4 +90,11 @@ public interface SocialServiceI {
 	 * @param ticketId
 	 */
 	void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId);
+
+	/**
+	 * 获取活动轮播图
+	 * @param communityId
+	 * @return
+	 */
+	List<TpActivity> getActivity(Integer communityId);
 }

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

@@ -216,11 +216,23 @@ public class SocialServiceImpl implements SocialServiceI {
         return tpTransactionMapper.findAllTransaction(communityId, type);
     }
 
+
     @Transactional
     @Override
-    public ResponseBean addAllTransaction(Integer userId, TpTransaction tpTransaction) {
+    public ResponseBean addAllTransaction(Integer userId, String paramets) {
+
         ResponseBean response = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(paramets);
+        String transactionTitle = (String) jsonObject.get("title");
+        String transactionContent = (String) jsonObject.get("content");
+        String  type= (String) jsonObject.get("type");
+
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
+        TpTransaction tpTransaction=new TpTransaction();
+        tpTransaction.setTransactionTitle(transactionTitle);
+        tpTransaction.setTransactionContent(transactionContent);
+        tpTransaction.setType(type);
         tpTransaction.setCommunityId(user.getCommunityId());
         tpTransaction.setTaUserId(userId);
         tpTransaction.setCreateUser(userId);
@@ -228,26 +240,59 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setCreateDate(new Date());
         tpTransaction.setUpdateUser(userId);
         tpTransaction.setUpdateDate(new Date());
-        tpTransactionMapper.insertSelective(tpTransaction);
-        response.addSuccess("发布成功");
+
+        //判断身份是否为业主且状态为已停用
+        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userId);
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+        if (Constant.INVALID.equals(taUser.getStatus())
+                && Constant.OWNER.equals(sysRole.getRoleName())){
+
+            response.addError("9996", "您的身份已停用，请联系物业");
+            return response;
+        }
+
+        //身份为家属租客，状态为已停用
+        if (Constant.INVALID.equals(taUser.getStatus())
+                && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
+
+            response.addError("9996", "您的身份已停用，请联系物业");
+            return response;
+        }
+
+        if (Constant.EFFECTIVE.equals(taUser.getStatus())
+                && (Constant.RELATION.equals(sysRole.getRoleName()))
+                || Constant.TENANT.equals(sysRole.getRoleName())
+                || Constant.OWNER.equals(sysRole.getRoleName())){
+            tpTransactionMapper.insertSelective(tpTransaction);
+            TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
+            response.addSuccess(tpTransaction1);
+        }
+        response.addError("9995", "无法确认您的身份，请联系物业");
         return response;
+
     }
 
     @Override
     public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize) {
-        PageHelper.startPage(pageNum, paeSize);
         ResponseBean responseBean = new ResponseBean();
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
          Integer communityId=user.getCommunityId();
+
+        PageHelper.startPage(pageNum, paeSize);
         List<TpTransaction> tpTransactions=tpTransactionMapper.selectTransaction(userId,communityId);
+
         responseBean.addSuccess(tpTransactions);
         return responseBean;
     }
 
     @Override
-    public ResponseBean updateTransaction(Integer Id,String transactionTitle,String transactionContent,Integer userId,Integer Type) {
+    public ResponseBean updateTransaction(String paramets,Integer userId) {
         ResponseBean response = new ResponseBean();
-        tpTransactionMapper.updateTransaction(Id,transactionTitle,transactionContent,userId,Type);
+        JSONObject jsonObject = JSONObject.parseObject(paramets);
+        String id = (String) jsonObject.get("id");
+        String transactionTitle = (String) jsonObject.get("title");
+        String transactionContent = (String) jsonObject.get("content");
+        tpTransactionMapper.updateTransaction(Integer.valueOf(id),transactionTitle,transactionContent,userId);
         response.addSuccess("修改成功");
         return response;
     }
@@ -270,6 +315,13 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTicketRecordMapper.insertSelective(record);
     }
 
+    @Override
+    public List<TpActivity> getActivity(Integer communityId) {
+        Integer Num=tpCarouselSettingMapper.getcarouselNum(Constant.ACTIVITY);
+        List<TpActivity> listActivity=tpActivityMapper.getActivity(communityId,Num);
+        return listActivity;
+    }
+
     public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId){
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.MD5Utils;
@@ -151,6 +152,17 @@ public class TaUserServiceImpl implements ITaUserService {
         //user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
         taUserMapper.insertSelective(user);
 
+        user.setCreateUser(user.getId());
+        user.setUpdateUser(user.getId());
+
+        // 更新
+        taUserMapper.updateByPrimaryKeySelective(user);
+
+        // TODO 这里先默认 type=0 (租客), 后期需要和 资料库对接
+        addUserRole(0,response,user);
+
+
+
         TaUserVO taUserVO = new TaUserVO();
         BeanUtils.copyProperties(user,taUserVO);
         response.addSuccess(taUserVO);
@@ -250,17 +262,17 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
         if (bool) {
-            if ("1".equals(user.getStatus())) {
+            if (Constant.EFFECTIVE.equals(user.getStatus())) {
                 response.addError("用户已启用!");
                 return response;
             }
-            user.setStatus("1");
+            user.setStatus(Constant.EFFECTIVE+"");
         } else {
-            if ("0".equals(user.getStatus())) {
+            if (Constant.INVALID.equals(user.getStatus())) {
                 response.addError("用户已停用!");
                 return response;
             }
-            user.setStatus("0");
+            user.setStatus(Constant.INVALID+"");
         }
 
         int result = taUserMapper.updateByPrimaryKeySelective(user);
@@ -303,7 +315,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setUpdateDate(new Date());
         user.setUpdateUser(currentUserId);
         user.setParentId(currentUserId);
-        user.setStatus("1");
+        user.setStatus(Constant.EFFECTIVE+"");
         user.setVerifyStatus("1");
         user.setAcceptAgreementStatus("1");
         user.setRemark("这是业主添加的!");
@@ -317,6 +329,19 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
+        addUserRole(type,response,user);
+
+        return response;
+    }
+
+    /**
+     * 公共方法,添加角色.
+     *      用于注册 和 业主添加家属和租客
+     * @param type 0 是租客  1 是家属
+     * @param response
+     * @param user
+     */
+    private void addUserRole(Integer type,ResponseBean response,TaUser user){
         // 先查询角色 在角色关联记录
         // 这里的 2 或者 3 是对应角色编号
         int roleType = type.equals("0") ? 2 : 3;
@@ -324,7 +349,7 @@ public class TaUserServiceImpl implements ITaUserService {
         if (null == taSysRole) {
             response.addError("该权限不存在!");
             log.error("这个角色没有找到!角色名称:{} 角色编号:{}",type.equals("0") ? "租客" : "家属",roleType);
-            return response;
+            return;
         }
 
         TaSysUserRole taSysUserRole = new TaSysUserRole();
@@ -343,8 +368,6 @@ public class TaUserServiceImpl implements ITaUserService {
             log.error("租客或者家属角色权限添加失败!",e);
             throw new RuntimeException("租客或者家属角色权限添加失败");
         }
-
-        return response;
     }
 
     @Transactional

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

@@ -205,6 +205,7 @@ public class TicketServiceImpl implements ITicketService {
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
         tpTicketRecord.setCreateUser(userId);
         tpTicketRecord.setCreateDate(new Date());
+
         tpTicketRecordMapper.insertSelective(tpTicketRecord);
         response.addSuccess("新增成功");
         return response;

CODE/smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml

@@ -271,4 +271,11 @@
       a.activity_end_time DESC,
 	  a.create_date DESC
   </select>
+
+  <select id="getActivity" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tp_activity
+    where community_id = #{communityId,jdbcType=INTEGER}  and status=1 limit  #{num,jdbcType=INTEGER}
+  </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -41,7 +41,7 @@
       #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransaction" >
+  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"  parameterType="com.community.huiju.model.TpTransaction" >
     insert into tp_transaction
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -195,9 +195,15 @@
     ta_user_id = #{userId,jdbcType=INTEGER},
     transaction_title = #{transactionTitle,jdbcType=VARCHAR},
     transaction_content = #{transactionContent,jdbcType=VARCHAR},
-     type = #{Type,jdbcType=CHAR},
     update_user = #{userId,jdbcType=INTEGER},
     update_date = now()
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="getById" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction">
+    select
+    <include refid="Base_Column_List" />
+    from tp_transaction
+    where id = #{id,jdbcType=INTEGER}
+  </select>
 </mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -34,7 +34,7 @@ public class Constant {
     public static final String REQUEST_URL = "http://micservice.ycjcjy.com/sms";
 
     /** 本地缓存过期时间 单位秒 **/
-    public static final Long CACHE_EXPIRE = 60L;
+    public static final Long CACHE_EXPIRE = 120L;
 
     /** 本地緩存最大个数 **/
     public static final Long CACHE_SIZE = 1000L;

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

@@ -33,9 +33,10 @@ public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
             } else if (Status.RESPONSE_STATUS_801.getValue().equals(headerError)) {
                 result.addError("401","请您登陆!");
             }
-        }else {
-            result.addError("403",Status.RESPONSE_STATUS_401.getComment());
         }
+//        else {
+//            result.addError("403",Status.RESPONSE_STATUS_401.getComment());
+//        }
 
         try {
             //设置跨域请求 请求结果json刷到响应里

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

@@ -9,8 +9,10 @@ import com.community.huiju.service.IRoleService;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
 import org.springframework.util.AntPathMatcher;
 
@@ -74,7 +76,7 @@ public class RestPreAuthenticatedProcessingFilter extends AbstractPreAuthenticat
                 }
 
                 grantedAuthorityList = roleDTOList.stream()
-                        .map(e->new SimpleGrantedAuthority("ROLE_OWNER")) //
+                        .map(e->new SimpleGrantedAuthority(e.getRoleName()))
                         .collect(Collectors.toList());
             } catch (Exception e){
                 log.error("用户授权失败!",e);

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

@@ -35,8 +35,8 @@ 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());
+        filter.setAuthenticationManager(this.authenticationManagerBean());
+        //filter.setAuthenticationManager(new RestPreAuthenticateManager());
         return filter;
     }
 
@@ -45,11 +45,11 @@ public class WisdomSecurityConfig extends WebSecurityConfigurerAdapter {
      * @param auth
      * @throws Exception
      */
-//    @Override
-//    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-//        auth.authenticationProvider(new RestPreAuthenticateProvider());
-//        //super.configure(auth);
-//    }
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.authenticationProvider(new RestPreAuthenticateProvider());
+        //super.configure(auth);
+    }
 
     /**
      * 安全策略

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

@@ -0,0 +1,88 @@
+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;
+    }
+
+}