提交本地代码

.idea/compiler.xml

@@ -7,13 +7,15 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="adapter-td-hb" />
+        <module name="datatraining-server" />
         <module name="analysis-histroy-hb" />
+        <module name="common" />
         <module name="benchmarking-web-hb" />
         <module name="meteorologicalcollection" />
         <module name="customization-hb" />
         <module name="failurestatistics-server" />
         <module name="benchmarking" />
+<<<<<<< Updated upstream
         <module name="benchmarking-histroy-hb" />
         <module name="cache" />
         <module name="healthmodel-server" />
@@ -21,16 +23,27 @@
         <module name="meteorologicalcollection-web" />
         <module name="datatraining-server" />
         <module name="datacenter-hb" />
+=======
+        <module name="cache" />
+        <module name="adapter-td-hb" />
+        <module name="healthmodel-server" />
+        <module name="meteorologicalcollection-web" />
+>>>>>>> Stashed changes
         <module name="monitor-web" />
         <module name="benchmarking-web" />
         <module name="healthmanagement-histroy" />
+        <module name="analysis-web-hb" />
         <module name="healthmanagement-histroy-hb" />
         <module name="consumer" />
-        <module name="analysis-web-hb" />
+        <module name="benchmarking-histroy-hb" />
         <module name="benchmarking-histroy" />
         <module name="algorithm-web" />
-        <module name="common" />
+        <module name="datacenter-hb" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="eureka-server" target="1.8" />
+      <module name="eureka-serverU1" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -5,6 +5,8 @@
     <file url="file://$PROJECT_DIR$/cache/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/eureka-server/eureka-serverU1/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/eureka-server/eureka-serverU1/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/analysis-histroy-hb/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/analysis-histroy-hb/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/histroy/benchmarking-histroy-hb/src/main/java" charset="UTF-8" />
@@ -37,8 +39,11 @@
     <file url="file://$PROJECT_DIR$/web/benchmarking-web/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/consumer/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/consumer/src/main/resources" charset="UTF-8" />
+<<<<<<< Updated upstream
     <file url="file://$PROJECT_DIR$/web/knowledge-hb/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/knowledge-hb/src/main/resources" charset="UTF-8" />
+=======
+>>>>>>> Stashed changes
     <file url="file://$PROJECT_DIR$/web/meteorologicalcollection-web/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/meteorologicalcollection-web/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/monitor-web/src/main/java" charset="UTF-8" />

.idea/jarRepositories.xml

@@ -8,6 +8,11 @@
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
@@ -22,6 +27,16 @@
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
     </remote-repository>
     <remote-repository>
+      <option name="id" value="alimaven" />
+      <option name="name" value="aliyun maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="nexus" />
+      <option name="name" value="nexus" />
+      <option name="url" value="http://nexus.hepengju.cn:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />