update
This commit is contained in:
5
.idea/jarRepositories.xml
generated
5
.idea/jarRepositories.xml
generated
@@ -16,5 +16,10 @@
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/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/groups/public" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
232
.idea/workspace.xml
generated
232
.idea/workspace.xml
generated
@@ -5,19 +5,175 @@
|
||||
</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$/pluss-common-bundle/target/classes/config/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class" 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" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-wap-page/src/main/resources/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-wap-page/src/main/resources/application-test.yml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -33,8 +189,9 @@
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="localRepository" value="D:\java\maven\maven-repo" />
|
||||
<option name="userSettingsFile" value="D:\java\maven\conf\settings.xml" />
|
||||
<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>
|
||||
@@ -74,7 +231,7 @@
|
||||
</set>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Spring Boot.WapApplication">
|
||||
<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" />
|
||||
@@ -88,6 +245,17 @@
|
||||
<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" />
|
||||
@@ -145,6 +313,11 @@
|
||||
<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>
|
||||
@@ -201,6 +374,31 @@
|
||||
</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>
|
||||
@@ -223,6 +421,7 @@
|
||||
<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" />
|
||||
@@ -236,11 +435,6 @@
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java</url>
|
||||
<line>336</line>
|
||||
<option name="timeStamp" value="4" />
|
||||
</line-breakpoint>
|
||||
<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>
|
||||
|
||||
@@ -35,6 +35,8 @@
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
|
||||
@@ -35,6 +35,8 @@
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
spring:
|
||||
datasource:
|
||||
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: CZGmysqlroot@123
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
parameter:
|
||||
### 这个根据自己的情况配置
|
||||
domain:
|
||||
|
||||
swagger:
|
||||
### 生产环境不允许访问swagger
|
||||
production: false
|
||||
|
||||
logging:
|
||||
config: classpath:log4j2-dev.xml
|
||||
@@ -1,16 +0,0 @@
|
||||
spring:
|
||||
datasource:
|
||||
url:
|
||||
username:
|
||||
password:
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
|
||||
rabbitmq:
|
||||
enabled: true
|
||||
|
||||
swagger:
|
||||
### 生产环境不允许访问swagger
|
||||
production: true
|
||||
|
||||
logging:
|
||||
config: classpath:log4j2-prod.xml
|
||||
@@ -1,14 +0,0 @@
|
||||
# 测试服务器上的数据库连接
|
||||
spring:
|
||||
datasource:
|
||||
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: CZGmysqlroot@123
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
|
||||
parameter:
|
||||
domain:
|
||||
|
||||
swagger:
|
||||
### 生产环境不允许访问swagger
|
||||
production: true
|
||||
@@ -1,27 +0,0 @@
|
||||
spring:
|
||||
output:
|
||||
ansi:
|
||||
enabled: always
|
||||
profiles:
|
||||
### 将一些固定的配置放到下级文件夹下的yml文件中
|
||||
include: common, ryx, ys
|
||||
active: dev
|
||||
mvc:
|
||||
view:
|
||||
prefix: /WEB-INF/jsp/
|
||||
suffix: .jsp
|
||||
resources:
|
||||
static-locations: classpath:/static
|
||||
datasource:
|
||||
druid:
|
||||
break-after-acquire-failure: true
|
||||
connection-error-retry-attempts: 1
|
||||
task:
|
||||
execution:
|
||||
pool:
|
||||
max-size: 20
|
||||
|
||||
server:
|
||||
servlet:
|
||||
context-path: /api
|
||||
port: 7004
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user