代码同步更新 02.12
parent
748e23d521
commit
c13e5e8e54
@ -1,8 +0,0 @@
|
|||||||
# 默认忽略的文件
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
||||||
# 基于编辑器的 HTTP 客户端请求
|
|
||||||
/httpRequests/
|
|
||||||
# Datasource local storage ignored files
|
|
||||||
/dataSources/
|
|
||||||
/dataSources.local.xml
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="CompilerConfiguration">
|
|
||||||
<annotationProcessing>
|
|
||||||
<profile default="true" name="Default" enabled="true" />
|
|
||||||
<profile name="Annotation profile for yudao" enabled="true">
|
|
||||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
|
||||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
|
||||||
<outputRelativeToContentRoot value="true" />
|
|
||||||
<processorPath useClasspath="false">
|
|
||||||
<entry name="$PROJECT_DIR$/../../MVNrepository/org/springframework/boot/spring-boot-configuration-processor/2.7.8/spring-boot-configuration-processor-2.7.8.jar" />
|
|
||||||
<entry name="$PROJECT_DIR$/../../MVNrepository/org/projectlombok/lombok/1.18.24/lombok-1.18.24.jar" />
|
|
||||||
<entry name="$PROJECT_DIR$/../../MVNrepository/org/mapstruct/mapstruct-processor/1.5.3.Final/mapstruct-processor-1.5.3.Final.jar" />
|
|
||||||
<entry name="$PROJECT_DIR$/../../MVNrepository/org/mapstruct/mapstruct/1.5.3.Final/mapstruct-1.5.3.Final.jar" />
|
|
||||||
</processorPath>
|
|
||||||
<module name="yudao-spring-boot-starter-job" />
|
|
||||||
<module name="yudao-module-report-api" />
|
|
||||||
<module name="yudao-module-system-biz" />
|
|
||||||
<module name="yudao-module-chain-biz" />
|
|
||||||
<module name="yudao-spring-boot-starter-redis" />
|
|
||||||
<module name="yudao-spring-boot-starter-mybatis" />
|
|
||||||
<module name="yudao-module-basic-biz" />
|
|
||||||
<module name="yudao-module-product-biz" />
|
|
||||||
<module name="yudao-spring-boot-starter-protection" />
|
|
||||||
<module name="yudao-spring-boot-starter-file" />
|
|
||||||
<module name="yudao-module-report-biz" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-tenant" />
|
|
||||||
<module name="yudao-spring-boot-starter-captcha" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-pay" />
|
|
||||||
<module name="yudao-module-basic-api" />
|
|
||||||
<module name="yudao-spring-boot-starter-mq" />
|
|
||||||
<module name="yudao-module-configure-api" />
|
|
||||||
<module name="yudao-module-product-api" />
|
|
||||||
<module name="yudao-spring-boot-starter-banner" />
|
|
||||||
<module name="yudao-common" />
|
|
||||||
<module name="yudao-spring-boot-starter-excel" />
|
|
||||||
<module name="yudao-module-configure-biz" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-dict" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-sms" />
|
|
||||||
<module name="yudao-module-flow-api" />
|
|
||||||
<module name="yudao-spring-boot-starter-test" />
|
|
||||||
<module name="yudao-module-flow-biz" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-data-permission" />
|
|
||||||
<module name="yudao-spring-boot-starter-security" />
|
|
||||||
<module name="yudao-spring-boot-starter-web" />
|
|
||||||
<module name="yudao-module-identity-biz" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-ip" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-operatelog" />
|
|
||||||
<module name="yudao-gateway" />
|
|
||||||
<module name="yudao-module-infra-api" />
|
|
||||||
<module name="yudao-spring-boot-starter-monitor" />
|
|
||||||
<module name="yudao-module-infra-biz" />
|
|
||||||
<module name="yudao-spring-boot-starter-env" />
|
|
||||||
<module name="yudao-module-identity-api" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-error-code" />
|
|
||||||
<module name="yudao-spring-boot-starter-flowable" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-social" />
|
|
||||||
<module name="yudao-spring-boot-starter-rpc" />
|
|
||||||
<module name="yudao-module-system-api" />
|
|
||||||
<module name="yudao-spring-boot-starter-biz-weixin" />
|
|
||||||
<module name="yudao-module-chain-api" />
|
|
||||||
<module name="yudao-spring-boot-starter-desensitize" />
|
|
||||||
</profile>
|
|
||||||
</annotationProcessing>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,121 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="Encoding">
|
|
||||||
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-common/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-common/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-banner/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-banner/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-env/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-env/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-excel/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-excel/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-file/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-file/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-flowable/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-job/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-job/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-monitor/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-mq/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-mq/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-protection/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-protection/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-redis/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-redis/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-rpc/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-security/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-security/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-test/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-test/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-web/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-framework/yudao-spring-boot-starter-web/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-gateway/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-gateway/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-basic/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-basic/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-basic/yudao-module-basic-api/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-basic/yudao-module-basic-api/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-basic/yudao-module-basic-biz/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-basic/yudao-module-basic-biz/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-chain/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-chain/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-chain/yudao-module-chain-api/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-chain/yudao-module-chain-api/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-chain/yudao-module-chain-biz/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-chain/yudao-module-chain-biz/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-configure/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-configure/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-configure/yudao-module-configure-api/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-configure/yudao-module-configure-api/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-configure/yudao-module-configure-biz/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-configure/yudao-module-configure-biz/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-flow/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-flow/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-flow/yudao-module-flow-api/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-flow/yudao-module-flow-api/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-flow/yudao-module-flow-biz/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-flow/yudao-module-flow-biz/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-identity/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-identity/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-identity/yudao-module-identity-api/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-identity/yudao-module-identity-api/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-identity/yudao-module-identity-biz/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-identity/yudao-module-identity-biz/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-infra/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-infra/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-infra/yudao-module-infra-api/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-infra/yudao-module-infra-api/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-infra/yudao-module-infra-biz/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-infra/yudao-module-infra-biz/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-product/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-product/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-product/yudao-module-product-api/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-product/yudao-module-product-api/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-product/yudao-module-product-biz/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-product/yudao-module-product-biz/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-report/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-report/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-report/yudao-module-report-api/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-report/yudao-module-report-api/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-report/yudao-module-report-biz/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-report/yudao-module-report-biz/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-system/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-system/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-system/yudao-module-system-api/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-system/yudao-module-system-api/src/main/resources" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-system/yudao-module-system-biz/src/main/java" charset="UTF-8" />
|
|
||||||
<file url="file://$PROJECT_DIR$/yudao-module-system/yudao-module-system-biz/src/main/resources" charset="UTF-8" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="RemoteRepositoriesConfiguration">
|
|
||||||
<remote-repository>
|
|
||||||
<option name="id" value="aliyunmaven" />
|
|
||||||
<option name="name" value="aliyun" />
|
|
||||||
<option name="url" value="https://maven.aliyun.com/repository/public" />
|
|
||||||
</remote-repository>
|
|
||||||
<remote-repository>
|
|
||||||
<option name="id" value="central" />
|
|
||||||
<option name="name" value="Central Repository" />
|
|
||||||
<option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
|
|
||||||
</remote-repository>
|
|
||||||
<remote-repository>
|
|
||||||
<option name="id" value="central" />
|
|
||||||
<option name="name" value="Maven Central repository" />
|
|
||||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
|
||||||
</remote-repository>
|
|
||||||
<remote-repository>
|
|
||||||
<option name="id" value="jboss.community" />
|
|
||||||
<option name="name" value="JBoss Community repository" />
|
|
||||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
|
||||||
</remote-repository>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
|
||||||
<component name="MavenProjectsManager">
|
|
||||||
<option name="originalFiles">
|
|
||||||
<list>
|
|
||||||
<option value="$PROJECT_DIR$/pom.xml" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
|
|
||||||
</project>
|
|
||||||
@ -1,124 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="Palette2">
|
|
||||||
<group name="Swing">
|
|
||||||
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="Button" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="RadioButton" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="CheckBox" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
|
||||||
<initial-values>
|
|
||||||
<property name="text" value="Label" />
|
|
||||||
</initial-values>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
|
||||||
<preferred-size width="150" height="-1" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
|
||||||
<preferred-size width="150" height="-1" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
|
||||||
<preferred-size width="150" height="-1" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
|
||||||
<preferred-size width="150" height="50" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
|
||||||
<preferred-size width="200" height="200" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
|
||||||
<preferred-size width="200" height="200" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
|
||||||
<preferred-size width="-1" height="20" />
|
|
||||||
</default-constraints>
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
|
||||||
</item>
|
|
||||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
|
||||||
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
|
||||||
</item>
|
|
||||||
</group>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="" vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.api.businessrule;
|
|
||||||
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
||||||
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
|
|
||||||
import cn.iocoder.yudao.module.identity.api.businessrule.dto.BusinessRuleRespDTO;
|
|
||||||
import cn.iocoder.yudao.module.identity.enums.ApiConstants;
|
|
||||||
import io.swagger.annotations.Api;
|
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
|
||||||
import io.swagger.annotations.ApiOperation;
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
|
|
||||||
|
|
||||||
import javax.validation.Valid;
|
|
||||||
|
|
||||||
@FeignClient(name = ApiConstants.NAME)
|
|
||||||
@Api(tags = "RPC 服务 - 码规则")
|
|
||||||
public interface BusinessRuleApi {
|
|
||||||
String PREFIX = ApiConstants.CONST + "/business-rule";
|
|
||||||
|
|
||||||
@PostMapping(PREFIX + "/create")
|
|
||||||
@ApiOperation("创建码规则")
|
|
||||||
@OperateLog(enable = false) // 不记录操作日志
|
|
||||||
CommonResult<Long> createBusinessRule(@Valid @RequestBody BusinessRuleRespDTO businessRule);
|
|
||||||
|
|
||||||
@PostMapping(PREFIX + "/delBusinessRule")
|
|
||||||
@ApiOperation("删除码规则")
|
|
||||||
@ApiImplicitParam(name = "codeRuleId", value = "码规则ID", required = true, example = "1", dataTypeClass = Long.class)
|
|
||||||
@OperateLog(enable = false) // 不记录操作日志
|
|
||||||
CommonResult<Boolean> delBusinessRule(Long codeRuleId);
|
|
||||||
}
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.api.businessrule;
|
|
||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
||||||
import cn.iocoder.yudao.module.identity.api.businessrule.dto.BusinessRuleRespDTO;
|
|
||||||
import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.BusinessRuleCreateReqVO;
|
|
||||||
import cn.iocoder.yudao.module.identity.dal.dataobject.businessrule.BusinessRuleDO;
|
|
||||||
import cn.iocoder.yudao.module.identity.service.businessrule.BusinessRuleService;
|
|
||||||
import cn.iocoder.yudao.module.system.enums.ApiConstants;
|
|
||||||
import org.apache.dubbo.config.annotation.DubboService;
|
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
import javax.validation.Valid;
|
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
||||||
|
|
||||||
|
|
||||||
@RestController // 提供 RESTful API 接口，给 Feign 调用
|
|
||||||
@DubboService(version = ApiConstants.VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用
|
|
||||||
@Validated
|
|
||||||
public class businessRuleApiImpl implements BusinessRuleApi {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BusinessRuleService businessRuleService;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@Transactional
|
|
||||||
public CommonResult<Long> createBusinessRule(@Valid BusinessRuleRespDTO businessRule) {
|
|
||||||
// BeanUtils.copyProperties(businessRule);
|
|
||||||
BusinessRuleCreateReqVO businessRuleCreateReqVO = new BusinessRuleCreateReqVO();
|
|
||||||
BeanUtil.copyProperties(businessRule, businessRuleCreateReqVO);
|
|
||||||
return CommonResult.success(businessRuleService.createBusinessRule(businessRuleCreateReqVO));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CommonResult<Boolean> delBusinessRule(Long codeRuleId) {
|
|
||||||
businessRuleService.deleteBusinessRule(codeRuleId);
|
|
||||||
return success(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,106 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.controller.admin.businessrule;
|
|
||||||
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
|
||||||
import io.swagger.annotations.*;
|
|
||||||
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
import javax.validation.*;
|
|
||||||
import javax.servlet.http.*;
|
|
||||||
import java.util.*;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
||||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
|
|
||||||
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.*;
|
|
||||||
import cn.iocoder.yudao.module.identity.dal.dataobject.businessrule.BusinessRuleDO;
|
|
||||||
import cn.iocoder.yudao.module.identity.convert.businessrule.BusinessRuleConvert;
|
|
||||||
import cn.iocoder.yudao.module.identity.service.businessrule.BusinessRuleService;
|
|
||||||
|
|
||||||
@Api(tags = "管理后台 - 码规则")
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/identity/business-rule")
|
|
||||||
@Validated
|
|
||||||
public class BusinessRuleController {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BusinessRuleService businessRuleService;
|
|
||||||
|
|
||||||
@PostMapping("/create")
|
|
||||||
@ApiOperation("创建码规则")
|
|
||||||
@PreAuthorize("@ss.hasPermission('identity:business-rule:create')")
|
|
||||||
public CommonResult<Long> createBusinessRule(@Valid @RequestBody BusinessRuleCreateReqVO createReqVO) {
|
|
||||||
return success(businessRuleService.createBusinessRule(createReqVO));
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/update")
|
|
||||||
@ApiOperation("更新码规则")
|
|
||||||
@PreAuthorize("@ss.hasPermission('identity:business-rule:update')")
|
|
||||||
public CommonResult<Boolean> updateBusinessRule(@Valid @RequestBody BusinessRuleUpdateReqVO updateReqVO) {
|
|
||||||
businessRuleService.updateBusinessRule(updateReqVO);
|
|
||||||
return success(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/delete")
|
|
||||||
@ApiOperation("删除码规则")
|
|
||||||
@ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
|
|
||||||
@PreAuthorize("@ss.hasPermission('identity:business-rule:delete')")
|
|
||||||
public CommonResult<Boolean> deleteBusinessRule(@RequestParam("id") Long id) {
|
|
||||||
businessRuleService.deleteBusinessRule(id);
|
|
||||||
return success(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/get")
|
|
||||||
@ApiOperation("获得码规则")
|
|
||||||
@ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
|
|
||||||
@PreAuthorize("@ss.hasPermission('identity:business-rule:query')")
|
|
||||||
public CommonResult<BusinessRuleRespVO> getBusinessRule(@RequestParam("id") Long id) {
|
|
||||||
BusinessRuleDO businessRule = businessRuleService.getBusinessRule(id);
|
|
||||||
return success(BusinessRuleConvert.INSTANCE.convert(businessRule));
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/list")
|
|
||||||
@ApiOperation("获得码规则列表")
|
|
||||||
@ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
|
|
||||||
@PreAuthorize("@ss.hasPermission('identity:business-rule:query')")
|
|
||||||
public CommonResult<List<BusinessRuleRespVO>> getBusinessRuleList(@RequestParam("ids") Collection<Long> ids) {
|
|
||||||
List<BusinessRuleDO> list = businessRuleService.getBusinessRuleList(ids);
|
|
||||||
return success(BusinessRuleConvert.INSTANCE.convertList(list));
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/listByBusinessId")
|
|
||||||
@ApiOperation("根据所属商户编码,获得码规则列表")
|
|
||||||
@ApiImplicitParam(name = "businessId", value = "所属商户编码", required = true, dataTypeClass = String.class)
|
|
||||||
@PreAuthorize("@ss.hasPermission('identity:business-rule:query')")
|
|
||||||
public CommonResult<List<BusinessRuleRespVO>> getBusinessRuleListByBusinessId(String businessId) {
|
|
||||||
List<BusinessRuleDO> list = businessRuleService.getBusinessRuleListByBusinessId(businessId);
|
|
||||||
return success(BusinessRuleConvert.INSTANCE.convertList(list));
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/page")
|
|
||||||
@ApiOperation("获得码规则分页")
|
|
||||||
@PreAuthorize("@ss.hasPermission('identity:business-rule:query')")
|
|
||||||
public CommonResult<PageResult<BusinessRuleRespVO>> getBusinessRulePage(@Valid BusinessRulePageReqVO pageVO) {
|
|
||||||
PageResult<BusinessRuleDO> pageResult = businessRuleService.getBusinessRulePage(pageVO);
|
|
||||||
return success(BusinessRuleConvert.INSTANCE.convertPage(pageResult));
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/getBusinessRuleByBusinessName")
|
|
||||||
@ApiOperation("根据商户昵称获取马规则信息")
|
|
||||||
@ApiImplicitParam(name = "businessName", value = "商户编码", required = true, example = "1024", dataTypeClass = Long.class)
|
|
||||||
@PreAuthorize("@ss.hasPermission('identity:business-rule:query')")
|
|
||||||
public CommonResult<BusinessRuleDO> getBusinessRuleByBusinessName(@RequestParam("businessName") String businessName) {
|
|
||||||
BusinessRuleDO businessRuleByBusinessName = businessRuleService.getBusinessRuleByBusinessName(businessName);
|
|
||||||
return success(businessRuleByBusinessName);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo;
|
|
||||||
|
|
||||||
import lombok.*;
|
|
||||||
import java.util.*;
|
|
||||||
import io.swagger.annotations.*;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
|
|
||||||
@ApiModel("管理后台 - 码规则创建 Request VO")
|
|
||||||
@Data
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
|
||||||
@ToString(callSuper = true)
|
|
||||||
public class BusinessRuleCreateReqVO extends BusinessRuleBaseVO {
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo;
|
|
||||||
|
|
||||||
import lombok.*;
|
|
||||||
import io.swagger.annotations.*;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
@ApiModel("管理后台 - 码规则 Response VO")
|
|
||||||
@Data
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
|
||||||
@ToString(callSuper = true)
|
|
||||||
public class BusinessRuleRespVO extends BusinessRuleBaseVO {
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "编码", required = true)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "创建时间")
|
|
||||||
private Date createTime;
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo;
|
|
||||||
|
|
||||||
import lombok.*;
|
|
||||||
import java.util.*;
|
|
||||||
import io.swagger.annotations.*;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
|
|
||||||
@ApiModel("管理后台 - 码规则更新 Request VO")
|
|
||||||
@Data
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
|
||||||
@ToString(callSuper = true)
|
|
||||||
public class BusinessRuleUpdateReqVO extends BusinessRuleBaseVO {
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "编码", required = true)
|
|
||||||
@NotNull(message = "编码不能为空")
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.convert.businessrule;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
||||||
|
|
||||||
import org.mapstruct.Mapper;
|
|
||||||
import org.mapstruct.factory.Mappers;
|
|
||||||
import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.*;
|
|
||||||
import cn.iocoder.yudao.module.identity.dal.dataobject.businessrule.BusinessRuleDO;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 码规则 Convert
|
|
||||||
*
|
|
||||||
* @author 芋道源码
|
|
||||||
*/
|
|
||||||
@Mapper
|
|
||||||
public interface BusinessRuleConvert {
|
|
||||||
|
|
||||||
BusinessRuleConvert INSTANCE = Mappers.getMapper(BusinessRuleConvert.class);
|
|
||||||
|
|
||||||
BusinessRuleDO convert(BusinessRuleCreateReqVO bean);
|
|
||||||
|
|
||||||
BusinessRuleDO convert(BusinessRuleUpdateReqVO bean);
|
|
||||||
|
|
||||||
BusinessRuleRespVO convert(BusinessRuleDO bean);
|
|
||||||
|
|
||||||
List<BusinessRuleRespVO> convertList(List<BusinessRuleDO> list);
|
|
||||||
|
|
||||||
PageResult<BusinessRuleRespVO> convertPage(PageResult<BusinessRuleDO> page);
|
|
||||||
|
|
||||||
List<BusinessRuleExcelVO> convertList02(List<BusinessRuleDO> list);
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.dal.mysql.businessrule;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
||||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
|
||||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
|
||||||
import cn.iocoder.yudao.module.identity.dal.dataobject.businessrule.BusinessRuleDO;
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
|
||||||
import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 码规则 Mapper
|
|
||||||
*
|
|
||||||
* @author 芋道源码
|
|
||||||
*/
|
|
||||||
@Mapper
|
|
||||||
public interface BusinessRuleMapper extends BaseMapperX<BusinessRuleDO> {
|
|
||||||
|
|
||||||
default PageResult<BusinessRuleDO> selectPage(BusinessRulePageReqVO reqVO) {
|
|
||||||
return selectPage(reqVO, new LambdaQueryWrapperX<BusinessRuleDO>()
|
|
||||||
.eqIfPresent(BusinessRuleDO::getBusinessId, reqVO.getBusinessId())
|
|
||||||
.likeIfPresent(BusinessRuleDO::getBusinessName, reqVO.getBusinessName())
|
|
||||||
.eqIfPresent(BusinessRuleDO::getCodeRuleId, reqVO.getCodeRuleId())
|
|
||||||
.likeIfPresent(BusinessRuleDO::getCodeRuleName, reqVO.getCodeRuleName())
|
|
||||||
.eqIfPresent(BusinessRuleDO::getCodeType, reqVO.getCodeType())
|
|
||||||
.eqIfPresent(BusinessRuleDO::getCodeRuleFormat, reqVO.getCodeRuleFormat())
|
|
||||||
.betweenIfPresent(BusinessRuleDO::getCreateTime, reqVO.getCreateTime())
|
|
||||||
.orderByDesc(BusinessRuleDO::getId));
|
|
||||||
}
|
|
||||||
|
|
||||||
default List<BusinessRuleDO> selectList(BusinessRuleExportReqVO reqVO) {
|
|
||||||
return selectList(new LambdaQueryWrapperX<BusinessRuleDO>()
|
|
||||||
.eqIfPresent(BusinessRuleDO::getBusinessId, reqVO.getBusinessId())
|
|
||||||
.likeIfPresent(BusinessRuleDO::getBusinessName, reqVO.getBusinessName())
|
|
||||||
.eqIfPresent(BusinessRuleDO::getCodeRuleId, reqVO.getCodeRuleId())
|
|
||||||
.likeIfPresent(BusinessRuleDO::getCodeRuleName, reqVO.getCodeRuleName())
|
|
||||||
.eqIfPresent(BusinessRuleDO::getCodeType, reqVO.getCodeType())
|
|
||||||
.eqIfPresent(BusinessRuleDO::getCodeRuleFormat, reqVO.getCodeRuleFormat())
|
|
||||||
.betweenIfPresent(BusinessRuleDO::getCreateTime, reqVO.getCreateTime())
|
|
||||||
.orderByDesc(BusinessRuleDO::getId));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.service.businessrule;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
import javax.validation.*;
|
|
||||||
import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.*;
|
|
||||||
import cn.iocoder.yudao.module.identity.dal.dataobject.businessrule.BusinessRuleDO;
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 码规则 Service 接口
|
|
||||||
*
|
|
||||||
* @author 芋道源码
|
|
||||||
*/
|
|
||||||
public interface BusinessRuleService {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 创建码规则
|
|
||||||
*
|
|
||||||
* @param createReqVO 创建信息
|
|
||||||
* @return 编号
|
|
||||||
*/
|
|
||||||
Long createBusinessRule(@Valid BusinessRuleCreateReqVO createReqVO);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 更新码规则
|
|
||||||
*
|
|
||||||
* @param updateReqVO 更新信息
|
|
||||||
*/
|
|
||||||
void updateBusinessRule(@Valid BusinessRuleUpdateReqVO updateReqVO);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除码规则
|
|
||||||
*
|
|
||||||
* @param id 编号
|
|
||||||
*/
|
|
||||||
void deleteBusinessRule(Long id);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获得码规则
|
|
||||||
*
|
|
||||||
* @param id 编号
|
|
||||||
* @return 码规则
|
|
||||||
*/
|
|
||||||
BusinessRuleDO getBusinessRule(Long id);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获得码规则列表
|
|
||||||
*
|
|
||||||
* @param ids 编号
|
|
||||||
* @return 码规则列表
|
|
||||||
*/
|
|
||||||
List<BusinessRuleDO> getBusinessRuleList(Collection<Long> ids);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获得码规则列表
|
|
||||||
*
|
|
||||||
* @param businessId 商户编编码
|
|
||||||
* @return 码规则列表
|
|
||||||
*/
|
|
||||||
List<BusinessRuleDO> getBusinessRuleListByBusinessId(String businessId);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获得码规则分页
|
|
||||||
*
|
|
||||||
* @param pageReqVO 分页查询
|
|
||||||
* @return 码规则分页
|
|
||||||
*/
|
|
||||||
PageResult<BusinessRuleDO> getBusinessRulePage(BusinessRulePageReqVO pageReqVO);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据商户昵称获取马规则信息
|
|
||||||
* @param businessName
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
BusinessRuleDO getBusinessRuleByBusinessName(String businessName);
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,152 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.identity.service.businessrule;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Disabled;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.identity.controller.admin.businessrule.vo.*;
|
|
||||||
import cn.iocoder.yudao.module.identity.dal.dataobject.businessrule.BusinessRuleDO;
|
|
||||||
import cn.iocoder.yudao.module.identity.dal.mysql.businessrule.BusinessRuleMapper;
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
import org.springframework.context.annotation.Import;
|
|
||||||
import java.util.*;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
import static cn.hutool.core.util.RandomUtil.*;
|
|
||||||
import static cn.iocoder.yudao.module.identity.enums.ErrorCodeConstants.*;
|
|
||||||
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
|
|
||||||
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
|
|
||||||
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
|
|
||||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
|
||||||
import static org.mockito.Mockito.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link BusinessRuleServiceImpl} 的单元测试类
|
|
||||||
*
|
|
||||||
* @author 芋道源码
|
|
||||||
*/
|
|
||||||
@Import(BusinessRuleServiceImpl.class)
|
|
||||||
public class BusinessRuleServiceImplTest extends BaseDbUnitTest {
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BusinessRuleServiceImpl businessRuleService;
|
|
||||||
|
|
||||||
@Resource
|
|
||||||
private BusinessRuleMapper businessRuleMapper;
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testCreateBusinessRule_success() {
|
|
||||||
// 准备参数
|
|
||||||
BusinessRuleCreateReqVO reqVO = randomPojo(BusinessRuleCreateReqVO.class);
|
|
||||||
|
|
||||||
// 调用
|
|
||||||
Long businessRuleId = businessRuleService.createBusinessRule(reqVO);
|
|
||||||
// 断言
|
|
||||||
assertNotNull(businessRuleId);
|
|
||||||
// 校验记录的属性是否正确
|
|
||||||
BusinessRuleDO businessRule = businessRuleMapper.selectById(businessRuleId);
|
|
||||||
assertPojoEquals(reqVO, businessRule);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testUpdateBusinessRule_success() {
|
|
||||||
// mock 数据
|
|
||||||
BusinessRuleDO dbBusinessRule = randomPojo(BusinessRuleDO.class);
|
|
||||||
businessRuleMapper.insert(dbBusinessRule);// @Sql: 先插入出一条存在的数据
|
|
||||||
// 准备参数
|
|
||||||
BusinessRuleUpdateReqVO reqVO = randomPojo(BusinessRuleUpdateReqVO.class, o -> {
|
|
||||||
o.setId(dbBusinessRule.getId()); // 设置更新的 ID
|
|
||||||
});
|
|
||||||
|
|
||||||
// 调用
|
|
||||||
businessRuleService.updateBusinessRule(reqVO);
|
|
||||||
// 校验是否更新正确
|
|
||||||
BusinessRuleDO businessRule = businessRuleMapper.selectById(reqVO.getId()); // 获取最新的
|
|
||||||
assertPojoEquals(reqVO, businessRule);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testUpdateBusinessRule_notExists() {
|
|
||||||
// 准备参数
|
|
||||||
BusinessRuleUpdateReqVO reqVO = randomPojo(BusinessRuleUpdateReqVO.class);
|
|
||||||
|
|
||||||
// 调用, 并断言异常
|
|
||||||
assertServiceException(() -> businessRuleService.updateBusinessRule(reqVO), BUSINESS_RULE_NOT_EXISTS);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testDeleteBusinessRule_success() {
|
|
||||||
// mock 数据
|
|
||||||
BusinessRuleDO dbBusinessRule = randomPojo(BusinessRuleDO.class);
|
|
||||||
businessRuleMapper.insert(dbBusinessRule);// @Sql: 先插入出一条存在的数据
|
|
||||||
// 准备参数
|
|
||||||
Long id = dbBusinessRule.getId();
|
|
||||||
|
|
||||||
// 调用
|
|
||||||
businessRuleService.deleteBusinessRule(id);
|
|
||||||
// 校验数据不存在了
|
|
||||||
assertNull(businessRuleMapper.selectById(id));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testDeleteBusinessRule_notExists() {
|
|
||||||
// 准备参数
|
|
||||||
Long id = randomLongId();
|
|
||||||
|
|
||||||
// 调用, 并断言异常
|
|
||||||
assertServiceException(() -> businessRuleService.deleteBusinessRule(id), BUSINESS_RULE_NOT_EXISTS);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
|
|
||||||
public void testGetBusinessRulePage() {
|
|
||||||
// mock 数据
|
|
||||||
BusinessRuleDO dbBusinessRule = randomPojo(BusinessRuleDO.class, o -> { // 等会查询到
|
|
||||||
o.setBusinessId(null);
|
|
||||||
o.setBusinessName(null);
|
|
||||||
o.setCodeRuleId(null);
|
|
||||||
o.setCodeRuleName(null);
|
|
||||||
o.setCodeType(null);
|
|
||||||
o.setCodeRuleFormat(null);
|
|
||||||
o.setCreateTime(null);
|
|
||||||
});
|
|
||||||
businessRuleMapper.insert(dbBusinessRule);
|
|
||||||
// 测试 businessId 不匹配
|
|
||||||
businessRuleMapper.insert(cloneIgnoreId(dbBusinessRule, o -> o.setBusinessId(null)));
|
|
||||||
// 测试 businessName 不匹配
|
|
||||||
businessRuleMapper.insert(cloneIgnoreId(dbBusinessRule, o -> o.setBusinessName(null)));
|
|
||||||
// 测试 codeRuleId 不匹配
|
|
||||||
businessRuleMapper.insert(cloneIgnoreId(dbBusinessRule, o -> o.setCodeRuleId(null)));
|
|
||||||
// 测试 codeRuleName 不匹配
|
|
||||||
businessRuleMapper.insert(cloneIgnoreId(dbBusinessRule, o -> o.setCodeRuleName(null)));
|
|
||||||
// 测试 codeType 不匹配
|
|
||||||
businessRuleMapper.insert(cloneIgnoreId(dbBusinessRule, o -> o.setCodeType(null)));
|
|
||||||
// 测试 codeRuleFormat 不匹配
|
|
||||||
businessRuleMapper.insert(cloneIgnoreId(dbBusinessRule, o -> o.setCodeRuleFormat(null)));
|
|
||||||
// 测试 createTime 不匹配
|
|
||||||
businessRuleMapper.insert(cloneIgnoreId(dbBusinessRule, o -> o.setCreateTime(null)));
|
|
||||||
// 准备参数
|
|
||||||
BusinessRulePageReqVO reqVO = new BusinessRulePageReqVO();
|
|
||||||
reqVO.setBusinessId(null);
|
|
||||||
reqVO.setBusinessName(null);
|
|
||||||
reqVO.setCodeRuleId(null);
|
|
||||||
reqVO.setCodeRuleName(null);
|
|
||||||
reqVO.setCodeType(null);
|
|
||||||
reqVO.setCodeRuleFormat(null);
|
|
||||||
// reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
|
||||||
|
|
||||||
// 调用
|
|
||||||
PageResult<BusinessRuleDO> pageResult = businessRuleService.getBusinessRulePage(reqVO);
|
|
||||||
// 断言
|
|
||||||
assertEquals(1, pageResult.getTotal());
|
|
||||||
assertEquals(1, pageResult.getList().size());
|
|
||||||
assertPojoEquals(dbBusinessRule, pageResult.getList().get(0));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue