Merge branch 'master' into feature/center

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -714,4 +714,17 @@ public class InnerController implements IBaseController {
     }
     return JsonResult.buildSuccessResult(null, new UserRet(user));
   }
+
+  //根据日期时间段查询新注册用户信息并返回
+
+  @RequestMapping("/contract/queryRegisterUsers")
+  @LogHttpCaller
+  public JsonResult findRegisterUserByTime(String beginTime,String endTime) {
+    if (null == beginTime||endTime==null) {
+      return JsonResult.buildErrorStateResult(null, null);
+    }
+    List<User> userList=userService.findRegisterUserByTime(beginTime,endTime);
+    return JsonResult.buildSuccessResult(null, userList);
+  }
+
 }
\ No newline at end of file

src/main/java/cn/quantgroup/xyqb/repository/IUserRepository.java

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.repository;
 import cn.quantgroup.xyqb.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
@@ -18,4 +19,8 @@ public interface IUserRepository extends JpaRepository<User, Long>, JpaSpecifica
   List<User> findByIdIn(List<Long> ids);
 
   User findById(Long id);
+
+  @Query(value ="select * from user where created_at>=?1 and created_at<?2 ", nativeQuery = true)
+  List<User> findRegisterUserByTime(String beginTime,String endTime);
+
 }

src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java

@@ -67,4 +67,6 @@ public interface IUserService {
                           String district,
                           String address,
                           String contacts);
+
+  List<User> findRegisterUserByTime(String beginTime,String endTime);
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -369,6 +369,11 @@ public class UserServiceImpl implements IUserService {
     return user;
   }
 
+  @Override
+  public List<User> findRegisterUserByTime(String beginTime, String endTime) {
+    return userRepository.findRegisterUserByTime(beginTime,endTime);
+  }
+
   /**
      *
      * @param userId

src/main/resources/config/dev/xyqb.properties

@@ -3,7 +3,7 @@ configserver.disable=1
 configserver.system=xyqb-user
 
 #xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.22:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
-xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.26:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
+xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.155:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
 
 xyqb.data.mysql.password=qatest
 
@@ -17,7 +17,7 @@ xyqb.filter.allowedHeaders=Origin, No-Cache, x-auth-token, X-Requested-With, If-
 xyqb.data.redis.defaultExpiration=3600
 
 # redis
-xyqb.redis.master.host=192.168.4.22
+xyqb.redis.master.host=192.168.4.155
 xyqb.redis.master.port=6379
 xyqb.redis.master.name=
 xyqb.redis.sentinel1.host=
@@ -90,9 +90,9 @@ motan.application=xyqbUserMotan
 #xyqb-user-域名
 xyqb.user.domain=passport.xyqb.com
 xyqb.user.query.url=http://192.168.11.40:8081
-xyqb.domain = http://192.168.4.153:7003
+xyqb.domain = http://192.168.4.155:7003
 
-xyqb.paycenter.url=http://192.168.4.26:7006
+xyqb.paycenter.url=http://192.168.4.155:7006
 xyqb.paycenter.id=3
 #内部运营系统
 xyqb.yunying.url=http://192.168.4.50:7047
@@ -101,7 +101,7 @@ loanvest.rabbitmq.connection.virtual-host=/loan_order
 #loanvest.rabbitmq.stateMsgQueue=loan_vest_msg_queue
 loanvest.rabbitmq.queue=loan_user_queue
 loanvest.rabbitmq.exchange=loan_vest_exchange
-loanvest.rabbitmq.connection.host=192.168.4.153
+loanvest.rabbitmq.connection.host=192.168.4.155
 loanvest.rabbitmq.connection.port=5672
 loanvest.rabbitmq.connection.user=qa
 loanvest.rabbitmq.connection.password=qatest