|
|
@ -2,12 +2,16 @@ |
|
|
|
<project version="4"> |
|
|
|
<component name="ChangeListManager"> |
|
|
|
<list default="true" id="8b88b979-c3fa-4858-8fa6-d3a5d334cf69" name="Default Changelist" comment=""> |
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java" afterDir="false" /> |
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HttpClientUtil.java" afterDir="false" /> |
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java" afterDir="false" /> |
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShareService.java" afterDir="false" /> |
|
|
|
<change afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ApiLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ApiLoginController.java" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/BannerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/BannerController.java" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ConfigController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ConfigController.java" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ItemController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ItemController.java" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/NoticeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/NoticeController.java" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ScoreController.java" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShareController.java" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShopController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/ShopController.java" afterDir="false" /> |
|
|
|
<change beforePath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/UserInfoController.java" afterDir="false" /> |
|
|
|
</list> |
|
|
|
<option name="SHOW_DIALOG" value="false" /> |
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|
|
@ -159,7 +163,7 @@ |
|
|
|
<updated>1741573014101</updated> |
|
|
|
<workItem from="1741573016746" duration="4323000" /> |
|
|
|
<workItem from="1741580646045" duration="5038000" /> |
|
|
|
<workItem from="1741852577555" duration="30130000" /> |
|
|
|
<workItem from="1741852577555" duration="30660000" /> |
|
|
|
</task> |
|
|
|
<task id="LOCAL-00001" summary="1、项目初始化"> |
|
|
|
<created>1741919155045</created> |
|
|
@ -189,7 +193,14 @@ |
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
<updated>1742296430585</updated> |
|
|
|
</task> |
|
|
|
<option name="localTasksCounter" value="5" /> |
|
|
|
<task id="LOCAL-00005" summary="1、小程序推广二维码"> |
|
|
|
<created>1742347801147</created> |
|
|
|
<option name="number" value="00005" /> |
|
|
|
<option name="presentableId" value="LOCAL-00005" /> |
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
<updated>1742347801147</updated> |
|
|
|
</task> |
|
|
|
<option name="localTasksCounter" value="6" /> |
|
|
|
<servers /> |
|
|
|
</component> |
|
|
|
<component name="TypeScriptGeneratedFilesManager"> |
|
|
@ -212,7 +223,8 @@ |
|
|
|
<MESSAGE value="接口上传: 1、轮播图模块 2、公告模块 3、配置信息模块 4、推拿项目模块 5、订单模块 6、个人信息模块" /> |
|
|
|
<MESSAGE value="接口上传: 1、商家模块 2、积分模块 3、个人中心基础数据" /> |
|
|
|
<MESSAGE value="1、积分模块修改" /> |
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="1、积分模块修改" /> |
|
|
|
<MESSAGE value="1、小程序推广二维码" /> |
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="1、小程序推广二维码" /> |
|
|
|
</component> |
|
|
|
<component name="WindowStateProjectService"> |
|
|
|
<state x="734" y="358" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1741573453098"> |
|
|
@ -231,70 +243,70 @@ |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state x="1010" y="449" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1741587414527" /> |
|
|
|
<state x="679" y="297" key="CommitChangelistDialog2" timestamp="1742296430186"> |
|
|
|
<state x="679" y="297" key="CommitChangelistDialog2" timestamp="1742347800671"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1742296430186" /> |
|
|
|
<state x="679" y="297" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1742347800671" /> |
|
|
|
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog" timestamp="1742296412150"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state x="92" y="92" width="2376" height="1216" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1742296412150" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1742347666652"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.bottom" timestamp="1742348286214"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666652" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1742347666652"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286214" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.center" timestamp="1742348286214"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666652" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1742347666652"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286214" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.left" timestamp="1742348286214"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666652" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1742347666652"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286214" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.right" timestamp="1742348286214"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666652" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1742347666572"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.0.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286214" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.bottom" timestamp="1742348286103"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666572" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1742347666572"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286103" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.center" timestamp="1742348286103"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666572" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1742347666572"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286103" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.left" timestamp="1742348286103"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666572" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1742347666572"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286103" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.right" timestamp="1742348286103"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666572" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1742347666573"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.1.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286103" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.bottom" timestamp="1742348286104"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666573" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1742347666573"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.bottom/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286104" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.center" timestamp="1742348286104"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666573" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1742347666572"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.center/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286104" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.left" timestamp="1742348286103"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666572" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1742347666573"> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.left/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286103" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.right" timestamp="1742348286104"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742347666573" /> |
|
|
|
<state width="2517" height="388" key="GridCell.Tab.2.right/0.0.2560.1400@0.0.2560.1400" timestamp="1742348286104" /> |
|
|
|
<state x="783" y="345" key="SettingsEditor" timestamp="1741573035388"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state x="783" y="345" key="SettingsEditor/0.0.2560.1400@0.0.2560.1400" timestamp="1741573035388" /> |
|
|
|
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1742296434198"> |
|
|
|
<state x="872" y="436" key="Vcs.Push.Dialog.v2" timestamp="1742347803832"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1742296434198" /> |
|
|
|
<state x="872" y="436" key="Vcs.Push.Dialog.v2/0.0.2560.1400@0.0.2560.1400" timestamp="1742347803832" /> |
|
|
|
<state x="972" y="527" key="com.intellij.ide.util.TipDialog" timestamp="1741580728988"> |
|
|
|
<screen x="0" y="0" width="2560" height="1400" /> |
|
|
|
</state> |
|
|
|