From 727f15440f3367cb34a8d226d9a8e66d88e063e7 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 28 十一月 2023 20:28:31 +0800
Subject: [PATCH] 11.27,9
---
.idea/workspace.xml | 146 ++++++++++++++++++------------------------------
1 files changed, 56 insertions(+), 90 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4a094d1..05be1ae 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,26 +25,7 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/MgtShopAuthDto.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/WeChatUtil.java" 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-management/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/ManagementApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/ManagementApplication.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/mapper/TOperatorAuthMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/mapper/TOperatorAuthMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.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/OperatorUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IOperatorUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IOperatorUserService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OBSUploadUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OBSUploadUtil.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/resources/TOperatorUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/resources/TOperatorUserMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js" afterDir="false" />
- </list>
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="11.27,9" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -105,18 +86,12 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="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="PropertiesComponent"><![CDATA[{
+ "keyToString": {
+ "git-widget-placeholder": "master",
+ "node.js.selected.package.tslint": "(autodetect)"
+ }
+}]]></component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
@@ -127,6 +102,11 @@
<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" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.dsh.guns.modular.system.util" />
@@ -140,11 +120,6 @@
<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">
@@ -152,18 +127,8 @@
<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="Application.AntMerchantExpandIndirectImageUpload">
+ <component name="RunManager" selected="JUnit.AccountApplicationTests.contextLoads">
<configuration default="true" type="JUnit" factoryName="JUnit">
<shortenClasspath name="MANIFEST" />
<option name="TEST_OBJECT" value="class" />
@@ -298,8 +263,8 @@
</configuration>
<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" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.AccountApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -314,8 +279,8 @@
</configuration>
<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" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.ActivityApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -344,8 +309,8 @@
</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" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CompetitionApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -360,8 +325,8 @@
</configuration>
<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" />
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsh.CourseApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -389,10 +354,10 @@
</method>
</configuration>
<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" />
+ <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>
@@ -427,12 +392,6 @@
</method>
</configuration>
<list>
- <item itemvalue="Application.AccountApplicationTests" />
- <item itemvalue="Application.BigDecimalToChineseWords" />
- <item itemvalue="Application.OperatorController" />
- <item itemvalue="Application.AntMerchantExpandIndirectImageUpload" />
- <item itemvalue="Application.SaticScheduleTask" />
- <item itemvalue="Application.WeChatUtil" />
<item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
<item itemvalue="Spring Boot.CourseApplication" />
<item itemvalue="Spring Boot.AuthApplication" />
@@ -442,13 +401,15 @@
<item itemvalue="Spring Boot.OtherApplication" />
<item itemvalue="Spring Boot.ActivityApplication" />
<item itemvalue="Spring Boot.CompetitionApplication" />
+ <item itemvalue="应用程序.AccountApplicationTests" />
+ <item itemvalue="应用程序.AntMerchantExpandIndirectImageUpload" />
+ <item itemvalue="应用程序.BigDecimalToChineseWords" />
+ <item itemvalue="应用程序.OperatorController" />
+ <item itemvalue="应用程序.SaticScheduleTask" />
+ <item itemvalue="应用程序.WeChatUtil" />
</list>
<recent_temporary>
<list>
- <item itemvalue="Application.AntMerchantExpandIndirectImageUpload" />
- <item itemvalue="Application.WeChatUtil" />
- <item itemvalue="Application.SaticScheduleTask" />
- <item itemvalue="Application.OperatorController" />
<item itemvalue="JUnit.AccountApplicationTests.contextLoads" />
</list>
</recent_temporary>
@@ -474,7 +435,7 @@
</serviceView>
</option>
</component>
- <component name="SpellCheckerSettings" BundledDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="应用程序级" UseSingleDictionary="true" />
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="false" />
<component name="SvnConfiguration">
<configuration>C:\Users\luo\AppData\Roaming\Subversion</configuration>
</component>
@@ -567,22 +528,6 @@
<workItem from="1698325880893" duration="54542000" />
<workItem from="1698455150596" duration="11287000" />
<workItem from="1698627531587" duration="2092000" />
- </task>
- <task id="LOCAL-00045" summary="10.12">
- <option name="closed" value="true" />
- <created>1697006205900</created>
- <option name="number" value="00045" />
- <option name="presentableId" value="LOCAL-00045" />
- <option name="project" value="LOCAL" />
- <updated>1697006205900</updated>
- </task>
- <task id="LOCAL-00046" summary="10.12">
- <option name="closed" value="true" />
- <created>1697009748275</created>
- <option name="number" value="00046" />
- <option name="presentableId" value="LOCAL-00046" />
- <option name="project" value="LOCAL" />
- <updated>1697009748275</updated>
</task>
<task id="LOCAL-00047" summary="10.12">
<option name="closed" value="true" />
@@ -940,20 +885,31 @@
<option name="project" value="LOCAL" />
<updated>1698394471402</updated>
</task>
- <option name="localTasksCounter" value="94" />
+ <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>
+ <option name="localTasksCounter" value="96" />
<servers />
- </component>
- <component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
- <State>
- <option name="COLUMN_ORDER" />
- </State>
+ <State />
</value>
</entry>
</map>
@@ -961,7 +917,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
- <MESSAGE value="9.26。10" />
<MESSAGE value="9.26。11" />
<MESSAGE value="9.26。12" />
<MESSAGE value="9.26。13" />
@@ -986,7 +941,8 @@
<MESSAGE value="运营商权限" />
<MESSAGE value="10.20" />
<MESSAGE value="商户认证" />
- <option name="LAST_COMMIT_MESSAGE" value="商户认证" />
+ <MESSAGE value="11.27,9" />
+ <option name="LAST_COMMIT_MESSAGE" value="11.27,9" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -1023,6 +979,16 @@
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
+ <pin-to-top-manager>
+ <pinned-members>
+ <PinnedItemInfo parentTag="com.baomidou.mybatisplus.extension.plugins.pagination.Page" memberName="total" />
+ <PinnedItemInfo parentTag="com.dsh.account.feignclient.activity.model.PointMerchandiseVo" memberName="merchandises" />
+ <PinnedItemInfo parentTag="com.dsh.competition.model.PaymentCompetitionVo" memberName="id" />
+ <PinnedItemInfo parentTag="com.alipay.api.response.AlipayTradeAppPayResponse" memberName="body" />
+ <PinnedItemInfo parentTag="java.lang.Long" memberName="value" />
+ <PinnedItemInfo parentTag="com.dsh.other.util.ResultUtil" memberName="msg" />
+ </pinned-members>
+ </pin-to-top-manager>
</component>
<component name="XSLT-Support.FileAssociations.UIState">
<expand />
--
Gitblit v1.7.1