Browse Source

客户资料维护修改

anderx 4 years ago
parent
commit
3b4f6fad53
4 changed files with 22 additions and 35 deletions
  1. 2 1
      .gitignore
  2. 0 14
      .idea/artifacts/kede_server_war.xml
  3. 1 11
      .idea/artifacts/kede_server_war_exploded.xml
  4. 19 9
      .idea/workspace.xml

+ 2 - 1
.gitignore

@@ -7,4 +7,5 @@
 /build/
 /src/main/resources/generatorConfig.xml
 /.gitignore
-/.idea
+/.idea
+/out/

+ 0 - 14
.idea/artifacts/kede_server_war.xml

@@ -1,14 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="kede-server:war">
-    <output-path>$PROJECT_DIR$/target</output-path>
-    <properties id="maven-jee-properties">
-      <options>
-        <module>kede-server</module>
-        <packaging>war</packaging>
-      </options>
-    </properties>
-    <root id="archive" name="local.war">
-      <element id="artifact" artifact-name="kede-server:war exploded" />
-    </root>
-  </artifact>
-</component>

+ 1 - 11
.idea/artifacts/kede_server_war_exploded.xml

@@ -1,13 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="exploded-war" build-on-make="true" name="kede-server:war exploded">
-    <output-path>$PROJECT_DIR$/target/kede-server-1.0.0-BUILD-SNAPSHOT</output-path>
-    <properties id="maven-jee-properties">
-      <options>
-        <exploded>true</exploded>
-        <module>kede-server</module>
-        <packaging>war</packaging>
-      </options>
-    </properties>
+    <output-path>$PROJECT_DIR$/out</output-path>
     <root id="root">
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">
@@ -102,9 +95,6 @@
           <element id="library" level="project" name="Maven: org.mybatis.generator:mybatis-generator-core:1.3.7" />
         </element>
       </element>
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/target/kede-server-1.0.0-BUILD-SNAPSHOT/META-INF/MANIFEST.MF" />
-      </element>
       <element id="javaee-facet-resources" facet="kede-server/web/Web" />
     </root>
   </artifact>

+ 19 - 9
.idea/workspace.xml

@@ -10,9 +10,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="客户资料维护修改">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/artifacts/kede_server_war.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/artifacts/kede_server_war_exploded.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/kede_server_war_exploded.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/bo/OutUserMianProducts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/bo/OutUserMianProducts.java" afterDir="false" />
     </list>
     <list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -70,15 +71,15 @@
     <property name="ToolWindowEvent Log.ShowToolbar" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/out" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.last.edited" value="Problems" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+    <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
     <property name="two.files.diff.last.used.folder" value="$PROJECT_DIR$" />
   </component>
   <component name="RecentsManager">
@@ -105,7 +106,7 @@
       <option name="OPEN_IN_BROWSER" value="false" />
       <option name="COMMON_VM_ARGUMENTS" value="-Dprofiles.activation=&quot;local&quot; -Djdbc.worker.id=&quot;1001&quot;" />
       <option name="SHOW_DIALOG_ON_UPDATE" value="false" />
-      <option name="UPDATING_POLICY" value="redeploy-artifacts" />
+      <option name="UPDATING_POLICY" value="restart-server" />
       <deployment>
         <artifact name="kede-server:war exploded">
           <settings>
@@ -186,7 +187,9 @@
       </ConfigurationWrapper>
       <method v="2">
         <option name="Make" enabled="true" />
-        <option name="BuildArtifacts" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="kede-server:war exploded" />
+        </option>
       </method>
     </configuration>
   </component>
@@ -231,7 +234,7 @@
       <workItem from="1630656368650" duration="64000" />
       <workItem from="1630656901862" duration="33000" />
       <workItem from="1630888067668" duration="852000" />
-      <workItem from="1630893291690" duration="10570000" />
+      <workItem from="1630893291690" duration="11480000" />
     </task>
     <task id="LOCAL-00001" summary="修改客户跟进列表">
       <created>1630486551669</created>
@@ -331,7 +334,14 @@
       <option name="project" value="LOCAL" />
       <updated>1630917905043</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="客户资料维护修改">
+      <created>1630919726185</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1630919726185</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">