Merge branch 'v1' of http://git.quantgroup.cn/QG/cash-loan-flow-boss into v1

# By xiaozhe.chen (3) and junquan.wang (1)
# Via junquan.wang (1) and xiaozhe.chen (1)
* 'v1' of http://git.quantgroup.cn/QG/cash-loan-flow-boss:
  添加todo
  添加todo
  加入FeignClient
  添加todo

pom.xml

@@ -79,6 +79,48 @@
             <artifactId>commons-core</artifactId>
         </dependency>
 
+      <!--  <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-netflix-core</artifactId>
+            <version>1.4.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-feign</artifactId>
+            <version>1.4.6.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-commons</artifactId>
+            <version>1.3.2.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-hystrix</artifactId>
+            <version>1.4.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-ribbon</artifactId>
+            <version>1.4.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-feign</artifactId>
+            <version>1.4.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
+
 
     </dependencies>
 

src/main/java/cn/quantgroup/cashloanflowboss/Bootstrap.java

@@ -3,6 +3,7 @@ package cn.quantgroup.cashloanflowboss;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -12,6 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication(scanBasePackages = {"cn.quantgroup.cashloanflowboss"})
 @Configuration
 @EnableAutoConfiguration
+@EnableFeignClients
 public class Bootstrap {
 
 	public static void main(String[] args) {

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

@@ -69,6 +69,7 @@ public class ChannelConfService {
     }
 
 
+    //todo 返回值不用map可以吗
     public Map<String, Object> getChannelConf(Long channelId) {
         ChannelConf channelConf = channelConfRepository.getByChannelId(channelId);
         return ChannelConfUtil.channelConfConvertVOModel(channelConf);

src/main/java/cn/quantgroup/cashloanflowboss/api/user/service/UserSessionService.java

@@ -57,7 +57,6 @@ public class UserSessionService {
         HttpSession session = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest().getSession();
         session.setAttribute(ApplicationDictionary.USER_KEY, JSONTools.serialize(userSessionInfo));
 
-        //todo permission后续放入UserSessionInfo结构中吧
         Permission permission = new Permission();
         permission.setId("Log.logout");
         permission.setAuthorities(Arrays.asList(Authority.READ));

src/main/java/cn/quantgroup/cashloanflowboss/core/aspect/RoleDataLoadAspect.java

@@ -44,7 +44,7 @@ public class RoleDataLoadAspect {
         Method method = methodSignature.getMethod();
         ChannelIdInit annotation = method.getAnnotation(ChannelIdInit.class);
         UserSessionInfo userSessionInfo = userSessionService.findUserSessionInfo();
-
+        // todo channel_role 定义为常量吧
         if (annotation != null && "channel_role".equals(userSessionInfo.getRoleInfo().getRoleName())) {
             String[] paramNames = ((CodeSignature)pjp.getSignature()).getParameterNames();
             for (int i = 0; i < paramNames.length; i++) {