From 10e5d7a72be79ca923148924b771a3cae4b67ca0 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Thu, 25 Mar 2021 11:43:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD=E5=86=B2=E7=AA=81=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dq-financial-crms/pom.xml | 6 - .../crms/DqFinancialCrmsApplication.java | 2 +- .../financial/crms/config/IPageConfig.java | 26 +- .../CrmsCompanyPersonalController.java | 6 +- .../CrmsCustomerRelatedController.java | 7 +- .../crms/controller/CustomerController.java | 9 +- .../CustomerWorkbenchController.java | 8 +- .../src/main/resources/bootstrap.properties | 84 ++-- dq-financial-guarantee/pom.xml | 6 - .../DqFinancialGuaranteeApplication.java | 6 +- .../guarantee/config/IPageConfig.java | 36 +- .../controller/AlInsuranceListController.java | 7 +- .../AlRepaymentEntryController.java | 6 +- .../DgApplyAmountInfoController.java | 6 +- .../DgAssetsInvestigationController.java | 6 +- .../DgComplianceInvestigationController.java | 7 +- .../controller/DgCopyForController.java | 6 +- .../controller/DgCopyUserController.java | 6 +- .../controller/DgEfficiencyController.java | 6 +- .../controller/DgFormDesignController.java | 6 +- .../DgGuaranteeAssignUserController.java | 16 +- ...DgGuaranteeLetterAssignUserController.java | 8 +- .../DgLoanCommitteeConsiderController.java | 8 +- .../controller/DgLoanNoticeController.java | 14 +- .../DgMessageInvestigationController.java | 7 +- ...PaymentConfirmationConsiderController.java | 8 +- .../controller/DgProcessManageController.java | 13 +- .../controller/DgProcessUserController.java | 9 +- .../controller/DgStatisticsController.java | 6 +- .../DgWorkConferenceConsiderController.java | 7 +- .../src/main/resources/bootstrap.properties | 84 ++-- .../DqFinancialHrmsAuthApplication.java | 2 +- .../financial/hrauth/annotation/Log.java | 96 ++--- .../financial/hrauth/aspect/Operation.java | 278 ++++++------- .../financial/hrauth/aspect/SysLogAspect.java | 388 +++++++++--------- .../controller/RolePermissionController.java | 6 +- .../controller/SystemLogController.java | 6 +- .../controller/UserLoginController.java | 19 +- .../financial/hrauth/enums/BusinessType.java | 132 +++--- .../financial/hrauth/enums/OperationType.java | 104 ++--- .../financial/hrauth/enums/OperationUnit.java | 118 +++--- .../src/main/resources/bootstrap.properties | 86 ++-- dq-financial-hrms/pom.xml | 6 - .../hrms/DqFinancialHrmsApplication.java | 7 +- .../financial/hrms/config/IPageConfig.java | 26 +- .../hrms/controller/EmployeeController.java | 6 +- .../src/main/resources/bootstrap.properties | 86 ++-- dq-framework-common/pom.xml | 12 + .../com/daqing/framework/annotation/Log.java | 47 +++ .../daqing/framework/aspect/Operation.java | 129 ++++++ .../daqing/framework/aspect/SysLogAspect.java | 185 +++++++++ .../daqing/framework/enums/BusinessType.java | 66 +++ .../com/daqing/framework/enums/Constants.java | 48 +++ .../daqing/framework/enums/OperationType.java | 52 +++ .../daqing/framework/enums/OperationUnit.java | 59 +++ .../framework/feign/HrauthFeignService.java | 22 + .../framework/feign/HrmsFeignService.java | 21 + .../framework/model/EmployeeEntity.java | 73 ++++ .../com/daqing/framework/model/SystemLog.java | 105 +++++ .../daqing/framework/model/UserEntity.java | 102 +++++ .../com/daqing/framework/util/IpUtils.java | 67 +++ .../src/main/resources/bootstrap.properties | 68 +-- .../src/main/resources/jwt.properties | 4 +- 63 files changed, 1884 insertions(+), 974 deletions(-) create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/annotation/Log.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/aspect/Operation.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/aspect/SysLogAspect.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/enums/BusinessType.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/enums/Constants.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/enums/OperationType.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/enums/OperationUnit.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/feign/HrauthFeignService.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/feign/HrmsFeignService.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/model/EmployeeEntity.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/model/SystemLog.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/model/UserEntity.java create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/util/IpUtils.java diff --git a/dq-financial-crms/pom.xml b/dq-financial-crms/pom.xml index 732c1c06..76cc234e 100644 --- a/dq-financial-crms/pom.xml +++ b/dq-financial-crms/pom.xml @@ -21,12 +21,6 @@ - - com.daqing.financial - dq-financial-hrms-auth - 0.0.1-SNAPSHOT - compile - com.daqing.financial dq-financial-api 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 1cae2ee9..506f141f 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 @@ -6,7 +6,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; -@EnableFeignClients(basePackages = "com.daqing.financial.crms.feign") +@EnableFeignClients({"com.daqing.framework.feign","com.daqing.financial.crms.feign"}) @EnableDiscoveryClient @SpringBootApplication @ComponentScan("com.daqing") 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 a48778d6..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,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/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java index f3689f1c..507adcad 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java @@ -4,11 +4,11 @@ package com.daqing.financial.crms.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.daqing.financial.crms.service.ICrmsCompanyPersonalService; import com.daqing.financial.crms.service.ICrmsCustomerRelatedService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.CrmsCompanyPersonal; import com.daqing.framework.domain.crms.CrmsCustomerRelated; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java index 2ca07eb6..e036103f 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java @@ -2,11 +2,10 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.service.ICrmsCustomerRelatedService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.crms.CrmsCompanyPersonal; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.CrmsCustomerRelated; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index 1365f2c9..10ead555 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -3,17 +3,14 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.CustomerControllerApi; import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.service.CustomerService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.crms.CompanyCustomerEntity; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.CustomerEntity; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java index e4a905b9..d4148c97 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java @@ -3,15 +3,13 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.CustomerWorkbenchControllerApi; import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.service.CustomerWorkbenchService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.request.CustomerWorkbenchRequest; import com.daqing.framework.domain.hrms.EmployeeEntity; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index f255f463..4591677a 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.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=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -30,30 +30,30 @@ 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/pom.xml b/dq-financial-guarantee/pom.xml index 75a00711..786e03bc 100644 --- a/dq-financial-guarantee/pom.xml +++ b/dq-financial-guarantee/pom.xml @@ -20,12 +20,6 @@ - - com.daqing.financial - dq-financial-hrms-auth - 0.0.1-SNAPSHOT - compile - org.springframework.boot 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 4252fa98..1420676d 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,23 +1,21 @@ 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; -@EnableFeignClients(basePackages = "com.daqing.financial.guarantee.feign") +@EnableFeignClients({"com.daqing.framework.feign","com.daqing.financial.guarantee.feign"}) @EnableDiscoveryClient @SpringBootApplication @EnableScheduling @EnableSwagger2 @ComponentScan(basePackages = "com.daqing") -@Import({SecurityConfig.class}) +//@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 b675cbd5..759a152e 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,18 +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(); -// } -//} +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(); + } +} 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 index aa94703d..8ff947d1 100644 --- 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 @@ -3,10 +3,9 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.response.AlInsuranceListRes; import com.daqing.financial.guarantee.service.IAlInsuranceListService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.financial.hrauth.model.HrmsAccessRecordsLog; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; 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 index de950bb4..36c1ed9e 100644 --- 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 @@ -3,10 +3,10 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.AlRepaymentEntryReq; import com.daqing.financial.guarantee.service.IAlRepaymentEntryService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.guarantee.AlRepaymentEntry; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java index c03a317d..dc0899fd 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java @@ -12,11 +12,11 @@ import com.daqing.financial.guarantee.model.response.BusinessApplicationExportRe import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService; import com.daqing.financial.guarantee.service.IDgApplyAmountListService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.guarantee.DgApplyField; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.JwtUtils; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java index db5ad6a2..c5d9737f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java @@ -4,9 +4,9 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.*; import com.daqing.financial.guarantee.model.response.AssetsDetailResponse; import com.daqing.financial.guarantee.service.IDgAssetsInvestigationService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java index d91b7ca8..ac5240b3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java @@ -6,10 +6,9 @@ import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationReq import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationInfoResponse; import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java index 50bad371..386d3089 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java @@ -3,9 +3,9 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.CopySendRequest; import com.daqing.financial.guarantee.service.IDgCopyForService; import com.daqing.financial.guarantee.util.R; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java index 7e4400aa..c8cc196a 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java @@ -6,9 +6,9 @@ import com.daqing.financial.guarantee.model.response.CopyForMeResponse; import com.daqing.financial.guarantee.service.IDgCopyUserService; import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.TaskNodeUtil; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 0e1a1902..0d65a1d3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -13,9 +13,9 @@ import com.daqing.financial.guarantee.service.IDgEfficiencyService; import com.daqing.financial.guarantee.util.DateUtils; import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.TaskNodeUtil; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.excel.EasyExcelUtil; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java index 9498c500..d7f7956f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java @@ -3,9 +3,9 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.DgFormDesignRequest; import com.daqing.financial.guarantee.model.response.DgFormDesignListResponse; import com.daqing.financial.guarantee.service.IDgFormDesignService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java index 5fca4639..0d861686 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java @@ -1,22 +1,14 @@ package com.daqing.financial.guarantee.controller; -import com.daqing.financial.guarantee.feign.HrmsFeignService; -import com.daqing.financial.guarantee.mapper.DgGuaranteeAssignUserMapper; import com.daqing.financial.guarantee.model.request.ApprovalGuaranteeRequest; import com.daqing.financial.guarantee.model.request.GuaranteeRequest; import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest; import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse; import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser; -import com.daqing.framework.domain.guarantee.po.DgGuaranteePO; -import com.daqing.framework.domain.hrms.response.HrmsCode; -import com.daqing.framework.exception.ExceptionCast; -import com.daqing.framework.model.StatusCode; -import com.daqing.framework.model.response.PromptSuccess; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; @@ -26,9 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java index 9c1f219f..e06290de 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java @@ -5,12 +5,10 @@ import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest; import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; -import com.daqing.framework.domain.hrms.response.HrmsCode; -import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.DateUtil; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java index 37786692..e98ebb7c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java @@ -4,13 +4,11 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderRequest; import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse; import com.daqing.financial.guarantee.service.IDgLoanCommitteeConsiderService; -import com.daqing.financial.guarantee.service.IDgLoanNoticeService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java index 138459e9..f0ac8008 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java @@ -2,20 +2,13 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.*; -import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse; -import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; import com.daqing.financial.guarantee.service.IDgLoanNoticeService; -import com.daqing.financial.guarantee.service.impl.DgGuaranteeLetterAssignUserServiceImpl; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; -import com.daqing.framework.domain.hrms.response.HrmsCode; -import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; -import com.daqing.framework.utils.DateUtil; import com.daqing.framework.utils.NumberToCN; import com.daqing.framework.utils.PageUtils; import com.deepoove.poi.XWPFTemplate; @@ -28,7 +21,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.util.Date; import java.util.HashMap; /** diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java index d285cfef..6fb48b25 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java @@ -2,12 +2,11 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.*; -import com.daqing.financial.guarantee.model.response.AssetsDetailResponse; import com.daqing.financial.guarantee.model.response.MessageDetailResponse; import com.daqing.financial.guarantee.service.IDgMessageInvestigationService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java index 27b472e1..1dd6d9c6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java @@ -5,11 +5,9 @@ import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequ import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest; import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse; import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.hrms.response.HrmsCode; -import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java index 7bfe88b3..315704f5 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java @@ -1,29 +1,22 @@ package com.daqing.financial.guarantee.controller; -import com.alibaba.fastjson.JSONObject; import com.daqing.financial.guarantee.model.request.ProcessManageRequest; import com.daqing.financial.guarantee.model.request.UpdateUserVisualReq; -import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; -import com.daqing.financial.guarantee.model.response.DgProessManageRes; import com.daqing.financial.guarantee.service.IDgProcessManageService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.guarantee.DgProcessManage; import com.daqing.framework.domain.hrms.ext.EmployeeVO; -import com.daqing.framework.domain.hrms.ext.UserDeptVO; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; -import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import org.springframework.stereotype.Controller; import java.util.*; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java index ffc303d5..61e81bb0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java @@ -2,17 +2,14 @@ package com.daqing.financial.guarantee.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.model.request.CopySendUserRequest; -import com.daqing.financial.guarantee.service.IDgProcessManageService; import com.daqing.financial.guarantee.service.IDgProcessUserService; import com.daqing.financial.guarantee.util.R; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.guarantee.DgProcessManage; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.guarantee.DgProcessUser; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java index 2ef2a837..78f8d878 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java @@ -4,9 +4,9 @@ import com.daqing.financial.guarantee.model.request.DgStatisticsRequest; import com.daqing.financial.guarantee.model.response.DgStatisticsListRefuseResponse; import com.daqing.financial.guarantee.model.response.DgStatisticsListResponse; import com.daqing.financial.guarantee.service.IDgStatisticsService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java index 8d2b3ca8..082a6b32 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java @@ -3,12 +3,11 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.DgWorkConferenceConsiderRequest; import com.daqing.financial.guarantee.service.IDgWorkConferenceConsiderService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index b9faae67..c46626f2 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.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=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -37,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-hrms-auth/src/main/java/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.java index 2e999a5b..e2a9cba2 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.java @@ -7,7 +7,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; -@EnableFeignClients(basePackages = "com.daqing.financial.hrauth.feign") +@EnableFeignClients({"com.daqing.framework.feign","com.daqing.financial.hrauth.feign"}) @EnableDiscoveryClient @SpringBootApplication @EnableScheduling diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/annotation/Log.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/annotation/Log.java index 2c30b055..55cf754e 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/annotation/Log.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/annotation/Log.java @@ -1,48 +1,48 @@ -package com.daqing.financial.hrauth.annotation; - - -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; - -import java.lang.annotation.*; - -/** - * @author Rogers - * 操作日志注解 - * @create 2020-07-03 - */ -@Target({ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface Log { - - /** - * 方法描述,可使用占位符获取参数:{{tel}} - */ - String detail() default ""; - - /** - * 日志等级:自己定，此处分为1-9 - */ - int level() default 0; - - /** - * 操作类型(enum):主要是select,insert,update,delete - */ - OperationType operationType() default OperationType.UNKNOWN; - - /** - * 被操作的对象(此处使用enum):可以是任何对象，如表名(user)，或者是工具(redis) - */ - OperationUnit operationUnit() default OperationUnit.UNKNOWN; - - /** 该属性需要访问的微服务名称 */ -// String serverId(); -// -// /** 表名 */ -// String tableName(); - - -} - - +//package com.daqing.financial.hrauth.annotation; +// +// +//import com.daqing.financial.hrauth.enums.OperationType; +//import com.daqing.financial.hrauth.enums.OperationUnit; +// +//import java.lang.annotation.*; +// +///** +// * @author Rogers +// * 操作日志注解 +// * @create 2020-07-03 +// */ +//@Target({ElementType.METHOD}) +//@Retention(RetentionPolicy.RUNTIME) +//@Documented +//public @interface Log { +// +// /** +// * 方法描述,可使用占位符获取参数:{{tel}} +// */ +// String detail() default ""; +// +// /** +// * 日志等级:自己定，此处分为1-9 +// */ +// int level() default 0; +// +// /** +// * 操作类型(enum):主要是select,insert,update,delete +// */ +// OperationType operationType() default OperationType.UNKNOWN; +// +// /** +// * 被操作的对象(此处使用enum):可以是任何对象，如表名(user)，或者是工具(redis) +// */ +// OperationUnit operationUnit() default OperationUnit.UNKNOWN; +// +// /** 该属性需要访问的微服务名称 */ +//// String serverId(); +//// +//// /** 表名 */ +//// String tableName(); +// +// +//} +// +// diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/Operation.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/Operation.java index 1eee4f29..fb29fb5f 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/Operation.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/Operation.java @@ -1,141 +1,141 @@ -package com.daqing.financial.hrauth.aspect; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.dao.SystemLogMapper; -import com.daqing.financial.hrauth.feign.HrauthFeignService; -import com.daqing.financial.hrauth.service.TokenService; -import com.daqing.financial.hrauth.service.UserLoginService; -import com.daqing.financial.hrauth.util.IpUtils; -import com.daqing.framework.domain.hrms.EmployeeEntity; -import com.daqing.framework.domain.hrms.SystemLog; -import com.daqing.framework.domain.hrms.Token; -import com.daqing.framework.domain.hrms.UserEntity; -import com.daqing.framework.model.response.ResponseResult; -import com.daqing.framework.util.RedisUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -/** - * @ClassName Operation - * @Description 操作日志类 - * @Date 2020/9/29 10:06 - * @Version 1.0 - */ -@Slf4j -@Component -@EnableDiscoveryClient -@EnableAspectJAutoProxy(proxyTargetClass = true) -public class Operation { - - @Resource - private SystemLogMapper systemLogMapper; - @Autowired - private TokenService tokenService; - @Autowired - private UserLoginService userLoginService; - @Autowired - private HrauthFeignService hrauthFeignService; - - @Async - public void addOperationLog(JoinPoint joinPoint, Object res, long time, UserEntity systemUser, EmployeeEntity employeeEntity) { -// synchronized (SysLogAspect.class) {//获得登录用户信息 -// User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); - MethodSignature signature = (MethodSignature) joinPoint.getSignature(); - SystemLog operationLog = new SystemLog(); - operationLog.setJobNumber(employeeEntity.getJobNumber()); - //获取内网地址IpUtils.intranetIp() - //获取外网地址IpUtils.internetIp() -// operationLog.setIpAddressLan(""); -// operationLog.setIpAddressWan(""); - operationLog.setIpAddressLan(IpUtils.intranetIp()); - //获取不到外网IP设置内网IP - if (StringUtils.isBlank(IpUtils.internetIp())) { - operationLog.setIpAddressWan(IpUtils.intranetIp()); - } else { - operationLog.setIpAddressWan(IpUtils.internetIp()); - } -// operationLog.setRunTime(time); - //operationLog.setRunTime(0L); - operationLog.setReturnValue(JSONObject.toJSONString(res)); - operationLog.setId(UUID.randomUUID().toString()); - operationLog.setArgs(JSONObject.toJSONString(joinPoint.getArgs())); - operationLog.setCreateTime(new Date()); - operationLog.setMethod(signature.getDeclaringTypeName() + "." + signature.getName()); - operationLog.setUserId(systemUser.getId() + ""); - operationLog.setUserName(employeeEntity.getName()); - Log annotation = signature.getMethod().getAnnotation(Log.class); - if (annotation != null) { - operationLog.setLogLevel(annotation.level()); - operationLog.setLogDescribe(getDetail(((MethodSignature) joinPoint.getSignature()).getParameterNames(), joinPoint.getArgs(), annotation)); - operationLog.setOperationType(annotation.operationType().getValue()); - operationLog.setOperationUnit(annotation.operationUnit().getValue()); - } - - //这里保存日志 +//package com.daqing.financial.hrauth.aspect; +// +//import com.alibaba.fastjson.JSON; +//import com.alibaba.fastjson.JSONObject; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.daqing.financial.hrauth.annotation.Log; +//import com.daqing.financial.hrauth.dao.SystemLogMapper; +//import com.daqing.financial.hrauth.feign.HrauthFeignService; +//import com.daqing.financial.hrauth.service.TokenService; +//import com.daqing.financial.hrauth.service.UserLoginService; +//import com.daqing.financial.hrauth.util.IpUtils; +//import com.daqing.framework.domain.hrms.EmployeeEntity; +//import com.daqing.framework.domain.hrms.SystemLog; +//import com.daqing.framework.domain.hrms.Token; +//import com.daqing.framework.domain.hrms.UserEntity; +//import com.daqing.framework.model.response.ResponseResult; +//import com.daqing.framework.util.RedisUtil; +//import lombok.extern.slf4j.Slf4j; +//import org.apache.commons.lang3.StringUtils; +//import org.aspectj.lang.JoinPoint; +//import org.aspectj.lang.reflect.MethodSignature; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +//import org.springframework.context.annotation.EnableAspectJAutoProxy; +//import org.springframework.scheduling.annotation.Async; +//import org.springframework.stereotype.Component; +//import org.springframework.web.context.request.RequestContextHolder; +//import org.springframework.web.context.request.ServletRequestAttributes; +// +//import javax.annotation.Resource; +//import javax.servlet.http.HttpServletRequest; +//import java.util.Date; +//import java.util.HashMap; +//import java.util.Map; +//import java.util.UUID; +// +///** +// * @ClassName Operation +// * @Description 操作日志类 +// * @Date 2020/9/29 10:06 +// * @Version 1.0 +// */ +//@Slf4j +//@Component +//@EnableDiscoveryClient +//@EnableAspectJAutoProxy(proxyTargetClass = true) +//public class Operation { +// +// @Resource +// private SystemLogMapper systemLogMapper; +// @Autowired +// private TokenService tokenService; +// @Autowired +// private UserLoginService userLoginService; +// @Autowired +// private HrauthFeignService hrauthFeignService; +// +// @Async +// public void addOperationLog(JoinPoint joinPoint, Object res, long time, UserEntity systemUser, EmployeeEntity employeeEntity) { +//// synchronized (SysLogAspect.class) {//获得登录用户信息 +//// User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); +// MethodSignature signature = (MethodSignature) joinPoint.getSignature(); +// SystemLog operationLog = new SystemLog(); +// operationLog.setJobNumber(employeeEntity.getJobNumber()); +// //获取内网地址IpUtils.intranetIp() +// //获取外网地址IpUtils.internetIp() +//// operationLog.setIpAddressLan(""); +//// operationLog.setIpAddressWan(""); +// operationLog.setIpAddressLan(IpUtils.intranetIp()); +// //获取不到外网IP设置内网IP +// if (StringUtils.isBlank(IpUtils.internetIp())) { +// operationLog.setIpAddressWan(IpUtils.intranetIp()); +// } else { +// operationLog.setIpAddressWan(IpUtils.internetIp()); +// } +//// operationLog.setRunTime(time); +// //operationLog.setRunTime(0L); +// operationLog.setReturnValue(JSONObject.toJSONString(res)); +// operationLog.setId(UUID.randomUUID().toString()); +// operationLog.setArgs(JSONObject.toJSONString(joinPoint.getArgs())); +// operationLog.setCreateTime(new Date()); +// operationLog.setMethod(signature.getDeclaringTypeName() + "." + signature.getName()); +// operationLog.setUserId(systemUser.getId() + ""); +// operationLog.setUserName(employeeEntity.getName()); +// Log annotation = signature.getMethod().getAnnotation(Log.class); +// if (annotation != null) { +// operationLog.setLogLevel(annotation.level()); +// operationLog.setLogDescribe(getDetail(((MethodSignature) joinPoint.getSignature()).getParameterNames(), joinPoint.getArgs(), annotation)); +// operationLog.setOperationType(annotation.operationType().getValue()); +// operationLog.setOperationUnit(annotation.operationUnit().getValue()); +// } +// +// //这里保存日志 +//// log.info("######记录日志:{}######", operationLog.toString()); +// //int b = systemLogMapper.insert(operationLog); +// ResponseResult insert = hrauthFeignService.insert(operationLog); // log.info("######记录日志:{}######", operationLog.toString()); - //int b = systemLogMapper.insert(operationLog); - ResponseResult insert = hrauthFeignService.insert(operationLog); - log.info("######记录日志:{}######", operationLog.toString()); - if (insert.getCode()== 40007) { - log.error("#####新增###记录日志失败:{}####", operationLog); - } +// if (insert.getCode()== 40007) { +// log.error("#####新增###记录日志失败:{}####", operationLog); +// } +//// } +// } +// +// /** +// * 对当前登录用户和占位符处理 +// * +// * @param argNames 方法参数名称数组 +// * @param args 方法参数数组 +// * @param annotation 注解信息 +// * @return 返回处理后的描述 +// */ +// private String getDetail(String[] argNames, Object[] args, Log annotation) { +// //获得登录用户信息 +// //User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); +// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); +// String token = request.getHeader("token"); +// String userId = RedisUtil.get("dq:token:"+token); +// String userEntityStr = RedisUtil.get("dq:userId:"+userId); +// UserEntity systemUser = JSON.parseObject(userEntityStr,UserEntity.class); +// //Token userToken = tokenService.getOne(new QueryWrapper().eq("token", token)); +// //UserEntity systemUser = userLoginService.getOne(new QueryWrapper().eq("id",userToken.getUserId())); +// +// Map map = new HashMap<>(4); +// for (int i = 0; i < argNames.length; i++) { +// map.put(argNames[i], args[i]); +// } +// +// String detail = annotation.detail(); +// try { +// detail = "'" + systemUser.getAccount() + "'=》" + annotation.detail(); +// for (Map.Entry entry : map.entrySet()) { +// Object k = entry.getKey(); +// Object v = entry.getValue(); +// detail = detail.replace("{{" + k + "}}", JSONObject.toJSONString(v)); +// } +// } catch (Exception e) { +// e.printStackTrace(); // } - } - - /** - * 对当前登录用户和占位符处理 - * - * @param argNames 方法参数名称数组 - * @param args 方法参数数组 - * @param annotation 注解信息 - * @return 返回处理后的描述 - */ - private String getDetail(String[] argNames, Object[] args, Log annotation) { - //获得登录用户信息 - //User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String token = request.getHeader("token"); - String userId = RedisUtil.get("dq:token:"+token); - String userEntityStr = RedisUtil.get("dq:userId:"+userId); - UserEntity systemUser = JSON.parseObject(userEntityStr,UserEntity.class); - //Token userToken = tokenService.getOne(new QueryWrapper().eq("token", token)); - //UserEntity systemUser = userLoginService.getOne(new QueryWrapper().eq("id",userToken.getUserId())); - - Map map = new HashMap<>(4); - for (int i = 0; i < argNames.length; i++) { - map.put(argNames[i], args[i]); - } - - String detail = annotation.detail(); - try { - detail = "'" + systemUser.getAccount() + "'=》" + annotation.detail(); - for (Map.Entry entry : map.entrySet()) { - Object k = entry.getKey(); - Object v = entry.getValue(); - detail = detail.replace("{{" + k + "}}", JSONObject.toJSONString(v)); - } - } catch (Exception e) { - e.printStackTrace(); - } - return detail; - } -} +// return detail; +// } +//} diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/SysLogAspect.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/SysLogAspect.java index fc0d14f3..a6c18155 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/SysLogAspect.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/SysLogAspect.java @@ -1,194 +1,194 @@ -package com.daqing.financial.hrauth.aspect; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.feign.HrmsFeignService; -import com.daqing.financial.hrauth.service.TokenService; -import com.daqing.financial.hrauth.service.UserLoginService; -import com.daqing.framework.domain.hrms.EmployeeEntity; -import com.daqing.framework.domain.hrms.Token; -import com.daqing.framework.domain.hrms.UserEntity; -import com.daqing.framework.model.response.ResponseResult; -import com.daqing.framework.util.RedisUtil; -import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName SysLogAspect - * @Description 操作日志切面 - * @Date 2020/9/30 - * @Version 1.0 - */ -@Slf4j -@Aspect -@Component -@EnableDiscoveryClient -@EnableAspectJAutoProxy(proxyTargetClass = true) -public class SysLogAspect { - - @Resource - private Operation operation; - @Autowired - private TokenService tokenService; - @Autowired - private UserLoginService userLoginService; - @Autowired - private HrmsFeignService hrmsFeignService; - /** - * 此处的切点是注解的方式，也可以用包名的方式达到相同的效果 - * '@Pointcut("execution(* com.wwj.springboot.service.impl.*.*(..))")' - */ - @Pointcut("@annotation(com.daqing.financial.hrauth.annotation.Log)") - public void operationLog() { - } - - - /** - * 环绕增强，相当于MethodInterceptor - */ - @Around("operationLog()") - public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable { - Object res = null; - long time = System.currentTimeMillis(); - try { - res = joinPoint.proceed(); - time = System.currentTimeMillis() - time; - return res; - } finally { - try { - //User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String token = request.getHeader("token"); - String userId = RedisUtil.get("dq:token:"+token); - String userEntityStr = RedisUtil.get("dq:userId:"+userId); - UserEntity systemUser = JSON.parseObject(userEntityStr,UserEntity.class); - - //根据userId查询工号以及员工姓名 - if(userId !=null || userId != ""){ - EmployeeEntity employeeEntity = hrmsFeignService.getEmpmsgById(Long.valueOf(userId)); - operation.addOperationLog(joinPoint,res,time,systemUser,employeeEntity); - } - - //Token userToken = tokenService.getOne(new QueryWrapper().eq("token", token)); - //UserEntity systemUser = userLoginService.getOne(new QueryWrapper().eq("id",userId)); - //operation.addOperationLog(joinPoint,res,time,systemUser,employeeEntity); - //方法执行完成后增加日志 -// addOperationLog(joinPoint, res, time); - } catch (Exception e) { - log.error("LogAspect 操作失败：" + e.getMessage()); - e.printStackTrace(); - } - } - } - - - /** - * 对当前登录用户和占位符处理 - * - * @param argNames 方法参数名称数组 - * @param args 方法参数数组 - * @param annotation 注解信息 - * @return 返回处理后的描述 - */ - private String getDetail(String[] argNames, Object[] args, Log annotation) { - //获得登录用户信息 - //User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - UserEntity systemUser = (UserEntity) request.getUserPrincipal(); - - Map map = new HashMap<>(4); - for (int i = 0; i < argNames.length; i++) { - map.put(argNames[i], args[i]); - } - - String detail = annotation.detail(); - try { - detail = "'" + systemUser.getAccount() + "'=》" + annotation.detail(); - for (Map.Entry entry : map.entrySet()) { - Object k = entry.getKey(); - Object v = entry.getValue(); - detail = detail.replace("{{" + k + "}}", JSONObject.toJSONString(v)); - } - } catch (Exception e) { - e.printStackTrace(); - } - return detail; - } - - @Before("operationLog()") - public void doBeforeAdvice(JoinPoint joinPoint) { -// System.out.println("进入方法前执行....."); - } - - /** - * 处理完请求，返回内容 - * - * @param ret - */ - @AfterReturning(returning = "ret", pointcut = "operationLog()") - public void doAfterReturning(Object ret) { -// System.out.println("方法的返回值 : " + ret); - } - - /** - * 后置异常通知 - */ - @AfterThrowing("operationLog()") - public void throwss(JoinPoint jp) { -// System.out.println("方法异常时执行....."); - } - - - /** - * 后置最终通知,final增强，不管是抛出异常或者正常退出都会执行 - */ - @After("operationLog()") - public void after(JoinPoint jp) { -// System.out.println("方法最后执行....."); - } - - - /** - * 获取客户端ip地址 - * - * @param request - * @return - */ - public static String getClientIp(HttpServletRequest request) { - String ip = request.getHeader("x-forwarded-for"); - if (ip == null || ip.trim() == "" || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("Proxy-Client-IP"); - } - if (ip == null || ip.trim() == "" || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("WL-Proxy-Client-IP"); - } - if (ip == null || ip.trim() == "" || "unknown".equalsIgnoreCase(ip)) { - ip = request.getRemoteAddr(); - } - // 多个路由时，取第一个非unknown的ip - final String[] arr = ip.split(","); - for (final String str : arr) { - if (!"unknown".equalsIgnoreCase(str)) { - ip = str; - break; - } - } - return ip; - } - -} +//package com.daqing.financial.hrauth.aspect; +// +//import com.alibaba.fastjson.JSON; +//import com.alibaba.fastjson.JSONObject; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.daqing.financial.hrauth.annotation.Log; +//import com.daqing.financial.hrauth.feign.HrmsFeignService; +//import com.daqing.financial.hrauth.service.TokenService; +//import com.daqing.financial.hrauth.service.UserLoginService; +//import com.daqing.framework.domain.hrms.EmployeeEntity; +//import com.daqing.framework.domain.hrms.Token; +//import com.daqing.framework.domain.hrms.UserEntity; +//import com.daqing.framework.model.response.ResponseResult; +//import com.daqing.framework.util.RedisUtil; +//import lombok.extern.slf4j.Slf4j; +//import org.aspectj.lang.JoinPoint; +//import org.aspectj.lang.ProceedingJoinPoint; +//import org.aspectj.lang.annotation.*; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +//import org.springframework.context.annotation.EnableAspectJAutoProxy; +//import org.springframework.stereotype.Component; +//import org.springframework.web.context.request.RequestContextHolder; +//import org.springframework.web.context.request.ServletRequestAttributes; +// +//import javax.annotation.Resource; +//import javax.servlet.http.HttpServletRequest; +//import java.util.HashMap; +//import java.util.Map; +// +///** +// * @ClassName SysLogAspect +// * @Description 操作日志切面 +// * @Date 2020/9/30 +// * @Version 1.0 +// */ +//@Slf4j +//@Aspect +//@Component +//@EnableDiscoveryClient +//@EnableAspectJAutoProxy(proxyTargetClass = true) +//public class SysLogAspect { +// +// @Resource +// private Operation operation; +// @Autowired +// private TokenService tokenService; +// @Autowired +// private UserLoginService userLoginService; +// @Autowired +// private HrmsFeignService hrmsFeignService; +// /** +// * 此处的切点是注解的方式，也可以用包名的方式达到相同的效果 +// * '@Pointcut("execution(* com.wwj.springboot.service.impl.*.*(..))")' +// */ +// @Pointcut("@annotation(com.daqing.financial.hrauth.annotation.Log)") +// public void operationLog() { +// } +// +// +// /** +// * 环绕增强，相当于MethodInterceptor +// */ +// @Around("operationLog()") +// public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable { +// Object res = null; +// long time = System.currentTimeMillis(); +// try { +// res = joinPoint.proceed(); +// time = System.currentTimeMillis() - time; +// return res; +// } finally { +// try { +// //User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); +// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); +// String token = request.getHeader("token"); +// String userId = RedisUtil.get("dq:token:"+token); +// String userEntityStr = RedisUtil.get("dq:userId:"+userId); +// UserEntity systemUser = JSON.parseObject(userEntityStr,UserEntity.class); +// +// //根据userId查询工号以及员工姓名 +// if(userId !=null || userId != ""){ +// EmployeeEntity employeeEntity = hrmsFeignService.getEmpmsgById(Long.valueOf(userId)); +// operation.addOperationLog(joinPoint,res,time,systemUser,employeeEntity); +// } +// +// //Token userToken = tokenService.getOne(new QueryWrapper().eq("token", token)); +// //UserEntity systemUser = userLoginService.getOne(new QueryWrapper().eq("id",userId)); +// //operation.addOperationLog(joinPoint,res,time,systemUser,employeeEntity); +// //方法执行完成后增加日志 +//// addOperationLog(joinPoint, res, time); +// } catch (Exception e) { +// log.error("LogAspect 操作失败：" + e.getMessage()); +// e.printStackTrace(); +// } +// } +// } +// +// +// /** +// * 对当前登录用户和占位符处理 +// * +// * @param argNames 方法参数名称数组 +// * @param args 方法参数数组 +// * @param annotation 注解信息 +// * @return 返回处理后的描述 +// */ +// private String getDetail(String[] argNames, Object[] args, Log annotation) { +// //获得登录用户信息 +// //User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); +// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); +// UserEntity systemUser = (UserEntity) request.getUserPrincipal(); +// +// Map map = new HashMap<>(4); +// for (int i = 0; i < argNames.length; i++) { +// map.put(argNames[i], args[i]); +// } +// +// String detail = annotation.detail(); +// try { +// detail = "'" + systemUser.getAccount() + "'=》" + annotation.detail(); +// for (Map.Entry entry : map.entrySet()) { +// Object k = entry.getKey(); +// Object v = entry.getValue(); +// detail = detail.replace("{{" + k + "}}", JSONObject.toJSONString(v)); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// return detail; +// } +// +// @Before("operationLog()") +// public void doBeforeAdvice(JoinPoint joinPoint) { +//// System.out.println("进入方法前执行....."); +// } +// +// /** +// * 处理完请求，返回内容 +// * +// * @param ret +// */ +// @AfterReturning(returning = "ret", pointcut = "operationLog()") +// public void doAfterReturning(Object ret) { +//// System.out.println("方法的返回值 : " + ret); +// } +// +// /** +// * 后置异常通知 +// */ +// @AfterThrowing("operationLog()") +// public void throwss(JoinPoint jp) { +//// System.out.println("方法异常时执行....."); +// } +// +// +// /** +// * 后置最终通知,final增强，不管是抛出异常或者正常退出都会执行 +// */ +// @After("operationLog()") +// public void after(JoinPoint jp) { +//// System.out.println("方法最后执行....."); +// } +// +// +// /** +// * 获取客户端ip地址 +// * +// * @param request +// * @return +// */ +// public static String getClientIp(HttpServletRequest request) { +// String ip = request.getHeader("x-forwarded-for"); +// if (ip == null || ip.trim() == "" || "unknown".equalsIgnoreCase(ip)) { +// ip = request.getHeader("Proxy-Client-IP"); +// } +// if (ip == null || ip.trim() == "" || "unknown".equalsIgnoreCase(ip)) { +// ip = request.getHeader("WL-Proxy-Client-IP"); +// } +// if (ip == null || ip.trim() == "" || "unknown".equalsIgnoreCase(ip)) { +// ip = request.getRemoteAddr(); +// } +// // 多个路由时，取第一个非unknown的ip +// final String[] arr = ip.split(","); +// for (final String str : arr) { +// if (!"unknown".equalsIgnoreCase(str)) { +// ip = str; +// break; +// } +// } +// return ip; +// } +// +//} diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/RolePermissionController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/RolePermissionController.java index d3ff1fef..95d76671 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/RolePermissionController.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/RolePermissionController.java @@ -1,15 +1,15 @@ package com.daqing.financial.hrauth.controller; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; import com.daqing.financial.hrauth.service.RolePermissionService; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.hrms.PermissionEntity; import com.daqing.framework.domain.hrms.RoleEntity; import com.daqing.framework.domain.hrms.RolePermissionEntity; import com.daqing.framework.domain.hrms.request.RolePermissionRequest; import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.domain.hrms.response.RolePermissionResponse; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java index c8c76d12..0520af69 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java @@ -1,13 +1,13 @@ package com.daqing.financial.hrauth.controller; import com.daqing.financial.hrauth.SystemLogControllerApi; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; import com.daqing.financial.hrauth.service.LoginLogService; import com.daqing.financial.hrauth.service.SystemLogService; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.hrms.SystemLog; import com.daqing.framework.domain.hrms.request.UserLoginLogRequest; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; 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 591df6c9..043c9a92 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 @@ -1,43 +1,30 @@ package com.daqing.financial.hrauth.controller; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.daqing.financial.hrauth.UserLoginControllerApi; -import com.daqing.financial.hrauth.annotation.Log; import com.daqing.financial.hrauth.config.WeChatConfig; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; import com.daqing.financial.hrauth.feign.HrmsFeignService; import com.daqing.financial.hrauth.model.XccLoginReq; import com.daqing.financial.hrauth.service.UserLoginService; import com.daqing.financial.hrauth.service.UserService; -import com.daqing.framework.domain.hrms.EmployeeEntity; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.hrms.UserEntity; import com.daqing.framework.domain.hrms.request.*; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; -import com.daqing.framework.util.JwtUtils; -import com.daqing.framework.util.RedisUtil; import com.daqing.framework.util.SendUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.http.HttpEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; -import java.util.Map; /** diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/BusinessType.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/BusinessType.java index d93e0528..d15be743 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/BusinessType.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/BusinessType.java @@ -1,66 +1,66 @@ -package com.daqing.financial.hrauth.enums; - -/** - * 日志操作类型 - */ -public enum BusinessType -{ - /** - * 其它 - */ - OTHER, - /** - * 新增 - */ - INSERT, - /** - * 修改 - */ - UPDATE, - /** - * 删除 - */ - DELETE, - /** - * 查询 - */ - SELECT, - /** - * 导出 - */ - EXPORT, - /** - * 导入 - */ - IMPORT; - - public static String getMsg(BusinessType type){ - String result = null; - switch (type) { - case INSERT: - result = "新增"; - break; - case UPDATE: - result = "修改"; - break; - case DELETE: - result = "删除"; - break; - case SELECT: - result = "查询"; - break; - case EXPORT: - result = "导出"; - break; - case IMPORT: - result = "导入"; - break; - case OTHER: - result = "其它"; - break; - default: - break; - } - return result; - } -} +//package com.daqing.financial.hrauth.enums; +// +///** +// * 日志操作类型 +// */ +//public enum BusinessType +//{ +// /** +// * 其它 +// */ +// OTHER, +// /** +// * 新增 +// */ +// INSERT, +// /** +// * 修改 +// */ +// UPDATE, +// /** +// * 删除 +// */ +// DELETE, +// /** +// * 查询 +// */ +// SELECT, +// /** +// * 导出 +// */ +// EXPORT, +// /** +// * 导入 +// */ +// IMPORT; +// +// public static String getMsg(BusinessType type){ +// String result = null; +// switch (type) { +// case INSERT: +// result = "新增"; +// break; +// case UPDATE: +// result = "修改"; +// break; +// case DELETE: +// result = "删除"; +// break; +// case SELECT: +// result = "查询"; +// break; +// case EXPORT: +// result = "导出"; +// break; +// case IMPORT: +// result = "导入"; +// break; +// case OTHER: +// result = "其它"; +// break; +// default: +// break; +// } +// return result; +// } +//} diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/OperationType.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/OperationType.java index 0444d8a5..1b7d2db4 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/OperationType.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/OperationType.java @@ -1,52 +1,52 @@ -package com.daqing.financial.hrauth.enums; - -public enum OperationType { - - /** - * 操作类型 - */ - UNKNOWN("UNKNOWN"), - DELETE("DELETE"), - SELECT("SELECT"), - UPDATE("UPDATE"), - INSERT("INSERT"); - - private String value; - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - OperationType(String s) { - this.value = s; - } - - - public static String getMsg(BusinessType type){ - String result = null; - switch (type) { - case INSERT: - result = "新增"; - break; - case UPDATE: - result = "修改"; - break; - case DELETE: - result = "删除"; - break; - case SELECT: - result = "查询"; - break; - case OTHER: - result = "其它"; - break; - default: - break; - } - return result; - } -} +//package com.daqing.financial.hrauth.enums; +// +//public enum OperationType { +// +// /** +// * 操作类型 +// */ +// UNKNOWN("UNKNOWN"), +// DELETE("DELETE"), +// SELECT("SELECT"), +// UPDATE("UPDATE"), +// INSERT("INSERT"); +// +// private String value; +// +// public String getValue() { +// return value; +// } +// +// public void setValue(String value) { +// this.value = value; +// } +// +// OperationType(String s) { +// this.value = s; +// } +// +// +// public static String getMsg(BusinessType type){ +// String result = null; +// switch (type) { +// case INSERT: +// result = "新增"; +// break; +// case UPDATE: +// result = "修改"; +// break; +// case DELETE: +// result = "删除"; +// break; +// case SELECT: +// result = "查询"; +// break; +// case OTHER: +// result = "其它"; +// break; +// default: +// break; +// } +// return result; +// } +//} diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/OperationUnit.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/OperationUnit.java index 6212f0cf..6a812a1a 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/OperationUnit.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/OperationUnit.java @@ -1,59 +1,59 @@ -package com.daqing.financial.hrauth.enums; - -public enum OperationUnit { - /** - * 被操作的单元 - */ - UNKNOWN("unknown"), - APPLYAMOUNTINFO("业务申请"), - GUARANTEE("担保部调查"), - ASSETS("资产部调查"), - MESSAGE("信息部调查"), - COMPLIANCE("合规调查"), - WORKCONFERENCE("工作会"), - LOANCOMMITTEE("贷审会"), - GUARANTEELETTER("担保函"), - PAYMENTCONFIRMATION("财务确认"), - LOANNOTICE("放款通知"), - COPYFOR("抄送"), - EFFICIENCY("流程效率"), - FORMDESIGN("表单设计"), - PROCESSMANAGE("流程管理"), - STATISTICS("业务统计"), - LOGIN("登录"), - ROLEPERMISSION("角色权限管理"), - EMPLOYEE("员工信息"), - COMPANY("企业信息"), - SYSLOG("日志管理"), - INSURANCE("保后管理"), - COLLECTION("催收管理"), - USER("user"), - LOG("log"), - PERMISSION("permission"), - ROLE("role"), - DEVICE("device"), - WITHDRAW("withdraw"), - ATRUSER("atrUser"), - ASSERT("ASSERT"), - COIN("coin"), - NOTICE("notice"), - DATASTATISTIC("datastatistic"), - BlockGroup("blockGroup"), - C2C("c2c"), - USERROLE("userRole"); - - private String value; - - OperationUnit(String value) { - this.value = value; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - -} +//package com.daqing.financial.hrauth.enums; +// +//public enum OperationUnit { +// /** +// * 被操作的单元 +// */ +// UNKNOWN("unknown"), +// APPLYAMOUNTINFO("业务申请"), +// GUARANTEE("担保部调查"), +// ASSETS("资产部调查"), +// MESSAGE("信息部调查"), +// COMPLIANCE("合规调查"), +// WORKCONFERENCE("工作会"), +// LOANCOMMITTEE("贷审会"), +// GUARANTEELETTER("担保函"), +// PAYMENTCONFIRMATION("财务确认"), +// LOANNOTICE("放款通知"), +// COPYFOR("抄送"), +// EFFICIENCY("流程效率"), +// FORMDESIGN("表单设计"), +// PROCESSMANAGE("流程管理"), +// STATISTICS("业务统计"), +// LOGIN("登录"), +// ROLEPERMISSION("角色权限管理"), +// EMPLOYEE("员工信息"), +// COMPANY("企业信息"), +// SYSLOG("日志管理"), +// INSURANCE("保后管理"), +// COLLECTION("催收管理"), +// USER("user"), +// LOG("log"), +// PERMISSION("permission"), +// ROLE("role"), +// DEVICE("device"), +// WITHDRAW("withdraw"), +// ATRUSER("atrUser"), +// ASSERT("ASSERT"), +// COIN("coin"), +// NOTICE("notice"), +// DATASTATISTIC("datastatistic"), +// BlockGroup("blockGroup"), +// C2C("c2c"), +// USERROLE("userRole"); +// +// private String value; +// +// OperationUnit(String value) { +// this.value = value; +// } +// +// public String getValue() { +// return value; +// } +// +// public void setValue(String value) { +// this.value = value; +// } +// +//} diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index a0715411..21bfa8a9 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.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=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -33,30 +33,30 @@ ribbon.ConnectTimeout: 30000 #正式环境（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/pom.xml b/dq-financial-hrms/pom.xml index 53e5c6ad..f945e068 100644 --- a/dq-financial-hrms/pom.xml +++ b/dq-financial-hrms/pom.xml @@ -39,12 +39,6 @@ ooxml-schemas 1.0 - - com.daqing.financial - dq-financial-hrms-auth - 0.0.1-SNAPSHOT - compile -