解决冲突
This commit is contained in:
zhujunshuai
33
.idea/artifacts/pluss_manage_page_war_exploded.xml
generated
33
.idea/artifacts/pluss_manage_page_war_exploded.xml
generated
@@ -82,7 +82,6 @@
|
||||
<element id="library" level="project" name="Maven: com.github.virtuald:curvesapi:1.06" />
|
||||
<element id="library" level="project" name="Maven: cn.jpush.api:jpush-client:3.5.5" />
|
||||
<element id="library" level="project" name="Maven: io.netty:netty-all:4.1.29.Final" />
|
||||
<element id="library" level="project" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" />
|
||||
<element id="library" level="project" name="Maven: cn.jpush.api:jiguang-common:1.1.12" />
|
||||
<element id="library" level="project" name="Maven: com.mob.push.sdk:mobpush-websdkv3-java:1.0.4" />
|
||||
<element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.1.0.RELEASE" />
|
||||
@@ -96,17 +95,6 @@
|
||||
<element id="library" level="project" name="Maven: javax.servlet:javax.servlet-api:4.0.1" />
|
||||
<element id="library" level="project" name="Maven: com.jhlabs:filters:2.0.235-1" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:dysmsapi20170525:2.0.21" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-util:0.2.14" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:endpoint-util:0.0.7" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea:1.2.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-openapi:0.2.6" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:credentials-java:0.2.4" />
|
||||
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
|
||||
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-xml:0.1.5" />
|
||||
<element id="library" level="project" name="Maven: org.dom4j:dom4j:2.0.3" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:openapiutil:0.1.14" />
|
||||
<element id="library" level="project" name="Maven: cn.hutool:hutool-all:5.8.4" />
|
||||
<element id="library" level="project" name="Maven: xml-security:xmlsec:1.3.0" />
|
||||
<element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.3.2" />
|
||||
@@ -114,8 +102,6 @@
|
||||
<element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" />
|
||||
<element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.8.1" />
|
||||
<element id="library" level="project" name="Maven: org.projectlombok:lombok:1.18.20" />
|
||||
<element id="library" level="project" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" />
|
||||
<element id="library" level="project" name="Maven: com.squareup.okio:okio:1.15.0" />
|
||||
<element id="library" level="project" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.23" />
|
||||
<element id="library" level="project" name="Maven: com.alibaba:druid:1.1.23" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.9.1" />
|
||||
@@ -191,6 +177,25 @@
|
||||
<element id="library" level="project" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" />
|
||||
<element id="library" level="project" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" />
|
||||
<element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:cloudauth20200618:2.0.3" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:oss-client:3.0.2" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:credentials-java:0.2.5" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-xml:0.1.1" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:openplatform20191219:3.0.2" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-rpc-util:0.1.2" />
|
||||
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
|
||||
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-rpc:0.1.2" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:oss-util:1.0.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-util:0.2.11" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-fileform:0.0.3" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:endpoint-util:0.0.6" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea:1.2.3" />
|
||||
<element id="library" level="project" name="Maven: com.squareup.okhttp3:okhttp:3.12.13" />
|
||||
<element id="library" level="project" name="Maven: com.squareup.okio:okio:1.15.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-openapi:0.0.16" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:openapiutil:0.1.6" />
|
||||
<element id="library" level="project" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" />
|
||||
<element id="library" level="project" name="Maven: javax.annotation:javax.annotation-api:1.3.2" />
|
||||
<element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" />
|
||||
<element id="library" level="project" name="Maven: org.apache.taglibs:taglibs-standard-impl:1.2.5" />
|
||||
|
||||
460
.idea/workspace.xml
generated
460
.idea/workspace.xml
generated
@@ -1,460 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="更改部分配置（百度文字识别）">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/artifacts/pluss_manage_page_war_exploded.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/pluss_manage_page_war_exploded.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/code-generator/code-generator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/code-generator/code-generator.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/pluss-api-page.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-api-page/pluss-api-page.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/application-dev.yml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/application-prod.yml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/application-test.yml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/application.yml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/ApiApplication.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/annotation/Cert.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/annotation/OpLog.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/annotation/ThirdAuth.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/aop/CertAspect.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/aop/OpLogAspect.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/aop/TrimAspect.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/configurer/Swagger2Configurer.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/configurer/WebConfigurer.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/AllExceptionResolver.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/CurrentUserMethodArgumentResolver.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/FastJsonHttpMessageConverterEx.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/configurer/extend/StringDeserializer.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/AccountBalanceController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/AccountController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityActivateController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityConsumReturnController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityRechargeController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/ActivityRecommendController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/AgentInfoController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/AgreementController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/AlipayController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/AliyunController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/AppMenuController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/BankCardController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/BannerController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/BestNewActivityController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/CashAccountController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/CashController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceGoodsController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceMerchantBuyController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceMerchantBuyDetailController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/DeviceSignUnbindController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/FansConsumReturnController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/FansController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/HelpVideoController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/HomePageController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/IdcardController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/IntroduceController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/LeshuaMakeMoneyController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/LevelController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MainPageController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MccInfoController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MccInfoSortController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MemberOrderController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MemberSettingController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantAddressController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantBankCardController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantBaseInfoController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantDeviceController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantGuideController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantImageController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantIncomeController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberComsumeController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMenberRechargeController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantMoveRecordsController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantOrderController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantProfitController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantQrCodeController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRateController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRateRecordController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRegistAuditRecordController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantRegistLogController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantScanQrCodeController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantStaffController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/MerchantStoreController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/NewAreaController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticeController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticePageController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/NoticeReadRecordController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/PushController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/QuestionsAnswersController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/RealFansController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/SpreadController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/SuggestController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/SxfMccInfoController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/SystemConfigController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/SystemInfoController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/TestController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/UploadImageController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController$1.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/UserAppController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/UserInfoController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/UserLevelController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/UserOrganController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/UserPushIdController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/UserVoiceController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/WxBankCodeController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/WxCityInfoController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/address/UserAddressController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/bill/BillStatisticsController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/common/CustomErrorController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/common/ImageUploadController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/device/DeviceStockController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/device/DeviceTransferController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/device/MercOrderExpressController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/jft/JftAuditController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/jft/JftController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/level/TeamLevelController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/logist/LogistCallbackController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MakeMoneyController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MercAuthController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MercMemberSetController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchAuditController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantPluginController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/MerchantRateNewController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/WxCertController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/WxController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/MachineCallbackController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/merchant/callback/WxCertCallbackController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercOrderDetailController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercOrderNewController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/store/MercShopTrolleyController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/store/PostageConfigController.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/interceptor/TokenRegistryInterceptor.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/mapper/ImgReflectMapper.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/mapper/SpreadMapper.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/mapper/TestMapper.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/service/agent/AgentStaffService.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/service/agent/MerchantRateApiService.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/service/agent/impl/AgentStaffServiceImpl.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/service/agent/impl/MerchantRateServiceApiImpl.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/service/common/SpreadService.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/service/common/impl/SpreadServiceImpl.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/log4j2-dev.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/log4j2-prod.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/mapper/ImgReflectMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/mapper/SpreadMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-common-bundle/pluss-common-bundle.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/pluss-common-bundle.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GetuiConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GetuiConfig.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-common-bundle/src/main/resources/config/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/src/main/resources/config/application-common.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-dao-bundle/pluss-dao-bundle.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-dao-bundle/pluss-dao-bundle.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-dao-bundle/src/main/resources/mapper/BestNewActivity-sqlmap.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-dao-bundle/src/main/resources/mapper/BestNewActivity-sqlmap.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-dao-bundle/src/main/resources/mapper/Notice-sqlmap.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-dao-bundle/src/main/resources/mapper/Notice-sqlmap.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-dao-bundle/src/main/resources/mapper/NoticeReadRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-dao-bundle/src/main/resources/mapper/NoticeReadRecordMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-manage-page/pluss-manage-page.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-manage-page/pluss-manage-page.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-manage-page/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-manage-page/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-manage-page/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-manage-page/src/main/resources/application-dev.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/pluss-model-bundle.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/pluss-model-bundle.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-parent.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-parent.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/pluss-service-bundle.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/pluss-service-bundle.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-wap-page/pluss-wap-page.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-wap-page/pluss-wap-page.iml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="ComposerSettings">
|
||||
<execution />
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="localRepository" value="D:\m2\repository" />
|
||||
<option name="mavenHome" value="D:\software\apache-maven-3.6.3-bin\apache-maven-3.6.3" />
|
||||
<option name="userSettingsFile" value="D:\software\apache-maven-3.6.3-bin\apache-maven-3.6.3\conf\settings.xml" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectId" id="2JRKsoH7USttjLLgTdufP7isMIQ" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="ExpandSpringBootJavaOptionsPanel" value="true" />
|
||||
<property name="RequestMappingsPanelOrder0" value="0" />
|
||||
<property name="RequestMappingsPanelOrder1" value="1" />
|
||||
<property name="RequestMappingsPanelWidth0" value="75" />
|
||||
<property name="RequestMappingsPanelWidth1" value="75" />
|
||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="aspect.path.notification.shown" value="true" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="node.js.detected.package.eslint" value="true" />
|
||||
<property name="node.js.detected.package.tslint" value="true" />
|
||||
<property name="node.js.selected.package.eslint" value="(autodetect)" />
|
||||
<property name="node.js.selected.package.tslint" value="(autodetect)" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="project.structure.last.edited" value="模块" />
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
<property name="settings.editor.selected.configurable" value="MavenSettings" />
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="configurationTypes">
|
||||
<set>
|
||||
<option value="SpringBootApplicationConfigurationType" />
|
||||
</set>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Spring Boot.ManageApplication">
|
||||
<configuration name="Base64Util" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="cn.pluss.platform.util.Base64Util" />
|
||||
<module name="pluss-common-bundle" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="cn.pluss.platform.util.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
|
||||
<option name="arquillianRunConfiguration">
|
||||
<value>
|
||||
<option name="containerStateName" value="" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="TEST_OBJECT" value="class" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="ApiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="pluss-api-page" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.ApiApplication" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="ManageApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="pluss-manage-page" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.ManageApplication" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
|
||||
<option name="ALTERNATIVE_JRE_PATH" />
|
||||
<option name="SHORTEN_COMMAND_LINE" value="NONE" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="WapApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="pluss-wap-page" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.WapApplication" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="Application.Base64Util" />
|
||||
<item itemvalue="Spring Boot.ApiApplication" />
|
||||
<item itemvalue="Spring Boot.ManageApplication" />
|
||||
<item itemvalue="Spring Boot.WapApplication" />
|
||||
</list>
|
||||
</component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="默认任务">
|
||||
<changelist id="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="" />
|
||||
<created>1672035665897</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1672035665897</updated>
|
||||
<workItem from="1672035668891" duration="14242000" />
|
||||
<workItem from="1672710504604" duration="3600000" />
|
||||
<workItem from="1672794561883" duration="14930000" />
|
||||
<workItem from="1672880913444" duration="22544000" />
|
||||
<workItem from="1672967071131" duration="28253000" />
|
||||
<workItem from="1673053725300" duration="14019000" />
|
||||
<workItem from="1673226451285" duration="22191000" />
|
||||
<workItem from="1673312865230" duration="27697000" />
|
||||
<workItem from="1673400058089" duration="30123000" />
|
||||
<workItem from="1673486519964" duration="33762000" />
|
||||
<workItem from="1673571894423" duration="19662000" />
|
||||
<workItem from="1673831400192" duration="17300000" />
|
||||
<workItem from="1673917492868" duration="27221000" />
|
||||
<workItem from="1674003718074" duration="22135000" />
|
||||
<workItem from="1674867825532" duration="12546000" />
|
||||
<workItem from="1674889612655" duration="4695000" />
|
||||
<workItem from="1674894362598" duration="8405000" />
|
||||
<workItem from="1674954816004" duration="4649000" />
|
||||
<workItem from="1674973596901" duration="7466000" />
|
||||
<workItem from="1675047956716" duration="19778000" />
|
||||
<workItem from="1675126922196" duration="15667000" />
|
||||
<workItem from="1675212926447" duration="1330000" />
|
||||
<workItem from="1675214280482" duration="36324000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="更改配置">
|
||||
<created>1674892648184</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1674892648184</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="更改发送短信，">
|
||||
<created>1674897664824</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1674897664824</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="更改部分配置（百度文字识别）">
|
||||
<created>1674956689324</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1674956689324</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="4" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="1">
|
||||
<value>
|
||||
<State>
|
||||
<option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
|
||||
<option name="FILTERS">
|
||||
<map>
|
||||
<entry key="branch">
|
||||
<value>
|
||||
<list>
|
||||
<option value="HEAD" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="structure">
|
||||
<value>
|
||||
<list>
|
||||
<option value="dir:D:/czgzs/chaozhanggui/pluss-service-bundle/target" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="2">
|
||||
<value>
|
||||
<State>
|
||||
<option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
|
||||
<option name="FILTERS">
|
||||
<map>
|
||||
<entry key="branch">
|
||||
<value>
|
||||
<list>
|
||||
<option value="HEAD" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="roots">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State>
|
||||
<option name="FILTERS">
|
||||
<map>
|
||||
<entry key="branch">
|
||||
<value>
|
||||
<list>
|
||||
<option value="origin/master" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="OPEN_GENERIC_TABS">
|
||||
<map>
|
||||
<entry key="1" value="TOOL_WINDOW" />
|
||||
<entry key="2" value="TOOL_WINDOW" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="更改配置" />
|
||||
<MESSAGE value="更改发送短信，" />
|
||||
<MESSAGE value="更改部分配置（百度文字识别）" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="更改部分配置（百度文字识别）" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java</url>
|
||||
<line>95</line>
|
||||
<option name="timeStamp" value="15" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java</url>
|
||||
<line>2565</line>
|
||||
<option name="timeStamp" value="17" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
<pin-to-top-manager>
|
||||
<pinned-members>
|
||||
<PinnedItemInfo parentTag="com.aliyun.oss.OSSClient" memberName="uploadOperation" />
|
||||
</pinned-members>
|
||||
</pin-to-top-manager>
|
||||
</component>
|
||||
<component name="XSLT-Support.FileAssociations.UIState">
|
||||
<expand />
|
||||
<select />
|
||||
</component>
|
||||
</project>
|
||||
@@ -126,8 +126,6 @@
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
|
||||
@@ -216,6 +214,15 @@
|
||||
<orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.tencentyun:tls-sig-api:1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
|
||||
|
||||
@@ -101,6 +101,7 @@
|
||||
<artifactId>swagger-bootstrap-ui</artifactId>
|
||||
<version>1.9.6</version>
|
||||
</dependency>
|
||||
|
||||
<!--jsp支持 start -->
|
||||
|
||||
<!-- html 支持 -->
|
||||
|
||||
@@ -53,7 +53,7 @@ public class AccountController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存商户结算信息, 最新接口
|
||||
* 保存商户结算信息, 最新接口 最最最新
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
|
||||
@@ -726,6 +726,7 @@ public class MerchantOrderController {
|
||||
result = ysPayOldService.tradeQuery(order,channel.getMerchantId());
|
||||
break;
|
||||
}
|
||||
|
||||
if(result != null){
|
||||
merchantOrderService.updateOrderStatus(result,order);
|
||||
String status = result.getString("payStatus");
|
||||
|
||||
@@ -629,7 +629,7 @@ public class UserAppController {
|
||||
opDetail = "商户请求进件"
|
||||
)
|
||||
@PostMapping("/merchantAudit")
|
||||
@ApiOperation(value = "通用进件", notes = "通用进件", httpMethod = "POST")
|
||||
@ApiOperation(value = "通用进件， 商户进件请求", notes = "通用进件", httpMethod = "POST")
|
||||
@ApiImplicitParams(
|
||||
{
|
||||
@ApiImplicitParam(
|
||||
@@ -647,7 +647,7 @@ public class UserAppController {
|
||||
}
|
||||
|
||||
@PostMapping("/editMerchantAudit")
|
||||
@ApiOperation(value = "通用进件", notes = "通用进件", httpMethod = "POST")
|
||||
@ApiOperation(value = "通用进件，当前特指修改结算信息，只允许修改结算信息", notes = "通用进件", httpMethod = "POST")
|
||||
@ApiImplicitParams(
|
||||
{
|
||||
@ApiImplicitParam(
|
||||
|
||||
@@ -47,6 +47,7 @@ public class AuditCallbackController {
|
||||
private YsConfigV2 ysConfig;
|
||||
|
||||
@PostMapping("sxf")
|
||||
// TODO 后续需要接sxf的回调
|
||||
public Map<String, Object> sxfAuditCallback(@RequestBody JSONObject result) throws Exception {
|
||||
return sxfMerchantAuditService.merchantAuditCallback(result);
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ public class SxfConfg {
|
||||
public static final String SXF_WX_CERT_CANCEL = SXF_CERT_DOMAIN + "/merchant/realName/backApplyBill";
|
||||
public static String PRIVATE_KEY =
|
||||
"MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMRFhTpr+JWtfhHZ80UJcnDCMeydtcF38S5s+WdifTYNMequFN6uRYoSFJqzQrR0ls7/ZAjUFP/dZL0QJAsWlnRLLSvPsgUU/DzAF7myl6/swuK4eo9frwAYP4ItQcP+DsHBUFnqUbWUON8C3M5ggY92qKfKV1k59tVnFVjoPhbbAgMBAAECgYAzL/5jEi2uu6SZe0Iayy/xgHQMxcTVRDa+aOVStTj6k85k6im/OawhKj39aqsG7TE3oxuvwcAISvEu7bq4uZdbICPdeKLcfNpK4pIfVfokPROjlKSyDgm37gqM7F+T0ZoARVqcd7Mgj09UKKpq7Pi0a/FusEa5CdG2LrUTjZuHIQJBAOFzolrGsPsWaVMpoYGeRY2UrT0PjfXJ1E7nkHqLXCCgfrur374YEEWeLtjHCI6zaXgv/3Coj3USAhKMw4lDAYcCQQDe3bL3szwkGdUmZk61ebY7HanilKnIYNuhC9ALUEElDp2eA1ld5cQvRb4BAeNsvabptt2lRPcscFu9zvH0DaUNAkEAww8HAz8xVKyZSAiW4cyMJOjj0hapHmUXOYWELWJxvRDfVYRpOtEbEwC/S3M45i44LHJqsZBFPmbsQBxl+VZt9QJBAL2tD+EywU+0UK2SyxA2mzqq32iAwBNTI/lnlVPbpOYGD21pSkjZAWR+RdyTn9xveLxWr0M2c+t1YQ8lLtVYO40CQQC2pVlYu5BIvXClLj6pHxwrK9G3JgwaanbEPFX0PjIJmU94QSLUd4OtDhvbXq43E5dlyvz5ybYvd8pygmjV9oM5";
|
||||
//"MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMRFhTpr+JWtfhHZ80UJcnDCMeydtcF38S5s+WdifTYNMequFN6uRYoSFJqzQrR0ls7/ZAjUFP/dZL0QJAsWlnRLLSvPsgUU/DzAF7myl6/swuK4eo9frwAYP4ItQcP+DsHBUFnqUbWUON8C3M5ggY92qKfKV1k59tVnFVjoPhbbAgMBAAECgYAzL/5jEi2uu6SZe0Iayy/xgHQMxcTVRDa+aOVStTj6k85k6im/OawhKj39aqsG7TE3oxuvwcAISvEu7bq4uZdbICPdeKLcfNpK4pIfVfokPROjlKSyDgm37gqM7F+T0ZoARVqcd7Mgj09UKKpq7Pi0a/FusEa5CdG2LrUTjZuHIQJBAOFzolrGsPsWaVMpoYGeRY2UrT0PjfXJ1E7nkHqLXCCgfrur374YEEWeLtjHCI6zaXgv/3Coj3USAhKMw4lDAYcCQQDe3bL3szwkGdUmZk61ebY7HanilKnIYNuhC9ALUEElDp2eA1ld5cQvRb4BAeNsvabptt2lRPcscFu9zvH0DaUNAkEAww8HAz8xVKyZSAiW4cyMJOjj0hapHmUXOYWELWJxvRDfVYRpOtEbEwC/S3M45i44LHJqsZBFPmbsQBxl+VZt9QJBAL2tD+EywU+0UK2SyxA2mzqq32iAwBNTI/lnlVPbpOYGD21pSkjZAWR+RdyTn9xveLxWr0M2c+t1YQ8lLtVYO40CQQC2pVlYu5BIvXClLj6pHxwrK9G3JgwaanbEPFX0PjIJmU94QSLUd4OtDhvbXq43E5dlyvz5ybYvd8pygmjV9oM5";
|
||||
public static String PUBLIC_KEY;
|
||||
/**
|
||||
* sxf渠道号
|
||||
|
||||
@@ -20,8 +20,10 @@ aliyun:
|
||||
bucketname: czg-oss
|
||||
callback: ${parameter.domain}/manage/upload/ossCallback
|
||||
bankcard:
|
||||
#旧地址 https://aliyun-bankcard4-verify.apistore.cn/bank4
|
||||
bank-url: https://aliyun-bankcard4-verify.apistore.cn/bank4
|
||||
app-code: 11cb746de2704f5482a40fd36ed8a1f1
|
||||
app-code: 11cb746de2704f5482a40fd36ed2sg6u
|
||||
SceneId: 3931001
|
||||
|
||||
#阿里MQTT参数配置
|
||||
mqtt:
|
||||
@@ -88,6 +90,7 @@ spring:
|
||||
port: 5672
|
||||
|
||||
parameter:
|
||||
# 124.114.74.203本机ip
|
||||
domain: http://60.205.224.68
|
||||
ALI_APP_AUTH_TOKEN: ${parameter.domain}/wap/aliPay/index
|
||||
ALI_APP_ID: 支付宝原生接入的APPID
|
||||
@@ -118,9 +121,9 @@ parameter:
|
||||
bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
|
||||
blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
|
||||
# 百度人脸识别应用的AK
|
||||
baiduAK2:
|
||||
baiduAK2: ASgPr1OxpI32E3G96rxWObuZ
|
||||
# 百度人脸识别应用的SK
|
||||
baiduSK2:
|
||||
baiduSK2: 80aOspiFxTgGmcWZoTinwlOOjRT6IRPE
|
||||
fans_profit: 4.0E-4
|
||||
idCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
|
||||
leshuaCallBackKey:
|
||||
@@ -138,8 +141,8 @@ parameter:
|
||||
## 默认为正式环境
|
||||
sxf:
|
||||
domain: https://openapi.tianquetech.com
|
||||
orgId:
|
||||
publicKey:
|
||||
orgId: "02668880"
|
||||
publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjo1+KBcvwDSIo+nMYLeOJ19Ju4ii0xH66ZxFd869EWFWk/EJa3xIA2+4qGf/Ic7m7zi/NHuCnfUtUDmUdP0JfaZiYwn+1Ek7tYAOc1+1GxhzcexSJLyJlR2JLMfEM+rZooW4Ei7q3a8jdTWUNoak/bVPXnLEVLrbIguXABERQ0Ze0X9Fs0y/zkQFg8UjxUN88g2CRfMC6LldHm7UBo+d+WlpOYH7u0OTzoLLiP/04N1cfTgjjtqTBI7qkOGxYs6aBZHG1DJ6WdP+5w+ho91sBTVajsCxAaMoExWQM2ipf/1qGdsWmkZScPflBqg7m0olOD87ymAVP/3Tcbvi34bDfwIDAQAB
|
||||
|
||||
getui:
|
||||
domain: https://restapi.getui.com/v2/${getui.appId}
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.5.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.29.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.jpush.api:jiguang-common:1.1.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.mob.push.sdk:mobpush-websdkv3-java:1.0.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.1.0.RELEASE" level="project" />
|
||||
@@ -117,17 +116,6 @@
|
||||
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.21" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: xml-security:xmlsec:1.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.2" level="project" />
|
||||
@@ -135,8 +123,6 @@
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.9.1" level="project" />
|
||||
@@ -212,6 +198,25 @@
|
||||
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.13" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.0.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.0.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.12" level="project" />
|
||||
|
||||
@@ -23,7 +23,7 @@ import java.util.Objects;
|
||||
public class AccountDTO extends Account {
|
||||
|
||||
/**
|
||||
* 进件状态
|
||||
* 进件状态。0或无、待审核，1、审核中 2、审核失败
|
||||
*/
|
||||
private String status;
|
||||
|
||||
|
||||
@@ -100,8 +100,6 @@
|
||||
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.5.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.29.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.jpush.api:jiguang-common:1.1.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.mob.push.sdk:mobpush-websdkv3-java:1.0.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.1.0.RELEASE" level="project" />
|
||||
@@ -115,17 +113,6 @@
|
||||
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.21" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.16.11.ALL" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: xml-security:xmlsec:1.3.0" level="project" />
|
||||
@@ -135,8 +122,6 @@
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.75" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.9.1" level="project" />
|
||||
@@ -225,6 +210,26 @@
|
||||
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.1.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.13" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.0.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.65" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.2.71" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71" level="project" />
|
||||
|
||||
@@ -68,6 +68,12 @@
|
||||
<version>1.1.2.RELEASE</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>cloudauth20200618</artifactId>
|
||||
<version>2.0.3</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@@ -142,11 +142,12 @@ public class BaiduFaceDetectServiceImpl implements BaiduFaceDetectService {
|
||||
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
|
||||
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
try {
|
||||
Thumbnails.of(bais).size(1920, 1080).toOutputStream(baos);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
//TODO 图片压缩 暂时注释
|
||||
// try {
|
||||
// Thumbnails.of(bais).size(1920, 1080).toOutputStream(baos);
|
||||
// } catch (IOException e) {
|
||||
// throw new RuntimeException(e);
|
||||
// }
|
||||
|
||||
dist = DatatypeConverter.printBase64Binary(baos.toByteArray());
|
||||
|
||||
|
||||
@@ -18,6 +18,15 @@ public interface AliyunService extends IpLocationService {
|
||||
* @return 校验结果
|
||||
*/
|
||||
void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName);
|
||||
/**
|
||||
* 银行卡四要素（新）
|
||||
* @param phone 手机号
|
||||
* @param bankCardNo 银行卡号
|
||||
* @param certNo 身份证号
|
||||
* @param realName 姓名
|
||||
* @return 校验结果
|
||||
*/
|
||||
void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName);
|
||||
|
||||
/**
|
||||
* 银行卡四要素
|
||||
@@ -28,6 +37,15 @@ public interface AliyunService extends IpLocationService {
|
||||
* @return 校验结果
|
||||
*/
|
||||
void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName, String errorMsg);
|
||||
/**
|
||||
* 银行卡四要素（新）
|
||||
* @param phone 手机号
|
||||
* @param bankCardNo 银行卡号
|
||||
* @param certNo 身份证号
|
||||
* @param realName 姓名
|
||||
* @return 校验结果
|
||||
*/
|
||||
void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName,String errorMsg);
|
||||
|
||||
AssumeRoleResponse.Credentials stsToken(String userId);
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import cn.pluss.platform.util.HttpResult;
|
||||
import cn.pluss.platform.util.HttpUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.aliyun.cloudauth20200618.models.VerifyBankElementResponse;
|
||||
import com.aliyuncs.DefaultAcsClient;
|
||||
import com.aliyuncs.IAcsClient;
|
||||
import com.aliyuncs.auth.sts.AssumeRoleRequest;
|
||||
@@ -29,6 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||
import com.aliyun.tea.*;
|
||||
import com.aliyun.cloudauth20200618.Client;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
@@ -49,6 +52,21 @@ public class AliyunServiceImpl implements AliyunService {
|
||||
|
||||
@Value("${aliyun.bankcard.bank-url}")
|
||||
private String bankCheckUrl;
|
||||
/**
|
||||
*场景id
|
||||
*/
|
||||
@Value("${aliyun.bankcard.SceneId}")
|
||||
private Long SceneId;
|
||||
/**
|
||||
* 阿里云key
|
||||
*/
|
||||
@Value("${aliyun.keyid}")
|
||||
private String ACCESSKEYID;
|
||||
/**
|
||||
* 阿里云secret
|
||||
*/
|
||||
@Value("${aliyun.keysecret}")
|
||||
private String ACCESSKEYSECRET;
|
||||
|
||||
/**
|
||||
* 不好用
|
||||
@@ -104,15 +122,23 @@ public class AliyunServiceImpl implements AliyunService {
|
||||
|
||||
// 调用阿里云银行卡认证接口
|
||||
Map<String, String> headers = new HashMap<>();
|
||||
headers.put("Authorization", "APPCODE " + appCode);
|
||||
// headers.put("Authorization", "APPCODE " + appCode);
|
||||
Map<String, Object> querys = new HashMap<>();
|
||||
querys.put("Mobile", phone);
|
||||
querys.put("bankcard", bankCardNo);
|
||||
querys.put("cardNo", certNo);
|
||||
querys.put("realName", realName);
|
||||
// querys.put("bankcard", BankCardNo);
|
||||
//querys.put("cardNo", certNo);
|
||||
// querys.put("realName", realName);
|
||||
querys.put("Mode", "VERIFY_BANK_CARD");
|
||||
querys.put("OuterOrderNo", appCode);
|
||||
querys.put("BankCardNo", bankCardNo);
|
||||
querys.put("IdName", realName);
|
||||
querys.put("IdNo", certNo);
|
||||
querys.put("SceneId", SceneId);
|
||||
|
||||
HttpResult response = null;
|
||||
try {
|
||||
response = HttpUtil.doGet(bankCheckUrl, headers, querys);
|
||||
// response = HttpUtil.doGet(bankCheckUrl, querys);
|
||||
response = HttpUtil.doGet(bankCheckUrl, headers, querys);
|
||||
log.info(response.toString());
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
@@ -135,7 +161,6 @@ public class AliyunServiceImpl implements AliyunService {
|
||||
log.error("银行卡四要素检查：" + jsonObject.getString("reason"));
|
||||
bank4Cache.setRemark(jsonObject.getString("reason"));
|
||||
bank4Cache.setStatus(Bank4Cache.STATUS_FAIL);
|
||||
bank4CacheService.save(bank4Cache);
|
||||
throw new MsgException("身份证、银行卡或预留手机号信息不正确");
|
||||
} else {
|
||||
bank4Cache.setStatus(Bank4Cache.STATUS_PASS);
|
||||
@@ -143,6 +168,8 @@ public class AliyunServiceImpl implements AliyunService {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName, String errorMsg) {
|
||||
try {
|
||||
@@ -152,6 +179,15 @@ public class AliyunServiceImpl implements AliyunService {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName, String errorMsg) {
|
||||
try {
|
||||
checkBankCorrectNow(phone, bankCardNo, certNo, realName);
|
||||
} catch (Exception e) {
|
||||
throw new MsgException(errorMsg);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public AssumeRoleResponse.Credentials stsToken(String userId) {
|
||||
String endpoint = stsConfig.getEndpoint().replace("https://", "");
|
||||
@@ -194,4 +230,71 @@ public class AliyunServiceImpl implements AliyunService {
|
||||
throw new MsgException("无法获取oss上传凭证");
|
||||
}
|
||||
}
|
||||
|
||||
public static com.aliyun.cloudauth20200618.Client createClient(String accessKeyId, String accessKeySecret) throws Exception{
|
||||
com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
|
||||
// 必填，您的 AccessKey ID
|
||||
.setAccessKeyId(accessKeyId)
|
||||
// 必填，您的 AccessKey Secret
|
||||
.setAccessKeySecret(accessKeySecret);
|
||||
// 访问的域名
|
||||
config.endpoint = "cloudauth.aliyuncs.com";
|
||||
return new com.aliyun.cloudauth20200618.Client(config);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkBankCorrectNow(String phone, String bankCardNo, String certNo, String realName) {
|
||||
// java.util.List<String> args = java.util.Arrays.asList(args_);
|
||||
|
||||
//com.aliyun.cloudauth20200618.Client client = Sample.createClient("accessKeyId", "accessKeySecret");
|
||||
Client client = null;
|
||||
try {
|
||||
client = createClient(ACCESSKEYID,ACCESSKEYSECRET);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
com.aliyun.cloudauth20200618.models.VerifyBankElementRequest verifyBankElementRequest = new com.aliyun.cloudauth20200618.models.VerifyBankElementRequest()
|
||||
.setMode("VERIFY_BANK_CARD")
|
||||
.setBankCardNo(bankCardNo)
|
||||
.setIdNo(certNo)
|
||||
.setIdName(realName)
|
||||
.setMobile(phone)
|
||||
.setSceneId(SceneId)
|
||||
.setOuterOrderNo(appCode);
|
||||
|
||||
com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions();
|
||||
|
||||
try {
|
||||
// 复制代码运行请自行打印 API 的返回值
|
||||
assert client != null;
|
||||
VerifyBankElementResponse verifyBankElementResponse = client.verifyBankElementWithOptions(verifyBankElementRequest, runtime);
|
||||
} catch (TeaException error) {
|
||||
// 如有需要，请打印 error
|
||||
com.aliyun.teautil.Common.assertAsString(error.message);
|
||||
throw new MsgException("银行卡认证失败");
|
||||
} catch (Exception _error) {
|
||||
TeaException error = new TeaException(_error.getMessage(), _error);
|
||||
// 如有需要，请打印 error
|
||||
com.aliyun.teautil.Common.assertAsString(error.message);
|
||||
throw new MsgException("银行卡认证失败");
|
||||
}
|
||||
|
||||
|
||||
// if (200 != response.getCode()) {
|
||||
// if (403 == response.getCode()) {
|
||||
// throw new MsgException("银行卡认证接口已欠费，请联系平台");
|
||||
// } else {
|
||||
// throw new MsgException("银行卡认证失败");
|
||||
// }
|
||||
// }
|
||||
// if (!"0".equalsIgnoreCase(jsonObject.getString("error_code"))) {
|
||||
// log.error("银行卡四要素检查：" + jsonObject.getString("reason"));
|
||||
// bank4Cache.setRemark(jsonObject.getString("reason"));
|
||||
// bank4Cache.setStatus(Bank4Cache.STATUS_FAIL);
|
||||
// throw new MsgException("身份证、银行卡或预留手机号信息不正确");
|
||||
// } else {
|
||||
// bank4Cache.setStatus(Bank4Cache.STATUS_PASS);
|
||||
// bank4CacheService.save(bank4Cache);
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -381,7 +381,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
||||
|
||||
if (checkFlag && !(settleTypeFlag)) {
|
||||
// 执行银行卡四要素校验
|
||||
aliyunService.checkBankCorrect(accountDTO.getBankCard().getPhone(), accountDTO.getBankCard().getBankCardNo()
|
||||
aliyunService.checkBankCorrectNow(accountDTO.getBankCard().getPhone(), accountDTO.getBankCard().getBankCardNo()
|
||||
, accountDTO.getIdcard().getCertNo()
|
||||
, accountDTO.getBankCard().getBankHolder(), "结算人与结算银行卡不匹配，请核对结算信息");
|
||||
}
|
||||
@@ -1251,8 +1251,9 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
||||
}
|
||||
|
||||
Notice notice = new Notice(1, 5, userApp);
|
||||
//TODO 银行卡认证先绕过四要素检测
|
||||
try {
|
||||
aliyunService.checkBankCorrect(bankInfoDTO.getPhone(), bankInfoDTO.getBankCardNo(), idCard.getCertNo(), idCard.getCertName());
|
||||
aliyunService.checkBankCorrectNow(bankInfoDTO.getPhone(), bankInfoDTO.getBankCardNo(), idCard.getCertNo(), idCard.getCertName());
|
||||
} catch (MsgException e) {
|
||||
notice = new Notice(1, 5, userApp);
|
||||
notice.setConrtent("很遗憾你的银行卡认证未通过，请您核对信息后重新提交审核！");
|
||||
@@ -1303,9 +1304,9 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
||||
uaService.updateById(userApp);
|
||||
|
||||
// 调用极光通知推送
|
||||
List<String> alias = new ArrayList<>();
|
||||
alias.add(userApp.getUserId().toString());
|
||||
generalPushUtil.sendAllPlatByAlias(alias, "银行卡认证通知", "审核通过", "1");
|
||||
// List<String> alias = new ArrayList<>();
|
||||
// alias.add(userApp.getUserId().toString());
|
||||
// generalPushUtil.sendAllPlatByAlias(alias, "银行卡认证通知", "审核通过", "1");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -605,6 +605,7 @@ public class SxfMerchantAuditServiceImpl extends BaseMerchantAuditService {
|
||||
// 判断经营类型
|
||||
switch (sxfMccInfo.getFMccType()) {
|
||||
case "线上":
|
||||
//TODO 如果渠道判定魏线上则 onlineType onlineName为必填
|
||||
map.put("operationalType", "02");
|
||||
break;
|
||||
case "非盈利":
|
||||
|
||||
@@ -40,14 +40,16 @@ import java.util.Map;
|
||||
public class WxTalkServiceImpl implements WxTalkService {
|
||||
|
||||
/**
|
||||
* 企业微信审核机器人的链接
|
||||
* 企业微信审核机器人的链接 https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=eba1e093-4cae-424d-be52-7013411194cc
|
||||
*/
|
||||
private static final String WX_TALK_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=eba1e093-4cae-424d-be52-7013411194cc";
|
||||
//TODO 后面需要换成我们自己的
|
||||
private static final String WX_TALK_URL = "";
|
||||
|
||||
/**
|
||||
* 企业微信上市机器人的链接
|
||||
* 企业微信上市机器人的链接 https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=d89ed4ad-d723-4dce-a80b-bbf370c91943
|
||||
*/
|
||||
public static final String WX_GO_PUBLIC_TALK_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=d89ed4ad-d723-4dce-a80b-bbf370c91943";
|
||||
//TODO 后面需要换成我们自己的
|
||||
public static final String WX_GO_PUBLIC_TALK_URL = "";
|
||||
|
||||
private final RestTemplate restTemplate;
|
||||
|
||||
|
||||
@@ -213,6 +213,15 @@
|
||||
<orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.0.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.12" level="project" />
|
||||
|
||||
Reference in New Issue
Block a user