10.20

nickchange

2023-10-20 cee52521bbdb998745ca9a0dc6866667e606b79c

10.20

 .idea/workspace.xml

@@ -25,16 +25,18 @@
    <select />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.13bug2">
      <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" />
    <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.20">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/StudentClient.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudent.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/resources/sharding-jdbc.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-activity/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-activity/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-activity/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-activity/src/main/resources/sharding-jdbc.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-competition/src/main/resources/sharding-jdbc.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/resources/sharding-jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/sharding-jdbc.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-gateway/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-gateway/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -80,6 +82,9 @@
      </list>
    </option>
  </component>
  <component name="MavenRunner">
    <option name="skipTests" value="true" />
  </component>
  <component name="PackageJsonUpdateNotifier">
    <dismissed value="$PROJECT_DIR$/package.json" />
  </component>
@@ -97,30 +102,38 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "RequestMappingsPanelOrder0": "0",
    "RequestMappingsPanelOrder1": "1",
    "RequestMappingsPanelWidth0": "75",
    "RequestMappingsPanelWidth1": "75",
    "RunOnceActivity.OpenProjectViewOnStart": "true",
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "WebServerToolWindowFactoryState": "false",
    "ignore.virus.scanning.warn.message": "true",
    "node.js.detected.package.eslint": "true",
    "node.js.selected.package.eslint": "(autodetect)",
    "node.js.selected.package.tslint": "(autodetect)",
    "project.structure.last.edited": "模块",
    "project.structure.proportion": "0.0",
    "project.structure.side.proportion": "0.0",
    "settings.editor.selected.configurable": "MavenSettings",
    "vue.rearranger.settings.migration": "true"
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
    &quot;last_opened_file_path&quot;: &quot;D:/javaproject/play/cloud-server-other/src/main/java/com/dsh/other/util&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.54367816&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  }
}]]></component>
}</component>
  <component name="ReactorSettings">
    <option name="notificationShown" value="true" />
  </component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
      <recent name="D:\javaproject\play\cloud-server-other\src\main\java\com\dsh\other\util" />
      <recent name="D:\javaproject\play\cloud-server-management\src\main\webapp\WEB-INF\view\system\tStudent" />
      <recent name="D:\javaproject\play\cloud-server-management\src\main\webapp\WEB-INF\view\system\ball" />
      <recent name="E:\IdeaProjects\PlayPai\cloud-server-management\src\main\webapp\WEB-INF\view\system\user" />
      <recent name="E:\IdeaProjects\PlayPai\cloud-server-management\src\main\webapp\WEB-INF\view\system\tStudent" />
    </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" />
@@ -135,13 +148,6 @@
      <recent name="com.dsh.guns.modular.system.service.impl" />
      <recent name="com.dsh.guns.modular.system.service" />
      <recent name="com.dsh.other.mapper" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
      <recent name="E:\IdeaProjects\PlayPai\cloud-server-management\src\main\webapp\WEB-INF\view\system\user" />
      <recent name="E:\IdeaProjects\PlayPai\cloud-server-management\src\main\webapp\WEB-INF\view\system\tStudent" />
      <recent name="D:\javaproject\play\cloud-server-parent" />
      <recent name="D:\Javaproject\PlayPay\cloud-server-management\src\main\webapp\WEB-INF\view\system\ball" />
      <recent name="D:\Javaproject\PlayPay\cloud-server-account\src\test\java\com\dsh" />
    </key>
  </component>
  <component name="RunDashboard">
@@ -390,13 +396,13 @@
    </configuration>
    <list>
      <item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
      <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.AuthApplication" />
      <item itemvalue="Spring Boot.CourseApplication" />
      <item itemvalue="Spring Boot.CompetitionApplication" />
      <item itemvalue="应用程序.AccountApplicationTests" />
      <item itemvalue="应用程序.BigDecimalToChineseWords" />
@@ -514,7 +520,10 @@
      <workItem from="1697181152560" duration="3246000" />
      <workItem from="1697184619489" duration="382000" />
      <workItem from="1697185123659" duration="1829000" />
      <workItem from="1697186980814" duration="3007000" />
      <workItem from="1697186980814" duration="5035000" />
      <workItem from="1697417273104" duration="16186000" />
      <workItem from="1697438899985" duration="44114000" />
      <workItem from="1697590715803" duration="66758000" />
    </task>
    <task id="LOCAL-00001" summary="后台代码删除">
      <created>1690249807612</created>
@@ -606,190 +615,6 @@
      <option name="presentableId" value="LOCAL-00013" />
      <option name="project" value="LOCAL" />
      <updated>1690364506501</updated>
    </task>
    <task id="LOCAL-00015" summary="学员">
      <option name="closed" value="true" />
      <created>1695461057360</created>
      <option name="number" value="00015" />
      <option name="presentableId" value="LOCAL-00015" />
      <option name="project" value="LOCAL" />
      <updated>1695461057360</updated>
    </task>
    <task id="LOCAL-00016" summary="学员2">
      <option name="closed" value="true" />
      <created>1695461216122</created>
      <option name="number" value="00016" />
      <option name="presentableId" value="LOCAL-00016" />
      <option name="project" value="LOCAL" />
      <updated>1695461216122</updated>
    </task>
    <task id="LOCAL-00017" summary="学员4">
      <option name="closed" value="true" />
      <created>1695461535365</created>
      <option name="number" value="00017" />
      <option name="presentableId" value="LOCAL-00017" />
      <option name="project" value="LOCAL" />
      <updated>1695461535365</updated>
    </task>
    <task id="LOCAL-00018" summary="9.25">
      <option name="closed" value="true" />
      <created>1695629926005</created>
      <option name="number" value="00018" />
      <option name="presentableId" value="LOCAL-00018" />
      <option name="project" value="LOCAL" />
      <updated>1695629926005</updated>
    </task>
    <task id="LOCAL-00019" summary="9.25">
      <option name="closed" value="true" />
      <created>1695636138175</created>
      <option name="number" value="00019" />
      <option name="presentableId" value="LOCAL-00019" />
      <option name="project" value="LOCAL" />
      <updated>1695636138175</updated>
    </task>
    <task id="LOCAL-00020" summary="9.26">
      <option name="closed" value="true" />
      <created>1695719130696</created>
      <option name="number" value="00020" />
      <option name="presentableId" value="LOCAL-00020" />
      <option name="project" value="LOCAL" />
      <updated>1695719130696</updated>
    </task>
    <task id="LOCAL-00021" summary="9.26。1">
      <option name="closed" value="true" />
      <created>1695723019798</created>
      <option name="number" value="00021" />
      <option name="presentableId" value="LOCAL-00021" />
      <option name="project" value="LOCAL" />
      <updated>1695723019798</updated>
    </task>
    <task id="LOCAL-00022" summary="9.26。2">
      <option name="closed" value="true" />
      <created>1695725709313</created>
      <option name="number" value="00022" />
      <option name="presentableId" value="LOCAL-00022" />
      <option name="project" value="LOCAL" />
      <updated>1695725709313</updated>
    </task>
    <task id="LOCAL-00023" summary="9.26。3">
      <option name="closed" value="true" />
      <created>1695728959013</created>
      <option name="number" value="00023" />
      <option name="presentableId" value="LOCAL-00023" />
      <option name="project" value="LOCAL" />
      <updated>1695728959013</updated>
    </task>
    <task id="LOCAL-00024" summary="9.26。4">
      <option name="closed" value="true" />
      <created>1695730124076</created>
      <option name="number" value="00024" />
      <option name="presentableId" value="LOCAL-00024" />
      <option name="project" value="LOCAL" />
      <updated>1695730124076</updated>
    </task>
    <task id="LOCAL-00025" summary="9.26。5">
      <option name="closed" value="true" />
      <created>1695730466910</created>
      <option name="number" value="00025" />
      <option name="presentableId" value="LOCAL-00025" />
      <option name="project" value="LOCAL" />
      <updated>1695730466910</updated>
    </task>
    <task id="LOCAL-00026" summary="9.26。6">
      <option name="closed" value="true" />
      <created>1695734782274</created>
      <option name="number" value="00026" />
      <option name="presentableId" value="LOCAL-00026" />
      <option name="project" value="LOCAL" />
      <updated>1695734782274</updated>
    </task>
    <task id="LOCAL-00027" summary="9.26。7">
      <option name="closed" value="true" />
      <created>1695735077405</created>
      <option name="number" value="00027" />
      <option name="presentableId" value="LOCAL-00027" />
      <option name="project" value="LOCAL" />
      <updated>1695735077405</updated>
    </task>
    <task id="LOCAL-00028" summary="9.26。7">
      <option name="closed" value="true" />
      <created>1695735363112</created>
      <option name="number" value="00028" />
      <option name="presentableId" value="LOCAL-00028" />
      <option name="project" value="LOCAL" />
      <updated>1695735363112</updated>
    </task>
    <task id="LOCAL-00029" summary="9.26。8">
      <option name="closed" value="true" />
      <created>1695735796008</created>
      <option name="number" value="00029" />
      <option name="presentableId" value="LOCAL-00029" />
      <option name="project" value="LOCAL" />
      <updated>1695735796008</updated>
    </task>
    <task id="LOCAL-00030" summary="9.26。9">
      <option name="closed" value="true" />
      <created>1695736281231</created>
      <option name="number" value="00030" />
      <option name="presentableId" value="LOCAL-00030" />
      <option name="project" value="LOCAL" />
      <updated>1695736281231</updated>
    </task>
    <task id="LOCAL-00031" summary="9.26。10">
      <option name="closed" value="true" />
      <created>1695739914189</created>
      <option name="number" value="00031" />
      <option name="presentableId" value="LOCAL-00031" />
      <option name="project" value="LOCAL" />
      <updated>1695739914189</updated>
    </task>
    <task id="LOCAL-00032" summary="9.26。11">
      <option name="closed" value="true" />
      <created>1695740202022</created>
      <option name="number" value="00032" />
      <option name="presentableId" value="LOCAL-00032" />
      <option name="project" value="LOCAL" />
      <updated>1695740202022</updated>
    </task>
    <task id="LOCAL-00033" summary="9.26。12">
      <option name="closed" value="true" />
      <created>1695795966970</created>
      <option name="number" value="00033" />
      <option name="presentableId" value="LOCAL-00033" />
      <option name="project" value="LOCAL" />
      <updated>1695795966970</updated>
    </task>
    <task id="LOCAL-00034" summary="9.26。13">
      <option name="closed" value="true" />
      <created>1695820597140</created>
      <option name="number" value="00034" />
      <option name="presentableId" value="LOCAL-00034" />
      <option name="project" value="LOCAL" />
      <updated>1695820597140</updated>
    </task>
    <task id="LOCAL-00035" summary="9.26。14">
      <option name="closed" value="true" />
      <created>1695886217811</created>
      <option name="number" value="00035" />
      <option name="presentableId" value="LOCAL-00035" />
      <option name="project" value="LOCAL" />
      <updated>1695886217811</updated>
    </task>
    <task id="LOCAL-00036" summary="9.26。15">
      <option name="closed" value="true" />
      <created>1696485767075</created>
      <option name="number" value="00036" />
      <option name="presentableId" value="LOCAL-00036" />
      <option name="project" value="LOCAL" />
      <updated>1696485767076</updated>
    </task>
    <task id="LOCAL-00037" summary="9.26。15">
      <option name="closed" value="true" />
      <created>1696488897294</created>
      <option name="number" value="00037" />
      <option name="presentableId" value="LOCAL-00037" />
      <option name="project" value="LOCAL" />
      <updated>1696488897295</updated>
    </task>
    <task id="LOCAL-00038" summary="9.26。15">
      <option name="closed" value="true" />
@@ -895,7 +720,191 @@
      <option name="project" value="LOCAL" />
      <updated>1697187817778</updated>
    </task>
    <option name="localTasksCounter" value="51" />
    <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" />
      <option name="project" value="LOCAL" />
      <updated>1697190103134</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" />
      <option name="project" value="LOCAL" />
      <updated>1697421033991</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" />
      <option name="project" value="LOCAL" />
      <updated>1697423594604</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" />
      <option name="project" value="LOCAL" />
      <updated>1697425647172</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" />
      <option name="project" value="LOCAL" />
      <updated>1697437273028</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" />
      <option name="project" value="LOCAL" />
      <updated>1697440369715</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" />
      <option name="project" value="LOCAL" />
      <updated>1697441280562</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>
    <option name="localTasksCounter" value="74" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -913,14 +922,6 @@
    </option>
  </component>
  <component name="VcsManagerConfiguration">
    <MESSAGE value="学员4" />
    <MESSAGE value="9.25" />
    <MESSAGE value="9.26" />
    <MESSAGE value="9.26。1" />
    <MESSAGE value="9.26。2" />
    <MESSAGE value="9.26。3" />
    <MESSAGE value="9.26。4" />
    <MESSAGE value="9.26。5" />
    <MESSAGE value="9.26。6" />
    <MESSAGE value="9.26。7" />
    <MESSAGE value="9.26。8" />
@@ -938,7 +939,15 @@
    <MESSAGE value="10.13" />
    <MESSAGE value="10.13bug1" />
    <MESSAGE value="10.13bug2" />
    <option name="LAST_COMMIT_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="10.20" />
    <option name="LAST_COMMIT_MESSAGE" value="10.20" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@@ -965,7 +974,7 @@
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java</url>
          <line>471</line>
          <line>479</line>
          <option name="timeStamp" value="26" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
@@ -975,7 +984,7 @@
        </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>277</line>
          <line>276</line>
          <option name="timeStamp" value="50" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">

 cloud-server-account/src/main/resources/redis.properties

@@ -1,9 +1,7 @@
spring.redis.database=0
# Redis·þÎñÆ÷µØÖ·
spring.redis.host=@redis.addr@
# Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú

spring.redis.port=@redis.port@
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=@redis.password@
spring.redis.jedis.pool.max-active=1024
spring.redis.jedis.pool.max-wait=10000

 cloud-server-account/src/main/resources/sharding-jdbc.properties

@@ -1,6 +1,5 @@
datasource.names=master0

#¿ª·¢»·¾³
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
@@ -11,15 +10,5 @@
datasource.master0.minIdle=5
datasource.master0.initialSize=2

#Éú²ú»·¾³
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
#datasource.master0.url=jdbc:mysql://110.239.68.140:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B7
#datasource.master0.username=root
#datasource.master0.password=G4LLlNouAGH1dijbyU&xDo$X
#datasource.master0.maxActive=200
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=100
#datasource.master0.initialSize=100



 cloud-server-activity/src/main/resources/redis.properties

@@ -1,9 +1,8 @@
spring.redis.database=0
# Redis·þÎñÆ÷µØÖ·

spring.redis.host=@redis.addr@
# Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú

spring.redis.port=@redis.port@
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=@redis.password@
spring.redis.jedis.pool.max-active=1024
spring.redis.jedis.pool.max-wait=10000

 cloud-server-activity/src/main/resources/sharding-jdbc.properties

@@ -1,6 +1,5 @@
datasource.names=master0

#¿ª·¢»·¾³
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
@@ -11,15 +10,6 @@
datasource.master0.minIdle=5
datasource.master0.initialSize=2

#Éú²ú»·¾³
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
#datasource.master0.url=jdbc:mysql://110.239.68.140:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B7
#datasource.master0.username=root
#datasource.master0.password=G4LLlNouAGH1dijbyU&xDo$X
#datasource.master0.maxActive=200
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=100
#datasource.master0.initialSize=100




 cloud-server-competition/src/main/resources/redis.properties

@@ -1,9 +1,6 @@
spring.redis.database=0
# Redis·þÎñÆ÷µØÖ·
spring.redis.host=@redis.addr@
# Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
spring.redis.port=@redis.port@
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=@redis.password@
spring.redis.jedis.pool.max-active=1024
spring.redis.jedis.pool.max-wait=10000

 cloud-server-competition/src/main/resources/sharding-jdbc.properties

@@ -1,6 +1,5 @@
datasource.names=master0

#¿ª·¢»·¾³
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
@@ -11,15 +10,5 @@
datasource.master0.minIdle=5
datasource.master0.initialSize=2

#Éú²ú»·¾³
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
#datasource.master0.url=jdbc:mysql://110.239.68.140:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B7
#datasource.master0.username=root
#datasource.master0.password=G4LLlNouAGH1dijbyU&xDo$X
#datasource.master0.maxActive=200
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=100
#datasource.master0.initialSize=100



 cloud-server-course/src/main/resources/redis.properties

@@ -1,9 +1,6 @@
spring.redis.database=0
# Redis·þÎñÆ÷µØÖ·
spring.redis.host=@redis.addr@
# Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
spring.redis.port=@redis.port@
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=@redis.password@
spring.redis.jedis.pool.max-active=1024
spring.redis.jedis.pool.max-wait=10000

 cloud-server-course/src/main/resources/sharding-jdbc.properties

@@ -1,6 +1,5 @@
datasource.names=master0

#¿ª·¢»·¾³
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
@@ -11,15 +10,5 @@
datasource.master0.minIdle=5
datasource.master0.initialSize=2

#Éú²ú»·¾³
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
#datasource.master0.url=jdbc:mysql://110.239.68.140:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B7
#datasource.master0.username=root
#datasource.master0.password=G4LLlNouAGH1dijbyU&xDo$X
#datasource.master0.maxActive=200
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=100
#datasource.master0.initialSize=100



 cloud-server-gateway/src/main/resources/redis.properties

@@ -1,9 +1,6 @@
spring.redis.database=0
# Redis·þÎñÆ÷µØÖ·
spring.redis.host=@redis.addr@
# Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
spring.redis.port=@redis.port@
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=@redis.password@
spring.redis.jedis.pool.max-active=1024
spring.redis.jedis.pool.max-wait=10000

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -227,6 +227,10 @@

//        List<SiteBooking> siteBookings = siteClient.listBooks(id);
        List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).eq("nextName",siteName).like("times",day));
        if (siteName==null|| siteName.equals("")){
            siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).like("times",day));
        }

        System.out.println("=======siteBookings======"+siteBookings);
        for (SiteBooking siteBooking : siteBookings) {