From 1f1b5541a872a0b2d974344df18e0890f414cc9b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 17:43:59 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html | 2
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java | 109 ++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html | 5
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html | 2
cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js | 2
cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js | 24
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 31
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 8
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 11
cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js | 16
.idea/workspace.xml | 1781 +++++---------------------------------------
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 2
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 6
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html | 1
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html | 1
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/userGameRecord.js | 76 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html | 2
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/UserGameRecordList.java | 27
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html | 24
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java | 9
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js | 60 +
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 7
cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/userGameRecord.html | 42 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/UserStatisticsList.java | 31
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java | 5
cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js | 2
cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js | 2
cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html | 2
36 files changed, 665 insertions(+), 1,650 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 49c11f8..79748ac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,312 +1,175 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="AnalysisUIOptions">
- <option name="GROUP_BY_SEVERITY" value="true" />
- </component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
- <component name="BranchesTreeState">
- <expand>
- <path>
- <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
- <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
- </path>
- <path>
- <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
- <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
- </path>
- <path>
- <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
- <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
- <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
- </path>
- </expand>
- <select />
- </component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="11.27,9">
- <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/other/GameClient.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/other/model/TGame.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/GDMapGeocodingUtil.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/HttpRequestUtil.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCup.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupListAll.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupStore.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupStoreClient.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/store.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/worldCup/store.js" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js" afterDir="false" />
+ <list default="true" id="650df2b6-cf87-4680-baeb-f5d214ecefb7" name="更改" comment="添加方法">
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/bootstrap.properties" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/CommunityWorldCupApplication.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/advice/ControllerException.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/controller/WorldCupController.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCup.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCupCompetitor.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCupPayment.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/entity/WorldCupStore.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/DeductionCompetitionsClient.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/AppUserClient.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/StudentClient.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/AppUser.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/AppUserIdsByCityName.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/Student.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/account/model/TStudent.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/competition/ParticipantClient.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/competition/model/Participant.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/course/CoursePackageOrderStudentClient.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/course/CoursePackagePaymentClient.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/course/model/CoursePackageOrderStudent.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/course/model/PaymentDeductionClassHour.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/BillingDataRequestVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/BillingRequest.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/BillingRequestVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/CompetitionUser.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/GetPeopleQuery.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/GetStuSourseList.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/ListQuery.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/model/PurchaseRecordVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/GameClient.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/SiteClient.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/StoreClient.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/model/Site.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/model/Store.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/feignclient/other/model/TGame.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupCompetitorMapper.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupMapper.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupPaymentMapper.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/mapper/WorldCupStoreMapper.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/CheckPaymentMethod.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/CheckPaymentMethodVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/DeductionClassHour.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/DeductionClassHourList.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/EntrantRank.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/EntrantRankVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/EntryPointInfoVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MatchRecord.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MatchRecordList.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MatchRecordVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MyWorldCupInfo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/MyWorldCupList.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/ParticipantVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/PaymentWorldCup.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/RegisteredPersonnel.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/StartWorldCup.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupGameStatistics.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupInfo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupList.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupListAll.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupListCoach.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupListCoachVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupListVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupPeople.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupPeopleVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupRank.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupRankVo.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/model/WorldCupRecords.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupCompetitorService.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupPaymentService.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupService.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/IWorldCupStoreService.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupPaymentServiceImpl.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl$1.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl$2.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl$3.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/service/impl/WorldCupStoreServiceImpl.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/CodeGenerateUtils.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/DateTimeHelper.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/DateUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/DoubleUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/EmojiUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/GDMapGeocodingUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/GeodesyUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/HeaderAuthUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/HttpRequestUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/JsonUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/JuHeUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/LocalDateTimeUtils.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/MD5AndKL.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/MessageUtils.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/PayMoneyUtil$1.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/PayMoneyUtil$2.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/PayMoneyUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/RedisUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/ResultUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/StrUtils.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/StringUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/StudyTimeUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/TaskUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/TaskUtilCompetition.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/TokenUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/ToolUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/UUIDUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/Base64Utils.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/BaseUtils.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/DES.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/Md5Util.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/akeylogin/SignUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/httpClinet/HttpClientUtil.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/communityWorldCup/util/httpClinet/HttpResult.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/config/JsonLongSerializer.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/config/MessageLocalConfig.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/config/MyLocaleResolver.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/config/RedisConfig.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/config/Sharding_jdbc/DatasourceModel.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/config/Sharding_jdbc/Master0DataSource.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/config/Sharding_jdbc/ShardingConfig.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/config/SwaggerConfig.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/page/HttpKit.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/page/Order.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/page/PageFactory.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/page/WafKit.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/com/dsh/page/WafRequestWrapper.class" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/logback-spring.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/mapper/WorldCupCompetitorMapper.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/mapper/WorldCupMapper.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/mapper/WorldCupPaymentMapper.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/mapper/WorldCupPaymentParticipantMapper.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/mapper/WorldCupStoreMapper.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/redis.properties" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/sharding-jdbc.properties" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/PlayPai.iml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/course/CoursePackageOrderStudentClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/course/CoursePackageOrderStudentClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/DeductionClassHour.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/DeductionClassHour.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageOrderStudentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageOrderStudentController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/model/DeductionClassHour.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/model/DeductionClassHour.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/ICoursePackageOrderStudentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/ICoursePackageOrderStudentService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/RefereeClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/RefereeClient.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/RefereeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/RefereeController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoreController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoreController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/referee/referee.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/referee/referee.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js" afterDir="false" />
</list>
- <ignored path="$PROJECT_DIR$/cloud-server-competition/target/" />
- <ignored path="$PROJECT_DIR$/cloud-server-other/target/" />
- <ignored path="$PROJECT_DIR$/cloud-server-activity/target/" />
- <ignored path="$PROJECT_DIR$/cloud-server-account/target/" />
- <ignored path="$PROJECT_DIR$/cloud-server-auth/target/" />
- <ignored path="$PROJECT_DIR$/cloud-server-management/target/" />
- <ignored path="$PROJECT_DIR$/cloud-server-course/target/" />
- <ignored path="$PROJECT_DIR$/cloud-server-gateway/target/" />
- <ignored path="$PROJECT_DIR$/cloud-server-parent/target/" />
- <ignored path="$PROJECT_DIR$/cloud-server-communityWorldCup/target/" />
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<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="ChangesViewManager">
- <option name="groupingKeys">
- <option value="directory" />
- </option>
- </component>
- <component name="FUSProjectUsageTrigger">
- <session id="1283956588">
- <usages-collector id="statistics.lifecycle.project">
- <counts>
- <entry key="project.closed" value="1" />
- <entry key="project.open.time.7" value="1" />
- <entry key="project.opened" value="1" />
- </counts>
- </usages-collector>
- <usages-collector id="statistics.vcs.git.usages">
- <counts>
- <entry key="git.branch.checkout.remote" value="1" />
- </counts>
- </usages-collector>
- <usages-collector id="statistics.file.extensions.open">
- <counts>
- <entry key="xml" value="1" />
- </counts>
- </usages-collector>
- <usages-collector id="statistics.file.types.open">
- <counts>
- <entry key="XML" value="1" />
- </counts>
- </usages-collector>
- </session>
- <session id="-908660615">
- <usages-collector id="statistics.lifecycle.project">
- <counts>
- <entry key="project.open.time.4" value="1" />
- <entry key="project.opened" value="1" />
- </counts>
- </usages-collector>
- <usages-collector id="statistics.file.extensions.open">
- <counts>
- <entry key="java" value="50" />
- <entry key="properties" value="4" />
- <entry key="xml" value="5" />
- </counts>
- </usages-collector>
- <usages-collector id="statistics.file.types.open">
- <counts>
- <entry key="JAVA" value="50" />
- <entry key="Properties" value="4" />
- <entry key="XML" value="5" />
- </counts>
- </usages-collector>
- <usages-collector id="statistics.file.extensions.edit">
- <counts>
- <entry key="java" value="425" />
- <entry key="txt" value="17" />
- <entry key="xml" value="16" />
- </counts>
- </usages-collector>
- <usages-collector id="statistics.file.types.edit">
- <counts>
- <entry key="JAVA" value="425" />
- <entry key="PLAIN_TEXT" value="17" />
- <entry key="SQL" value="3" />
- <entry key="XML" value="13" />
- </counts>
- </usages-collector>
- </session>
- </component>
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-836">
- <caret line="436" column="46" selection-start-line="436" selection-start-column="46" selection-end-line="436" selection-end-column="46" />
- <folding>
- <element signature="e#22578#22579#0" expanded="true" />
- <element signature="e#22634#22635#0" expanded="true" />
- <element signature="e#24096#24097#0" expanded="true" />
- <element signature="e#24146#24147#0" expanded="true" />
- <element signature="e#24683#24684#0" expanded="true" />
- <element signature="e#24739#24740#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="70" column="15" selection-start-line="70" selection-start-column="15" selection-end-line="70" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="84">
- <caret line="617" column="60" selection-start-line="617" selection-start-column="60" selection-end-line="617" selection-end-column="60" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="354">
- <caret line="47" column="34" selection-start-line="47" selection-start-column="34" selection-end-line="47" selection-end-column="34" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="230">
- <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="414">
- <caret line="127" column="19" selection-start-line="127" selection-start-column="19" selection-end-line="127" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="171">
- <caret line="44" column="54" selection-start-line="44" selection-start-column="54" selection-end-line="44" selection-end-column="54" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupInfo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="125">
- <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="HTML File" />
- <option value="Interface" />
+ <option value="JavaScript File" />
<option value="Class" />
</list>
</option>
</component>
- <component name="FindInProjectRecents">
- <findStrings>
- <find>2.0</find>
- <find>getWorldCupListCoach</find>
- <find>queryParticipantList</find>
- <find>getWorldCupListAll</find>
- <find>getAppUserIds</find>
- <find>getWorldCupInfo</find>
- <find>getMyWorldCupList</find>
- <find>queryAppUser1</find>
- <find>/getWorldCupInfo</find>
- <find>/getParticipant</find>
- </findStrings>
- <dirStrings>
- <dir>E:\IDEA Workspaces\PlayPai\code</dir>
- <dir>E:\IDEA Workspaces\PlayPai\code\cloud-server-account</dir>
- </dirStrings>
- </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- <option name="RECENT_BRANCH_BY_REPOSITORY">
- <map>
- <entry key="$PROJECT_DIR$" value="master" />
- </map>
- </option>
- </component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/TaskUtil.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/DeductionCompetitionsClient.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/TaskUtilCompetition.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/CommunityWorldCupApplication.java" />
- <option value="$PROJECT_DIR$/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java" />
- <option value="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java" />
- <option value="$PROJECT_DIR$/cloud-server-other/src/main/resources/mapper/BannerMapper.xml" />
- <option value="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/HomeModuleController.java" />
- <option value="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/entity/HomeModule.java" />
- <option value="$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPayment.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupInfo.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java" />
- <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java" />
- </list>
- </option>
- </component>
- <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
- <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
- <component name="JsGulpfileManager">
- <detection-done>true</detection-done>
- <sorting>DEFINITION_ORDER</sorting>
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
@@ -314,127 +177,59 @@
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
- <option name="mavenHome" value="$APPLICATION_HOME_DIR$/plugins/maven/lib/maven3" />
- <option name="userSettingsFile" value="E:\apache-maven\apache-maven-3.6.1\conf\settings.xml" />
+ <option name="mavenHome" value="D:/Program Files/apache-maven-3.6.1" />
+ <option name="useMavenConfig" value="true" />
+ <option name="userSettingsFile" value="D:\Program Files\apache-maven-3.6.1\conf\settings.xml" />
</MavenGeneralSettings>
</option>
<option name="enabledProfiles">
- <list>
- <option value="dev" />
- </list>
- </option>
- <option name="disabledProfiles">
<list>
<option value="fat" />
</list>
</option>
</component>
- <component name="MavenProjectNavigator">
- <treeState>
- <expand>
- <path>
- <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
- <item name="社区世界杯" type="9519ce18:MavenProjectsStructure$ProjectNode" />
- </path>
- <path>
- <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
- <item name="社区世界杯" type="9519ce18:MavenProjectsStructure$ProjectNode" />
- <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
- </path>
- </expand>
- <select />
- </treeState>
- </component>
- <component name="MavenRunner">
- <option name="skipTests" value="true" />
- </component>
- <component name="NodePackageJsonFileManager">
- <packageJsonPaths>
- <path value="$PROJECT_DIR$/package.json" />
- </packageJsonPaths>
- </component>
<component name="PackageJsonUpdateNotifier">
<dismissed value="$PROJECT_DIR$/package.json" />
</component>
- <component name="ProblemsViewState">
- <option name="selectedTabId" value="CurrentFile" />
- </component>
- <component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="-7" />
- <option name="y" value="1" />
- <option name="width" value="1932" />
- <option name="height" value="1046" />
- </component>
- <component name="ProjectId" id="2T0poWYlZShlnPso29uxjn4gQQo" />
- <component name="ProjectLevelVcsManager" settingsEditedManually="true">
- <ConfirmationsSetting value="2" id="Add" />
- </component>
- <component name="ProjectView">
- <navigator proportions="" version="1">
- <foldersAlwaysOnTop value="true" />
- </navigator>
- <panes>
- <pane id="PackagesPane" />
- <pane id="AndroidView" />
- <pane id="Scope" />
- <pane id="ProjectPane">
- <subPane>
- <expand>
- <path>
- <item name="code" type="b2602c69:ProjectViewProjectNode" />
- <item name="code" type="462c0819:PsiDirectoryNode" />
- </path>
- </expand>
- <select />
- </subPane>
- </pane>
- </panes>
+ <component name="ProjectId" id="2dIMvMGb7ERghaw8CMkmNWTIl8Y" />
+ <component name="ProjectLevelVcsManager">
+ <ConfirmationsSetting value="1" id="Add" />
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">
- <property name="RequestMappingsPanelOrder0" value="0" />
- <property name="RequestMappingsPanelOrder1" value="1" />
- <property name="RequestMappingsPanelWidth0" value="75" />
- <property name="RequestMappingsPanelWidth1" value="75" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="aspect.path.notification.shown" value="true" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1709619211990" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="project.structure.last.edited" value="Project" />
- <property name="project.structure.proportion" value="0.0" />
- <property name="project.structure.side.proportion" value="0.0" />
- <property name="settings.editor.selected.configurable" value="MavenSettings" />
- </component>
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "DefaultHtmlFileTemplate": "HTML File",
+ "RequestMappingsPanelOrder0": "0",
+ "RequestMappingsPanelOrder1": "1",
+ "RequestMappingsPanelWidth0": "75",
+ "RequestMappingsPanelWidth1": "75",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "last_opened_file_path": "E:/IDEA Workspace/PlayPai/code/cloud-server-management/src/main/webapp/static/js",
+ "nodejs_package_manager_path": "npm",
+ "project.structure.last.edited": "项目",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.0",
+ "settings.editor.selected.configurable": "MavenSettings",
+ "spring.configuration.checksum": "70ca91ffe4de7b1d6ace8a9f4834e8a5"
+ }
+}</component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
- <recent name="E:\PlayPai\cloud-server-management\src\main\java\com\dsh\course\mapper" />
- <recent name="E:\PlayPai\cloud-server-management\src\main\resources\mapper" />
- <recent name="E:\PlayPai\cloud-server-management\src\main\java\com\dsh\guns\modular\system\service\impl" />
- <recent name="E:\PlayPai\cloud-server-management\src\main\java\com\dsh\guns\modular\system\service" />
- <recent name="E:\PlayPai\cloud-server-management\src\main\java\com\dsh\guns\modular\system\model" />
- </key>
- <key name="MoveFile.RECENT_KEYS">
- <recent name="D:\JavaTool\PlayPai1\cloud-server-management\src\main\webapp\static\modular\system\tStudent" />
- <recent name="D:\JavaTool\PlayPai1\cloud-server-parent" />
- <recent name="D:\ttt\java\PlayPai\cloud-server-parent" />
+ <recent name="E:\IDEA Workspace\PlayPai\code\cloud-server-management\src\main\webapp\static\js" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="com.dsh.communityWorldCup.model" />
+ <recent name="com.dsh.account.model" />
<recent name="com.dsh.guns.modular.system.util" />
<recent name="com.dsh.guns.modular.system.model" />
- <recent name="com.dsh.course.feignClient.account.model" />
- <recent name="com.dsh.guns.modular.system.model.dto" />
- <recent name="com.dsh.course.mapper" />
- <recent name="com.dsh.course.service.impl" />
- <recent name="com.dsh.course.service" />
- <recent name="com.dsh.guns.modular.system.service.impl" />
- <recent name="com.dsh.guns.modular.system.service" />
- <recent name="com.dsh.other.mapper" />
</key>
</component>
<component name="RunDashboard">
@@ -443,82 +238,10 @@
<option value="SpringBootApplicationConfigurationType" />
</set>
</option>
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- <option name="contentProportion" value="0.24296537" />
</component>
- <component name="RunManager" selected="Spring Boot.CommunityWorldCupApplication">
- <configuration default="true" type="JUnit" factoryName="JUnit">
- <shortenClasspath name="MANIFEST" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="AccountApplicationTests.contextLoads" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
- <module name="mb-cloud-account" />
- <shortenClasspath name="MANIFEST" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.dsh.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <option name="PACKAGE_NAME" value="com.dsh" />
- <option name="MAIN_CLASS_NAME" value="com.dsh.AccountApplicationTests" />
- <option name="METHOD_NAME" value="contextLoads" />
- <option name="TEST_OBJECT" value="method" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="AccountApplicationTests.contextLoads" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
- <module name="mb-cloud-account" />
- <shortenClasspath name="MANIFEST" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.dsh.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <option name="PACKAGE_NAME" value="com.dsh" />
- <option name="MAIN_CLASS_NAME" value="com.dsh.AccountApplicationTests" />
- <option name="METHOD_NAME" value="contextLoads" />
- <option name="TEST_OBJECT" value="method" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit">
- <shortenClasspath name="MANIFEST" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
+ <component name="RunManager" selected="Spring Boot.ManagementApplication">
<configuration name="AccountApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-account" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="AccountApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="mb-cloud-account" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" />
<method v="2">
<option name="Make" enabled="true" />
@@ -527,22 +250,6 @@
<configuration name="ActivityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-activity" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="ActivityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="mb-cloud-activity" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="AuthApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="mb-cloud-auth" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="cn.mb.cloud.auth.AuthApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -557,22 +264,12 @@
<configuration name="CommunityWorldCupApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-communityWorldCup" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CommunityWorldCupApplication" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="CompetitionApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-competition" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="CompetitionApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="mb-cloud-competition" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" />
<method v="2">
<option name="Make" enabled="true" />
@@ -581,27 +278,11 @@
<configuration name="CourseApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-course" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
- <configuration name="CourseApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="mb-cloud-course" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="GatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
- <module name="mb-cloud-gateway" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="cn.mb.cloud.gateway.GatewayApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="GatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+ <configuration name="GatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-gateway" />
<option name="SPRING_BOOT_MAIN_CLASS" value="cn.mb.cloud.gateway.GatewayApplication" />
<method v="2">
@@ -611,1100 +292,102 @@
<configuration name="ManagementApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-management" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ManagementApplication" />
- <option name="ENABLE_JMX_AGENT" value="false" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
- <configuration name="ManagementApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <option name="ENABLE_JMX_AGENT" value="false" />
- <module name="mb-cloud-management" />
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ManagementApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="OtherApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+ <configuration name="OtherApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="mb-cloud-other" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.OtherApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
- <configuration name="OtherApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
- <module name="mb-cloud-other" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.OtherApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <list>
- <item itemvalue="Spring Boot.CourseApplication" />
- <item itemvalue="Spring Boot.AuthApplication" />
- <item itemvalue="Spring Boot.AccountApplication" />
- <item itemvalue="Spring Boot.ManagementApplication" />
- <item itemvalue="Spring Boot.GatewayApplication" />
- <item itemvalue="Spring Boot.OtherApplication" />
- <item itemvalue="Spring Boot.ActivityApplication" />
- <item itemvalue="Spring Boot.CompetitionApplication" />
- <item itemvalue="Spring Boot.CommunityWorldCupApplication" />
- <item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
- </list>
- <recent_temporary>
- <list>
- <item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
- </list>
- </recent_temporary>
</component>
- <component name="ServiceViewManager">
- <option name="allServicesViewState">
- <serviceView>
- <option name="contentProportion" value="0.21049784" />
- <treeState>
- <expand>
- <path>
- <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@89aeeae2" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- </path>
- <path>
- <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@89aeeae2" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5fffee20" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- </path>
- </expand>
- <select />
- </treeState>
- </serviceView>
- </option>
- </component>
- <component name="ShelveChangesManager">
- <option name="remove_strategy" value="true" />
- </component>
- <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" />
- <component name="SvnConfiguration">
- <configuration>C:\Users\luo\AppData\Roaming\Subversion</configuration>
- </component>
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="" />
- <created>1686653431962</created>
+ <task active="true" id="Default" summary="默认任务">
+ <changelist id="650df2b6-cf87-4680-baeb-f5d214ecefb7" name="更改" comment="" />
+ <created>1709691371771</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
- <updated>1686653431962</updated>
- <workItem from="1686653433491" duration="2267000" />
- <workItem from="1690190039038" duration="16883000" />
- <workItem from="1690333209172" duration="26986000" />
- <workItem from="1694491048553" duration="19249000" />
- <workItem from="1694568465297" duration="8212000" />
- <workItem from="1694576808030" duration="31000" />
- <workItem from="1694578995783" duration="17340000" />
- <workItem from="1694652961834" duration="2402000" />
- <workItem from="1694749027815" duration="287000" />
- <workItem from="1694826312367" duration="136000" />
- <workItem from="1694826468892" duration="22165000" />
- <workItem from="1694931109193" duration="31686000" />
- <workItem from="1695084815207" duration="29663000" />
- <workItem from="1695138476053" duration="63000" />
- <workItem from="1695138628399" duration="396000" />
- <workItem from="1695139199151" duration="117000" />
- <workItem from="1695139544607" duration="173000" />
- <workItem from="1695139722530" duration="14000" />
- <workItem from="1695139741242" duration="4527000" />
- <workItem from="1695162059666" duration="1120000" />
- <workItem from="1695163191288" duration="585000" />
- <workItem from="1695170647169" duration="6776000" />
- <workItem from="1695178072108" duration="30661000" />
- <workItem from="1695250896481" duration="445000" />
- <workItem from="1695255303249" duration="37521000" />
- <workItem from="1695342171677" duration="37810000" />
- <workItem from="1695430054273" duration="24454000" />
- <workItem from="1695461202457" duration="3973000" />
- <workItem from="1695520475699" duration="28522000" />
- <workItem from="1695602623205" duration="24182000" />
- <workItem from="1695633570775" duration="65000" />
- <workItem from="1695633789585" duration="4703000" />
- <workItem from="1695638521906" duration="1415000" />
- <workItem from="1695689815334" duration="13353000" />
- <workItem from="1695718856285" duration="22098000" />
- <workItem from="1695775091167" duration="4246000" />
- <workItem from="1695794503293" duration="3283000" />
- <workItem from="1695799021203" duration="5869000" />
- <workItem from="1695820563853" duration="56000" />
- <workItem from="1695863479059" duration="12419000" />
- <workItem from="1696427897814" duration="1362000" />
- <workItem from="1696433675086" duration="2211000" />
- <workItem from="1696462020097" duration="481000" />
- <workItem from="1696465598653" duration="19850000" />
- <workItem from="1696639362946" duration="88523000" />
- <workItem from="1696894655693" duration="923000" />
- <workItem from="1696895595069" duration="471000" />
- <workItem from="1696896079395" duration="4306000" />
- <workItem from="1696900426210" duration="3256000" />
- <workItem from="1696903826401" duration="164000" />
- <workItem from="1696904129011" duration="6673000" />
- <workItem from="1696917635013" duration="5121000" />
- <workItem from="1696847977356" duration="7435000" />
- <workItem from="1696898972818" duration="19012000" />
- <workItem from="1696992350781" duration="4934000" />
- <workItem from="1697004175378" duration="3253000" />
- <workItem from="1697007526233" duration="1089000" />
- <workItem from="1697008680148" duration="240000" />
- <workItem from="1697009049694" duration="7913000" />
- <workItem from="1697017354280" duration="2337000" />
- <workItem from="1697020450777" duration="4953000" />
- <workItem from="1697072437579" duration="8289000" />
- <workItem from="1697092527442" duration="204000" />
- <workItem from="1697092830953" duration="1837000" />
- <workItem from="1697178223586" duration="78000" />
- <workItem from="1697178417354" duration="1021000" />
- <workItem from="1697180043229" duration="965000" />
- <workItem from="1697181152560" duration="3246000" />
- <workItem from="1697184619489" duration="382000" />
- <workItem from="1697185123659" duration="1829000" />
- <workItem from="1697186980814" duration="5035000" />
- <workItem from="1697417273104" duration="16186000" />
- <workItem from="1697438899985" duration="44114000" />
- <workItem from="1697590715803" duration="66758000" />
- <workItem from="1698142818373" duration="10099000" />
- <workItem from="1698154539431" duration="913000" />
- <workItem from="1698194264793" duration="36754000" />
- <workItem from="1698280994018" duration="26917000" />
- <workItem from="1698316299057" duration="8429000" />
- <workItem from="1698325880893" duration="54542000" />
- <workItem from="1698455150596" duration="11287000" />
- <workItem from="1698627531587" duration="2092000" />
- <workItem from="1708947562373" duration="284000" />
- <workItem from="1708947995181" duration="6987000" />
+ <updated>1709691371771</updated>
+ <workItem from="1709691375734" duration="12401000" />
+ <workItem from="1709711014430" duration="5169000" />
+ <workItem from="1709716480207" duration="11477000" />
+ <workItem from="1709772697689" duration="9173000" />
+ <workItem from="1709794828105" duration="2957000" />
+ <workItem from="1709865060803" duration="1995000" />
</task>
- <task id="LOCAL-00051" summary="10.13bug2">
- <option name="closed" value="true" />
- <created>1697190103134</created>
- <option name="number" value="00051" />
- <option name="presentableId" value="LOCAL-00051" />
+ <task id="LOCAL-00001" summary="添加方法">
+ <created>1709696336025</created>
+ <option name="number" value="00001" />
+ <option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
- <updated>1697190103134</updated>
+ <updated>1709696336025</updated>
</task>
- <task id="LOCAL-00052" summary="10.16">
- <option name="closed" value="true" />
- <created>1697421033991</created>
- <option name="number" value="00052" />
- <option name="presentableId" value="LOCAL-00052" />
+ <task id="LOCAL-00002" summary="添加方法">
+ <created>1709715651179</created>
+ <option name="number" value="00002" />
+ <option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
- <updated>1697421033991</updated>
+ <updated>1709715651179</updated>
</task>
- <task id="LOCAL-00053" summary="10.16">
- <option name="closed" value="true" />
- <created>1697423594604</created>
- <option name="number" value="00053" />
- <option name="presentableId" value="LOCAL-00053" />
+ <task id="LOCAL-00003" summary="添加方法">
+ <created>1709715708020</created>
+ <option name="number" value="00003" />
+ <option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
- <updated>1697423594604</updated>
+ <updated>1709715708020</updated>
</task>
- <task id="LOCAL-00054" summary="10.16">
- <option name="closed" value="true" />
- <created>1697425647172</created>
- <option name="number" value="00054" />
- <option name="presentableId" value="LOCAL-00054" />
+ <task id="LOCAL-00004" summary="添加方法">
+ <created>1709720116353</created>
+ <option name="number" value="00004" />
+ <option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
- <updated>1697425647172</updated>
+ <updated>1709720116353</updated>
</task>
- <task id="LOCAL-00055" summary="10.16">
- <option name="closed" value="true" />
- <created>1697437273028</created>
- <option name="number" value="00055" />
- <option name="presentableId" value="LOCAL-00055" />
+ <task id="LOCAL-00005" summary="添加方法">
+ <created>1709720368655</created>
+ <option name="number" value="00005" />
+ <option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
- <updated>1697437273028</updated>
+ <updated>1709720368655</updated>
</task>
- <task id="LOCAL-00056" summary="10.16">
- <option name="closed" value="true" />
- <created>1697440369715</created>
- <option name="number" value="00056" />
- <option name="presentableId" value="LOCAL-00056" />
+ <task id="LOCAL-00006" summary="添加方法">
+ <created>1709727533919</created>
+ <option name="number" value="00006" />
+ <option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
- <updated>1697440369715</updated>
+ <updated>1709727533919</updated>
</task>
- <task id="LOCAL-00057" summary="10.16">
- <option name="closed" value="true" />
- <created>1697441280562</created>
- <option name="number" value="00057" />
- <option name="presentableId" value="LOCAL-00057" />
+ <task id="LOCAL-00007" summary="添加方法">
+ <created>1709781024147</created>
+ <option name="number" value="00007" />
+ <option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
- <updated>1697441280562</updated>
+ <updated>1709781024147</updated>
</task>
- <task id="LOCAL-00058" summary="10.16">
- <option name="closed" value="true" />
- <created>1697441941175</created>
- <option name="number" value="00058" />
- <option name="presentableId" value="LOCAL-00058" />
- <option name="project" value="LOCAL" />
- <updated>1697441941175</updated>
- </task>
- <task id="LOCAL-00059" summary="10.16">
- <option name="closed" value="true" />
- <created>1697442367816</created>
- <option name="number" value="00059" />
- <option name="presentableId" value="LOCAL-00059" />
- <option name="project" value="LOCAL" />
- <updated>1697442367816</updated>
- </task>
- <task id="LOCAL-00060" summary="10.16">
- <option name="closed" value="true" />
- <created>1697445040226</created>
- <option name="number" value="00060" />
- <option name="presentableId" value="LOCAL-00060" />
- <option name="project" value="LOCAL" />
- <updated>1697445040226</updated>
- </task>
- <task id="LOCAL-00061" summary="10.16">
- <option name="closed" value="true" />
- <created>1697450421770</created>
- <option name="number" value="00061" />
- <option name="presentableId" value="LOCAL-00061" />
- <option name="project" value="LOCAL" />
- <updated>1697450421770</updated>
- </task>
- <task id="LOCAL-00062" summary="10.17">
- <option name="closed" value="true" />
- <created>1697508559659</created>
- <option name="number" value="00062" />
- <option name="presentableId" value="LOCAL-00062" />
- <option name="project" value="LOCAL" />
- <updated>1697508559659</updated>
- </task>
- <task id="LOCAL-00063" summary="10.18">
- <option name="closed" value="true" />
- <created>1697513780976</created>
- <option name="number" value="00063" />
- <option name="presentableId" value="LOCAL-00063" />
- <option name="project" value="LOCAL" />
- <updated>1697513780976</updated>
- </task>
- <task id="LOCAL-00064" summary="10.17.1">
- <option name="closed" value="true" />
- <created>1697534717056</created>
- <option name="number" value="00064" />
- <option name="presentableId" value="LOCAL-00064" />
- <option name="project" value="LOCAL" />
- <updated>1697534717056</updated>
- </task>
- <task id="LOCAL-00065" summary="10.17.2">
- <option name="closed" value="true" />
- <created>1697535415315</created>
- <option name="number" value="00065" />
- <option name="presentableId" value="LOCAL-00065" />
- <option name="project" value="LOCAL" />
- <updated>1697535415315</updated>
- </task>
- <task id="LOCAL-00066" summary="10.18">
- <option name="closed" value="true" />
- <created>1697591762701</created>
- <option name="number" value="00066" />
- <option name="presentableId" value="LOCAL-00066" />
- <option name="project" value="LOCAL" />
- <updated>1697591762701</updated>
- </task>
- <task id="LOCAL-00067" summary="10.18">
- <option name="closed" value="true" />
- <created>1697596664774</created>
- <option name="number" value="00067" />
- <option name="presentableId" value="LOCAL-00067" />
- <option name="project" value="LOCAL" />
- <updated>1697596664774</updated>
- </task>
- <task id="LOCAL-00068" summary="10.18">
- <option name="closed" value="true" />
- <created>1697596688673</created>
- <option name="number" value="00068" />
- <option name="presentableId" value="LOCAL-00068" />
- <option name="project" value="LOCAL" />
- <updated>1697596688673</updated>
- </task>
- <task id="LOCAL-00069" summary="10.18">
- <option name="closed" value="true" />
- <created>1697596933769</created>
- <option name="number" value="00069" />
- <option name="presentableId" value="LOCAL-00069" />
- <option name="project" value="LOCAL" />
- <updated>1697596933769</updated>
- </task>
- <task id="LOCAL-00070" summary="10.18.1">
- <option name="closed" value="true" />
- <created>1697600675539</created>
- <option name="number" value="00070" />
- <option name="presentableId" value="LOCAL-00070" />
- <option name="project" value="LOCAL" />
- <updated>1697600675539</updated>
- </task>
- <task id="LOCAL-00071" summary="10.18.2">
- <option name="closed" value="true" />
- <created>1697619016814</created>
- <option name="number" value="00071" />
- <option name="presentableId" value="LOCAL-00071" />
- <option name="project" value="LOCAL" />
- <updated>1697619016814</updated>
- </task>
- <task id="LOCAL-00072" summary="10.18.2">
- <option name="closed" value="true" />
- <created>1697700791683</created>
- <option name="number" value="00072" />
- <option name="presentableId" value="LOCAL-00072" />
- <option name="project" value="LOCAL" />
- <updated>1697700791683</updated>
- </task>
- <task id="LOCAL-00073" summary="10.20">
- <option name="closed" value="true" />
- <created>1697765704121</created>
- <option name="number" value="00073" />
- <option name="presentableId" value="LOCAL-00073" />
- <option name="project" value="LOCAL" />
- <updated>1697765704122</updated>
- </task>
- <task id="LOCAL-00074" summary="运营商添加bug修改">
- <created>1698144558537</created>
- <option name="number" value="00074" />
- <option name="presentableId" value="LOCAL-00074" />
- <option name="project" value="LOCAL" />
- <updated>1698144558538</updated>
- </task>
- <task id="LOCAL-00075" summary="运营商权限">
- <created>1698150152696</created>
- <option name="number" value="00075" />
- <option name="presentableId" value="LOCAL-00075" />
- <option name="project" value="LOCAL" />
- <updated>1698150152696</updated>
- </task>
- <task id="LOCAL-00076" summary="权限添加">
- <created>1698150815040</created>
- <option name="number" value="00076" />
- <option name="presentableId" value="LOCAL-00076" />
- <option name="project" value="LOCAL" />
- <updated>1698150815040</updated>
- </task>
- <task id="LOCAL-00077" summary="运营商权限">
- <created>1698154307813</created>
- <option name="number" value="00077" />
- <option name="presentableId" value="LOCAL-00077" />
- <option name="project" value="LOCAL" />
- <updated>1698154307813</updated>
- </task>
- <task id="LOCAL-00078" summary="运营商权限">
- <created>1698194296076</created>
- <option name="number" value="00078" />
- <option name="presentableId" value="LOCAL-00078" />
- <option name="project" value="LOCAL" />
- <updated>1698194296076</updated>
- </task>
- <task id="LOCAL-00079" summary="运营商权限">
- <created>1698199358403</created>
- <option name="number" value="00079" />
- <option name="presentableId" value="LOCAL-00079" />
- <option name="project" value="LOCAL" />
- <updated>1698199358403</updated>
- </task>
- <task id="LOCAL-00080" summary="运营商权限">
- <created>1698204167784</created>
- <option name="number" value="00080" />
- <option name="presentableId" value="LOCAL-00080" />
- <option name="project" value="LOCAL" />
- <updated>1698204167784</updated>
- </task>
- <task id="LOCAL-00081" summary="10.20">
- <created>1698225060306</created>
- <option name="number" value="00081" />
- <option name="presentableId" value="LOCAL-00081" />
- <option name="project" value="LOCAL" />
- <updated>1698225060307</updated>
- </task>
- <task id="LOCAL-00082" summary="运营商权限">
- <created>1698281682907</created>
- <option name="number" value="00082" />
- <option name="presentableId" value="LOCAL-00082" />
- <option name="project" value="LOCAL" />
- <updated>1698281682907</updated>
- </task>
- <task id="LOCAL-00083" summary="10.20">
- <created>1698304011843</created>
- <option name="number" value="00083" />
- <option name="presentableId" value="LOCAL-00083" />
- <option name="project" value="LOCAL" />
- <updated>1698304011843</updated>
- </task>
- <task id="LOCAL-00084" summary="10.20">
- <created>1698379811872</created>
- <option name="number" value="00084" />
- <option name="presentableId" value="LOCAL-00084" />
- <option name="project" value="LOCAL" />
- <updated>1698379811872</updated>
- </task>
- <task id="LOCAL-00085" summary="10.20">
- <created>1698379912528</created>
- <option name="number" value="00085" />
- <option name="presentableId" value="LOCAL-00085" />
- <option name="project" value="LOCAL" />
- <updated>1698379912528</updated>
- </task>
- <task id="LOCAL-00086" summary="商户认证">
- <created>1698382105139</created>
- <option name="number" value="00086" />
- <option name="presentableId" value="LOCAL-00086" />
- <option name="project" value="LOCAL" />
- <updated>1698382105139</updated>
- </task>
- <task id="LOCAL-00087" summary="商户认证">
- <created>1698383333283</created>
- <option name="number" value="00087" />
- <option name="presentableId" value="LOCAL-00087" />
- <option name="project" value="LOCAL" />
- <updated>1698383333283</updated>
- </task>
- <task id="LOCAL-00088" summary="商户认证">
- <created>1698383355441</created>
- <option name="number" value="00088" />
- <option name="presentableId" value="LOCAL-00088" />
- <option name="project" value="LOCAL" />
- <updated>1698383355441</updated>
- </task>
- <task id="LOCAL-00089" summary="商户认证">
- <created>1698383380121</created>
- <option name="number" value="00089" />
- <option name="presentableId" value="LOCAL-00089" />
- <option name="project" value="LOCAL" />
- <updated>1698383380121</updated>
- </task>
- <task id="LOCAL-00090" summary="商户认证">
- <created>1698383394712</created>
- <option name="number" value="00090" />
- <option name="presentableId" value="LOCAL-00090" />
- <option name="project" value="LOCAL" />
- <updated>1698383394712</updated>
- </task>
- <task id="LOCAL-00091" summary="商户认证">
- <created>1698383409580</created>
- <option name="number" value="00091" />
- <option name="presentableId" value="LOCAL-00091" />
- <option name="project" value="LOCAL" />
- <updated>1698383409580</updated>
- </task>
- <task id="LOCAL-00092" summary="商户认证">
- <created>1698384180115</created>
- <option name="number" value="00092" />
- <option name="presentableId" value="LOCAL-00092" />
- <option name="project" value="LOCAL" />
- <updated>1698384180115</updated>
- </task>
- <task id="LOCAL-00093" summary="商户认证">
- <created>1698394471402</created>
- <option name="number" value="00093" />
- <option name="presentableId" value="LOCAL-00093" />
- <option name="project" value="LOCAL" />
- <updated>1698394471402</updated>
- </task>
- <task id="LOCAL-00094" summary="11.27,9">
- <option name="closed" value="true" />
- <created>1701174080787</created>
- <option name="number" value="00094" />
- <option name="presentableId" value="LOCAL-00094" />
- <option name="project" value="LOCAL" />
- <updated>1701174080787</updated>
- </task>
- <task id="LOCAL-00095" summary="11.27,9">
- <option name="closed" value="true" />
- <created>1701174292128</created>
- <option name="number" value="00095" />
- <option name="presentableId" value="LOCAL-00095" />
- <option name="project" value="LOCAL" />
- <updated>1701174292128</updated>
- </task>
- <task id="LOCAL-00096" summary="修改bug">
- <created>1709112234344</created>
- <option name="number" value="00096" />
- <option name="presentableId" value="LOCAL-00096" />
- <option name="project" value="LOCAL" />
- <updated>1709112234345</updated>
- </task>
- <task id="LOCAL-00097" summary="合并代码">
- <created>1709534778085</created>
- <option name="number" value="00097" />
- <option name="presentableId" value="LOCAL-00097" />
- <option name="project" value="LOCAL" />
- <updated>1709534778085</updated>
- </task>
- <task id="LOCAL-00098" summary="合并代码">
- <created>1709534897759</created>
- <option name="number" value="00098" />
- <option name="presentableId" value="LOCAL-00098" />
- <option name="project" value="LOCAL" />
- <updated>1709534897759</updated>
- </task>
- <task id="LOCAL-00099" summary="合并代码">
- <created>1709619248636</created>
- <option name="number" value="00099" />
- <option name="presentableId" value="LOCAL-00099" />
- <option name="project" value="LOCAL" />
- <updated>1709619248636</updated>
- </task>
- <option name="localTasksCounter" value="100" />
+ <option name="localTasksCounter" value="8" />
<servers />
</component>
- <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="16463000" />
- </component>
- <component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
- <layout>
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25266525" />
- <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
- <window_info id="Designer" order="2" />
- <window_info id="Image Layers" order="3" />
- <window_info id="UI Designer" order="4" />
- <window_info id="Favorites" order="5" side_tool="true" />
- <window_info id="Capture Tool" order="6" />
- <window_info id="Web" order="7" side_tool="true" />
- <window_info anchor="bottom" id="Message" order="0" />
- <window_info anchor="bottom" id="Find" order="1" />
- <window_info anchor="bottom" id="Run" order="2" weight="0.32899022" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
- <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
- <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
- <window_info anchor="bottom" id="TODO" order="6" />
- <window_info anchor="bottom" id="Terminal" order="7" />
- <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
- <window_info anchor="bottom" id="Statistic" order="9" />
- <window_info anchor="bottom" id="Java Enterprise" order="10" />
- <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
- <window_info active="true" anchor="bottom" id="Version Control" order="12" visible="true" weight="0.32899022" />
- <window_info anchor="bottom" id="Run Dashboard" order="13" weight="0.19652551" />
- <window_info anchor="bottom" id="Spring" order="14" />
- <window_info anchor="bottom" id="Messages" order="15" weight="0.32899022" />
- <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
- <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
- <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
- <window_info anchor="right" id="Palette" order="3" />
- <window_info anchor="right" id="Capture Analysis" order="4" />
- <window_info anchor="right" id="Maven Projects" order="5" weight="0.21321961" />
- <window_info anchor="right" id="Database" order="6" />
- <window_info anchor="right" id="Palette	" order="7" />
- <window_info anchor="right" id="Theme Preview" order="8" />
- <window_info anchor="right" id="Bean Validation" order="9" />
- </layout>
- </component>
<component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="1" />
+ <option name="version" value="3" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
- <State>
- <option name="RECENTLY_FILTERED_USER_GROUPS">
- <collection />
- </option>
- <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
- <collection />
- </option>
- </State>
+ <State />
</value>
</entry>
</map>
</option>
</component>
- <component name="VcsContentAnnotationSettings">
- <option name="myLimit" value="2678400000" />
- </component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="9.26。13" />
- <MESSAGE value="9.26。14" />
- <MESSAGE value="9.26。15" />
- <MESSAGE value="10.8" />
- <MESSAGE value="10.8。1" />
- <MESSAGE value="10.11" />
- <MESSAGE value="10.12" />
- <MESSAGE value="10.13" />
- <MESSAGE value="10.13bug1" />
- <MESSAGE value="10.13bug2" />
- <MESSAGE value="10.16" />
- <MESSAGE value="10.17" />
- <MESSAGE value="10.17.1" />
- <MESSAGE value="10.17.2" />
- <MESSAGE value="10.18" />
- <MESSAGE value="10.18.1" />
- <MESSAGE value="10.18.2" />
- <MESSAGE value="运营商添加bug修改" />
- <MESSAGE value="权限添加" />
- <MESSAGE value="运营商权限" />
- <MESSAGE value="10.20" />
- <MESSAGE value="商户认证" />
- <MESSAGE value="11.27,9" />
- <MESSAGE value="修改bug" />
- <MESSAGE value="合并代码" />
- <option name="LAST_COMMIT_MESSAGE" value="合并代码" />
- </component>
- <component name="XDebuggerManager">
- <breakpoint-manager>
- <breakpoints>
- <line-breakpoint type="java-line">
- <url>file://$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java</url>
- <line>264</line>
- <properties />
- <option name="timeStamp" value="1" />
- </line-breakpoint>
- <line-breakpoint type="java-line">
- <url>file://$PROJECT_DIR$/cloud-server-auth/src/main/java/cn/mb/cloud/auth/service/UserDetailsServiceImpl.java</url>
- <line>111</line>
- <properties />
- <option name="timeStamp" value="2" />
- </line-breakpoint>
- <line-breakpoint type="java-line">
- <url>file://$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java</url>
- <line>458</line>
- <properties />
- <option name="timeStamp" value="9" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java</url>
- <line>282</line>
- <properties />
- <option name="timeStamp" value="50" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java</url>
- <line>584</line>
- <properties />
- <option name="timeStamp" value="111" />
- </line-breakpoint>
- </breakpoints>
- </breakpoint-manager>
- </component>
- <component name="XSLT-Support.FileAssociations.UIState">
- <expand />
- <select />
- </component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/cloud-server-parent/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="9" selection-start-line="9" selection-end-line="9" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/TaskUtil.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="593">
- <caret line="29" selection-start-line="29" selection-end-line="29" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/DeductionCompetitionsClient.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="175">
- <caret line="13" selection-start-line="13" selection-end-line="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/TaskUtilCompetition.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="148">
- <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/CommunityWorldCupApplication.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="125">
- <caret line="17" column="3" lean-forward="true" selection-start-line="17" selection-start-column="3" selection-end-line="17" selection-end-column="3" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/RequestParamFilter.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-26">
- <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/ResponseParamFilter.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-876">
- <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/WrapperResponseGlobalFilter.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-476">
- <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="139">
- <caret line="124" column="19" selection-start-line="124" selection-start-column="19" selection-end-line="124" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/model/HeaderParams.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="125">
- <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/handler/AppTypeContextHolder.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="261">
- <caret line="17" selection-start-line="17" selection-end-line="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/model/StoreConfigVo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="195">
- <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/model/BannerVo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="372">
- <caret line="23" column="31" lean-forward="true" selection-start-line="23" selection-start-column="31" selection-end-line="23" selection-end-column="31" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-other/src/main/resources/mapper/BannerMapper.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="372">
- <caret line="51" column="63" selection-start-line="51" selection-start-column="59" selection-end-line="51" selection-end-column="63" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/QueryParamsUtil.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1828">
- <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="325">
- <caret line="13" column="22" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2130">
- <caret line="125" lean-forward="true" selection-start-line="125" selection-end-line="125" />
- <folding>
- <element signature="e#5114#5115#0" expanded="true" />
- <element signature="e#5197#5198#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/HomeModuleController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="350">
- <caret line="30" column="24" lean-forward="true" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="24" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/entity/HomeModule.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="254">
- <caret line="30" column="7" lean-forward="true" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="7" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/target/classes/bootstrap.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="12" column="51" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/resources/sharding-jdbc.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="175">
- <caret line="7" column="32" lean-forward="true" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="282">
- <caret line="123" column="13" lean-forward="true" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/CoursePackagePaymentClient.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="251">
- <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="401">
- <caret line="141" column="50" lean-forward="true" selection-start-line="141" selection-start-column="50" selection-end-line="141" selection-end-column="50" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/service/IParticipantService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="260">
- <caret line="39" column="24" selection-start-line="39" selection-start-column="24" selection-end-line="39" selection-end-column="24" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="292">
- <caret line="88" column="79" selection-start-line="88" selection-start-column="79" selection-end-line="88" selection-end-column="79" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="320">
- <caret line="21" column="45" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="320">
- <caret line="20" column="45" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPayment.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="85">
- <caret line="21" column="45" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="421">
- <caret line="37" column="45" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="307">
- <caret line="116" column="28" selection-start-line="116" selection-start-column="15" selection-end-line="116" selection-end-column="28" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupListVo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="252">
- <caret line="14" column="22" lean-forward="true" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="50">
- <caret line="2" column="63" lean-forward="true" selection-start-line="2" selection-start-column="63" selection-end-line="2" selection-end-column="63" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupMapper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="14" column="56" lean-forward="true" selection-start-line="14" selection-start-column="56" selection-end-line="14" selection-end-column="56" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCup.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="200">
- <caret line="110" column="7" lean-forward="true" selection-start-line="102" selection-start-column="32" selection-end-line="122" selection-end-column="28" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupPaymentParticipantMapper.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="19">
- <caret line="16" column="33" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="33" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupPaymentParticipantMapper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="340">
- <caret line="33" column="42" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="42" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="326">
- <caret line="604" column="49" selection-start-line="604" selection-start-column="27" selection-end-line="604" selection-end-column="49" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupInfo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="125">
- <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupPaymentParticipantService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="230">
- <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/MyWorldCupInfo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="171">
- <caret line="44" column="54" selection-start-line="44" selection-start-column="54" selection-end-line="44" selection-end-column="54" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="414">
- <caret line="127" column="19" selection-start-line="127" selection-start-column="19" selection-end-line="127" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="70" column="15" selection-start-line="70" selection-start-column="15" selection-end-line="70" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPaymentParticipant.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="354">
- <caret line="47" column="34" selection-start-line="47" selection-start-column="34" selection-end-line="47" selection-end-column="34" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="84">
- <caret line="617" column="60" selection-start-line="617" selection-start-column="60" selection-end-line="617" selection-end-column="60" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-836">
- <caret line="436" column="46" selection-start-line="436" selection-start-column="46" selection-end-line="436" selection-end-column="46" />
- <folding>
- <element signature="e#22578#22579#0" expanded="true" />
- <element signature="e#22634#22635#0" expanded="true" />
- <element signature="e#24096#24097#0" expanded="true" />
- <element signature="e#24146#24147#0" expanded="true" />
- <element signature="e#24683#24684#0" expanded="true" />
- <element signature="e#24739#24740#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </component>
- <component name="masterDetails">
- <states>
- <state key="ArtifactsStructureConfigurable.UI">
- <settings>
- <artifact-editor />
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="FacetStructureConfigurable.UI">
- <settings>
- <last-edited>Spring</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="GlobalLibrariesConfigurable.UI">
- <settings>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="JdkListConfigurable.UI">
- <settings>
- <last-edited>1.8</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ModuleStructureConfigurable.UI">
- <settings>
- <last-edited>PlayPai</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- <option value="0.6" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ProjectLibrariesConfigurable.UI">
- <settings>
- <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- </states>
+ <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
+ <MESSAGE value="添加方法" />
+ <option name="LAST_COMMIT_MESSAGE" value="添加方法" />
</component>
</project>
\ No newline at end of file
diff --git a/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml b/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
index 0b7c89b..b8ffd67 100644
--- a/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
+++ b/cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
@@ -92,10 +92,10 @@
and `name` like CONCAT('%', #{item.name}, '%')
</if>
<if test="null != item.startTime and '' != item.startTime">
- and DATE_FORMAT(startTime, '%Y-%m-%d') >= #{item.startTime}
+ and DATE_FORMAT(startTime, '%Y-%m-%d') = #{item.startTime}
</if>
<if test="null != item.endTime and '' != item.endTime">
- and DATE_FORMAT(endTime, '%Y-%m-%d') <= #{item.endTime}
+ and DATE_FORMAT(endTime, '%Y-%m-%d') = #{item.endTime}
</if>
<if test="null != item.status">
and status= #{item.status}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/UserGameRecordList.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/UserGameRecordList.java
new file mode 100644
index 0000000..7063aee
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/UserGameRecordList.java
@@ -0,0 +1,27 @@
+package com.dsh.course.feignClient.communityWorldCup.Model;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/3/7 10:34
+ */
+@Data
+public class UserGameRecordList {
+ /**
+ * 用户姓名
+ */
+ private String userName;
+ /**
+ * 参与比赛名称
+ */
+ private String name;
+ /**
+ * 页码
+ */
+ private Integer offset;
+ /**
+ * 页条数
+ */
+ private Integer limit;
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/UserStatisticsList.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/UserStatisticsList.java
new file mode 100644
index 0000000..8cb1aaf
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/UserStatisticsList.java
@@ -0,0 +1,31 @@
+package com.dsh.course.feignClient.communityWorldCup.Model;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/3/7 9:37
+ */
+@Data
+public class UserStatisticsList {
+ /**
+ * 姓名
+ */
+ private String name;
+ /**
+ * 电话号码
+ */
+ private String phone;
+ /**
+ * 身份证号
+ */
+ private String idcard;
+ /**
+ * 页码
+ */
+ private Integer offset;
+ /**
+ * 页条数
+ */
+ private Integer limit;
+}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java
index 2936cfb..583623b 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java
@@ -108,4 +108,13 @@
*/
@PostMapping("/worldCup/changeScore")
void changeScore(ChangeScore changeScore);
+
+
+ /**
+ * 获取用户比赛记录
+ * @param userGameRecordList
+ * @return
+ */
+ @PostMapping("/worldCup/userGameRecordList")
+ Map<String, Object> userGameRecordList(UserGameRecordList userGameRecordList);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java
index 177c8c0..011e972 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/Site.java
@@ -27,6 +27,11 @@
@TableField("storeId")
private Integer storeId;
/**
+ * 是否可预约
+ */
+ @TableField("isCanBeBooked")
+ private Integer isCanBeBooked;
+ /**
* 场地名称
*/
@TableField("name")
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
index e5c79f1..e9a69b7 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -88,8 +88,8 @@
List<Map<String, Object>> querySiteListOfpage(@Param("provinceCode") String provinceCode,
@Param("cityCode") String cityCode,
@Param("operatorId") Integer operatorId,
- @Param("storeName") String storeName,
- @Param("page") Page<Map<String, Object>> page);
+ @Param("storeName") String storeName
+ );
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index 1fe189b..0023ad3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -225,8 +225,7 @@
// 筛选这个运营商下的门店
operatorId = UserExt.getUser().getObjectId();
}
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,page);
+ List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName);
if (storeList.size() > 0 ){
for (Map<String, Object> stringObjectMap : storeList) {
String provinceName = (String) stringObjectMap.get("province");
@@ -234,16 +233,14 @@
stringObjectMap.put("provinceCity",provinceName+cityName);
Integer managerId = (Integer) stringObjectMap.get("operatorId");
if (managerId == null){
- stringObjectMap.put("accountName","平台");
+ stringObjectMap.put("account","平台");
}else{
if (managerId==0){
- stringObjectMap.put("accountName","平台");
+ stringObjectMap.put("account","平台");
}else{
TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
if (ToolUtil.isNotEmpty(operator)){
- stringObjectMap.put("accountName",operator.getName());
- }else{
- stringObjectMap.put("accountName","平台");
+ stringObjectMap.put("account",operator.getName());
}
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java
index 2d955d3..2d20e65 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java
@@ -101,13 +101,14 @@
.eq("operatorId", 0)
.ne("state", 3));
model.addAttribute("storeList",list);
+ model.addAttribute("operatorId",0);
}
if (UserExt.getUser().getObjectType()==2){
List<TStore> list2 = storeService.list(new QueryWrapper<TStore>()
.eq("operatorId", UserExt.getUser().getObjectId())
.ne("state", 3));
model.addAttribute("storeList",list2);
- model.addAttribute("operatorId",UserExt.getUser().getObjectId());
+ model.addAttribute("operatorId",0);
}
if (UserExt.getUser().getObjectType()==3){
List<TStore> list3 = new ArrayList<>();
@@ -246,6 +247,7 @@
.eq("storeId", byId.getStoreId())
.ne("state",3));
model.addAttribute("siteList",siteList);
+ model.addAttribute("operatorId",byId.getOperatorId());
}
if (UserExt.getUser().getObjectType()==2){
List<TStore> list2 = storeService.list(new QueryWrapper<TStore>()
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 51ed32e..5800575 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -561,10 +561,10 @@
}
}
}
-
+ // 判断所选场地是否一个运营商
if (StringUtils.hasLength(sites)){
Integer oid=null;
- String[] split = storeIds.split(",");
+ String[] split = sites.split(",");
for (int i = 0; i < split.length; i++) {
if(i==0){
Integer operatorId = siteService.getById(split[0]).getOperatorId();
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 0e5b648..d80850d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -422,7 +422,11 @@
model.addAttribute("c8",c8);
model.addAttribute("id",id);
StoreConfig c9 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,9));
- model.addAttribute("c9",c9);
+ if (c9==null){
+ model.addAttribute("c9",new StoreConfig());
+ }else{
+ model.addAttribute("c9",c9);
+ }
return PREFIX + "TShop_imgAll.html";
}
@@ -744,12 +748,27 @@
}
private StoreConfig collect(Integer id,Integer sort,Integer isOpen,String img,int type){
- StoreConfig one = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType, type));
- one.setSort(sort);
- one.setIsOpen(isOpen);
- if(ToolUtil.isNotEmpty(img)){
- one.setBackgroundImage(img);
+ StoreConfig one = storeConfigService.getOne(new QueryWrapper<StoreConfig>()
+ .eq("storeId", id)
+ .eq("type", type));
+ if (one!=null){
+ one.setSort(sort);
+ one.setIsOpen(isOpen);
+ if(ToolUtil.isNotEmpty(img)){
+ one.setBackgroundImage(img);
+ }
}
+ if (one == null){
+ StoreConfig storeConfig = new StoreConfig();
+ storeConfig.setStoreId(id);
+ storeConfig.setType(type);
+ storeConfig.setIsOpen(isOpen);
+ storeConfig.setSort(sort);
+ storeConfig.setBackgroundImage(img);
+ storeConfigService.save(storeConfig);
+ return storeConfig;
+ }
+
return one;
}
@RequestMapping(value = "/oneChangeNext")
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
index 725fdbb..a144fe6 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
@@ -2,14 +2,23 @@
import com.dsh.course.feignClient.communityWorldCup.Model.*;
import com.dsh.course.feignClient.communityWorldCup.WorldCupClient;
+import com.dsh.guns.modular.system.util.ExcelUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -46,7 +55,10 @@
}
-
+ @RequestMapping("/openUserGameRecord")
+ public String openUserGameRecord(){
+ return PREFIX + "userGameRecord.html";
+ }
@@ -111,4 +123,99 @@
worldCupClient.changeScore(changeScore);
return ResultUtil.success();
}
+
+
+ /**
+ * 导出用户统计列表
+ * @param worldCupGameStatisticsInfoList
+ * @param response
+ */
+ @ResponseBody
+ @GetMapping("/exportUserStatistics")
+ public void exportUserStatistics(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList, HttpServletResponse response){
+ worldCupGameStatisticsInfoList.setOffset(0);
+ worldCupGameStatisticsInfoList.setLimit(100000);
+ Map<String, Object> map = worldCupClient.worldCupGameStatisticsInfoList(worldCupGameStatisticsInfoList);
+ List<Map<String, Object>> list = (List<Map<String, Object>>)map.get("rows");
+
+ try {
+ Date date = new Date();
+ DateFormat format = new SimpleDateFormat("yyyyMMdd");
+ String time1 = format.format(date);
+ String fileName ="用户统计.xls";
+ String[] title = new String[] {"用户姓名","联系电话","身份证号","已比赛场次","胜-负场次","胜率"};
+ String[][] values = new String[list.size()][];
+ for (int i = 0; i < list.size(); i++) {
+ Map<String, Object> d = list.get(i);
+ values[i] = new String[title.length];
+ values[i][0] = d.get("name").toString();
+ values[i][1] = d.get("phone").toString();
+ values[i][2] = d.get("idcard").toString();
+ values[i][3] = d.get("totalSession").toString();
+ values[i][4] = d.get("win").toString() + "-" + d.get("lose").toString();
+ values[i][5] = d.get("winRate").toString() + "%";
+ }
+ HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(time1, title, values, null);
+ ExcelUtil.setResponseHeader(response, fileName);
+ OutputStream os = response.getOutputStream();
+ wb.write(os);
+ os.flush();
+ os.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 获取用户比赛记录
+ * @param userGameRecordList
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/userGameRecordList")
+ public Object userGameRecordList(UserGameRecordList userGameRecordList){
+ return worldCupClient.userGameRecordList(userGameRecordList);
+ }
+
+
+ /**
+ * 导出用户比赛记录
+ * @param userGameRecordList
+ * @param response
+ */
+ @ResponseBody
+ @GetMapping("/exportUserGameRecord")
+ public void exportUserGameRecord(UserGameRecordList userGameRecordList, HttpServletResponse response){
+ userGameRecordList.setOffset(0);
+ userGameRecordList.setLimit(100000);
+ Map<String, Object> map = worldCupClient.userGameRecordList(userGameRecordList);
+ List<Map<String, Object>> list = (List<Map<String, Object>>)map.get("rows");
+
+ try {
+ Date date = new Date();
+ DateFormat format = new SimpleDateFormat("yyyyMMdd");
+ String time1 = format.format(date);
+ String fileName ="比赛记录.xls";
+ String[] title = new String[] {"用户姓名","参与比赛","比赛时间","比分","结果"};
+ String[][] values = new String[list.size()][];
+ for (int i = 0; i < list.size(); i++) {
+ Map<String, Object> d = list.get(i);
+ values[i] = new String[title.length];
+ values[i][0] = d.get("userName").toString();
+ values[i][1] = d.get("name").toString();
+ values[i][2] = d.get("startTime").toString();
+ values[i][3] = d.get("score").toString();
+ values[i][4] = d.get("matchResult").toString();
+ }
+ HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(time1, title, values, null);
+ ExcelUtil.setResponseHeader(response, fileName);
+ OutputStream os = response.getOutputStream();
+ wb.write(os);
+ os.flush();
+ os.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 904f26c..a7e4c49 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -216,7 +216,7 @@
@RequestMapping("/list")
@ResponseBody
public List<Game> changelist(BallQueryDto ballQueryDto) {
-System.out.println("=======ballQueryDto=========="+ballQueryDto);
+ System.out.println("=======ballQueryDto=========="+ballQueryDto);
User user = UserExt.getUser();
ballQueryDto.setType(user.getObjectType());
ballQueryDto.setId(user.getObjectId());
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
index e984f83..ed97bff 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
@@ -83,6 +83,6 @@
List<Map<String, Object>> listStoreAllByIds(List<Integer> ids);
- List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page);
+ List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
index 4bc5fd2..69cdb47 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
@@ -30,8 +30,8 @@
}
@Override
- public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page) {
- return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName,page);
+ public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName) {
+ return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName);
}
/**
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 3dae29d..0fbec6a 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -36,7 +36,9 @@
<select id="listAll" resultType="com.dsh.guns.modular.system.model.TStoreListVo">
select t1.*,t2.name userName,t2.phone userPhone,t3.name 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
+ 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 1=1
<if test="provinceCode !=null and provinceCode !=''">
and t1.provinceCode = #{provinceCode}
@@ -175,7 +177,7 @@
SELECT t1.id, t1.operatorId, t1.province, t1.city, t2.name,t1.ids,t1.name as siteName
from t_site t1
left join t_store t2 on t1.storeId =t2.id
- where t1.state=1 and t2.state=1
+ where t1.state=1 and t2.state=1 and t1.isCanBeBooked = 1 and t1.reservation=1
<if test="provinceCode != null and provinceCode!=''">
and t1.provinceCode = #{provinceCode}
</if>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html
index 30e62ab..e5ae7fc 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html
@@ -228,7 +228,10 @@
console.log(res)
if (oneId == "1"){
res.innerHTML ="推荐像素:780x472px";
- }else{
+ }else if (oneId == "6" || oneId == "7") {
+ res.innerHTML ="推荐像素:宽780px，高不限制";
+ }
+ else{
res.innerHTML ="推荐像素:780x440px";
}
console.log(oneId)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
index 3f374b1..d57394f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
@@ -60,6 +60,8 @@
<option value="2" ${data.position == 2 ? 'selected=selected' : ''}>线上课得积分</option>
<option value="3" ${data.position == 3 ? 'selected=selected' : ''}>看视频得奖励</option>
<option value="4" ${data.position == 4 ? 'selected=selected' : ''}>常见问题</option>
+ <option value="6" ${data.position == 6 ? 'selected=selected' : ''}>社区世界杯顶部banner</option>
+ <option value="7" ${data.position == 7 ? 'selected=selected' : ''}>社区世界杯底部banner</option>
</select>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html
index b9a9294..f1b32c2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_add.html
@@ -44,9 +44,7 @@
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
<input hidden id="userType" value="${userType}">
- @if(userType!=1){
<input hidden id="operatorId" value="${operatorId}">
- @}
@if(userType==3){
<input hidden id="storeId" value="${storeId}">
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html
index 0ec3e9d..13fe006 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gate/gate_edit.html
@@ -45,9 +45,7 @@
<div class="ibox float-e-margins">
<input hidden id="userType" value="${userType}">
<input hidden id="id" value="${id}">
- @if(userType!=1){
<input hidden id="operatorId" value="${operatorId}">
- @}
@if(userType==3){
<input hidden id="storeId" value="${storeId}">
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html
index f622916..dbff552 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html
@@ -3,7 +3,7 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5>所在门店</h5>
+ <h5>所在场地</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html
index 4036fde..33d19cc 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_add.html
@@ -20,6 +20,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="userInfoForm">
<input type="hidden" id="id" value="">
+ <input type="hidden" id="page", value='add'>
<div class="row">
<div class="form-group">
<label class="col-sm-3 control-label">*比赛名称：</label>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html
index ff95132..5890a5a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_edit.html
@@ -21,6 +21,7 @@
<div class="form-horizontal" id="userInfoForm">
<input type="hidden" id="id" value="${item.id}">
<input type="hidden" id="storeInfo", value='${stores}'>
+ <input type="hidden" id="page", value='edit'>
<div class="row">
<div class="form-group">
<label class="col-sm-3 control-label">*比赛名称：</label>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html
index 5943704..d5737b1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCup/worldCup_info.html
@@ -21,6 +21,7 @@
<div class="form-horizontal" id="userInfoForm">
<input type="hidden" id="id" value="${item.id}">
<input type="hidden" id="storeInfo", value='${stores}'>
+ <input type="hidden" id="page", value='info'>
<div class="row">
<div class="form-group">
<label class="col-sm-3 control-label">*比赛名称：</label>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/userGameRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/userGameRecord.html
new file mode 100644
index 0000000..5df63f1
--- /dev/null
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/userGameRecord.html
@@ -0,0 +1,42 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>比赛记录</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="用户姓名：" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="参与比赛：" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="UserGameRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="UserGameRecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="UserGameRecordTableToolbar" role="group">
+ <#button name="导出" icon="fa-plus" clickFun="UserGameRecord.exportUserGameRecord()"/>
+ </div>
+ <#table id="UserGameRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/modular/system/worldCupRecords/userGameRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#startTime'
+ });
+ laydate.render({
+ elem: '#endTime'
+ });
+</script>
+@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html
index 5c0d40c..4a699c8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/worldCupRecords/worldCupRecords.html
@@ -53,10 +53,13 @@
<div class="panel-body">
<div class="row">
<div class="col-sm-3">
- <#NameCon id="province" name="所在省份：" />
+ <#NameCon id="name" name="用户姓名：" />
</div>
<div class="col-sm-3">
- <#NameCon id="city" name="所在城市：" />
+ <#NameCon id="phone" name="联系电话：" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="idcard" name="身份证号：" />
</div>
<div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="WorldCupRecords.search3()"/>
@@ -64,21 +67,8 @@
</div>
</div>
<div class="hidden-xs" id="WorldCupRecordsTable3Toolbar" role="group">
- @if(shiro.hasPermission("/WorldCupRecords/openAddWorldCupRecords")){
- <#button name="添加" icon="fa-plus" clickFun="WorldCupRecords.openAddWorldCupRecords()"/>
- @}
- @if(shiro.hasPermission("/WorldCupRecords/openEditWorldCupRecords")){
- <#button name="编辑" icon="fa-edit" clickFun="WorldCupRecords.openEditWorldCupRecords()" space="true"/>
- @}
- @if(shiro.hasPermission("/WorldCupRecords/cancelWorldCupRecords")){
- <#button name="取消" icon="fa-edit" clickFun="WorldCupRecords.cancelWorldCupRecords()" space="true"/>
- @}
- @if(shiro.hasPermission("/WorldCupRecords/openWorldCupRecordsInfo")){
- <#button name="查看详情" icon="fa-edit" clickFun="WorldCupRecords.openWorldCupRecordsInfo()" space="true"/>
- @}
- @if(shiro.hasPermission("/WorldCupRecords/registeredPersonnel")){
- <#button name="已报名人员" icon="fa-edit" clickFun="WorldCupRecords.registeredPersonnel()" space="true"/>
- @}
+ <#button name="比赛记录" icon="fa-plus" clickFun="WorldCupRecords.openUserGameRecord()"/>
+ <#button name="导出" icon="fa-edit" clickFun="WorldCupRecords.exportUserStatistics()" space="true"/>
</div>
<#table id="WorldCupRecordsTable3"/>
</div>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js b/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js
index dd36d09..d042a33 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js
@@ -24,7 +24,7 @@
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '广告类型', field: 'position', visible: true, align: 'center', valign: 'middle',width:'20%',
formatter:function (data) {
- return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题"}[data]
+ return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题",6:"社区世界杯顶部",7:"社区世界杯底部"}[data]
}
},
{title: '广告名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js b/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js
index 4694b30..a08a483 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/referee/referee.js
@@ -269,12 +269,12 @@
if (res.code == 200) {
Feng.success("删除成功");
layer.closeAll();
- Referee.table.refresh();
+ Referee.search();
} else {
Feng.error(res.msg);
}
}, function (data) {
- Feng.error("添加失败!" + data.responseJSON.message + "!");
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
});
ajax.setData({
'id': Referee.seItem.id,
@@ -296,14 +296,14 @@
var operation = function(){
var ajax = new $ax(Feng.ctxPath + "/referee/updateState", function (res) {
if (res.code == 200) {
- Feng.success("删除成功");
+ Feng.success("解冻成功");
layer.closeAll();
- Referee.table.refresh();
+ Referee.search();
} else {
Feng.error(res.msg);
}
}, function (data) {
- Feng.error("添加失败!" + data.responseJSON.message + "!");
+ Feng.error("解冻失败!" + data.responseJSON.message + "!");
});
ajax.setData({
'id': Referee.seItem.id,
@@ -323,14 +323,14 @@
var operation = function(){
var ajax = new $ax(Feng.ctxPath + "/referee/updateState", function (res) {
if (res.code == 200) {
- Feng.success("删除成功");
+ Feng.success("冻结成功");
layer.closeAll();
- Referee.table.refresh();
+ Referee.search();
} else {
Feng.error(res.msg);
}
}, function (data) {
- Feng.error("添加失败!" + data.responseJSON.message + "!");
+ Feng.error("冻结失败!" + data.responseJSON.message + "!");
});
ajax.setData({
'id': Referee.seItem.id,
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js
index f8b2538..79d8665 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js
@@ -17,8 +17,10 @@
{field: 'selectItem', checkbox: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '所在省市', field: 'provinceCity', visible: true, align: 'center', valign: 'middle'},
+ {title: '所属运营商', field: 'account', visible: true, align: 'center', valign: 'middle'},
{title: '门店名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
{title: '场地名称', field: 'siteName', visible: true, align: 'center', valign: 'middle'},
+ {title: '闸机ids', field: 'ids', visible: true, align: 'center', valign: 'middle'},
];
};
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
index e9fd6df..40c0de1 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
@@ -117,7 +117,7 @@
function siteList1(){
var index = layer.open({
type: 2,
- title: '门店列表',
+ title: '场地列表',
area: ['80%', '80%'], //宽高
fix: false, //不固定
maxmin: true,
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js
index 92d5ee9..9d178fe 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup.js
@@ -14,7 +14,7 @@
return [
{field: 'selectItem', checkbox: true},
{title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '比赛名字', field: 'name', visible: true, align: 'center', valign: 'middle',width:'20%',},
+ {title: '比赛名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:'20%',},
{title: '开始时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',},
{title: '结束时间', field: 'endTime', visible: true, align: 'center', valign: 'middle'},
{title: '报名条件', field: 'age', visible: true, align: 'center', valign: 'middle',
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js
index ae905e3..9e9d079 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js
@@ -143,7 +143,7 @@
'name': name,
'startTime': new Date(startTime + " 00:00:00"),
'endTime': new Date(endTime + " 23:59:59"),
- 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : registrationClosingTime),
+ 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
'startAge': startAge,
'endAge': endAge,
'gender': gender,
@@ -171,7 +171,7 @@
if (res.code==200){
Feng.success("添加成功!");
WorldCupInfo.close();
- window.parent.WorldCup.refresh();
+ window.parent.WorldCup.search();
}else{
Feng.error(res.msg);
}
@@ -307,7 +307,7 @@
'name': name,
'startTime': new Date(startTime + " 00:00:00"),
'endTime': new Date(endTime + " 23:59:59"),
- 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : registrationClosingTime),
+ 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
'startAge': startAge,
'endAge': endAge,
'gender': gender,
@@ -335,7 +335,7 @@
if (res.code==200){
Feng.success("编辑成功!");
WorldCupInfo.close();
- window.parent.WorldCup.refresh();
+ window.parent.WorldCup.search();
}else{
Feng.error(res.msg);
}
@@ -411,7 +411,7 @@
});
- if(null != $('#id').val()){
+ if(null != $('#id').val() && '' != $('#id').val()){
WorldCupInfo.stores = JSON.parse($('#storeInfo').val());
WorldCupInfo.initStore();
let lng = $('#longitude').val();
@@ -541,12 +541,18 @@
WorldCupInfo.initStore = function (){
let html = '';
+ let page = $('#page').val();
for (let i = 0; i < WorldCupInfo.stores.length; i++) {
let item = WorldCupInfo.stores[i];
- html += '<tr><td>' + item.province + '</td><td>' + (typeof item.operator == "undefined" ? "" : item.operator) + '</td><td>' + item.name + '</td><td><button style="height: 30px;\n' +
- ' line-height: 30px;\n' +
- ' font-size: 14px;\n' +
- ' width: 50px" onclick="WorldCupInfo.delStore(' + item.id + ')">删除</button></td></tr>'
+ html += '<tr><td>' + item.province + '</td><td>' + (typeof item.operator == "undefined" ? "" : item.operator) + '</td><td>' + item.name + '</td>';
+ if("info" != page){
+ html += '<td><button style="height: 30px;\n' +
+ ' line-height: 30px;\n' +
+ ' font-size: 14px;\n' +
+ ' width: 50px" onclick="WorldCupInfo.delStore(' + item.id + ')">删除</button></td></tr>'
+ }else{
+ html += '</tr>';
+ }
}
$('#stores tbody').html(html);
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/userGameRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/userGameRecord.js
new file mode 100644
index 0000000..fda2fd2
--- /dev/null
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/userGameRecord.js
@@ -0,0 +1,76 @@
+/**
+ * 跨城站点管理管理初始化
+ */
+var UserGameRecord = {
+ id: "UserGameRecordTable", //表格id
+ seItem: null, //选中的条目
+ table: null,
+ layerIndex: -1,
+};
+/**
+ * 初始化表格的列
+ */
+UserGameRecord.initColumn = function () {
+ return [
+ {field: 'selectItem', checkbox: true},
+ {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '用户姓名', field: 'userName', visible: true, align: 'center', valign: 'middle',},
+ {title: '参与比赛', field: 'name', visible: true, align: 'center', valign: 'middle'},
+ {title: '比赛时间', field: 'startTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '比分', field: 'score', visible: true, align: 'center', valign: 'middle'},
+ {title: '结果', field: 'matchResult', visible: true, align: 'center', valign: 'middle'}
+ ];
+};
+
+/**
+ * 检查是否选中
+ */
+UserGameRecord.check = function () {
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ if(selected.length == 0){
+ Feng.info("请先选中表格中的某一记录！");
+ return false;
+ }else{
+ UserGameRecord.seItem = selected[0];
+ return true;
+ }
+};
+/**
+ * 商户号认证
+ */
+UserGameRecord.exportUserGameRecord = function () {
+ let userName = $('#userName').val();
+ let name = $('#name').val();
+ window.location.href = Feng.ctxPath + '/worldCupRecords/exportUserGameRecord?userName=' + userName + "&name=" + name;
+};
+
+
+
+
+/**
+ * 关闭此对话框
+ */
+UserGameRecord.close = function() {
+ parent.layer.close(window.parent.UserGameRecord.layerIndex);
+};
+
+UserGameRecord.search = function () {
+ var queryData = {};
+ queryData['userName'] =$("#userName").val();
+ queryData['name'] =$("#name").val();
+ UserGameRecord.table.refresh({query: queryData});
+};
+
+UserGameRecord.resetSearch = function () {
+ $("#userName").val("");
+ $("#name").val("");
+ UserGameRecord.search();
+};
+
+$(function () {
+ var defaultColunms = UserGameRecord.initColumn();
+ var table = new BSTable(UserGameRecord.id, "/worldCupRecords/userGameRecordList", defaultColunms);
+ table.setPaginationType("server");
+ UserGameRecord.table = table.init();
+
+});
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js
index 78b06e7..092d1c6 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js
@@ -45,7 +45,24 @@
this.layerIndex = index;
}
+WorldCupRecords.openUserGameRecord = function (){
+ var index = layer.open({
+ type: 2,
+ title: '比赛记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/worldCupRecords/openUserGameRecord'
+ });
+ this.layerIndex = index;
+}
+WorldCupRecords.exportUserStatistics = function (){
+ let phone = $("#phone").val();
+ let name =$("#name").val();
+ let idcard =$("#idcard").val();
+ window.location.href = Feng.ctxPath + '/worldCupRecords/exportUserStatistics?phone=' + phone + "&name=" + name + "&idcard=" + idcard
+}
/**
@@ -82,8 +99,9 @@
WorldCupRecords.search3 = function () {
var queryData = {};
- queryData['province'] = $("#province").val();
- queryData['city'] =$("#city").val();
+ queryData['phone'] = $("#phone").val();
+ queryData['name'] =$("#name").val();
+ queryData['idcard'] =$("#idcard").val();
WorldCupRecords.table3.refresh({query: queryData});
};
@@ -130,21 +148,25 @@
table2.setPaginationType("server");
WorldCupRecords.table2 = table2.init();
- // var defaultColunms3 = [
- // {field: 'selectItem', checkbox: true},
- // {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- // {title: '用户姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'20%',},
- // {title: '联系电话', field: 'startTime', visible: true, align: 'center', valign: 'middle',},
- // {title: '身份证号', field: 'endTime', visible: true, align: 'center', valign: 'middle'},
- // {title: '已比赛场次', field: 'maxPeople', visible: true, align: 'center', valign: 'middle'},
- // {title: '胜-负场次', field: 'maxPeople', visible: true, align: 'center', valign: 'middle'},
- // {title: '胜率', field: 'status', visible: true, align: 'center', valign: 'middle',
- // formatter:function (data) {
- // return data + '%';
- // }
- // },
- // ];
- // var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/listAll", defaultColunms3);
- // table3.setPaginationType("server");
- // WorldCupRecords.table3 = table3.init();
+ var defaultColunms3 = [
+ {field: 'selectItem', checkbox: true},
+ {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '用户姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'20%',},
+ {title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle',},
+ {title: '身份证号', field: 'idcard', visible: true, align: 'center', valign: 'middle'},
+ {title: '已比赛场次', field: 'totalSession', visible: true, align: 'center', valign: 'middle'},
+ {title: '胜-负场次', field: 'win', visible: true, align: 'center', valign: 'middle',
+ formatter:function (data, item) {
+ return item.win + '-' + item.lose;
+ }
+ },
+ {title: '胜率', field: 'winRate', visible: true, align: 'center', valign: 'middle',
+ formatter:function (data) {
+ return data + '%';
+ }
+ },
+ ];
+ var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/worldCupGameStatisticsInfoList", defaultColunms3);
+ table3.setPaginationType("server");
+ WorldCupRecords.table3 = table3.init();
});
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
index c2ac606..73b6c4e 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -89,25 +89,18 @@
})
public ResultUtil<List<TGameConfig>> queryGameList(Integer siteId, Integer storeId) {
try {
-
Integer uid = tokenUtil.getUserIdFormRedis();
AppUser appUser = appUserClient.queryAppUser(uid);
List<TGameConfig> tGameConfigs = new ArrayList<>();
-
if (appUser.getAddUserId() == null) {
-
-
List<SiteLock> lock = lockService.list(new QueryWrapper<SiteLock>().eq("siteId", siteId));
-
Date now = new Date();
for (SiteLock siteLock : lock) {
if (now.after(siteLock.getStartTime()) && now.before(siteLock.getEndTime())) {
return ResultUtil.error("当前场地已被锁定");
}
}
-
}
-
List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId).eq(TGame::getState, 0));
if (list.size() > 0) {
Integer id = list.get(0).getId();
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
index 6891cc2..867ce75 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
@@ -36,6 +36,8 @@
*/
@TableField("siteTypeId")
private Integer siteTypeId;
+ @TableField("isCanBeBooked")
+ private Integer isCanBeBooked;
/**
* 城市管理员id
*/
@@ -61,11 +63,7 @@
*/
@TableField("cityCode")
private String cityCode;
- /**
- * 是否可预约（0=否，1=是）
- */
- @TableField("isCanBeBooked")
- private Integer isCanBeBooked;
+
/**
* 预约开始时间
*/
--
Gitblit v1.7.1