From ccfe65392a86f04f1d4a0d8b994d5b9a5ce3eba9 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Fri, 25 Dec 2020 10:41:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9maven=E8=81=9A=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dq_financial_crms_Web_exploded.xml | 13 ++ .idea/compiler.xml | 4 + .idea/encodings.xml | 4 + .idea/sqldialects.xml | 1 + dq-financial-api/pom.xml | 22 ++-- .../financial/DqFinancialApiApplication.java | 13 -- .../financial/config/SwaggerConfig.java | 2 - .../hrms/PermissionControllerApi.java | 1 - dq-financial-crms/pom.xml | 42 +++---- .../crms/DqFinancialCrmsApplication.java | 5 +- .../financial/crms/config/IPageConfig.java | 2 - .../src/main/resources/bootstrap.properties | 72 +++++------ dq-financial-guarantee/pom.xml | 26 +--- .../src/main/resources/bootstrap.properties | 66 +++++----- dq-financial-hrms-auth/pom.xml | 11 +- .../financial/hrauth/config/IPageConfig.java | 14 +-- .../src/main/resources/bootstrap.properties | 66 +++++----- dq-financial-hrms/pom.xml | 7 +- .../hrms/DqFinancialHrmsApplication.java | 1 + .../hrms/service/impl/DeptServiceImpl.java | 4 +- .../service/impl/PermissionServiceImpl.java | 83 +------------ .../src/main/resources/bootstrap.properties | 106 ++++++++-------- dq-framework-common/pom.xml | 48 +++----- dq-framework-model/pom.xml | 21 +++- dq-framework-utils/pom.xml | 36 ++---- dq-govern-gateway/pom.xml | 31 +---- .../src/main/resources/bootstrap.properties | 56 ++++----- financial.ipr | 116 ++++++++++++++++++ pom.xml | 48 +++++++- 29 files changed, 473 insertions(+), 448 deletions(-) create mode 100644 .idea/artifacts/dq_financial_crms_Web_exploded.xml delete mode 100644 dq-financial-api/src/main/java/com/daqing/financial/DqFinancialApiApplication.java create mode 100644 financial.ipr diff --git a/.idea/artifacts/dq_financial_crms_Web_exploded.xml b/.idea/artifacts/dq_financial_crms_Web_exploded.xml new file mode 100644 index 00000000..24037e04 --- /dev/null +++ b/.idea/artifacts/dq_financial_crms_Web_exploded.xml @@ -0,0 +1,13 @@ + + + $PROJECT_DIR$/out/artifacts/dq_financial_crms_Web_exploded + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 13d90be3..89d5c3e1 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -25,12 +25,16 @@ diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 7f97a975..8703e7ad 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,7 @@ + @@ -12,6 +13,9 @@ + + + diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml index 7f3f3332..ebb0ac7a 100644 --- a/.idea/sqldialects.xml +++ b/.idea/sqldialects.xml @@ -1,6 +1,7 @@ + diff --git a/dq-financial-api/pom.xml b/dq-financial-api/pom.xml index 90eb2948..8dd178b0 100644 --- a/dq-financial-api/pom.xml +++ b/dq-financial-api/pom.xml @@ -9,10 +9,9 @@ 4.0.0 - com.daqing.financial dq-financial-api - 系统API统一定义 + 系统API统一定义api @@ -27,12 +26,19 @@ spring-boot-starter-web 2.1.8.RELEASE - + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + \ No newline at end of file diff --git a/dq-financial-api/src/main/java/com/daqing/financial/DqFinancialApiApplication.java b/dq-financial-api/src/main/java/com/daqing/financial/DqFinancialApiApplication.java deleted file mode 100644 index 96efe364..00000000 --- a/dq-financial-api/src/main/java/com/daqing/financial/DqFinancialApiApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.daqing.financial; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -@SpringBootApplication -@EnableSwagger2 -public class DqFinancialApiApplication { - public static void main(String[] args) { - SpringApplication.run(DqFinancialApiApplication.class, args); - } -} diff --git a/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java b/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java index eb8759e3..1994fbf3 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java @@ -19,8 +19,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; */ @Configuration @EnableSwagger2 -//@Profile({"dev","test"}) -//@ConditionalOnProperty(name = "swagger.enable", havingValue = "true") public class SwaggerConfig { @Bean diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/PermissionControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/PermissionControllerApi.java index b77513a7..19835153 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/PermissionControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/PermissionControllerApi.java @@ -1,7 +1,6 @@ package com.daqing.financial.hrms; import com.daqing.framework.domain.hrms.PermissionEntity; -import com.daqing.framework.domain.hrms.request.DeptAddRequest; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-crms/pom.xml b/dq-financial-crms/pom.xml index f6f86562..54f97d16 100644 --- a/dq-financial-crms/pom.xml +++ b/dq-financial-crms/pom.xml @@ -3,16 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.1.8.RELEASE - + financial + com.daqing.financial + 0.0.1-SNAPSHOT - com.daqing.financial dq-financial-crms 0.0.1-SNAPSHOT - dq-financial-crms - 大庆智慧金融平台-客户资源管理服务 + 客户资源管理服务crms 1.8 @@ -82,25 +79,16 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - + + + + + + + + + + + diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/DqFinancialCrmsApplication.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/DqFinancialCrmsApplication.java index 73319226..1cae2ee9 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/DqFinancialCrmsApplication.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/DqFinancialCrmsApplication.java @@ -1,18 +1,15 @@ package com.daqing.financial.crms; -import com.daqing.financial.hrauth.config.SecurityConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Import; @EnableFeignClients(basePackages = "com.daqing.financial.crms.feign") @EnableDiscoveryClient @SpringBootApplication -@ComponentScan(basePackages = "com.daqing") -@Import({SecurityConfig.class}) +@ComponentScan("com.daqing") public class DqFinancialCrmsApplication { public static void main(String[] args) { 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 243e1e84..6001a7e0 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,4 +1,3 @@ -/* package com.daqing.financial.crms.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; @@ -12,4 +11,3 @@ public class IPageConfig { return new PaginationInterceptor(); } } -*/ diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index da7762ac..cea72869 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -33,43 +33,12 @@ ribbon.ReadTimeout: 120000 #请求连接的超时时间 ribbon.ConnectTimeout: 120000 -# 正式环境（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 - - # 正式环境（prod） #服务名称 spring.application.name=dq-financial-crms -#配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -spring.cloud.nacos.config.namespace=1912aa66-6e18-4680-8943-5b8fae71414c +##配置中心地址 +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 @@ -86,10 +55,41 @@ spring.cloud.nacos.config.ext-config[2].refresh=true spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password= +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.redis.jedis.pool.min-idle=0 + + +# 测试环境（prod） +#服务名称 +#spring.application.name=dq-financial-crms +##配置中心地址 +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=1912aa66-6e18-4680-8943-5b8fae71414c +##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= +#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/pom.xml b/dq-financial-guarantee/pom.xml index 7c224442..f1b79431 100644 --- a/dq-financial-guarantee/pom.xml +++ b/dq-financial-guarantee/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.1.8.RELEASE - + financial + com.daqing.financial + 0.0.1-SNAPSHOT + com.daqing.financial.guarantee dq-financial-guarantee 0.0.1-SNAPSHOT - dq-financial-guarantee - 大庆智慧金融平台-担保业务管理系统 + 担保业务管理系统guarantee 1.8 @@ -64,12 +63,6 @@ 1.8.2 - - org.freemarker freemarker @@ -95,13 +88,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index 6fbec6b0..9d1d841d 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -41,40 +41,10 @@ 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 - - -#测试服务器环境（prod） -#服务名称 spring.application.name=dq-financial-guarantee #配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -spring.cloud.nacos.config.namespace=66fce8ff-5ca8-412d-bc06-b8730fa65869 +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 @@ -90,10 +60,40 @@ spring.cloud.nacos.config.ext-config[2].refresh=true spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password= +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 + + +#测试服务器环境（prod） +#服务名称 +#spring.application.name=dq-financial-guarantee +##配置中心地址 +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=66fce8ff-5ca8-412d-bc06-b8730fa65869 +# +#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= +#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-hrms-auth/pom.xml b/dq-financial-hrms-auth/pom.xml index 4ca343e4..2141a878 100644 --- a/dq-financial-hrms-auth/pom.xml +++ b/dq-financial-hrms-auth/pom.xml @@ -3,16 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.1.8.RELEASE - + financial + com.daqing.financial + 0.0.1-SNAPSHOT - com.daqing.financial dq-financial-hrms-auth 0.0.1-SNAPSHOT - dq-financial-hrms-auth - 大庆智慧金融平台-人资用户认证服务 + 人资用户认证服务hrms-auth 1.8 diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/IPageConfig.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/IPageConfig.java index c8772bed..22645e30 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/IPageConfig.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/IPageConfig.java @@ -4,10 +4,10 @@ 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(); - } -} +// @Configuration +// public class IPageConfig { +// @Bean +// public PaginationInterceptor paginationInterceptor() { +// return new PaginationInterceptor(); +// } +// } diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index c13b1dd2..e8c43ed5 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -28,40 +28,11 @@ #spring.redis.jedis.pool.min-idle=0 -#正式环境（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 - #正式环境（prod） spring.application.name=dq-financial-hrms-auth -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -spring.cloud.nacos.config.namespace=d4e087eb-2a9b-4ef1-9f22-76269a30d081 +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 @@ -78,10 +49,39 @@ spring.cloud.nacos.config.ext-config[2].refresh=true spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password= +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.redis.jedis.pool.min-idle=0 + +#测试环境（prod） +#spring.application.name=dq-financial-hrms-auth +# +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=d4e087eb-2a9b-4ef1-9f22-76269a30d081 +##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= +#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/pom.xml b/dq-financial-hrms/pom.xml index 050c3081..5b50f8e2 100644 --- a/dq-financial-hrms/pom.xml +++ b/dq-financial-hrms/pom.xml @@ -11,8 +11,7 @@ com.daqing.financial dq-financial-hrms 0.0.1-SNAPSHOT - dq-financial-hrms - 大庆智慧金融平台-人力资源管理服务 + 人力资源管理服务hrms 1.8 @@ -39,12 +38,12 @@ ooxml-schemas 1.0 - + - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - + 微服务公共的依赖common + + financial + com.daqing.financial + 0.0.1-SNAPSHOT + @@ -118,13 +101,6 @@ spring-cloud-starter-alibaba-nacos-config - - - com.alibaba @@ -166,4 +142,16 @@ + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + \ No newline at end of file diff --git a/dq-framework-model/pom.xml b/dq-framework-model/pom.xml index ab582637..7067609d 100644 --- a/dq-framework-model/pom.xml +++ b/dq-framework-model/pom.xml @@ -6,9 +6,14 @@ com.daqing.framework dq-framework-model - 1.0-SNAPSHOT - 统一管理项目涉及到的实体类 + + financial + com.daqing.financial + 0.0.1-SNAPSHOT + + + 统一管理实体类model @@ -22,4 +27,16 @@ 0.0.1-SNAPSHOT + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + \ No newline at end of file diff --git a/dq-framework-utils/pom.xml b/dq-framework-utils/pom.xml index 61db1364..06949335 100644 --- a/dq-framework-utils/pom.xml +++ b/dq-framework-utils/pom.xml @@ -11,30 +11,8 @@ com.daqing.framework dq-framework-utils + 系统通用的工具类utils - 系统通用的工具类 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - - @@ -75,4 +53,16 @@ compile + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + \ No newline at end of file diff --git a/dq-govern-gateway/pom.xml b/dq-govern-gateway/pom.xml index f6b16892..f0137c74 100644 --- a/dq-govern-gateway/pom.xml +++ b/dq-govern-gateway/pom.xml @@ -11,8 +11,7 @@ com.daqing.financial dq-govern-gateway 0.0.1-SNAPSHOT - dq-govern-gateway - 大庆智慧金融平台-网关服务 + 网关服务gateway 1.8 @@ -26,37 +25,11 @@ dq-framework-common 1.0-SNAPSHOT + org.springframework.cloud spring-cloud-starter-gateway - - - - diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index e36fc0db..dcfd86f6 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -20,34 +20,10 @@ # 正式环境（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 -# -#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=127.0.0.1:8848 -spring.cloud.nacos.config.namespace=8a913b60-2335-4657-9048-7392c8d0899f +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 @@ -55,7 +31,7 @@ spring.cloud.nacos.config.ext-config[0].refresh=true spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password= +spring.redis.password=dq123456 spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 @@ -64,4 +40,28 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 spring.servlet.multipart.max-file-size=10MB -spring.servlet.multipart.max-request-size=10MB \ No newline at end of file +spring.servlet.multipart.max-request-size=10MB + +# 测试环境（prod） +#服务名称 +#spring.application.name=dq-govern-gateway +##配置中心地址 +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=8a913b60-2335-4657-9048-7392c8d0899f +# +#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= +#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.servlet.multipart.max-file-size=10MB +#spring.servlet.multipart.max-request-size=10MB \ No newline at end of file diff --git a/financial.ipr b/financial.ipr new file mode 100644 index 00000000..08ee6aba --- /dev/null +++ b/financial.ipr @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index a1662b25..4ea03339 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,27 @@ + + + org.springframework.boot + spring-boot-starter-parent + 2.1.8.RELEASE + + + 4.0.0 com.daqing.financial financial 0.0.1-SNAPSHOT - financial - 聚合服务 + 大庆智慧金融平台 pom + + + 1.8 + UTF-8 + + dq-framework-common dq-framework-model @@ -17,8 +30,35 @@ dq-financial-hrms dq-financial-hrms-auth dq-financial-crms - dq-govern-gateway - dq-financial-guarantee + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + From 71b16579c06b9e146ac35714d2f4272cad1ad288 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 25 Dec 2020 11:06:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial/hrms/service/impl/PermissionServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.java index 99cd6d39..aaec3513 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.java @@ -82,7 +82,6 @@ public class PermissionServiceImpl extends ServiceImpl permissionList = new ArrayList(); - List employeeMessage = null; if(responseResult.getData() != null){ employeeMessage = (List) responseResult.getData(); From 34081b29dfa4cd4893e8822da099c5eeb539a68d Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Fri, 25 Dec 2020 15:54:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dq-financial-guarantee/pom.xml | 9 +- ...gGuaranteeLetterAssignUserServiceImpl.java | 24 ++--- .../service/impl/DgLoanNoticeServiceImpl.java | 4 +- ...aymentConfirmationConsiderServiceImpl.java | 12 +-- .../guarantee/util/AuditProcessUtil.java | 5 +- .../src/main/resources/bootstrap.properties | 98 +++++++++---------- .../domain/guarantee/DgAuditProcess.java | 5 +- 7 files changed, 83 insertions(+), 74 deletions(-) diff --git a/dq-financial-guarantee/pom.xml b/dq-financial-guarantee/pom.xml index f1b79431..8b487c7b 100644 --- a/dq-financial-guarantee/pom.xml +++ b/dq-financial-guarantee/pom.xml @@ -34,14 +34,13 @@ com.daqing.framework dq-framework-common - 1.0-SNAPSHOT + 0.0.1-SNAPSHOT com.daqing.financial dq-financial-api 0.0.1-SNAPSHOT - compile org.springframework.boot @@ -75,6 +74,12 @@ mybatis-plus-boot-starter 3.0.7.1 + + com.daqing.framework + dq-framework-model + 0.0.1-SNAPSHOT + compile + diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java index adee80e8..f7091942 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java @@ -170,7 +170,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //获取之前指定的a角用户 @@ -243,7 +243,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //更新a角 @@ -302,7 +302,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //根据业务id查询贷审会数据 @@ -342,7 +342,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //更新法规部经理数据 @@ -466,7 +466,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //更新法规部经理数据 @@ -528,7 +528,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "首次a角用户确认担保函更新成功" : "首次a角用户确认担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,"","",""); + AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,PromptSuccess.DB_A_ID,"","",""); //更新成功后，判断b角用户是否确认 if (i > 0){ QueryWrapper tempB = new QueryWrapper<>(); @@ -577,7 +577,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "驳回后a角用户确认担保函更新成功" : "驳回后a角用户确认担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,"","",""); + AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,PromptSuccess.DB_A_ID,"","",""); //更新成功后，判断b角用户是否确认 if (i > 0){ QueryWrapper tempB = new QueryWrapper<>(); @@ -618,7 +618,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "a角用户驳回担保函更新成功" : "a角用户驳回担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,"","",""); + AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,PromptSuccess.DB_A_ID,"","",""); //更新成功后，更新b角数据及更新法规部经理数据 if (i > 0){ //更新b用户的审核状态为驳回，操作状态为已处理 @@ -667,7 +667,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "首次b角用户确认担保函更新成功" : "首次b角用户确认担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,"","",""); + AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,PromptSuccess.DB_B_ID,"","",""); //更新成功后，判断a角用户是否确认 if (i > 0){ QueryWrapper tempB = new QueryWrapper<>(); @@ -717,7 +717,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "驳回后b角用户确认担保函更新成功" : "驳回后b角用户确认担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,"","",""); + AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,PromptSuccess.DB_B_ID,"","",""); //更新成功后，判断a角用户是否确认 if (i > 0){ QueryWrapper tempB = new QueryWrapper<>(); @@ -758,7 +758,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0 ? "b角用户驳回担保函更新成功" : "b角用户驳回担保函更新失败"); //同时往审核流程进程表新增一条记录 String account = DgApplyAmountInfoController.getAccount(); - AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,"","",""); + AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,PromptSuccess.DB_B_ID,"","",""); //更新成功后，更新a角数据及更新法规部经理数据 if (i > 0){ //更新a用户的审核状态为驳回，操作状态为已处理 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java index 343fbc72..d6b01309 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java @@ -116,7 +116,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl 0){ QueryWrapper businessProcessStatusQueryWrapper = new QueryWrapper<>(); @@ -142,7 +142,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl 0){ QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java index c55c0d3e..297eea56 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java @@ -143,7 +143,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ @@ -183,7 +183,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper wrapperTemp = new QueryWrapper<>(); @@ -212,7 +212,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ //更新法规部经理数据 @@ -275,7 +275,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ @@ -319,7 +319,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper queryWrapperCwb = new QueryWrapper<>(); @@ -354,7 +354,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper queryWrapperT = new QueryWrapper<>(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java index 32e70bd0..a283894d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java @@ -26,12 +26,13 @@ public class AuditProcessUtil{ auditProcessUtil.auditProcessMapper = this.auditProcessMapper; } - public static boolean save(Integer businessId, String approver, String deptName, String auditOpinion,Integer processId,String reason,String loanMoney,String loanTern) { + public static boolean save(Integer businessId, String approver, String departmentName, String auditOpinion,Integer processId,Integer roleId,String reason,String loanMoney,String loanTern) { DgAuditProcess auditProcess = new DgAuditProcess(); auditProcess.setApprover(approver); auditProcess.setAuditOpinion(auditOpinion); auditProcess.setBusinessId(businessId); - auditProcess.setDeptName(deptName); + auditProcess.setDepartmentName(departmentName); + auditProcess.setRoleId(roleId); auditProcess.setProcessId(processId); auditProcess.setLoanMoney(loanMoney); auditProcess.setLoanTern(loanTern); diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index 9d1d841d..bd324b95 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -1,66 +1,25 @@ ##服务名称 -#spring.application.name=dq-financial-guarantee -###配置中心地址 -#spring.cloud.nacos.config.server-addr=192.168.31.140:8848 -#spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60 -##spring.cloud.nacos.config.group=prod -# -#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml -#spring.cloud.nacos.config.ext-config[0].group=dev -#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=dev -#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=dev -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password=123456 -#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 - -#请求处理的超时时间 -ribbon.ReadTimeout: 120000 -#请求连接的超时时间 -ribbon.ConnectTimeout: 120000 - - - -# 上传文件总的最大值 -spring.servlet.multipart.max-request-size=10MB -# 单个文件的最大值 -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.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60 +#spring.cloud.nacos.config.group=prod 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].group=dev 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].group=dev 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].group=dev 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.password=123456 spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 @@ -68,6 +27,47 @@ spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 +#请求处理的超时时间 +ribbon.ReadTimeout: 120000 +#请求连接的超时时间 +ribbon.ConnectTimeout: 120000 + + + +# 上传文件总的最大值 +#spring.servlet.multipart.max-request-size=10MB +## 单个文件的最大值 +#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 + #测试服务器环境（prod） #服务名称 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java index 104a86cb..884080b7 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java @@ -32,8 +32,11 @@ public class DgAuditProcess implements Serializable { @ApiModelProperty(value = "审批人") private String approver; + @ApiModelProperty(value = "角色id") + private Integer roleId; + @ApiModelProperty(value = "部门名称") - private String deptName; + private String departmentName; @ApiModelProperty(value = "通过时间") @TableField(fill = FieldFill.INSERT) From 9a06ca337f5bf4facfcae476916efcc0a964b65d Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Fri, 25 Dec 2020 16:57:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dq-financial-api/pom.xml | 2 +- .../financial/crms/config/IPageConfig.java | 2 + .../financial/crms/dao/CustomerDao.java | 2 + .../service/impl/CustomerServiceImpl.java | 23 ++++- .../src/main/resources/bootstrap.properties | 84 +++++++++---------- .../resources/mapper/crms/CustomerDao.xml | 5 +- .../DqFinancialGuaranteeApplication.java | 4 +- .../guarantee/config/IPageConfig.java | 19 ++--- .../DgComplianceInvestigationMapper.java | 2 +- .../guarantee/mapper/DgStatisticsMapper.java | 2 + .../response/DgStatisticsListResponse.java | 18 ++-- .../impl/DgApplyAmountInfoServiceImpl.java | 11 ++- .../DgAssetsInvestigationServiceImpl.java | 7 +- .../DgComplianceInvestigationServiceImpl.java | 28 +++---- .../DgGuaranteeAssignUserServiceImpl.java | 12 ++- .../DgLoanCommitteeConsiderServiceImpl.java | 8 +- .../DgMessageInvestigationServiceImpl.java | 7 +- .../service/impl/DgStatisticsServiceImpl.java | 8 +- .../DgWorkConferenceConsiderServiceImpl.java | 8 +- .../guarantee/util/AuditProcessUtil.java | 2 + .../DgComplianceInvestigationMapper.xml | 4 +- .../mapper/guarantee/DgStatisticsMapper.xml | 14 ++-- .../financial/hrauth/config/IPageConfig.java | 14 ++-- .../src/main/resources/bootstrap.properties | 72 ++++++++-------- .../main/resources/mapper/hrms/DeptDao.xml | 8 +- .../model/response/PromptSuccess.java | 10 +++ dq-framework-model/pom.xml | 2 +- .../domain/guarantee/po/DgStatisticsPO.java | 20 ++--- dq-framework-utils/pom.xml | 2 +- dq-govern-gateway/pom.xml | 2 +- .../src/main/resources/bootstrap.properties | 54 ++++++------ 31 files changed, 254 insertions(+), 202 deletions(-) diff --git a/dq-financial-api/pom.xml b/dq-financial-api/pom.xml index 8dd178b0..c8584a3e 100644 --- a/dq-financial-api/pom.xml +++ b/dq-financial-api/pom.xml @@ -18,7 +18,7 @@ com.daqing.framework dq-framework-model - 1.0-SNAPSHOT + 0.0.1-SNAPSHOT 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..243e1e84 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,3 +1,4 @@ +/* package com.daqing.financial.crms.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; @@ -11,3 +12,4 @@ public class IPageConfig { return new PaginationInterceptor(); } } +*/ diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java index 5863ef98..830744c7 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java @@ -36,4 +36,6 @@ public interface CustomerDao extends BaseMapper { List listCustomerId(); List queryCompanyCodeAndName(int type); + + String getCodeByType(Integer type); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 51bf5f6c..c065f1e3 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -219,7 +219,12 @@ public class CustomerServiceImpl extends ServiceImpl relatedList = new ArrayList<>(); List intList = companyCustomerReq.getRelatedId(); diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index cea72869..fe1ce1cd 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -1,61 +1,26 @@ # 开发和测试环境（dev） #服务名称 -#spring.application.name=dq-financial-crms -##配置中心地址 -#spring.cloud.nacos.config.server-addr=192.168.31.140:8848 -#spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354 -##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=dev -#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=dev -#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=dev -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password=123456 -#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 - -#请求处理的超时时间 -ribbon.ReadTimeout: 120000 -#请求连接的超时时间 -ribbon.ConnectTimeout: 120000 - -# 正式环境（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.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354 #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].group=dev 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].group=dev 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].group=dev 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.password=123456 spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 @@ -63,6 +28,41 @@ spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 +#请求处理的超时时间 +ribbon.ReadTimeout: 120000 +#请求连接的超时时间 +ribbon.ConnectTimeout: 120000 + +# 正式环境（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 + # 测试环境（prod） #服务名称 diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml index e77752a5..b871d350 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml @@ -95,5 +95,8 @@ SELECT code,`name` from crms_customer where `type` =#{type} and del_or_not = 0 and status = 0 - + + \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java index 45915ec8..e7409c32 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java @@ -1,12 +1,11 @@ package com.daqing.financial.guarantee; -import com.daqing.financial.hrauth.config.SecurityConfig; + import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableScheduling; import springfox.documentation.swagger2.annotations.EnableSwagger2; @@ -16,7 +15,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @EnableScheduling @EnableSwagger2 @ComponentScan(basePackages = "com.daqing") -@Import({SecurityConfig.class}) public class DqFinancialGuaranteeApplication { public static void main(String[] args) { diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java index f3c1c0bf..aaae8a3a 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java @@ -1,21 +1,18 @@ -/* package com.daqing.financial.guarantee.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -*/ /** * @auther River * @date 2020/11/5 14:38 - *//* + */ -@Configuration -public class IPageConfig { - @Bean - public PaginationInterceptor paginationInterceptor() { - return new PaginationInterceptor(); - } -} -*/ +//@Configuration +//public class IPageConfig { +// @Bean +// public PaginationInterceptor paginationInterceptor() { +// return new PaginationInterceptor(); +// } +//} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java index ce6455be..267e4143 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java @@ -76,7 +76,7 @@ public interface DgComplianceInvestigationMapper extends BaseMapper - + SELECT process_id FROM dg_audit_process WHERE business_id = #{businessId} AND create_time = (SELECT MAX(create_time) FROM dg_audit_process WHERE business_id = #{businessId}) diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml index 56724aca..177bf97d 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml @@ -19,14 +19,16 @@