温红权 8 лет назад
Родитель
Сommit
a8795abe2b

+ 96 - 75
Visuallnspection_fjq/visuallnspectioninteface/.idea/workspace.xml

@@ -16,26 +16,26 @@
       <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="40" />
+            <state relative-caret-position="504">
+              <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="install.sh" pinned="false" current-in-tab="false">
+      <file leaf-file-name="install.sh" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/install.sh">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="60">
-              <caret line="4" selection-start-line="4" selection-end-line="4" />
+              <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FwqCheckTask.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="FwqCheckTask.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="267">
-              <caret line="19" column="29" lean-forward="true" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
+              <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -46,7 +46,7 @@
       <file leaf-file-name="TaskService_F.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
+            <state relative-caret-position="75">
               <caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -59,7 +59,7 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/User.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="315">
-              <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" selection-end-column="50" />
+              <caret line="30" selection-start-line="30" selection-end-line="30" selection-end-column="50" />
             </state>
           </provider>
         </entry>
@@ -79,14 +79,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/DemoService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/filter/JwtAuthenticationTokenFilterInterface.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/bean/User.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/bean/Role.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/UserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/AuthService.java" />
-        <option value="$PROJECT_DIR$/install.bat" />
-        <option value="$PROJECT_DIR$/install.sh" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/install.sh" />
+        <option value="$PROJECT_DIR$/install.bat" />
       </list>
     </option>
   </component>
@@ -109,7 +109,7 @@
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
+  <component name="ProjectFrameBounds" fullScreen="true">
     <option name="x" value="205" />
     <option name="y" value="403" />
     <option name="width" value="1640" />
@@ -120,38 +120,36 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane">
+      <pane id="Scope" />
+      <pane id="PackagesPane">
         <subPane>
           <expand>
             <path>
-              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="visuallnspectioninteface" type="58d84e3e:PackageViewProjectNode" />
+              <item name="visuallnspectioninteface" type="616d4139:PackageViewModuleNode" />
             </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="AndroidView" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
             <path>
               <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
               <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
               <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
               <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
@@ -159,8 +157,6 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
@@ -168,19 +164,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
-              <item name="bean" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
@@ -190,19 +174,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="visuallnspectioninteface" type="58d84e3e:PackageViewProjectNode" />
-              <item name="visuallnspectioninteface" type="616d4139:PackageViewModuleNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -211,7 +182,7 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -311,14 +282,16 @@
       <workItem from="1522804176068" duration="3055000" />
       <workItem from="1523151336860" duration="449000" />
       <workItem from="1523428036367" duration="2235000" />
+      <workItem from="1524015022257" duration="1499000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="11087000" />
+    <option name="totallyTimeSpent" value="12586000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -339,18 +312,18 @@
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.29333332" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.2921212" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1602289" />
       <window_info anchor="right" id="Bean Validation" order="4" />
       <window_info id="Web" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32946146" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32946146" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -373,6 +346,47 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/install.sh">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="19" column="29" lean-forward="true" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/install.sh">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
           <caret line="2" column="122" selection-start-line="2" selection-start-column="122" selection-end-line="2" selection-end-column="122" />
         </state>
@@ -429,30 +443,16 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/UserService.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/AuthService.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/UserService.java" />
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/install.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/User.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
-          <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" selection-end-column="50" />
+          <caret line="30" selection-start-line="30" selection-end-line="30" selection-end-column="50" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
+        <state relative-caret-position="75">
           <caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -463,13 +463,34 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="267">
-          <caret line="19" column="29" lean-forward="true" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
+          <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="504">
+          <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/install.bat">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="16" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/install.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 2 - 1
Visuallnspection_fjq/visuallnspectioninteface/install.bat

@@ -1,3 +1,4 @@
 @echo off
 java -version
-mvn clean package && mvn install:install-file -Dfile="D:\VisualInspection\Visuallnspection_fjq\visuallnspectioninteface\target\visuallnspectioninteface-1.0-SNAPSHOT.jar" -DgroupId=com.xintong.visuallnspection.inteface -DartifactId=visuallnspectioninteface -Dversion=1.0 -Dpackaging=jar
+mvn clean deploy;
+#mvn clean package && mvn install:install-file -Dfile="D:\VisualInspection\Visuallnspection_fjq\visuallnspectioninteface\target\visuallnspectioninteface-1.0-SNAPSHOT.jar" -DgroupId=com.xintong.visuallnspection.inteface -DartifactId=visuallnspectioninteface -Dversion=1.0 -Dpackaging=jar

+ 2 - 2
Visuallnspection_fjq/visuallnspectioninteface/install.sh

@@ -1,4 +1,4 @@
 java -version;
-mvn clean package;
-mvn install:install-file -Dfile="/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/target/visuallnspectioninteface-1.0-SNAPSHOT.jar" -DgroupId=com.xintong.visuallnspection.inteface -DartifactId=visuallnspectioninteface -Dversion=1.0 -Dpackaging=jar;
+mvn clean deploy;
+#mvn install:install-file -Dfile="/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/target/visuallnspectioninteface-1.0-SNAPSHOT.jar" -DgroupId=com.xintong.visuallnspection.inteface -DartifactId=visuallnspectioninteface -Dversion=1.0 -Dpackaging=jar;
 

+ 25 - 0
Visuallnspection_fjq/visuallnspectioninteface/pom.xml

@@ -35,6 +35,31 @@
 
     </dependencies>
 
+
+    <distributionManagement>
+        <repository>
+            <id>xt-releases</id>
+            <name>Releases</name>
+            <url>http://git.topm.win:9506/nexus/content/repositories/releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>xt-snapshots</id>
+            <name>Snapshot</name>
+            <url>http://git.topm.win:9506/nexus/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+    </profiles>
+
+
     <build>
         <plugins>
 

+ 1 - 1
Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Apr 11 16:25:02 CST 2018
+#Wed Apr 18 09:55:51 CST 2018
 version=1.0-SNAPSHOT
 groupId=com.xintong.visuallnspection.inteface
 artifactId=visuallnspectioninteface

+ 0 - 0
Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst