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

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/controller/ChannelConfController.java

 package cn.quantgroup.cashloanflowboss.api.channel.controller;
 
-import cn.quantgroup.cashloanflowboss.api.channel.entity.clf.ChannelConfiguration;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ChannelConfiguration;
 import cn.quantgroup.cashloanflowboss.api.channel.service.ChannelConfService;
-import cn.quantgroup.cashloanflowboss.api.user.entity.boss.User;
 import cn.quantgroup.cashloanflowboss.api.user.model.Pagination;
 import cn.quantgroup.cashloanflowboss.core.base.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.Map;
 
 /**
  * Created with suntao on 2019/8/2
@@ -29,8 +27,8 @@ public class ChannelConfController {
 
 
     @GetMapping("/info")
-    public Page<ChannelConfiguration> channelInfo(@RequestParam @Valid Pagination pagination, Integer channelId) {
-        return channelConfService.getChannelInfo(pagination, channelId);
+    public Page<ChannelConfiguration> channelInfo(Integer pageNumber, Integer pageSize, Integer channelId) {
+        return channelConfService.getChannelInfo(pageNumber, pageSize, channelId);
     }
 
 

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/model/boss/ChannelConfAddModel.java → src/main/java/cn/quantgroup/cashloanflowboss/api/channel/model/ChannelConfAddModel.java

-package cn.quantgroup.cashloanflowboss.api.channel.model.boss;
+package cn.quantgroup.cashloanflowboss.api.channel.model;
 
 import lombok.Data;
 

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/model/boss/ChannelConfBaseModel.java → src/main/java/cn/quantgroup/cashloanflowboss/api/channel/model/ChannelConfBaseModel.java

-package cn.quantgroup.cashloanflowboss.api.channel.model.boss;
+package cn.quantgroup.cashloanflowboss.api.channel.model;
 
 import lombok.Data;
 

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/model/clf/ChannelConfigurationPage.java

-package cn.quantgroup.cashloanflowboss.api.channel.model.clf;
-
-/**
- * function:
- * date: 2019/8/6
- *
- * @author: suntao
- */
-public class ChannelConfigurationPage {
-}

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.boss.ChannelConf;
-import cn.quantgroup.cashloanflowboss.api.channel.entity.clf.ChannelConfiguration;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ChannelConfiguration;
 import cn.quantgroup.cashloanflowboss.api.channel.repository.boss.ChannelConfRepository;
-import cn.quantgroup.cashloanflowboss.api.channel.repository.clf.ChannelConfigurationRepository;
+import cn.quantgroup.cashloanflowboss.spi.clf.repository.ChannelConfigurationRepository;
 import cn.quantgroup.cashloanflowboss.api.channel.util.ChannelConfUtil;
 import cn.quantgroup.cashloanflowboss.api.user.model.Pagination;
 import cn.quantgroup.cashloanflowboss.core.base.Result;
@@ -35,7 +35,7 @@ public class ChannelConfService {
 
 
 
-    public Page<ChannelConfiguration> getChannelInfo(Pagination pagination, Integer channelId) {
+    public Page<ChannelConfiguration> getChannelInfo(Integer pageNumber, Integer pageSize, Integer channelId) {
 
         Page<ChannelConfiguration> page = this.clfChannelConfigurationRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
 
@@ -51,7 +51,7 @@ public class ChannelConfService {
 
             return criteriaQuery.getRestriction();
 
-        }, new PageRequest(pagination.getPageNumber(), pagination.getPageSize()));
+        }, new PageRequest(pageNumber, pageSize));
 
         return page;
 

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

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

src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/data/ClfDSConfig.java

@@ -20,29 +20,28 @@ import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 @Configuration
-@EntityScan(basePackages = {"cn.quantgroup.cashloanflowboss.api.*.entity.clf"})
 @EnableTransactionManagement
-@EnableJpaRepositories(basePackages = {"cn.quantgroup.cashloanflowboss.api.*.repository.clf"},
+@EnableJpaRepositories(basePackages = {"cn.quantgroup.cashloanflowboss.spi.clf.repository"},
         entityManagerFactoryRef = "clfEntityManager",
         transactionManagerRef = "clfTransactionManager")
 public class ClfDSConfig {
 
-    @Value("${data.boss.url}")
+    @Value("${data.clf.url}")
     private String jdbcUrl;
 
-    @Value("${data.boss.password}")
+    @Value("${data.clf.password}")
     private String password;
 
-    @Value("${data.boss.username}")
+    @Value("${data.clf.username}")
     private String user;
 
-    private String uniquename = "bossDS";
+    private String uniquename = "clfDS";
 
-    @Value("${data.boss.pool-size}")
+    @Value("${data.clf.pool-size}")
     private Integer poolSize;
 
     @Bean(name = "clfDataSource")
-    @ConfigurationProperties(prefix = "data.boss")
+    @ConfigurationProperties(prefix = "data.clf")
     public DataSource createDataSource() {
         DruidDataSource source = DruidDataSourceBuilder.create().build();
         source.setMaxActive(200);
@@ -63,7 +62,7 @@ public class ClfDSConfig {
     public LocalContainerEntityManagerFactoryBean entityManager(EntityManagerFactoryBuilder builder) {
 
         return builder.dataSource(createDataSource())
-                .packages("cn.quantgroup.cashloanflowboss.api.*.entity.clf")
+                .packages("cn.quantgroup.cashloanflowboss.spi.clf.entity")
                 .persistenceUnit(uniquename)
                 .build();
     }

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/entity/clf/ChannelConfiguration.java → src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/entity/ChannelConfiguration.java

-package cn.quantgroup.cashloanflowboss.api.channel.entity.clf;
+package cn.quantgroup.cashloanflowboss.spi.clf.entity;
 
-import cn.quantgroup.cashloanflowboss.api.channel.model.clf.EncType;
+import cn.quantgroup.cashloanflowboss.spi.clf.model.EncType;
 import lombok.Data;
 
 import javax.persistence.*;

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/model/clf/EncType.java → src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/model/EncType.java

-package cn.quantgroup.cashloanflowboss.api.channel.model.clf;
+package cn.quantgroup.cashloanflowboss.spi.clf.model;
 
 /**
  * Created by liqing on 2017/4/26 0026.

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/repository/clf/ChannelConfigurationRepository.java → src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/repository/ChannelConfigurationRepository.java

-package cn.quantgroup.cashloanflowboss.api.channel.repository.clf;
+package cn.quantgroup.cashloanflowboss.spi.clf.repository;
 
 
-import cn.quantgroup.cashloanflowboss.api.channel.entity.clf.ChannelConfiguration;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ChannelConfiguration;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;