.gitignore
@@ -57,4 +57,5 @@ # #!*/build/*.java #!*/build/*.html #!*/build/*.xml #!*/build/*.xml /cloud-server-communityWorldCup/target/ cloud-server-communityWorldCup/target/classes/META-INF/spring-configuration-metadata.json
File was deleted cloud-server-communityWorldCup/target/classes/bootstrap.properties
File was deleted cloud-server-communityWorldCup/target/classes/com/dsh/CommunityWorldCupApplication.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/advice/ControllerException.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/controller/WorldCupController.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCup.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCupCompetitor.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCupPayment.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCupStore.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/DeductionCompetitionsClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/AppUserClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/StudentClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/StudentHonorClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/UserIntegralChangesClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/AppUser.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/AppUserIdsByCityName.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/SaveUserIntegralChangesVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/Student.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/StudentHonor.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/TStudent.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/competition/ParticipantClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/competition/model/Participant.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/course/CoursePackageOrderStudentClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/course/CoursePackagePaymentClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/course/model/CoursePackageOrderStudent.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/course/model/PaymentDeductionClassHour.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/BillingDataRequestVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/BillingRequest.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/BillingRequestVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/CompetitionUser.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/GetPeopleQuery.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/GetStuSourseList.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/ListQuery.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/PurchaseRecordVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/GameClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/SiteClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/StoreClient.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/model/Site.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/model/Store.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/model/TGame.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupCompetitorMapper.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupMapper.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupPaymentMapper.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupStoreMapper.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/ChangeScore.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/CheckPaymentMethod.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/CheckPaymentMethodVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/DeductionClassHour.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/DeductionClassHourList.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/EndWorldCup.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/EntrantRank.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/EntrantRankVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/EntryPointInfoVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/GetWorldCupPayment.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MatchRecord.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MatchRecordList.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MatchRecordVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MyWorldCupInfo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MyWorldCupList.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/ParticipantVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/PaymentWorldCup.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/RegisteredPersonnel.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/SaveData.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/StartWorldCup.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/StoreIds.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/UserDetailsOfSearch.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/UserGameRecordList.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/UserStatisticsList.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/UserVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupCodeListVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupGameStatistics.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupGameStatisticsInfoList.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupGameStatisticsListInfo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupIncomeVO.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupInfo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupList.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupListAll.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupListCoach.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupListCoachVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupListVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupPeople.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupPeopleVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupQuery.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupRank.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupRankVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupRecords.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupStoreVO.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupUserListVo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupCompetitorService.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupPaymentService.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupService.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupStoreService.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl$1.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupPaymentServiceImpl.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl$1.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl$2.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl$3.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl$4.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupStoreServiceImpl.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/CodeGenerateUtils.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/DateTimeHelper.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/DateUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/DoubleUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/EmojiUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/GDMapGeocodingUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/GeodesyUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/HeaderAuthUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/HttpRequestUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/JsonUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/JuHeUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/LocalDateTimeUtils.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/MD5AndKL.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/MessageUtils.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/PayMoneyUtil$1.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/PayMoneyUtil$2.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/PayMoneyUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/RedisUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/ResultUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/StrUtils.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/StringUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/StudyTimeUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/TaskUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/TaskUtilCompetition.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/TokenUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/ToolUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/UUIDUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/Base64Utils.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/BaseUtils.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/DES.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/Md5Util.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/SignUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/httpClinet/HttpClientUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/httpClinet/HttpResult.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$Account.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$Amount.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$AmountReq.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$Channel.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$CreateRequest.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$FundsAccount.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$FundsFromItem.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$GoodsDetail.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$Promotion.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$PromotionScope.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$PromotionType.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$Refund.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$ReqFundsAccount.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create$Status.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/Create.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/PartnerAppPrepay$CommonAmountInfo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/PartnerAppPrepay$CommonSceneInfo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/PartnerAppPrepay$CouponInfo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/PartnerAppPrepay$GoodsDetail.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/PartnerAppPrepay$PartnerAPIv3AppPrepayResponse.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/PartnerAppPrepay$PartnerAPIv3CommonPrepayRequest.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/PartnerAppPrepay$PartnerSettleInfo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/PartnerAppPrepay$StoreInfo.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/PartnerAppPrepay.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/WXPayUtility$1.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/WXPayUtility$2.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/WXPayUtility$ApiException.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/WXPayUtility.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/WeChatSignUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/WeChatV3SignUtil.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/wx/WxV3PayConfig.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/config/JsonLongSerializer.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/config/MessageLocalConfig.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/config/MyLocaleResolver.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/config/RedisConfig.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/config/Sharding_jdbc/DatasourceModel.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/config/Sharding_jdbc/Master0DataSource.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/config/Sharding_jdbc/ShardingConfig.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/config/SwaggerConfig.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/page/HttpKit.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/page/Order.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/page/PageFactory.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/page/WafKit.classBinary files differ
cloud-server-communityWorldCup/target/classes/com/dsh/page/WafRequestWrapper.classBinary files differ
cloud-server-communityWorldCup/target/classes/logback-spring.xml
File was deleted cloud-server-communityWorldCup/target/classes/mapper/WorldCupCompetitorMapper.xml
File was deleted cloud-server-communityWorldCup/target/classes/mapper/WorldCupMapper.xml
File was deleted cloud-server-communityWorldCup/target/classes/mapper/WorldCupPaymentMapper.xml
File was deleted cloud-server-communityWorldCup/target/classes/mapper/WorldCupPaymentParticipantMapper.xml
File was deleted cloud-server-communityWorldCup/target/classes/mapper/WorldCupStoreMapper.xml
File was deleted cloud-server-communityWorldCup/target/classes/redis.properties
File was deleted cloud-server-communityWorldCup/target/classes/sharding-jdbc.properties
File was deleted cloud-server-communityWorldCup/target/maven-archiver/pom.properties
File was deleted cloud-server-communityWorldCup/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
File was deleted cloud-server-communityWorldCup/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
File was deleted cloud-server-communityWorldCup/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
cloud-server-communityWorldCup/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
File was deleted cloud-server-communityWorldCup/target/mb-cloud-communityWorldCup.jarBinary files differ
cloud-server-communityWorldCup/target/mb-cloud-communityWorldCup.jar.originalBinary files differ
cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -81,6 +81,14 @@ List<TStoreListVo> listAllStore(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName, @Param("id") Integer id); List<TStoreListVo> listAllStoresByIds(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName, @Param("ids") List<Integer> ids); List<Map<String, Object>> listStoreAll(Page page, @Param("name") String name, cloud-server-management/src/main/java/com/dsh/guns/core/aop/LogAop.java
@@ -97,7 +97,7 @@ audit.put("errorMessage", maskText(errorMessage)); audit.put("createdAt", new Date()); auditWriter.append(audit); } catch (Exception auditException) { } catch (Throwable auditException) { // 审计失败不能影响原有业务。 log.error("统一操作审计记录出错", auditException); } cloud-server-management/src/main/java/com/dsh/guns/core/aop/ManagementOperationAuditAspect.java
@@ -81,7 +81,7 @@ audit.put("errorMessage", mask(error)); audit.put("createdAt", new Date()); auditWriter.append(audit); } catch (Exception ignored) { } catch (Throwable ignored) { // 审计链路不能影响后台业务。 } } cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AppGuideManagementController.java
@@ -149,7 +149,7 @@ } private String guideUrl(QrLink link) { return "https://www.weparklife.com/appdown?code=" + link.getShortCode(); return "https://package.daowepark.com/appdown?code=" + link.getShortCode(); } private String nextCode() { cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -474,14 +474,22 @@ @ResponseBody public Object list(String provinceCode, String cityCode , String name, String phone,String shopName) { Page<TStoreListVo> page = new PageFactory<TStoreListVo>().defaultPage(); String roleid = UserExt.getUser().getRoleid(); List<TStoreListVo> list =new ArrayList<>(); if("3".equals(roleid)){ Integer objectId = UserExt.getUser().getObjectId(); list = storeService.listAllStore(page,provinceCode,cityCode,name,phone,shopName,objectId); }else { Integer objectType = UserExt.getUser().getObjectType(); if (Integer.valueOf(3).equals(objectType)) { // 门店员工按员工-门店中间表的数据范围查询;getStoreIdsByUserId 同时兼容 // sys_user.objectId 和 t_store.storeStaffId 两种历史归属数据。 List<Integer> storeIds = userMapper.getStoreIdsByUserId(UserExt.getUser().getId()); if (!CollectionUtils.isEmpty(storeIds)) { list = storeService.listAllStoresByIds(page, provinceCode, cityCode, name, phone, shopName, storeIds); } } else if (Integer.valueOf(2).equals(objectType)) { Integer objectId = UserExt.getUser().getObjectId(); list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName,objectId); } else { // 平台账号不带运营商条件,查询全部门店;数据范围由 objectType 决定, // 不能用 roleid(菜单权限)判断,避免员工被授予角色 1 后被误当成运营商。 list = storeService.listAll(page, provinceCode, cityCode, name, phone, shopName, null); } page.setRecords(list); return super.packForBT(page); cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -491,6 +491,9 @@ // "undefined";该值绝不能覆盖 sys_user.roleid。 if (isValidRoleId(user.getRoleid())) { oldUser.setRoleid(user.getRoleid()); // 仅内置平台管理员(1)和门店管理员(3)切换数据归属类型; // 其他自定义角色只控制菜单权限,不改变账号归属。objectId 始终保留。 syncObjectTypeWithBuiltInRole(oldUser, user.getRoleid()); } this.userService.updateById(oldUser); return SUCCESS_TIP; @@ -502,6 +505,14 @@ && !"null".equalsIgnoreCase(roleId); } private void syncObjectTypeWithBuiltInRole(User user, String roleId) { if ("1".equals(roleId)) { user.setObjectType(1); } else if ("3".equals(roleId)) { user.setObjectType(3); } } private String maskPhone(String value) { if (value == null) return null; return value.length() <= 7 ? stars(value.length()) : value.substring(0, 3) + "****" + value.substring(7); cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
@@ -80,6 +80,9 @@ List<TStoreListVo> listAllStore(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName, Integer objectId); List<TStoreListVo> listAllStoresByIds(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName, List<Integer> ids); List<Map<String, Object>> listStoreAll(Page page, String name, Integer operator, String provinceCode, String cityCode); cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
@@ -30,6 +30,12 @@ } @Override public List<TStoreListVo> listAllStoresByIds(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName, List<Integer> ids) { return this.baseMapper.listAllStoresByIds(page, provinceCode, cityCode, name, phone, shopName, ids); } @Override public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Integer storeId) { return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName,storeId); } cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -207,6 +207,36 @@ </if> order by t1.id desc </select> <select id="listAllStoresByIds" resultType="com.dsh.guns.modular.system.model.TStoreListVo"> select t1.*, t2.name as userName, coalesce(nullif(t1.phone, ''), nullif(t2.phone, '')) as phone, coalesce(nullif(t2.phone, ''), nullif(t1.phone, '')) as userPhone, t3.name as yysName from t_store t1 left join sys_user t2 on t1.storeStaffId = t2.id left join t_operator t3 on t1.operatorId = t3.id where t1.id in <foreach collection="ids" item="id" open="(" separator="," close=")"> #{id} </foreach> <if test="provinceCode !=null and provinceCode !=''"> and t1.provinceCode = #{provinceCode} </if> <if test="cityCode !=null and cityCode !=''"> and t1.cityCode = #{cityCode} </if> <if test="name !=null and name !=''"> and t2.name like concat("%",#{name},"%") </if> <if test="phone !=null and phone !=''"> and coalesce(nullif(t2.phone, ''), nullif(t1.phone, '')) like concat("%",#{phone},"%") </if> <if test="shopName !=null and shopName !=''"> and t1.name like concat("%",#{shopName},"%") </if> order by t1.id desc </select> <select id="querySiteListOfpage" resultType="java.util.Map"> SELECT t1.id, t2.operatorId, t1.province, t1.city, t2.name,t1.ids,t1.name as siteName ,t2.type as `type` cloud-server-management/src/main/webapp/WEB-INF/view/login.html
@@ -55,7 +55,7 @@ <div style="display: flex;align-items: center;justify-content: center;height: 100%"> <h1 style="color: white">玩湃生活后台管理系统V1.0</h1> <h1 style="color: white">玩湃生活后台管理系统</h1> <div style="position: relative;margin-left:200px;left: -20px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;"> <div style="max-height: 100%" > <img style="margin-left: 44px" src="${ctxPath}/img/logo.png" width="100px" height="120px"/> cloud-server-management/src/main/webapp/WEB-INF/view/system/appGuide/appGuide.html
@@ -1,13 +1,11 @@ @layout("/common/_container.html"){ <style>.app-guide-section{margin-bottom:25px}.qr{width:90px;height:90px}.table td{vertical-align:middle}</style> <div class="row"><div class="col-sm-12"><div class="ibox float-e-margins"><div class="ibox-title"><h5>APP 下载引导与场地订场二维码</h5></div><div class="ibox-content"> <div class="app-guide-section"><h4>下载配置</h4><form id="configForm" class="form-inline"> <input type="hidden" name="id" id="configId"><p><input class="form-control" name="appName" placeholder="APP 名称"> <input class="form-control" name="androidPackage" placeholder="Android 包名,例如 com.sinata.wepark"> <input class="form-control" name="iosPackage" placeholder="iOS 包名,例如 com.sinata.wepark"></p> <p><input class="form-control" name="iosStoreUrl" style="width:350px" placeholder="iOS App Store 地址"> <input class="form-control" name="apkUrl" style="width:350px" placeholder="APK 下载地址"></p> <p><input class="form-control" name="androidDeepLink" style="width:350px" placeholder="Android Deep Link"> <input class="form-control" name="iosDeepLink" style="width:350px" placeholder="iOS Deep Link"></p> <div class="app-guide-section"><h4>APP 下载链接</h4><form id="configForm" class="form-inline"> <input type="hidden" name="id" id="configId"><p><input class="form-control" name="apkUrl" style="width:350px" placeholder="Android 下载链接"> <input class="form-control" name="iosStoreUrl" style="width:350px" placeholder="iOS 下载链接"></p> <button type="button" class="btn btn-primary" onclick="saveConfig()">保存下载配置</button></form></div> <hr><div class="app-guide-section"><h4>宣传图</h4><form class="form-inline"><input id="bannerFile" type="file" accept="image/*" class="form-control"><input id="bannerUrl" type="hidden"><button type="button" class="btn btn-default" onclick="uploadBanner()">上传图片</button><input id="bannerTitle" class="form-control" placeholder="标题(可选)"><input id="bannerSort" class="form-control" style="width:100px" placeholder="排序"><button type="button" class="btn btn-primary" onclick="addBanner()">添加</button></form><p id="uploadTip" class="text-muted"></p><table class="table table-bordered"><thead><tr><th>预览</th><th>标题</th><th>排序</th><th>状态</th><th>操作</th></tr></thead><tbody id="bannerRows"></tbody></table></div> <hr><div class="app-guide-section"><h4>场地订场二维码</h4><p class="text-muted">从现有场地管理数据中选择,每个场地仅允许一个启用二维码。</p><form class="form-inline"><select id="siteSelect" class="form-control" style="min-width:360px"><option value="">请选择场地</option></select><input id="pageName" class="form-control" style="width:360px" placeholder="App页面,例如 com.sinata.wepark.ui.home.PlaceDetailActivity"><input id="channel" class="form-control" placeholder="渠道(可选)"><button type="button" class="btn btn-primary" onclick="createQr()">生成二维码</button></form><table class="table table-bordered"><thead><tr><th>名称</th><th>App页面</th><th>门店/场地</th><th>二维码</th><th>引导链接</th><th>状态</th><th>操作</th></tr></thead><tbody id="linkRows"></tbody></table></div> <hr><div class="app-guide-section"><h4>场地订场二维码</h4><p class="text-muted">从现有场地管理数据中选择,每个场地仅允许一个启用二维码。</p><form class="form-inline"><select id="siteSelect" class="form-control" style="min-width:360px"><option value="">请选择场地</option></select><button type="button" class="btn btn-primary" onclick="createQr()">生成二维码</button></form><table class="table table-bordered"><thead><tr><th>名称</th><th>App页面</th><th>门店/场地</th><th>二维码</th><th>引导链接</th><th>状态</th><th>操作</th></tr></thead><tbody id="linkRows"></tbody></table></div> </div></div></div></div> <script src="${ctxPath}/modular/system/appGuide/appGuide.js"></script> @} cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
@@ -24,7 +24,7 @@ @} </#select> @if(role == 1){ <#select id="deptid" name="角色" underline="true" > <#select id="deptid" name="所在部门" underline="true" > @for(l in depts){ <option value="${l.id}" ${l.id == user.deptid ? 'selected=selected' : ''}>${l.fullname}</option> @} cloud-server-management/src/main/webapp/static/modular/system/appGuide/appGuide.js
@@ -1,11 +1,11 @@ (function(){ function esc(v){return $('<div>').text(v==null?'':v).html()} function val(n,v){$('#configForm [name='+n+']').val(v==null?'':v)} window.reloadAppGuide=function(){ $.get(Feng.ctxPath+'/appGuide/data',function(d){var c=d.config||{};['id','appName','androidPackage','iosPackage','iosStoreUrl','apkUrl','androidDeepLink','iosDeepLink'].forEach(function(k){val(k,c[k])});$('#bannerRows').html((d.banners||[]).map(function(x){return '<tr><td><img class="qr" src="'+esc(x.imageUrl)+'"></td><td>'+esc(x.title)+'</td><td>'+esc(x.sort)+'</td><td>'+((x.enabled===1)?'启用':'停用')+'</td><td><button class="btn btn-danger btn-xs" onclick="deleteBanner(\''+x.id+'\')">删除</button></td></tr>'}).join(''));$('#linkRows').html((d.links||[]).map(function(x){var id=String(x.id),q=Feng.ctxPath+'/appGuide/siteQr/'+encodeURIComponent(id)+'.png';return '<tr><td>'+esc(x.name)+'</td><td>'+esc(x.pageName)+'</td><td>'+x.storeId+' / '+x.siteId+'</td><td><a href="'+q+'" target="_blank"><img class="qr" src="'+q+'"></a></td><td><code>'+esc(x.guideUrl)+'</code></td><td>'+((x.enabled===1)?'启用':'停用')+'</td><td><button class="btn btn-warning btn-xs" onclick="changeQr(\''+id+'\','+(x.enabled===1?0:1)+')">'+(x.enabled===1?'停用':'启用')+'</button> <button class="btn btn-danger btn-xs" onclick="deleteQr(\''+id+'\')">删除</button></td></tr>'}).join(''))})}; window.reloadAppGuide=function(){ $.get(Feng.ctxPath+'/appGuide/data',function(d){var c=d.config||{};['id','apkUrl','iosStoreUrl'].forEach(function(k){val(k,c[k])});$('#bannerRows').html((d.banners||[]).map(function(x){return '<tr><td><img class="qr" src="'+esc(x.imageUrl)+'"></td><td>'+esc(x.title)+'</td><td>'+esc(x.sort)+'</td><td>'+((x.enabled===1)?'启用':'停用')+'</td><td><button class="btn btn-danger btn-xs" onclick="deleteBanner(\''+x.id+'\')">删除</button></td></tr>'}).join(''));$('#linkRows').html((d.links||[]).map(function(x){var id=String(x.id),q=Feng.ctxPath+'/appGuide/siteQr/'+encodeURIComponent(id)+'.png';return '<tr><td>'+esc(x.name)+'</td><td>'+esc(x.pageName)+'</td><td>'+x.storeId+' / '+x.siteId+'</td><td><a href="'+q+'" target="_blank"><img class="qr" src="'+q+'"></a></td><td><code>'+esc(x.guideUrl)+'</code></td><td>'+((x.enabled===1)?'启用':'停用')+'</td><td><button class="btn btn-warning btn-xs" onclick="changeQr(\''+id+'\','+(x.enabled===1?0:1)+')">'+(x.enabled===1?'停用':'启用')+'</button> <button class="btn btn-danger btn-xs" onclick="deleteQr(\''+id+'\')">删除</button></td></tr>'}).join(''))})}; window.saveConfig=function(){$.post(Feng.ctxPath+'/appGuide/config',$('#configForm').serialize(),function(){Feng.success('保存成功');reloadAppGuide()})}; window.uploadBanner=function(){var f=$('#bannerFile')[0].files[0];if(!f){Feng.info('请选择图片');return}var d=new FormData();d.append('file',f);$.ajax({url:Feng.ctxPath+'/mgr/uploadFile',data:d,type:'POST',contentType:false,processData:false,success:function(url){$('#bannerUrl').val(url);$('#uploadTip').text('上传成功')}})}; window.addBanner=function(){if(!$('#bannerUrl').val()){Feng.info('请先上传图片');return}$.post(Feng.ctxPath+'/appGuide/banner',{imageUrl:$('#bannerUrl').val(),title:$('#bannerTitle').val(),sort:$('#bannerSort').val()||0,enabled:1},function(){reloadAppGuide();$('#bannerUrl,#bannerTitle,#bannerSort,#bannerFile').val('')})}; window.deleteBanner=function(id){$.post(Feng.ctxPath+'/appGuide/banner/delete',{id:id},reloadAppGuide)}; window.createQr=function(){var o=$('#siteSelect option:selected'),pageName=$('#pageName').val();if(!o.val()){Feng.info('请选择场地');return}if(!pageName){Feng.info('请输入 App 页面');return}$.post(Feng.ctxPath+'/appGuide/siteQr',{storeId:o.data('store'),siteId:o.val(),name:o.text(),channel:$('#channel').val(),pageName:pageName},function(r){if(!r.success){Feng.error(r.message);return}Feng.success('已生成');reloadAppGuide()})}; window.createQr=function(){var o=$('#siteSelect option:selected'),pageName='com.sinata.wepark.ui.home.PlaceDetailActivity';if(!o.val()){Feng.info('请选择场地');return}$.post(Feng.ctxPath+'/appGuide/siteQr',{storeId:o.data('store'),siteId:o.val(),name:o.text(),pageName:pageName},function(r){if(!r.success){Feng.error(r.message);return}Feng.success('已生成');reloadAppGuide()})}; window.changeQr=function(id,enabled){$.post(Feng.ctxPath+'/appGuide/siteQr/status',{id:id,enabled:enabled},reloadAppGuide)};$.get(Feng.ctxPath+'/appGuide/sites',function(s){$('#siteSelect').append((s||[]).map(function(x){return '<option value="'+x.id+'" data-store="'+x.storeId+'">['+x.storeId+'] '+esc(x.name)+'</option>'}).join(''))});$(reloadAppGuide); window.deleteQr=function(id){if(!confirm('确认删除该场地订场二维码?'))return;$.post(Feng.ctxPath+'/appGuide/siteQr/delete',{id:id},reloadAppGuide)}; })(); cloud-server-other/src/main/java/com/dsh/other/controller/AppGuideController.java
@@ -14,6 +14,7 @@ import com.dsh.other.util.TokenUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -52,13 +53,13 @@ QrLink link = validLink(code); if (code != null && !code.isEmpty() && link == null) return ResultUtil.error("二维码无效或已失效"); Map<String, Object> data = new HashMap<>(); data.put("appName", config.getAppName()); data.put("androidPackage", config.getAndroidPackage()); data.put("iosPackage", config.getIosPackage()); data.put("appName", StringUtils.isNotBlank(config.getAppName()) ? config.getAppName() : "玩湃生活"); data.put("androidPackage", StringUtils.isNotBlank(config.getAndroidPackage()) ? config.getAndroidPackage() : "com.sinata.wepark"); data.put("iosPackage", StringUtils.isNotBlank(config.getIosPackage()) ? config.getIosPackage() : "com.sinata.WeParkLife"); data.put("iosStoreUrl", config.getIosStoreUrl()); data.put("apkUrl", config.getApkUrl()); data.put("androidDeepLink", config.getAndroidDeepLink()); data.put("iosDeepLink", config.getIosDeepLink()); data.put("androidDeepLink", config.getAndroidDeepLink() + (StringUtils.isNotBlank(code) ? "?route=" + code : "")); data.put("iosDeepLink", "weparklife://app" + (StringUtils.isNotBlank(code) ? "?code=" + code : "")); data.put("banners", appGuideBannerMapper.selectList(new QueryWrapper<AppGuideBanner>() .eq("enabled", EnableStatusEnum.ENABLED.getCode()).orderByAsc("sort").orderByDesc("id"))); // if (link != null) data.put("target", target(link)); cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -738,7 +738,7 @@ @ResponseBody @GetMapping("/api/site/entryQr") @ApiOperation(value = "获取订场进场二维码", tags = {"用户—预约场地"}) @ApiOperation(value = "获取订场进场二维码(废弃没用)", tags = {"用户—预约场地"}) @ApiImplicitParams({ @ApiImplicitParam(value = "预约数据 id", name = "bookingId", dataType = "int", required = true), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header") @@ -763,7 +763,7 @@ } Map<String, Object> data = new HashMap<>(); data.put("shortCode", link.getShortCode()); data.put("url", "https://www.weparklife.com/other/q/" + link.getShortCode()); data.put("url", "http://8.137.22.229:56666/other/q/" + link.getShortCode()); data.put("expiresAt", link.getExpiresAt()); return ResultUtil.success(data); } catch (Exception e) { cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
@@ -54,7 +54,7 @@ private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号 private String callbackPath = "https://online.daowepark.com:443/other";//支付回调网关地址/ private String callbackPath = "http://8.137.22.229:56666/other";//支付回调网关地址/ // private String callbackPath = "http://8.137.14.183:56666/other";//支付回调网关地址 // private String callbackPath = "http://47.108.147.192:56666/other";//支付回调网关地址