Merge branch 'weiwei' into branch-suntao

* weiwei:
  更换权限认证策略
  去掉响应ID和时间戳
  重写权限认证

Conflicts:
	src/main/java/cn/quantgroup/cashloanflowboss/Bootstrap.java
	src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/security/CustomAuthenticationProvider.java
	src/main/resources/application.properties

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/entity/ChannelConf.java → src/main/java/cn/quantgroup/cashloanflowboss/api/channel/entity/boss/ChannelConf.java

-package cn.quantgroup.cashloanflowboss.api.channel.entity;
+package cn.quantgroup.cashloanflowboss.api.channel.entity.boss;
 
-import cn.quantgroup.cashloanflowboss.api.user.dictionary.UserStatus;
 import cn.quantgroup.cashloanflowboss.core.persistence.Primary;
 import lombok.Data;
 
 import javax.persistence.*;
-import java.util.Date;
 
 /**
  * date 2019/7/22.

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/repository/ChannelConfRepository.java → src/main/java/cn/quantgroup/cashloanflowboss/api/channel/repository/boss/ChannelConfRepository.java

-package cn.quantgroup.cashloanflowboss.api.channel.repository;
+package cn.quantgroup.cashloanflowboss.api.channel.repository.boss;
 
-import cn.quantgroup.cashloanflowboss.api.channel.entity.ChannelConf;
-import org.springframework.data.repository.PagingAndSortingRepository;
+import cn.quantgroup.cashloanflowboss.api.channel.entity.boss.ChannelConf;
 import org.springframework.stereotype.Repository;
 
 /**
- * Created by WeiWei on 2019/7/22.
+ * Created by suntao on 2019/7/22.
+ * @author suntao
  */
 @Repository
-public interface ChannelConfRepository extends PagingAndSortingRepository<ChannelConf, String> {
+public interface ChannelConfRepository{
 
     /**
      * 获取用户

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/service/ChannelConfService.java

 package cn.quantgroup.cashloanflowboss.api.channel.service;
 
-import cn.quantgroup.cashloanflowboss.api.channel.entity.ChannelConf;
-import cn.quantgroup.cashloanflowboss.api.channel.repository.ChannelConfRepository;
+import cn.quantgroup.cashloanflowboss.api.channel.entity.boss.ChannelConf;
+import cn.quantgroup.cashloanflowboss.api.channel.repository.boss.ChannelConfRepository;
 import cn.quantgroup.cashloanflowboss.api.channel.util.ChannelConfUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/util/ChannelConfUtil.java

 package cn.quantgroup.cashloanflowboss.api.channel.util;
 import java.util.Date;
 
-import cn.quantgroup.cashloanflowboss.api.channel.entity.ChannelConf;
+import cn.quantgroup.cashloanflowboss.api.channel.entity.boss.ChannelConf;
 import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelConfAddModel;
 import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelConfBaseModel;
 import org.springframework.beans.BeanUtils;

src/main/java/cn/quantgroup/cashloanflowboss/api/log/service/LogService.java

 package cn.quantgroup.cashloanflowboss.api.log.service;
 
 import cn.quantgroup.cashloanflowboss.api.user.dictionary.UserStatus;
-import cn.quantgroup.cashloanflowboss.api.user.entity.User;
+import cn.quantgroup.cashloanflowboss.api.user.entity.boss.User;
 import cn.quantgroup.cashloanflowboss.api.user.service.UserService;
 import cn.quantgroup.cashloanflowboss.component.security.Authority;
 import cn.quantgroup.cashloanflowboss.core.asserts.Assert;