From fda6d849d3c0cd4f0eb57ea5e2d1462bc95d0181 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 27 十月 2023 13:09:54 +0800
Subject: [PATCH] 商户认证
---
.idea/workspace.xml | 396 +++++++++++++++++++++++++++++--------------------------
1 files changed, 208 insertions(+), 188 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a744ade..6ed129d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,19 +25,13 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.20">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="商户认证">
+ <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.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-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" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java" afterDir="false" />
</list>
+ <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" />
@@ -66,9 +60,8 @@
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
- <option name="localRepository" value="C:\Users\45438\.m2\repository" />
- <option name="mavenHome" value="$PROJECT_DIR$/../../apache-maven-3.9.3" />
- <option name="userSettingsFile" value="C:\Users\45438\.m2\settings.xml" />
+ <option name="localRepository" value="C:\Users\44323\.m2\repository" />
+ <option name="userSettingsFile" value="C:\Users\44323\.m2\settings.xml" />
</MavenGeneralSettings>
</option>
<option name="enabledProfiles">
@@ -91,9 +84,6 @@
<component name="ProblemsViewState">
<option name="selectedTabId" value="CurrentFile" />
</component>
- <component name="ProjectColorInfo">{
- "associatedIndex": 5
-}</component>
<component name="ProjectId" id="2T0poWYlZShlnPso29uxjn4gQQo" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
@@ -102,42 +92,28 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">{
- "keyToString": {
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "ignore.virus.scanning.warn.message": "true",
- "last_opened_file_path": "D:/javaproject/play/cloud-server-other/src/main/java/com/dsh/other/util",
- "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.54367816",
- "settings.editor.selected.configurable": "MavenSettings",
- "vue.rearranger.settings.migration": "true"
- }
-}</component>
+ <component name="PropertiesComponent">
+ <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
+ <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="last_opened_file_path" value="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/mapper" />
+ <property name="nodejs_package_manager_path" value="npm" />
+ <property name="settings.editor.selected.configurable" value="MavenSettings" />
+ </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" />
- <recent name="D:\ttt\java\PlayPai\cloud-server-parent" />
+ <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="CopyClassDialog.RECENTS_KEY">
<recent name="com.dsh.course.feignClient.account.model" />
@@ -149,12 +125,27 @@
<recent name="com.dsh.guns.modular.system.service" />
<recent name="com.dsh.other.mapper" />
</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" />
+ </key>
</component>
<component name="RunDashboard">
<option name="configurationTypes">
<set>
<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>
</component>
<component name="RunManager" selected="Spring Boot.ManagementApplication">
@@ -184,12 +175,12 @@
<option name="Make" enabled="true" />
</method>
</configuration>
- <configuration name="AccountApplicationTests" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="com.dsh.AccountApplicationTests" />
- <module name="mb-cloud-account" />
+ <configuration name="AntMerchantExpandIndirectImageUpload" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.dsh.guns.modular.system.api.AntMerchantExpandIndirectImageUpload" />
+ <module name="mb-cloud-management" />
<extension name="coverage">
<pattern>
- <option name="PATTERN" value="com.dsh.*" />
+ <option name="PATTERN" value="com.dsh.guns.modular.system.api.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
@@ -216,6 +207,32 @@
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsh.guns.modular.system.util.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="OperatorController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.dsh.guns.modular.system.controller.code.OperatorController" />
+ <module name="mb-cloud-management" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.dsh.guns.modular.system.controller.code.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="SaticScheduleTask" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.dsh.guns.modular.system.api.SaticScheduleTask" />
+ <module name="mb-cloud-management" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.dsh.guns.modular.system.api.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
@@ -266,8 +283,8 @@
</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" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -282,8 +299,8 @@
</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" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -312,8 +329,8 @@
</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" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -328,8 +345,8 @@
</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" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -357,10 +374,10 @@
</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" />
+ <option name="ENABLE_JMX_AGENT" value="false" />
+ <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -395,6 +412,7 @@
</method>
</configuration>
<list>
+ <item itemvalue="Application.BigDecimalToChineseWords" />
<item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
<item itemvalue="Spring Boot.CourseApplication" />
<item itemvalue="Spring Boot.AuthApplication" />
@@ -404,11 +422,15 @@
<item itemvalue="Spring Boot.OtherApplication" />
<item itemvalue="Spring Boot.ActivityApplication" />
<item itemvalue="Spring Boot.CompetitionApplication" />
- <item itemvalue="应用程序.AccountApplicationTests" />
- <item itemvalue="应用程序.BigDecimalToChineseWords" />
+ <item itemvalue="Application.OperatorController" />
+ <item itemvalue="Application.AntMerchantExpandIndirectImageUpload" />
+ <item itemvalue="Application.SaticScheduleTask" />
</list>
<recent_temporary>
<list>
+ <item itemvalue="Application.SaticScheduleTask" />
+ <item itemvalue="Application.AntMerchantExpandIndirectImageUpload" />
+ <item itemvalue="Application.OperatorController" />
<item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
</list>
</recent_temporary>
@@ -421,17 +443,17 @@
<expand>
<path>
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@afa9c549" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@f1b22ae" type="7427dc5b:ServiceModel$ServiceGroupNode" />
</path>
<path>
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@afa9c549" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@6283755e" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@f1b22ae" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@d892f522" type="7427dc5b:ServiceModel$ServiceGroupNode" />
</path>
<path>
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@afa9c549" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@6016f0bd" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@f1b22ae" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@4c3d359f" type="7427dc5b:ServiceModel$ServiceGroupNode" />
</path>
</expand>
<select />
@@ -439,7 +461,7 @@
</serviceView>
</option>
</component>
- <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+ <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>
@@ -524,105 +546,12 @@
<workItem from="1697417273104" duration="16186000" />
<workItem from="1697438899985" duration="44114000" />
<workItem from="1697590715803" duration="66758000" />
- </task>
- <task id="LOCAL-00001" summary="后台代码删除">
- <created>1690249807612</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1690249807612</updated>
- </task>
- <task id="LOCAL-00002" summary="后台代码删除">
- <created>1690254629455</created>
- <option name="number" value="00002" />
- <option name="presentableId" value="LOCAL-00002" />
- <option name="project" value="LOCAL" />
- <updated>1690254629455</updated>
- </task>
- <task id="LOCAL-00003" summary="后台代码删除">
- <created>1690254749862</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
- <option name="project" value="LOCAL" />
- <updated>1690254749862</updated>
- </task>
- <task id="LOCAL-00004" summary="后台代码">
- <created>1690334274202</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
- <option name="project" value="LOCAL" />
- <updated>1690334274203</updated>
- </task>
- <task id="LOCAL-00005" summary="后台代码">
- <created>1690335913450</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
- <option name="project" value="LOCAL" />
- <updated>1690335913450</updated>
- </task>
- <task id="LOCAL-00006" summary="后台代码">
- <created>1690338179876</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
- <option name="project" value="LOCAL" />
- <updated>1690338179876</updated>
- </task>
- <task id="LOCAL-00007" summary="后台代码">
- <created>1690338325966</created>
- <option name="number" value="00007" />
- <option name="presentableId" value="LOCAL-00007" />
- <option name="project" value="LOCAL" />
- <updated>1690338325966</updated>
- </task>
- <task id="LOCAL-00008" summary="后台代码">
- <created>1690341067099</created>
- <option name="number" value="00008" />
- <option name="presentableId" value="LOCAL-00008" />
- <option name="project" value="LOCAL" />
- <updated>1690341067099</updated>
- </task>
- <task id="LOCAL-00009" summary="后台代码">
- <created>1690355617215</created>
- <option name="number" value="00009" />
- <option name="presentableId" value="LOCAL-00009" />
- <option name="project" value="LOCAL" />
- <updated>1690355617215</updated>
- </task>
- <task id="LOCAL-00010" summary="后台代码删除">
- <created>1690362658673</created>
- <option name="number" value="00010" />
- <option name="presentableId" value="LOCAL-00010" />
- <option name="project" value="LOCAL" />
- <updated>1690362658673</updated>
- </task>
- <task id="LOCAL-00011" summary="后台代码删除">
- <created>1690363462474</created>
- <option name="number" value="00011" />
- <option name="presentableId" value="LOCAL-00011" />
- <option name="project" value="LOCAL" />
- <updated>1690363462474</updated>
- </task>
- <task id="LOCAL-00012" summary="后台代码">
- <created>1690364368448</created>
- <option name="number" value="00012" />
- <option name="presentableId" value="LOCAL-00012" />
- <option name="project" value="LOCAL" />
- <updated>1690364368448</updated>
- </task>
- <task id="LOCAL-00013" summary="后台代码">
- <created>1690364506501</created>
- <option name="number" value="00013" />
- <option name="presentableId" value="LOCAL-00013" />
- <option name="project" value="LOCAL" />
- <updated>1690364506501</updated>
- </task>
- <task id="LOCAL-00038" summary="9.26。15">
- <option name="closed" value="true" />
- <created>1696489413711</created>
- <option name="number" value="00038" />
- <option name="presentableId" value="LOCAL-00038" />
- <option name="project" value="LOCAL" />
- <updated>1696489413712</updated>
+ <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="32759000" />
</task>
<task id="LOCAL-00039" summary="10.8">
<option name="closed" value="true" />
@@ -904,28 +833,125 @@
<option name="project" value="LOCAL" />
<updated>1697765704122</updated>
</task>
- <option name="localTasksCounter" value="74" />
+ <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>
+ <option name="localTasksCounter" value="88" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="3" />
+ <option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
- <State />
+ <State>
+ <option name="COLUMN_ORDER" />
+ </State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="9.26。6" />
- <MESSAGE value="9.26。7" />
- <MESSAGE value="9.26。8" />
- <MESSAGE value="9.26。9" />
+ <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="9.26。10" />
<MESSAGE value="9.26。11" />
<MESSAGE value="9.26。12" />
@@ -946,8 +972,12 @@
<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" />
- <option name="LAST_COMMIT_MESSAGE" value="10.20" />
+ <MESSAGE value="商户认证" />
+ <option name="LAST_COMMIT_MESSAGE" value="商户认证" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -969,28 +999,18 @@
</line-breakpoint>
<line-breakpoint type="java-line">
<url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java</url>
- <line>1373</line>
+ <line>1382</line>
<option name="timeStamp" value="14" />
</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>479</line>
- <option name="timeStamp" value="26" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java</url>
- <line>389</line>
- <option name="timeStamp" value="27" />
- </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>276</line>
+ <line>282</line>
<option name="timeStamp" value="50" />
</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/system/TStudentController.java</url>
- <line>244</line>
- <option name="timeStamp" value="54" />
+ <url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java</url>
+ <line>172</line>
+ <option name="timeStamp" value="111" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
--
Gitblit v1.7.1