From a0cbfed12cfc5809a9e6d96e21b77a44a9a91e68 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 11 Aug 2020 18:58:31 +0800
Subject: [PATCH] 1.修改H端添加医生需要审核的问题 2.修改运动端充值后,跳转时间太长问题
---
.idea/workspace.xml | 145 +++++++++++++++++++++++++++++++----------------
1 files changed, 95 insertions(+), 50 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 237d084..c92fb6c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="aea2b99e-00ff-4ea5-b353-a3f1702228c0" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -69,7 +66,9 @@
<option name="version" value="1" />
</component>
<component name="ProjectId" id="1XH6QHSVpxmkZqoD1h1n0POmhTf" />
- <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+ <ConfirmationsSetting value="2" id="Add" />
+ </component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
@@ -81,6 +80,7 @@
<property name="Repository.Attach.JavaDocs" value="false" />
<property name="Repository.Attach.Sources" value="false" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+ <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
@@ -98,7 +98,7 @@
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.26596674" />
- <property name="settings.editor.selected.configurable" value="vcs.Git" />
+ <property name="settings.editor.selected.configurable" value="Docker" />
</component>
<component name="RecentsManager">
<key name="CreateTestDialog.RecentsKey">
@@ -129,18 +129,11 @@
</set>
</option>
</component>
- <component name="RunManager" selected="Spring Boot.UserCenterApplication">
- <configuration name="EurekaServerApplication1" type="Application" factoryName="Application" singleton="false" temporary="true">
- <option name="ALTERNATIVE_JRE_PATH" value="13" />
+ <component name="RunManager" selected="Application.EurekaServerApplication1">
+ <configuration name="EurekaServerApplication1" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="com.kidgrow.eureka.EurekaServerApplication" />
<module name="kidgrow-springcloud-eureka" />
<option name="PROGRAM_PARAMETERS" value="--spring.profiles.active=es1" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.kidgrow.eureka.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -366,10 +359,25 @@
<option name="Make" enabled="true" />
</method>
</configuration>
+ <configuration name="kidgrow-common-spring-boot-starter/Dockerfile" type="docker-deploy" factoryName="dockerfile" temporary="true" server-name="Docker">
+ <deployment type="dockerfile">
+ <settings>
+ <option name="buildCliOptions" value="" />
+ <option name="command" value="" />
+ <option name="containerName" value="" />
+ <option name="entrypoint" value="" />
+ <option name="imageTag" value="" />
+ <option name="commandLineOptions" value="" />
+ <option name="sourceFilePath" value="kidgrow-commons/kidgrow-common-spring-boot-starter/Dockerfile" />
+ </settings>
+ </deployment>
+ <method v="2" />
+ </configuration>
<list>
+ <item itemvalue="Application.EurekaServerApplication1" />
<item itemvalue="Application.EurekaServerApplication2" />
<item itemvalue="Application.EurekaServerApplication3" />
- <item itemvalue="Application.EurekaServerApplication1" />
+ <item itemvalue="Docker.kidgrow-common-spring-boot-starter/Dockerfile" />
<item itemvalue="JUnit.OrderTestMapperTest.add" />
<item itemvalue="JUnit.HospitalMapperTest.addHospital" />
<item itemvalue="Spring Boot.UserCenterApplication" />
@@ -394,11 +402,11 @@
</list>
<recent_temporary>
<list>
+ <item itemvalue="Docker.kidgrow-common-spring-boot-starter/Dockerfile" />
<item itemvalue="Spring Boot.HospitalApplication" />
<item itemvalue="Spring Boot.ManagerApplication" />
<item itemvalue="JUnit.HospitalMapperTest.addHospital" />
<item itemvalue="JUnit.OrderTestMapperTest.add" />
- <item itemvalue="Application.EurekaServerApplication1" />
</list>
</recent_temporary>
</component>
@@ -413,6 +421,10 @@
</serviceView>
</list>
</option>
+ <option name="showServicesTree" value="false" />
+ </component>
+ <component name="SshConsoleOptionsProvider">
+ <option name="myEncoding" value="UTF-8" />
</component>
<component name="SvnConfiguration">
<configuration />
@@ -473,6 +485,9 @@
<workItem from="1584001173541" duration="6294000" />
<workItem from="1584059900270" duration="5612000" />
<workItem from="1584343593706" duration="5136000" />
+ <workItem from="1584428458472" duration="10848000" />
+ <workItem from="1584492643810" duration="19252000" />
+ <workItem from="1584519528264" duration="4509000" />
</task>
<task id="LOCAL-00001" summary="提交到Gitblit">
<created>1584349724162</created>
@@ -481,7 +496,21 @@
<option name="project" value="LOCAL" />
<updated>1584349724162</updated>
</task>
- <option name="localTasksCounter" value="2" />
+ <task id="LOCAL-00002" summary="增加dockerfile">
+ <created>1584425125383</created>
+ <option name="number" value="00002" />
+ <option name="presentableId" value="LOCAL-00002" />
+ <option name="project" value="LOCAL" />
+ <updated>1584425125383</updated>
+ </task>
+ <task id="LOCAL-00003" summary="增加dockerfiles,并生成docker，传到harbor">
+ <created>1584530092741</created>
+ <option name="number" value="00003" />
+ <option name="presentableId" value="LOCAL-00003" />
+ <option name="project" value="LOCAL" />
+ <updated>1584530092741</updated>
+ </task>
+ <option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -489,7 +518,9 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="提交到Gitblit" />
- <option name="LAST_COMMIT_MESSAGE" value="提交到Gitblit" />
+ <MESSAGE value="增加dockerfile" />
+ <MESSAGE value="增加dockerfiles,并生成docker，传到harbor" />
+ <option name="LAST_COMMIT_MESSAGE" value="增加dockerfiles,并生成docker，传到harbor" />
</component>
<component name="WindowStateProjectService">
<state x="663" y="237" key="#<template>_of_Spring_Boot" timestamp="1583973805556">
@@ -500,13 +531,26 @@
<screen x="0" y="0" width="2048" height="1250" />
</state>
<state x="666" y="84" key="#Custom_Plugin_Repositories/0.0.2048.1250@0.0.2048.1250" timestamp="1580868596342" />
+ <state x="725" y="304" key="#Deploy_to_ACR" timestamp="1584442039228">
+ <screen x="0" y="0" width="2048" height="1250" />
+ </state>
+ <state x="725" y="304" key="#Deploy_to_ACR/0.0.2048.1250@0.0.2048.1250" timestamp="1584442039228" />
+ <state x="617" y="287" key="#Docker" timestamp="1584444006976">
+ <screen x="0" y="0" width="2048" height="1250" />
+ </state>
+ <state x="617" y="287" key="#Docker/0.0.2048.1250@0.0.2048.1250" timestamp="1584444006976" />
+ <state x="740" y="312" key="#ECS_on_Alibaba_Cloud" timestamp="1584430519740">
+ <screen x="0" y="0" width="2048" height="1250" />
+ </state>
+ <state x="740" y="312" key="#ECS_on_Alibaba_Cloud/0.0.2048.1250@0.0.2048.1250" timestamp="1584430519740" />
<state x="617" y="290" key="#Inspections" timestamp="1582378310795">
<screen x="0" y="0" width="2048" height="1250" />
</state>
<state x="617" y="290" key="#Inspections/0.0.2048.1250@0.0.2048.1250" timestamp="1582378310795" />
- <state x="617" y="287" key="#Notifications" timestamp="1583287159681">
+ <state x="617" y="287" key="#Notifications" timestamp="1584530223811">
<screen x="0" y="0" width="2048" height="1250" />
</state>
+ <state x="617" y="287" key="#Notifications/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584530223811" />
<state x="617" y="287" key="#Notifications/0.0.2048.1250@0.0.2048.1250" timestamp="1583287159681" />
<state x="172" y="170" width="1360" height="675" key="#Project_Structure" timestamp="1582421248962">
<screen x="0" y="0" width="2048" height="1250" />
@@ -520,10 +564,10 @@
<screen x="0" y="0" width="2048" height="1250" />
</state>
<state x="755" y="381" key="#com.intellij.codeInsight.editorActions.RestoreReferencesDialog/0.0.2048.1250@0.0.2048.1250" timestamp="1583890344633" />
- <state x="479" y="281" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1583973451083">
+ <state x="479" y="281" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1584497027692">
<screen x="0" y="0" width="2048" height="1250" />
</state>
- <state x="479" y="281" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2048.1250@0.0.2048.1250" timestamp="1583973451083" />
+ <state x="479" y="281" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2048.1250@0.0.2048.1250" timestamp="1584497027692" />
<state x="770" y="434" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1582277642885">
<screen x="0" y="0" width="2048" height="1250" />
</state>
@@ -552,39 +596,46 @@
<screen x="0" y="0" width="2048" height="1250" />
</state>
<state x="583" y="266" key="#com.intellij.util.ui.classpath.ChooseLibrariesDialog/0.0.2048.1250@0.0.2048.1250" timestamp="1582421049946" />
- <state x="2753" y="118" key="CommitChangelistDialog2" timestamp="1584349700981">
- <screen x="2560" y="0" width="1920" height="1050" />
+ <state x="206" y="140" key="CommitChangelistDialog2" timestamp="1584529996471">
+ <screen x="0" y="0" width="2048" height="1250" />
</state>
+ <state x="206" y="140" key="CommitChangelistDialog2/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584529996471" />
<state x="2753" y="118" key="CommitChangelistDialog2/0.0.2048.1250/2560.0.1920.1050@2560.0.1920.1050" timestamp="1584349700981" />
+ <state x="206" y="140" key="CommitChangelistDialog2/0.0.2048.1250@0.0.2048.1250" timestamp="1584425124834" />
<state width="475" height="466" key="DebuggerActiveHint" timestamp="1583481815003">
<screen x="0" y="0" width="2048" height="1250" />
</state>
<state width="475" height="466" key="DebuggerActiveHint/0.0.2048.1250@0.0.2048.1250" timestamp="1583481815003" />
- <state x="428" y="393" width="861" height="465" key="FileChooserDialogImpl" timestamp="1584424780970">
+ <state x="428" y="393" width="861" height="465" key="FileChooserDialogImpl" timestamp="1584510471376">
<screen x="0" y="0" width="2048" height="1250" />
</state>
+ <state x="428" y="393" key="FileChooserDialogImpl/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584510471376" />
<state x="2961" y="330" key="FileChooserDialogImpl/0.0.2048.1250/2560.0.1920.1050@2560.0.1920.1050" timestamp="1584348777771" />
- <state x="428" y="393" width="861" height="465" key="FileChooserDialogImpl/0.0.2048.1250@0.0.2048.1250" timestamp="1584424780970" />
- <state width="2005" height="233" key="GridCell.Tab.0.bottom" timestamp="1584177029445">
+ <state x="428" y="393" width="861" height="465" key="FileChooserDialogImpl/0.0.2048.1250@0.0.2048.1250" timestamp="1584493128535" />
+ <state width="2004" height="544" key="GridCell.Tab.0.bottom" timestamp="1584529552580">
<screen x="0" y="0" width="2048" height="1250" />
</state>
+ <state width="2004" height="544" key="GridCell.Tab.0.bottom/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584529552580" />
<state width="1877" height="220" key="GridCell.Tab.0.bottom/0.0.2048.1250/2560.0.1920.1050@2560.0.1920.1050" timestamp="1584060443085" />
- <state width="2005" height="233" key="GridCell.Tab.0.bottom/0.0.2048.1250@0.0.2048.1250" timestamp="1584177029445" />
- <state width="2005" height="233" key="GridCell.Tab.0.center" timestamp="1584177029443">
+ <state width="2004" height="544" key="GridCell.Tab.0.bottom/0.0.2048.1250@0.0.2048.1250" timestamp="1584520439250" />
+ <state width="2004" height="544" key="GridCell.Tab.0.center" timestamp="1584529552580">
<screen x="0" y="0" width="2048" height="1250" />
</state>
+ <state width="2004" height="544" key="GridCell.Tab.0.center/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584529552580" />
<state width="1877" height="220" key="GridCell.Tab.0.center/0.0.2048.1250/2560.0.1920.1050@2560.0.1920.1050" timestamp="1584060443085" />
- <state width="2005" height="233" key="GridCell.Tab.0.center/0.0.2048.1250@0.0.2048.1250" timestamp="1584177029443" />
- <state width="2005" height="233" key="GridCell.Tab.0.left" timestamp="1584177029442">
+ <state width="2004" height="544" key="GridCell.Tab.0.center/0.0.2048.1250@0.0.2048.1250" timestamp="1584520439249" />
+ <state width="2004" height="544" key="GridCell.Tab.0.left" timestamp="1584529552579">
<screen x="0" y="0" width="2048" height="1250" />
</state>
+ <state width="2004" height="544" key="GridCell.Tab.0.left/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584529552579" />
<state width="1877" height="220" key="GridCell.Tab.0.left/0.0.2048.1250/2560.0.1920.1050@2560.0.1920.1050" timestamp="1584060443084" />
- <state width="2005" height="233" key="GridCell.Tab.0.left/0.0.2048.1250@0.0.2048.1250" timestamp="1584177029442" />
- <state width="2005" height="233" key="GridCell.Tab.0.right" timestamp="1584177029444">
+ <state width="2004" height="544" key="GridCell.Tab.0.left/0.0.2048.1250@0.0.2048.1250" timestamp="1584520439248" />
+ <state width="2004" height="544" key="GridCell.Tab.0.right" timestamp="1584529552580">
<screen x="0" y="0" width="2048" height="1250" />
</state>
+ <state width="2004" height="544" key="GridCell.Tab.0.right/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584529552580" />
<state width="1877" height="220" key="GridCell.Tab.0.right/0.0.2048.1250/2560.0.1920.1050@2560.0.1920.1050" timestamp="1584060443085" />
- <state width="2005" height="233" key="GridCell.Tab.0.right/0.0.2048.1250@0.0.2048.1250" timestamp="1584177029444" />
+ <state width="2004" height="544" key="GridCell.Tab.0.right/0.0.2048.1250@0.0.2048.1250" timestamp="1584520439249" />
<state width="2005" height="233" key="GridCell.Tab.1.bottom" timestamp="1584177029446">
<screen x="0" y="0" width="2048" height="1250" />
</state>
@@ -621,15 +672,18 @@
<screen x="0" y="0" width="2048" height="1250" />
</state>
<state x="555" y="284" key="Maven.ArtifactSearchDialog/0.0.2048.1250@0.0.2048.1250" timestamp="1583054156324" />
- <state x="2857" y="102" width="1395" height="882" key="SettingsEditor" timestamp="1584347196922">
- <screen x="2560" y="0" width="1920" height="1050" />
+ <state x="317" y="122" width="1395" height="882" key="SettingsEditor" timestamp="1584515301065">
+ <screen x="0" y="0" width="2048" height="1250" />
</state>
+ <state x="317" y="122" key="SettingsEditor/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584515301065" />
<state x="2857" y="102" key="SettingsEditor/0.0.2048.1250/2560.0.1920.1050@2560.0.1920.1050" timestamp="1584347196922" />
- <state x="317" y="122" width="1395" height="882" key="SettingsEditor/0.0.2048.1250@0.0.2048.1250" timestamp="1583644609158" />
- <state x="3112" y="261" key="Vcs.Push.Dialog.v2" timestamp="1584349950997">
- <screen x="2560" y="0" width="1920" height="1050" />
+ <state x="317" y="122" width="1395" height="882" key="SettingsEditor/0.0.2048.1250@0.0.2048.1250" timestamp="1584494194137" />
+ <state x="589" y="311" key="Vcs.Push.Dialog.v2" timestamp="1584530108121">
+ <screen x="0" y="0" width="2048" height="1250" />
</state>
+ <state x="589" y="311" key="Vcs.Push.Dialog.v2/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584530108121" />
<state x="3112" y="261" key="Vcs.Push.Dialog.v2/0.0.2048.1250/2560.0.1920.1050@2560.0.1920.1050" timestamp="1584349950997" />
+ <state x="589" y="311" key="Vcs.Push.Dialog.v2/0.0.2048.1250@0.0.2048.1250" timestamp="1584425143947" />
<state x="821" y="406" key="chooseDestDirectoryDialog" timestamp="1583922853506">
<screen x="0" y="0" width="2048" height="1250" />
</state>
@@ -650,10 +704,11 @@
<screen x="0" y="0" width="2048" height="1250" />
</state>
<state x="498" y="368" width="1052" height="534" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/0.0.2048.1250@0.0.2048.1250" timestamp="1583332222590" />
- <state x="699" y="167" width="1012" height="774" key="find.popup" timestamp="1584159008526">
+ <state x="699" y="167" width="1012" height="774" key="find.popup" timestamp="1584514541911">
<screen x="0" y="0" width="2048" height="1250" />
</state>
- <state x="699" y="167" width="1012" height="774" key="find.popup/0.0.2048.1250@0.0.2048.1250" timestamp="1584159008526" />
+ <state x="699" y="167" width="1012" height="774" key="find.popup/0.0.2048.1250/2560.0.1920.1050@0.0.2048.1250" timestamp="1584514541911" />
+ <state x="699" y="167" width="1012" height="774" key="find.popup/0.0.2048.1250@0.0.2048.1250" timestamp="1584494915054" />
<state x="3290" y="327" key="git4idea.merge.GitPullDialog" timestamp="1584349872317">
<screen x="2560" y="0" width="1920" height="1050" />
</state>
@@ -724,16 +779,6 @@
<url>file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-biz/src/main/java/com/kidgrow/oauth2/service/impl/RedisTokensServiceImpl.java</url>
<line>46</line>
<option name="timeStamp" value="115" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java</url>
- <line>66</line>
- <option name="timeStamp" value="119" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/OAuth2Controller.java</url>
- <line>65</line>
- <option name="timeStamp" value="120" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/kidgrow-commons/kidgrow-redis-spring-boot-starter/src/main/java/com/kidgrow/redis/template/RedisRepository.java</url>
--
Gitblit v1.8.0