From 4e279e136b3090137834712d7af81229831cead4 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Wed, 17 Mar 2021 18:20:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B7=E5=90=8E=E7=AE=A1=E7=90=86=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../financial/crms/config/IPageConfig.java | 26 ++---
.../src/main/resources/bootstrap.properties | 87 +++++++--------
.../controller/AlCollectionController.java | 20 ++++
.../controller/AlInsuranceListController.java | 20 ++++
.../AlRepaymentEntryController.java | 20 ++++
.../guarantee/mapper/AlCollectionMapper.java | 18 ++++
.../mapper/AlInsuranceListMapper.java | 18 ++++
.../mapper/AlRepaymentEntryMapper.java | 18 ++++
.../service/IAlCollectionService.java | 17 +++
.../service/IAlInsuranceListService.java | 17 +++
.../service/IAlRepaymentEntryService.java | 17 +++
.../service/impl/AlCollectionServiceImpl.java | 20 ++++
.../impl/AlInsuranceListServiceImpl.java | 20 ++++
.../impl/AlRepaymentEntryServiceImpl.java | 20 ++++
.../util/MyBatisPlusCodeGenerator.java | 2 +-
.../src/main/resources/bootstrap.properties | 87 +++++++--------
.../mapper/guarantee/AlCollectionMapper.xml | 15 +++
.../guarantee/AlInsuranceListMapper.xml | 24 +++++
.../guarantee/AlRepaymentEntryMapper.xml | 23 ++++
.../HrmsAccessRecordsLogController.java | 4 +-
.../controller/UserLoginController.java | 8 +-
.../hrauth/feign/HrmsFeignService.java | 4 +-
.../src/main/resources/bootstrap.properties | 91 ++++++++--------
.../mapper/hrauth/SystemLogMapper.xml | 2 +-
.../src/main/resources/bootstrap.properties | 91 ++++++++--------
.../resources/mapper/hrms/EmployeeDao.xml | 2 +-
dq-framework-common/pom.xml | 1 +
.../domain/guarantee/AlCollection.java | 55 ++++++++++
.../domain/guarantee/AlInsuranceList.java | 101 ++++++++++++++++++
.../domain/guarantee/AlRepaymentEntry.java | 96 +++++++++++++++++
.../src/main/resources/bootstrap.properties | 71 ++++++------
31 files changed, 782 insertions(+), 233 deletions(-)
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlCollectionController.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlInsuranceListController.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlCollectionMapper.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlInsuranceListMapper.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlCollectionService.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlInsuranceListService.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlRepaymentEntryService.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java
create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java
create mode 100644 dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml
create mode 100644 dq-financial-guarantee/src/main/resources/mapper/guarantee/AlInsuranceListMapper.xml
create mode 100644 dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml
create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlCollection.java
create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlInsuranceList.java
create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlRepaymentEntry.java
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java
index 6001a7e0..a48778d6 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java
@@ -1,13 +1,13 @@
-package com.daqing.financial.crms.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class IPageConfig {
- @Bean
- public PaginationInterceptor paginationInterceptor() {
- return new PaginationInterceptor();
- }
-}
+//package com.daqing.financial.crms.config;
+//
+//import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//@Configuration
+//public class IPageConfig {
+// @Bean
+// public PaginationInterceptor paginationInterceptor() {
+// return new PaginationInterceptor();
+// }
+//}
diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties
index 33940124..f255f463 100644
--- a/dq-financial-crms/src/main/resources/bootstrap.properties
+++ b/dq-financial-crms/src/main/resources/bootstrap.properties
@@ -1,20 +1,20 @@
#服务名称
-#spring.application.name=dq-financial-crms
-##配置中心地址
-#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-#spring.cloud.nacos.config.file-extension=yml
-##redis配置
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
-##本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.application.name=dq-financial-crms
+#配置中心地址
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.file-extension=yml
+#redis配置
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
+#本地测试环境
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -26,33 +26,34 @@
ribbon.ReadTimeout: 120000
#请求连接的超时时间
ribbon.ConnectTimeout: 120000
+ribbon.eureka.enabled=true
# 正式环境（prod）
#服务名称
-spring.application.name=dq-financial-crms
-##配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
-#spring.cloud.nacos.config.group=prod
-
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
-spring.cloud.nacos.config.ext-config[1].refresh=true
-
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
-spring.cloud.nacos.config.ext-config[2].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=dq123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
+#spring.application.name=dq-financial-crms
+###配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlCollectionController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlCollectionController.java
new file mode 100644
index 00000000..20cdc983
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlCollectionController.java
@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 保后催收 前端控制器
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@RestController
+@RequestMapping("/al-collection")
+public class AlCollectionController {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlInsuranceListController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlInsuranceListController.java
new file mode 100644
index 00000000..f9106d7b
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlInsuranceListController.java
@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 保后管理列表 前端控制器
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@RestController
+@RequestMapping("/al-insurance-list")
+public class AlInsuranceListController {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java
new file mode 100644
index 00000000..379edfab
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java
@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 还款记录表 前端控制器
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@RestController
+@RequestMapping("/al-repayment-entry")
+public class AlRepaymentEntryController {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlCollectionMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlCollectionMapper.java
new file mode 100644
index 00000000..2e3fc555
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlCollectionMapper.java
@@ -0,0 +1,18 @@
+package com.daqing.financial.guarantee.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.guarantee.AlCollection;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ * 保后催收 Mapper 接口
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Mapper
+public interface AlCollectionMapper extends BaseMapper {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlInsuranceListMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlInsuranceListMapper.java
new file mode 100644
index 00000000..81fadea5
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlInsuranceListMapper.java
@@ -0,0 +1,18 @@
+package com.daqing.financial.guarantee.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.guarantee.AlInsuranceList;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ * 保后管理列表 Mapper 接口
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Mapper
+public interface AlInsuranceListMapper extends BaseMapper {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java
new file mode 100644
index 00000000..9bb15b63
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java
@@ -0,0 +1,18 @@
+package com.daqing.financial.guarantee.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.guarantee.AlRepaymentEntry;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ * 还款记录表 Mapper 接口
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Mapper
+public interface AlRepaymentEntryMapper extends BaseMapper {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlCollectionService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlCollectionService.java
new file mode 100644
index 00000000..cfe2c96b
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlCollectionService.java
@@ -0,0 +1,17 @@
+package com.daqing.financial.guarantee.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.guarantee.AlCollection;
+
+/**
+ *
+ * 保后催收 服务类
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+public interface IAlCollectionService extends IService {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlInsuranceListService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlInsuranceListService.java
new file mode 100644
index 00000000..765217e2
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlInsuranceListService.java
@@ -0,0 +1,17 @@
+package com.daqing.financial.guarantee.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.guarantee.AlInsuranceList;
+
+/**
+ *
+ * 保后管理列表 服务类
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+public interface IAlInsuranceListService extends IService {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlRepaymentEntryService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlRepaymentEntryService.java
new file mode 100644
index 00000000..24d5b232
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlRepaymentEntryService.java
@@ -0,0 +1,17 @@
+package com.daqing.financial.guarantee.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.guarantee.AlRepaymentEntry;
+
+/**
+ *
+ * 还款记录表 服务类
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+public interface IAlRepaymentEntryService extends IService {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java
new file mode 100644
index 00000000..15688dcc
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java
@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.mapper.AlCollectionMapper;
+import com.daqing.financial.guarantee.service.IAlCollectionService;
+import com.daqing.framework.domain.guarantee.AlCollection;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 保后催收 服务实现类
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Service
+public class AlCollectionServiceImpl extends ServiceImpl implements IAlCollectionService {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java
new file mode 100644
index 00000000..3cbf289a
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlInsuranceListServiceImpl.java
@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.mapper.AlInsuranceListMapper;
+import com.daqing.financial.guarantee.service.IAlInsuranceListService;
+import com.daqing.framework.domain.guarantee.AlInsuranceList;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 保后管理列表 服务实现类
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Service
+public class AlInsuranceListServiceImpl extends ServiceImpl implements IAlInsuranceListService {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java
new file mode 100644
index 00000000..04bd8f3e
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java
@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.mapper.AlRepaymentEntryMapper;
+import com.daqing.financial.guarantee.service.IAlRepaymentEntryService;
+import com.daqing.framework.domain.guarantee.AlRepaymentEntry;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 还款记录表 服务实现类
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Service
+public class AlRepaymentEntryServiceImpl extends ServiceImpl implements IAlRepaymentEntryService {
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java
index 1e7baa11..19df16bf 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java
@@ -25,7 +25,7 @@ public class MyBatisPlusCodeGenerator {
public static final String PACKAGE_NAME = "com.daqing.financial.guarantee";
public static void main(String[] args) {
- String[] tables = new String[] {"dg_customer_related"};//表名数组
+ String[] tables = new String[] {"al_collection","al_insurance_list","al_repayment_entry"};//表名数组
String[] tablePrefixs = new String[] {""};//去掉前缀
executeCode(PACKAGE_NAME,tables,tablePrefixs);
}
diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties
index 3aaeaf32..b9faae67 100644
--- a/dq-financial-guarantee/src/main/resources/bootstrap.properties
+++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties
@@ -1,21 +1,21 @@
#服务名称
-#spring.application.name=dq-financial-guarantee
-##配置中心地址
-#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-#spring.cloud.nacos.config.file-extension=yml
-##redis配置
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
-#
-##本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.application.name=dq-financial-guarantee
+#配置中心地址
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.file-extension=yml
+#redis配置
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
+
+#本地测试环境
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -27,6 +27,7 @@
ribbon.ReadTimeout: 120000
#请求连接的超时时间
ribbon.ConnectTimeout: 120000
+ribbon.eureka.enabled=true
# 上传文件总的最大值
@@ -36,29 +37,29 @@ spring.servlet.multipart.max-file-size=10MB
#
##正式环境（prod）
##服务名称
-spring.application.name=dq-financial-guarantee
-#配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
-
-spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
-spring.cloud.nacos.config.ext-config[1].refresh=true
-
-spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
-spring.cloud.nacos.config.ext-config[2].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=dq123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+#spring.application.name=dq-financial-guarantee
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml
new file mode 100644
index 00000000..a1859e41
--- /dev/null
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlInsuranceListMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlInsuranceListMapper.xml
new file mode 100644
index 00000000..a510e939
--- /dev/null
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlInsuranceListMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml
new file mode 100644
index 00000000..25e76d13
--- /dev/null
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/HrmsAccessRecordsLogController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/HrmsAccessRecordsLogController.java
index 719d7ceb..87619988 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/HrmsAccessRecordsLogController.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/HrmsAccessRecordsLogController.java
@@ -37,7 +37,7 @@ public class HrmsAccessRecordsLogController {
* @param
* @return
*/
- @Scheduled(cron ="0 */5 * * * ?")
+ //@Scheduled(cron ="0 */5 * * * ?")
@GetMapping("/queryAccessRecords")
public ResponseResult queryAccessRecords() {
List list = iHrmsAccessRecordsLogService.queryAccessRecords();
@@ -48,7 +48,7 @@ public class HrmsAccessRecordsLogController {
* 访问次数
* @return
*/
- @Scheduled(cron ="0 */5 * * * ?")
+ //@Scheduled(cron ="0 */5 * * * ?")
@GetMapping("/queryVisitNum")
public ResponseResult queryVisitNum() {
Map map = iHrmsAccessRecordsLogService.queryVisitNum();
diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
index d6389cb7..591df6c9 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
@@ -70,7 +70,7 @@ public class UserLoginController implements UserLoginControllerApi {
return ResponseResult.SUCCESS(result);
}
- @Log(detail = "重置密码",level = 2,operationUnit = OperationUnit.LOGIN,operationType = OperationType.UPDATE)
+ //@Log(detail = "重置密码",level = 2,operationUnit = OperationUnit.LOGIN,operationType = OperationType.UPDATE)
@PostMapping("/getBackPwd")
@ApiOperation(value = "重置密码")
public ResponseResult getBackPwd(@RequestBody @Valid ResetPwdRequest user){
@@ -78,7 +78,7 @@ public class UserLoginController implements UserLoginControllerApi {
return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
}
- @Log(detail = "用户登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
+// @Log(detail = "用户登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
@PostMapping(value = "/login")
@ApiOperation(value = "用户登录")
/*@SysLog(MODULE = "登录日志", REMARK = "登录日志")*/
@@ -122,7 +122,7 @@ public class UserLoginController implements UserLoginControllerApi {
* @param response
* @throws IOException
*/
- @Log(detail = "微信扫码登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
+// @Log(detail = "微信扫码登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
@GetMapping("/user/callback")
public void wechatUserCallback(@RequestParam(value = "code",required = true) String code,
String state, HttpServletResponse response) throws IOException {
@@ -210,7 +210,7 @@ public class UserLoginController implements UserLoginControllerApi {
* @param
* @return
*/
- @Log(detail = "微信小程序授权登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
+// @Log(detail = "微信小程序授权登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
@PostMapping(value = "/wxAuthLogin")
public ResponseResult wxAuthLogin(@RequestBody XccLoginReq xccLoginReq){
diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java
index 01fb369c..e0d352e5 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java
@@ -15,7 +15,7 @@ import java.util.List;
* 这是一个声明式的远程调用
*/
@Component
-@FeignClient(name="dq-financial-hrms", value = "dq-financial-hrms",contextId = "hrms")
+@FeignClient(name="dq-financial-hrms",contextId = "hrms")
public interface HrmsFeignService {
@RequestMapping(method = RequestMethod.GET, value = "/hrms/employee/getEmployeeByUserId")
@@ -33,6 +33,6 @@ public interface HrmsFeignService {
@PostMapping("hrms/employee/getAccountAndDeptNameById")
ResponseResult getAccountAndDeptNameById(@RequestBody List ids);
- @PostMapping("hrms/employee/getEmpmsgById")
+ @GetMapping("hrms/employee/getEmpmsgById")
EmployeeEntity getEmpmsgById(@RequestParam("id") Long id);
}
diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties
index 0023cf7a..a0715411 100644
--- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties
+++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties
@@ -1,21 +1,21 @@
#服务名称
-#spring.application.name=dq-financial-hrms-auth
-##配置中心地址
-#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-#spring.cloud.nacos.config.file-extension=yml
-##redis配置
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
-#
-##本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.application.name=dq-financial-hrms-auth
+#配置中心地址
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.file-extension=yml
+#redis配置
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
+
+#本地测试环境
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -27,33 +27,36 @@
ribbon.ReadTimeout: 120000
#请求连接的超时时间
ribbon.ConnectTimeout: 30000
+#ribbon.eureka.enabled: true
+#eureka.client.fetch-registry: false
+#feign.hystrix.enabled=true
#正式环境（prod）
-spring.application.name=dq-financial-hrms-auth
-
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
-#spring.cloud.nacos.config.group=prod
-
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
-spring.cloud.nacos.config.ext-config[1].refresh=true
-
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
-spring.cloud.nacos.config.ext-config[2].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=dq123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
+#spring.application.name=dq-financial-hrms-auth
+#
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/SystemLogMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/SystemLogMapper.xml
index 9e22f325..28860264 100644
--- a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/SystemLogMapper.xml
+++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/SystemLogMapper.xml
@@ -22,7 +22,7 @@
AND create_time <= #{sysLog.endTime}
- order by create_time desc limit 1000
+ order by create_time desc
\ No newline at end of file
diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties
index 9f312e40..71d08eb4 100644
--- a/dq-financial-hrms/src/main/resources/bootstrap.properties
+++ b/dq-financial-hrms/src/main/resources/bootstrap.properties
@@ -1,21 +1,21 @@
#服务名称
-#spring.application.name=dq-financial-hrms
-##配置中心地址
-#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-#spring.cloud.nacos.config.file-extension=yml
-##redis配置
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
-#
-##本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.application.name=dq-financial-hrms
+#配置中心地址
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.file-extension=yml
+#redis配置
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
+
+#本地测试环境
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -27,36 +27,39 @@
ribbon.ReadTimeout: 120000
#请求连接的超时时间
ribbon.ConnectTimeout: 30000
+#ribbon.eureka.enabled: true
+#eureka.client.fetch-registry: false
+#feign.hystrix.enabled=true
spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB
# 正式环境（prod）
#服务名称
-spring.application.name=dq-financial-hrms
-#配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
-#spring.cloud.nacos.config.group=prod
-
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
-spring.cloud.nacos.config.ext-config[1].refresh=true
-
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
-spring.cloud.nacos.config.ext-config[2].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=dq123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
+#spring.application.name=dq-financial-hrms
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml
index 3441870b..5955daf0 100644
--- a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml
+++ b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml
@@ -641,7 +641,7 @@
LEFT JOIN hrms_user u
ON e.user_id = u.id
WHERE u.del_or_not = 0
- AND e.id = #{id}
+ AND e.user_id = #{id}
\ No newline at end of file
diff --git a/dq-framework-common/pom.xml b/dq-framework-common/pom.xml
index 32fa48b4..1beede66 100644
--- a/dq-framework-common/pom.xml
+++ b/dq-framework-common/pom.xml
@@ -111,6 +111,7 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
+ 2.1.2.RELEASE
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlCollection.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlCollection.java
new file mode 100644
index 00000000..0c5b7e1c
--- /dev/null
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlCollection.java
@@ -0,0 +1,55 @@
+package com.daqing.framework.domain.guarantee;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 保后催收
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Data
+@TableName("al_collection")
+public class AlCollection implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 保后主键id
+ */
+ private Integer insuranceId;
+
+ /**
+ * 催收方式：1->电话催收；2->上门/外访；
+ */
+ private Integer collectionMethod;
+
+ /**
+ * 催收时间
+ */
+ private Date collectionTime;
+
+ /**
+ * 催收反馈
+ */
+ private String collectionFeedback;
+
+ /**
+ * 附件
+ */
+ private String enclosureFile;
+}
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlInsuranceList.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlInsuranceList.java
new file mode 100644
index 00000000..e4526b71
--- /dev/null
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlInsuranceList.java
@@ -0,0 +1,101 @@
+package com.daqing.framework.domain.guarantee;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * 保后管理列表
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Data
+@TableName("al_insurance_list")
+public class AlInsuranceList implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 业务编号
+ */
+ private String businessCode;
+
+ /**
+ * 客户名称
+ */
+ private String customerName;
+
+ /**
+ * 联系电话
+ */
+ private String phone;
+
+ /**
+ * 业务类别
+ */
+ private String businessType;
+
+ /**
+ * 担保额度（元）
+ */
+ private BigDecimal guaranteeAmount;
+
+ /**
+ * 担保期限
+ */
+ private String guaranteeTime;
+
+ /**
+ * 申请日期
+ */
+ private Date applyTime;
+
+ /**
+ * 还款额度（元）
+ */
+ private BigDecimal repaymentAmount;
+
+ /**
+ * 剩余额度（元）
+ */
+ private BigDecimal remainAmount;
+
+ /**
+ * 还款期数
+ */
+ private String repaymentTime;
+
+ /**
+ * 所属部门
+ */
+ private String department;
+
+ /**
+ * 还款状态：1->还款中；2->已逾期；3->已还清；4->已结项；
+ */
+ private Integer paymentStatus;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+}
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlRepaymentEntry.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlRepaymentEntry.java
new file mode 100644
index 00000000..f5a79e9b
--- /dev/null
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/AlRepaymentEntry.java
@@ -0,0 +1,96 @@
+package com.daqing.framework.domain.guarantee;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * 还款记录表
+ *
+ *
+ * @author Qyq
+ * @since 2021-03-17
+ */
+@Data
+@TableName("al_repayment_entry")
+public class AlRepaymentEntry implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 保后外键id
+ */
+ private Integer insuranceId;
+
+ /**
+ * 应还款日
+ */
+ private Date repaymentDate;
+
+ /**
+ * 实际还款日
+ */
+ private Date actualRepaymentDate;
+
+ /**
+ * 逾期天数
+ */
+ private String overdueDays;
+
+ /**
+ * 还款总额（元）
+ */
+ private BigDecimal totalRepayment;
+
+ /**
+ * 本次还款（元）
+ */
+ private BigDecimal currentRepayment;
+
+ /**
+ * 利息（元）
+ */
+ private BigDecimal interest;
+
+ /**
+ * 其他费用（元）
+ */
+ private BigDecimal otherExpenses;
+
+ /**
+ * 减免金额（元）
+ */
+ private BigDecimal deductionAmount;
+
+ /**
+ * 还款备注
+ */
+ private String repaymentNotes;
+
+ /**
+ * 还款状态：1->待还款；2->已还款；3->已逾期；4->未到期；
+ */
+ private Integer repaymentStatus;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+}
diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties
index b5825ded..b071353a 100644
--- a/dq-govern-gateway/src/main/resources/bootstrap.properties
+++ b/dq-govern-gateway/src/main/resources/bootstrap.properties
@@ -1,21 +1,21 @@
#服务名称
-#spring.application.name=dq-govern-gateway
-##配置中心地址
-#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-#spring.cloud.nacos.config.file-extension=yml
-##redis配置
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
-#
-##本地测试环境
-#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
+spring.application.name=dq-govern-gateway
+#配置中心地址
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.file-extension=yml
+#redis配置
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.database=0
+spring.redis.timeout=30000
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
+
+#本地测试环境
+spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
@@ -23,26 +23,27 @@
#线上生产环境
#spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406
+ribbon.eureka.enabled=true
spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB
# 正式环境（prod）
#服务名称
-spring.application.name=dq-govern-gateway
-#配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
-
-spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=dq123456
-spring.redis.database=0
-spring.redis.timeout=30000
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
+#spring.application.name=dq-govern-gateway
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
\ No newline at end of file