Commit bf10f4a3d1b9bf7aec885293f6b8eb69bf3f628e

Authored by litao
1 parent 0e7694da

test new member

.gitignore
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 /*.ipr 9 /*.ipr
10 /*.iml 10 /*.iml
11 /*.iws 11 /*.iws
  12 +.idea/workspace.xml
12 13
13 # p4merge 14 # p4merge
14 *.orig 15 *.orig
.idea/artifacts/patent_war_exploded.xml
@@ -9,11 +9,12 @@ @@ -9,11 +9,12 @@
9 <element id="directory" name="lib"> 9 <element id="directory" name="lib">
10 <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" /> 10 <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" />
11 <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" /> 11 <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" />
  12 + <element id="library" level="project" name="Maven: org.springframework:spring-core:4.2.3.RELEASE" />
12 <element id="library" level="project" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" /> 13 <element id="library" level="project" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" />
13 <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" /> 14 <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" />
14 <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" /> 15 <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
15 - <element id="library" level="project" name="Maven: org.springframework:spring-core:4.2.3.RELEASE" />  
16 <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" /> 16 <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" />
  17 + <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.1.1" />
17 <element id="library" level="project" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" /> 18 <element id="library" level="project" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" />
18 <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" /> 19 <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" />
19 <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" /> 20 <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" />
@@ -24,12 +25,18 @@ @@ -24,12 +25,18 @@
24 <element id="library" level="project" name="Maven: us.codecraft:webmagic-core:0.5.2" /> 25 <element id="library" level="project" name="Maven: us.codecraft:webmagic-core:0.5.2" />
25 <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" /> 26 <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" />
26 <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" /> 27 <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" />
  28 + <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.6" />
  29 + <element id="library" level="project" name="Maven: com.google.guava:guava:18.0" />
  30 + <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
27 <element id="library" level="project" name="Maven: us.codecraft:xsoup:0.2.4" /> 31 <element id="library" level="project" name="Maven: us.codecraft:xsoup:0.2.4" />
28 - <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.1" /> 32 + <element id="library" level="project" name="Maven: org.jsoup:jsoup:1.8.3" />
29 <element id="library" level="project" name="Maven: org.assertj:assertj-core:1.5.0" /> 33 <element id="library" level="project" name="Maven: org.assertj:assertj-core:1.5.0" />
  34 + <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.13" />
  35 + <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.1" />
30 <element id="library" level="project" name="Maven: commons-io:commons-io:1.3.2" /> 36 <element id="library" level="project" name="Maven: commons-io:commons-io:1.3.2" />
31 <element id="library" level="project" name="Maven: com.jayway.jsonpath:json-path:0.8.1" /> 37 <element id="library" level="project" name="Maven: com.jayway.jsonpath:json-path:0.8.1" />
32 <element id="library" level="project" name="Maven: net.minidev:json-smart:1.1.1" /> 38 <element id="library" level="project" name="Maven: net.minidev:json-smart:1.1.1" />
  39 + <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.4" />
33 <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.7" /> 40 <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.7" />
34 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" /> 41 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" />
35 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" /> 42 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" />
@@ -38,23 +45,20 @@ @@ -38,23 +45,20 @@
38 <element id="library" level="project" name="Maven: com.google.code.gson:gson:2.3.1" /> 45 <element id="library" level="project" name="Maven: com.google.code.gson:gson:2.3.1" />
39 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" /> 46 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" />
40 <element id="library" level="project" name="Maven: org.apache.commons:commons-exec:1.3" /> 47 <element id="library" level="project" name="Maven: org.apache.commons:commons-exec:1.3" />
  48 + <element id="library" level="project" name="Maven: net.java.dev.jna:jna-platform:4.1.0" />
41 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" /> 49 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" />
42 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" /> 50 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" />
43 <element id="library" level="project" name="Maven: org.webbitserver:webbit:0.4.14" /> 51 <element id="library" level="project" name="Maven: org.webbitserver:webbit:0.4.14" />
44 <element id="library" level="project" name="Maven: io.netty:netty:3.9.8.Final" /> 52 <element id="library" level="project" name="Maven: io.netty:netty:3.9.8.Final" />
45 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" /> 53 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" />
46 <element id="library" level="project" name="Maven: org.quartz-scheduler:quartz:2.2.1" /> 54 <element id="library" level="project" name="Maven: org.quartz-scheduler:quartz:2.2.1" />
47 - <element id="library" level="project" name="Maven: net.java.dev.jna:jna-platform:4.1.0" />  
48 <element id="library" level="project" name="Maven: net.java.dev.jna:jna:4.1.0" /> 55 <element id="library" level="project" name="Maven: net.java.dev.jna:jna:4.1.0" />
49 <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" /> 56 <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" />
50 <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" /> 57 <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" />
51 <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" /> 58 <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" />
52 <element id="library" level="project" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" /> 59 <element id="library" level="project" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" />
53 <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" /> 60 <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" />
54 - <element id="library" level="project" name="Maven: org.jsoup:jsoup:1.8.3" />  
55 - <element id="library" level="project" name="Maven: com.google.guava:guava:18.0" />  
56 <element id="library" level="project" name="Maven: joda-time:joda-time:2.9.1" /> 61 <element id="library" level="project" name="Maven: joda-time:joda-time:2.9.1" />
57 - <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />  
58 <element id="library" level="project" name="Maven: org.apache.commons:commons-math3:3.3" /> 62 <element id="library" level="project" name="Maven: org.apache.commons:commons-math3:3.3" />
59 <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.3" /> 63 <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.3" />
60 <element id="library" level="project" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" /> 64 <element id="library" level="project" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" />
@@ -65,7 +69,6 @@ @@ -65,7 +69,6 @@
65 <element id="library" level="project" name="Maven: org.ow2.asm:asm:4.2" /> 69 <element id="library" level="project" name="Maven: org.ow2.asm:asm:4.2" />
66 <element id="library" level="project" name="Maven: com.esotericsoftware:minlog:1.3.0" /> 70 <element id="library" level="project" name="Maven: com.esotericsoftware:minlog:1.3.0" />
67 <element id="library" level="project" name="Maven: org.objenesis:objenesis:2.1" /> 71 <element id="library" level="project" name="Maven: org.objenesis:objenesis:2.1" />
68 - <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.13" />  
69 <element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" /> 72 <element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" />
70 <element id="library" level="project" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" /> 73 <element id="library" level="project" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" />
71 <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.1.3" /> 74 <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.1.3" />
@@ -78,10 +81,7 @@ @@ -78,10 +81,7 @@
78 <element id="library" level="project" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" /> 81 <element id="library" level="project" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" />
79 <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.34" /> 82 <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.34" />
80 <element id="library" level="project" name="Maven: org.apache.velocity:velocity:1.7" /> 83 <element id="library" level="project" name="Maven: org.apache.velocity:velocity:1.7" />
81 - <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.4" />  
82 - <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.6" />  
83 <element id="library" level="project" name="Maven: commons-httpclient:commons-httpclient:3.0.1" /> 84 <element id="library" level="project" name="Maven: commons-httpclient:commons-httpclient:3.0.1" />
84 - <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.1.1" />  
85 <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" /> 85 <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
86 <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" /> 86 <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" />
87 <element id="library" level="project" name="Maven: jaxen:jaxen:1.1-beta" /> 87 <element id="library" level="project" name="Maven: jaxen:jaxen:1.1-beta" />
.idea/compiler.xml
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <profile default="true" name="Default" enabled="false"> 17 <profile default="true" name="Default" enabled="false">
18 <processorPath useClasspath="true" /> 18 <processorPath useClasspath="true" />
19 </profile> 19 </profile>
20 - <profile default="false" name="Annotation profile for patent" enabled="true"> 20 + <profile default="false" name="Maven default annotation processors profile" enabled="true">
21 <sourceOutputDir name="target/generated-sources/annotations" /> 21 <sourceOutputDir name="target/generated-sources/annotations" />
22 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> 22 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
23 <outputRelativeToContentRoot value="true" /> 23 <outputRelativeToContentRoot value="true" />
.idea/misc.xml
@@ -26,65 +26,4 @@ @@ -26,65 +26,4 @@
26 <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> 26 <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
27 <output url="file://$PROJECT_DIR$/out" /> 27 <output url="file://$PROJECT_DIR$/out" />
28 </component> 28 </component>
29 - <component name="masterDetails">  
30 - <states>  
31 - <state key="GlobalLibrariesConfigurable.UI">  
32 - <settings>  
33 - <splitter-proportions>  
34 - <option name="proportions">  
35 - <list>  
36 - <option value="0.2" />  
37 - </list>  
38 - </option>  
39 - </splitter-proportions>  
40 - </settings>  
41 - </state>  
42 - <state key="JdkListConfigurable.UI">  
43 - <settings>  
44 - <last-edited>1.8</last-edited>  
45 - <splitter-proportions>  
46 - <option name="proportions">  
47 - <list>  
48 - <option value="0.2" />  
49 - </list>  
50 - </option>  
51 - </splitter-proportions>  
52 - </settings>  
53 - </state>  
54 - <state key="ProjectJDKs.UI">  
55 - <settings>  
56 - <last-edited>1.8</last-edited>  
57 - <splitter-proportions>  
58 - <option name="proportions">  
59 - <list>  
60 - <option value="0.2" />  
61 - </list>  
62 - </option>  
63 - </splitter-proportions>  
64 - </settings>  
65 - </state>  
66 - <state key="ProjectLibrariesConfigurable.UI">  
67 - <settings>  
68 - <splitter-proportions>  
69 - <option name="proportions">  
70 - <list>  
71 - <option value="0.2" />  
72 - </list>  
73 - </option>  
74 - </splitter-proportions>  
75 - </settings>  
76 - </state>  
77 - <state key="ScopeChooserConfigurable.UI">  
78 - <settings>  
79 - <splitter-proportions>  
80 - <option name="proportions">  
81 - <list>  
82 - <option value="0.2" />  
83 - </list>  
84 - </option>  
85 - </splitter-proportions>  
86 - </settings>  
87 - </state>  
88 - </states>  
89 - </component>  
90 </project> 29 </project>
91 \ No newline at end of file 30 \ No newline at end of file
.idea/workspace.xml
@@ -2,8 +2,18 @@ @@ -2,8 +2,18 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment=""> 4 <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/css/home.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/home.css" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" /> 5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/css/example_home_patent.css" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/example.jsp" />
  7 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/example_home_patent.jsp" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent.war" afterPath="$PROJECT_DIR$/target/patent.war" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
  15 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  16 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patent.iml" afterPath="$PROJECT_DIR$/patent.iml" />
7 </list> 17 </list>
8 <ignored path="patent.iws" /> 18 <ignored path="patent.iws" />
9 <ignored path=".idea/workspace.xml" /> 19 <ignored path=".idea/workspace.xml" />
@@ -25,22 +35,63 @@ @@ -25,22 +35,63 @@
25 <favorites_list name="patent" /> 35 <favorites_list name="patent" />
26 </component> 36 </component>
27 <component name="FileEditorManager"> 37 <component name="FileEditorManager">
28 - <leaf>  
29 - <file leaf-file-name="home.css" pinned="false" current-in-tab="true"> 38 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  39 + <file leaf-file-name="home.css" pinned="false" current-in-tab="false">
30 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css"> 40 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
31 <provider selected="true" editor-type-id="text-editor"> 41 <provider selected="true" editor-type-id="text-editor">
32 - <state vertical-scroll-proportion="0.97727275">  
33 - <caret line="103" column="1" selection-start-line="103" selection-start-column="1" selection-end-line="103" selection-end-column="1" /> 42 + <state relative-caret-position="270">
  43 + <caret line="18" column="18" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
34 <folding /> 44 <folding />
35 </state> 45 </state>
36 </provider> 46 </provider>
37 </entry> 47 </entry>
38 </file> 48 </file>
39 - <file leaf-file-name="home_patent.jsp" pinned="false" current-in-tab="false"> 49 + <file leaf-file-name="home_patent.jsp" pinned="false" current-in-tab="true">
40 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> 50 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
41 <provider selected="true" editor-type-id="text-editor"> 51 <provider selected="true" editor-type-id="text-editor">
42 - <state vertical-scroll-proportion="-5.8039217">  
43 - <caret line="43" column="28" selection-start-line="43" selection-start-column="28" selection-end-line="43" selection-end-column="28" /> 52 + <state relative-caret-position="157">
  53 + <caret line="58" column="7" selection-start-line="58" selection-start-column="7" selection-end-line="58" selection-end-column="7" />
  54 + <folding />
  55 + </state>
  56 + </provider>
  57 + </entry>
  58 + </file>
  59 + <file leaf-file-name="example.jsp" pinned="false" current-in-tab="false">
  60 + <entry file="file://$PROJECT_DIR$/src/main/webapp/example.jsp">
  61 + <provider selected="true" editor-type-id="text-editor">
  62 + <state relative-caret-position="7935">
  63 + <caret line="529" column="23" selection-start-line="529" selection-start-column="23" selection-end-line="529" selection-end-column="23" />
  64 + <folding>
  65 + <marker date="1470117932544" expanded="true" signature="1866:1912" ph="..." />
  66 + <marker date="1470117932544" expanded="true" signature="1976:2044" ph="..." />
  67 + <marker date="1470117932544" expanded="true" signature="56669:57235" ph="..." />
  68 + <marker date="1470117932544" expanded="true" signature="56783:56962" ph="..." />
  69 + <marker date="1470117932544" expanded="true" signature="56992:57194" ph="..." />
  70 + <marker date="1470117932544" expanded="true" signature="57220:57235" ph="..." />
  71 + <marker date="1470117932544" expanded="true" signature="60749:60937" ph="..." />
  72 + <marker date="1470117932544" expanded="true" signature="60866:60937" ph="..." />
  73 + <marker date="1470117932544" expanded="true" signature="61062:61292" ph="..." />
  74 + <marker date="1470117932544" expanded="true" signature="61318:61333" ph="..." />
  75 + </folding>
  76 + </state>
  77 + </provider>
  78 + </entry>
  79 + </file>
  80 + <file leaf-file-name="example_home_patent.jsp" pinned="false" current-in-tab="false">
  81 + <entry file="file://$PROJECT_DIR$/src/main/webapp/example_home_patent.jsp">
  82 + <provider selected="true" editor-type-id="text-editor">
  83 + <state relative-caret-position="225">
  84 + <caret line="15" column="40" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="40" />
  85 + <folding />
  86 + </state>
  87 + </provider>
  88 + </entry>
  89 + </file>
  90 + <file leaf-file-name="example_home_patent.css" pinned="false" current-in-tab="false">
  91 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/example_home_patent.css">
  92 + <provider selected="true" editor-type-id="text-editor">
  93 + <state relative-caret-position="255">
  94 + <caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
44 <folding /> 95 <folding />
45 </state> 96 </state>
46 </provider> 97 </provider>
@@ -52,9 +103,10 @@ @@ -52,9 +103,10 @@
52 <option name="RECENT_TEMPLATES"> 103 <option name="RECENT_TEMPLATES">
53 <list> 104 <list>
54 <option value="jsf" /> 105 <option value="jsf" />
55 - <option value="Jsp File" />  
56 <option value="Enum" /> 106 <option value="Enum" />
57 <option value="Class" /> 107 <option value="Class" />
  108 + <option value="HTML File" />
  109 + <option value="Jsp File" />
58 <option value="CSS File" /> 110 <option value="CSS File" />
59 </list> 111 </list>
60 </option> 112 </option>
@@ -70,10 +122,6 @@ @@ -70,10 +122,6 @@
70 <component name="IdeDocumentHistory"> 122 <component name="IdeDocumentHistory">
71 <option name="CHANGED_PATHS"> 123 <option name="CHANGED_PATHS">
72 <list> 124 <list>
73 - <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" />  
74 - <option value="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" />  
75 - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java" />  
76 - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" />  
77 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" /> 125 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" />
78 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" /> 126 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" />
79 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java" /> 127 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java" />
@@ -121,12 +169,18 @@ @@ -121,12 +169,18 @@
121 <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" /> 169 <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" />
122 <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" /> 170 <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
123 <option value="$PROJECT_DIR$/src/main/webapp/css/home.css" /> 171 <option value="$PROJECT_DIR$/src/main/webapp/css/home.css" />
  172 + <option value="$PROJECT_DIR$/src/main/webapp/example.jsp" />
  173 + <option value="$PROJECT_DIR$/src/main/webapp/example.html" />
  174 + <option value="$PROJECT_DIR$/src/main/webapp/css/example_home_patent.css" />
  175 + <option value="$PROJECT_DIR$/src/main/webapp/example_home_patent.jsp" />
124 </list> 176 </list>
125 </option> 177 </option>
126 </component> 178 </component>
127 - <component name="JsBuildToolGruntFileManager" detection-done="true" /> 179 + <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  180 + <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
128 <component name="JsGulpfileManager"> 181 <component name="JsGulpfileManager">
129 <detection-done>true</detection-done> 182 <detection-done>true</detection-done>
  183 + <sorting>DEFINITION_ORDER</sorting>
130 </component> 184 </component>
131 <component name="LogFilters"> 185 <component name="LogFilters">
132 <option name="FILTER_ERRORS" value="false" /> 186 <option name="FILTER_ERRORS" value="false" />
@@ -138,9 +192,16 @@ @@ -138,9 +192,16 @@
138 <component name="MavenImportPreferences"> 192 <component name="MavenImportPreferences">
139 <option name="generalSettings"> 193 <option name="generalSettings">
140 <MavenGeneralSettings> 194 <MavenGeneralSettings>
141 - <option name="mavenHome" value="$USER_HOME$/install/apache-maven-3.2.5" /> 195 + <option name="localRepository" value="$MAVEN_REPOSITORY$" />
  196 + <option name="mavenHome" value="/usr/share/maven" />
  197 + <option name="userSettingsFile" value="$MAVEN_REPOSITORY$/settings.xml" />
142 </MavenGeneralSettings> 198 </MavenGeneralSettings>
143 </option> 199 </option>
  200 + <option name="importingSettings">
  201 + <MavenImportingSettings>
  202 + <option name="importAutomatically" value="true" />
  203 + </MavenImportingSettings>
  204 + </option>
144 <option name="disabledProfiles"> 205 <option name="disabledProfiles">
145 <list> 206 <list>
146 <option value="dev" /> 207 <option value="dev" />
@@ -199,13 +260,11 @@ @@ -199,13 +260,11 @@
199 </PATH> 260 </PATH>
200 </treeState> 261 </treeState>
201 </component> 262 </component>
202 - <component name="NamedScopeManager">  
203 - <order />  
204 - </component>  
205 <component name="ProjectFrameBounds"> 263 <component name="ProjectFrameBounds">
206 - <option name="y" value="23" />  
207 - <option name="width" value="1280" />  
208 - <option name="height" value="737" /> 264 + <option name="x" value="65" />
  265 + <option name="y" value="24" />
  266 + <option name="width" value="1855" />
  267 + <option name="height" value="1056" />
209 </component> 268 </component>
210 <component name="ProjectLevelVcsManager" settingsEditedManually="false"> 269 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
211 <OptionsSetting value="true" id="Add" /> 270 <OptionsSetting value="true" id="Add" />
@@ -228,9 +287,13 @@ @@ -228,9 +287,13 @@
228 <autoscrollToSource /> 287 <autoscrollToSource />
229 <autoscrollFromSource /> 288 <autoscrollFromSource />
230 <sortByType /> 289 <sortByType />
  290 + <manualOrder />
  291 + <foldersAlwaysOnTop value="true" />
231 </navigator> 292 </navigator>
232 <panes> 293 <panes>
233 <pane id="Scratches" /> 294 <pane id="Scratches" />
  295 + <pane id="Scope" />
  296 + <pane id="PackagesPane" />
234 <pane id="ProjectPane"> 297 <pane id="ProjectPane">
235 <subPane> 298 <subPane>
236 <PATH> 299 <PATH>
@@ -302,19 +365,65 @@ @@ -302,19 +365,65 @@
302 <option name="myItemId" value="main" /> 365 <option name="myItemId" value="main" />
303 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 366 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
304 </PATH_ELEMENT> 367 </PATH_ELEMENT>
  368 + <PATH_ELEMENT>
  369 + <option name="myItemId" value="webapp" />
  370 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  371 + </PATH_ELEMENT>
  372 + <PATH_ELEMENT>
  373 + <option name="myItemId" value="css" />
  374 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  375 + </PATH_ELEMENT>
  376 + </PATH>
  377 + <PATH>
  378 + <PATH_ELEMENT>
  379 + <option name="myItemId" value="patent" />
  380 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  381 + </PATH_ELEMENT>
  382 + <PATH_ELEMENT>
  383 + <option name="myItemId" value="canrd-patent" />
  384 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  385 + </PATH_ELEMENT>
  386 + <PATH_ELEMENT>
  387 + <option name="myItemId" value="src" />
  388 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  389 + </PATH_ELEMENT>
  390 + <PATH_ELEMENT>
  391 + <option name="myItemId" value="main" />
  392 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  393 + </PATH_ELEMENT>
  394 + </PATH>
  395 + <PATH>
  396 + <PATH_ELEMENT>
  397 + <option name="myItemId" value="patent" />
  398 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  399 + </PATH_ELEMENT>
  400 + <PATH_ELEMENT>
  401 + <option name="myItemId" value="canrd-patent" />
  402 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  403 + </PATH_ELEMENT>
  404 + <PATH_ELEMENT>
  405 + <option name="myItemId" value="src" />
  406 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  407 + </PATH_ELEMENT>
  408 + <PATH_ELEMENT>
  409 + <option name="myItemId" value="main" />
  410 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  411 + </PATH_ELEMENT>
  412 + <PATH_ELEMENT>
  413 + <option name="myItemId" value="resources" />
  414 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  415 + </PATH_ELEMENT>
305 </PATH> 416 </PATH>
306 </subPane> 417 </subPane>
307 </pane> 418 </pane>
308 - <pane id="Scope" />  
309 - <pane id="PackagesPane" />  
310 </panes> 419 </panes>
311 </component> 420 </component>
312 <component name="PropertiesComponent"> 421 <component name="PropertiesComponent">
313 - <property name="settings.editor.selected.configurable" value="vcs.Git" /> 422 + <property name="settings.editor.selected.configurable" value="MavenSettings" />
314 <property name="settings.editor.splitter.proportion" value="0.2" /> 423 <property name="settings.editor.splitter.proportion" value="0.2" />
315 - <property name="project.structure.last.edited" value="Project" /> 424 + <property name="project.structure.last.edited" value="Global Libraries" />
316 <property name="project.structure.proportion" value="0.0" /> 425 <property name="project.structure.proportion" value="0.0" />
317 - <property name="project.structure.side.proportion" value="0.0" /> 426 + <property name="project.structure.side.proportion" value="0.2" />
318 <property name="aspect.path.notification.shown" value="true" /> 427 <property name="aspect.path.notification.shown" value="true" />
319 <property name="WebServerToolWindowFactoryState" value="false" /> 428 <property name="WebServerToolWindowFactoryState" value="false" />
320 <property name="recentsLimit" value="5" /> 429 <property name="recentsLimit" value="5" />
@@ -325,7 +434,8 @@ @@ -325,7 +434,8 @@
325 <property name="OverrideImplement.combined" value="true" /> 434 <property name="OverrideImplement.combined" value="true" />
326 <property name="OverrideImplement.overriding.sorted" value="false" /> 435 <property name="OverrideImplement.overriding.sorted" value="false" />
327 <property name="extract.method.default.visibility" value="private" /> 436 <property name="extract.method.default.visibility" value="private" />
328 - <property name="last_opened_file_path" value="$USER_HOME$/ToolUtil.class" /> 437 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
  438 + <property name="DefaultHtmlFileTemplate" value="HTML File" />
329 </component> 439 </component>
330 <component name="RecentsManager"> 440 <component name="RecentsManager">
331 <key name="CopyClassDialog.RECENTS_KEY"> 441 <key name="CopyClassDialog.RECENTS_KEY">
@@ -342,66 +452,201 @@ @@ -342,66 +452,201 @@
342 <recent name="$PROJECT_DIR$/src/main/webapp/views" /> 452 <recent name="$PROJECT_DIR$/src/main/webapp/views" />
343 </key> 453 </key>
344 </component> 454 </component>
345 - <component name="RunManager" selected="Tomcat Server.patent">  
346 - <configuration default="false" name="CaseTypeEnum" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">  
347 - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">  
348 - <pattern>  
349 - <option name="PATTERN" value="com.canrd.patent.dal.enums.*" />  
350 - <option name="ENABLED" value="true" />  
351 - </pattern>  
352 - </extension>  
353 - <option name="MAIN_CLASS_NAME" value="com.canrd.patent.dal.enums.CaseTypeEnum" />  
354 - <option name="VM_PARAMETERS" />  
355 - <option name="PROGRAM_PARAMETERS" />  
356 - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />  
357 - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />  
358 - <option name="ALTERNATIVE_JRE_PATH" />  
359 - <option name="ENABLE_SWING_INSPECTOR" value="false" />  
360 - <option name="ENV_VARIABLES" />  
361 - <option name="PASS_PARENT_ENVS" value="true" />  
362 - <module name="patent" />  
363 - <envs />  
364 - <method /> 455 + <component name="RunManager" selected="Tomcat Server.example_home_patent.jsp (4)">
  456 + <configuration default="false" name="example_home_patent.jsp" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  457 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/example_home_patent.jsp" />
  458 + <deployment>
  459 + <artifact name="patent:war">
  460 + <settings>
  461 + <option name="CONTEXT_PATH" value="/" />
  462 + </settings>
  463 + </artifact>
  464 + </deployment>
  465 + <server-settings>
  466 + <option name="BASE_DIRECTORY_NAME" value="example_home_patent_jsp_patent" />
  467 + </server-settings>
  468 + <predefined_log_file id="Tomcat" enabled="true" />
  469 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  470 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  471 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  472 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  473 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  474 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  475 + <option name="USE_ENV_VARIABLES" value="true" />
  476 + <STARTUP>
  477 + <option name="USE_DEFAULT" value="true" />
  478 + <option name="SCRIPT" value="" />
  479 + <option name="VM_PARAMETERS" value="" />
  480 + <option name="PROGRAM_PARAMETERS" value="" />
  481 + </STARTUP>
  482 + <SHUTDOWN>
  483 + <option name="USE_DEFAULT" value="true" />
  484 + <option name="SCRIPT" value="" />
  485 + <option name="VM_PARAMETERS" value="" />
  486 + <option name="PROGRAM_PARAMETERS" value="" />
  487 + </SHUTDOWN>
  488 + </ConfigurationWrapper>
  489 + <method>
  490 + <option name="BuildArtifacts" enabled="true">
  491 + <artifact name="patent:war" />
  492 + </option>
  493 + </method>
365 </configuration> 494 </configuration>
366 - <configuration default="false" name="TextUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">  
367 - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">  
368 - <pattern>  
369 - <option name="PATTERN" value="com.canrd.patent.common.utils.*" />  
370 - <option name="ENABLED" value="true" />  
371 - </pattern>  
372 - </extension>  
373 - <option name="MAIN_CLASS_NAME" value="com.canrd.patent.common.utils.TextUtils" />  
374 - <option name="VM_PARAMETERS" />  
375 - <option name="PROGRAM_PARAMETERS" />  
376 - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />  
377 - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />  
378 - <option name="ALTERNATIVE_JRE_PATH" />  
379 - <option name="ENABLE_SWING_INSPECTOR" value="false" />  
380 - <option name="ENV_VARIABLES" />  
381 - <option name="PASS_PARENT_ENVS" value="true" />  
382 - <module name="patent" />  
383 - <envs />  
384 - <method /> 495 + <configuration default="false" name="example_home_patent.jsp (1)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  496 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/example_home_patent.jsp" />
  497 + <deployment>
  498 + <artifact name="patent:war">
  499 + <settings>
  500 + <option name="CONTEXT_PATH" value="/" />
  501 + </settings>
  502 + </artifact>
  503 + </deployment>
  504 + <server-settings>
  505 + <option name="BASE_DIRECTORY_NAME" value="example_home_patent_jsp_(1)_patent" />
  506 + </server-settings>
  507 + <predefined_log_file id="Tomcat" enabled="true" />
  508 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  509 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  510 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  511 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  512 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  513 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  514 + <option name="USE_ENV_VARIABLES" value="true" />
  515 + <STARTUP>
  516 + <option name="USE_DEFAULT" value="true" />
  517 + <option name="SCRIPT" value="" />
  518 + <option name="VM_PARAMETERS" value="" />
  519 + <option name="PROGRAM_PARAMETERS" value="" />
  520 + </STARTUP>
  521 + <SHUTDOWN>
  522 + <option name="USE_DEFAULT" value="true" />
  523 + <option name="SCRIPT" value="" />
  524 + <option name="VM_PARAMETERS" value="" />
  525 + <option name="PROGRAM_PARAMETERS" value="" />
  526 + </SHUTDOWN>
  527 + </ConfigurationWrapper>
  528 + <method>
  529 + <option name="BuildArtifacts" enabled="true">
  530 + <artifact name="patent:war" />
  531 + </option>
  532 + </method>
385 </configuration> 533 </configuration>
386 - <configuration default="false" name="CasementService" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">  
387 - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">  
388 - <pattern>  
389 - <option name="PATTERN" value="com.canrd.patent.service.*" />  
390 - <option name="ENABLED" value="true" />  
391 - </pattern>  
392 - </extension>  
393 - <option name="MAIN_CLASS_NAME" value="com.canrd.patent.service.CasementService" />  
394 - <option name="VM_PARAMETERS" />  
395 - <option name="PROGRAM_PARAMETERS" />  
396 - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />  
397 - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />  
398 - <option name="ALTERNATIVE_JRE_PATH" />  
399 - <option name="ENABLE_SWING_INSPECTOR" value="false" />  
400 - <option name="ENV_VARIABLES" />  
401 - <option name="PASS_PARENT_ENVS" value="true" />  
402 - <module name="patent" />  
403 - <envs />  
404 - <method /> 534 + <configuration default="false" name="example_home_patent.jsp (2)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  535 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/example_home_patent.jsp" />
  536 + <deployment>
  537 + <artifact name="patent:war">
  538 + <settings>
  539 + <option name="CONTEXT_PATH" value="/" />
  540 + </settings>
  541 + </artifact>
  542 + </deployment>
  543 + <server-settings>
  544 + <option name="BASE_DIRECTORY_NAME" value="example_home_patent_jsp_(2)_patent" />
  545 + </server-settings>
  546 + <predefined_log_file id="Tomcat" enabled="true" />
  547 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  548 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  549 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  550 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  551 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  552 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  553 + <option name="USE_ENV_VARIABLES" value="true" />
  554 + <STARTUP>
  555 + <option name="USE_DEFAULT" value="true" />
  556 + <option name="SCRIPT" value="" />
  557 + <option name="VM_PARAMETERS" value="" />
  558 + <option name="PROGRAM_PARAMETERS" value="" />
  559 + </STARTUP>
  560 + <SHUTDOWN>
  561 + <option name="USE_DEFAULT" value="true" />
  562 + <option name="SCRIPT" value="" />
  563 + <option name="VM_PARAMETERS" value="" />
  564 + <option name="PROGRAM_PARAMETERS" value="" />
  565 + </SHUTDOWN>
  566 + </ConfigurationWrapper>
  567 + <method>
  568 + <option name="BuildArtifacts" enabled="true">
  569 + <artifact name="patent:war" />
  570 + </option>
  571 + </method>
  572 + </configuration>
  573 + <configuration default="false" name="example_home_patent.jsp (3)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  574 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/example_home_patent.jsp" />
  575 + <deployment>
  576 + <artifact name="patent:war">
  577 + <settings>
  578 + <option name="CONTEXT_PATH" value="/" />
  579 + </settings>
  580 + </artifact>
  581 + </deployment>
  582 + <server-settings>
  583 + <option name="BASE_DIRECTORY_NAME" value="example_home_patent_jsp_(3)_patent" />
  584 + </server-settings>
  585 + <predefined_log_file id="Tomcat" enabled="true" />
  586 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  587 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  588 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  589 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  590 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  591 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  592 + <option name="USE_ENV_VARIABLES" value="true" />
  593 + <STARTUP>
  594 + <option name="USE_DEFAULT" value="true" />
  595 + <option name="SCRIPT" value="" />
  596 + <option name="VM_PARAMETERS" value="" />
  597 + <option name="PROGRAM_PARAMETERS" value="" />
  598 + </STARTUP>
  599 + <SHUTDOWN>
  600 + <option name="USE_DEFAULT" value="true" />
  601 + <option name="SCRIPT" value="" />
  602 + <option name="VM_PARAMETERS" value="" />
  603 + <option name="PROGRAM_PARAMETERS" value="" />
  604 + </SHUTDOWN>
  605 + </ConfigurationWrapper>
  606 + <method>
  607 + <option name="BuildArtifacts" enabled="true">
  608 + <artifact name="patent:war" />
  609 + </option>
  610 + </method>
  611 + </configuration>
  612 + <configuration default="false" name="example_home_patent.jsp (4)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  613 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/example_home_patent.jsp" />
  614 + <deployment>
  615 + <artifact name="patent:war">
  616 + <settings>
  617 + <option name="CONTEXT_PATH" value="/" />
  618 + </settings>
  619 + </artifact>
  620 + </deployment>
  621 + <server-settings>
  622 + <option name="BASE_DIRECTORY_NAME" value="example_home_patent_jsp_(4)_patent" />
  623 + </server-settings>
  624 + <predefined_log_file id="Tomcat" enabled="true" />
  625 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  626 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  627 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  628 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  629 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  630 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  631 + <option name="USE_ENV_VARIABLES" value="true" />
  632 + <STARTUP>
  633 + <option name="USE_DEFAULT" value="true" />
  634 + <option name="SCRIPT" value="" />
  635 + <option name="VM_PARAMETERS" value="" />
  636 + <option name="PROGRAM_PARAMETERS" value="" />
  637 + </STARTUP>
  638 + <SHUTDOWN>
  639 + <option name="USE_DEFAULT" value="true" />
  640 + <option name="SCRIPT" value="" />
  641 + <option name="VM_PARAMETERS" value="" />
  642 + <option name="PROGRAM_PARAMETERS" value="" />
  643 + </SHUTDOWN>
  644 + </ConfigurationWrapper>
  645 + <method>
  646 + <option name="BuildArtifacts" enabled="true">
  647 + <artifact name="patent:war" />
  648 + </option>
  649 + </method>
405 </configuration> 650 </configuration>
406 <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false"> 651 <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false">
407 <deployment /> 652 <deployment />
@@ -422,22 +667,21 @@ @@ -422,22 +667,21 @@
422 </configuration> 667 </configuration>
423 <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> 668 <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
424 <module name="" /> 669 <module name="" />
425 - <option name="ACTIVITY_CLASS" value="" />  
426 - <option name="MODE" value="default_activity" />  
427 <option name="DEPLOY" value="true" /> 670 <option name="DEPLOY" value="true" />
428 <option name="ARTIFACT_NAME" value="" /> 671 <option name="ARTIFACT_NAME" value="" />
  672 + <option name="PM_INSTALL_OPTIONS" value="" />
  673 + <option name="ACTIVITY_EXTRA_FLAGS" value="" />
  674 + <option name="MODE" value="default_activity" />
429 <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> 675 <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
430 - <option name="USE_LAST_SELECTED_DEVICE" value="false" />  
431 <option name="PREFERRED_AVD" value="" /> 676 <option name="PREFERRED_AVD" value="" />
432 - <option name="USE_COMMAND_LINE" value="true" />  
433 - <option name="COMMAND_LINE" value="" />  
434 - <option name="WIPE_USER_DATA" value="false" />  
435 - <option name="DISABLE_BOOT_ANIMATION" value="false" />  
436 - <option name="NETWORK_SPEED" value="full" />  
437 - <option name="NETWORK_LATENCY" value="none" />  
438 <option name="CLEAR_LOGCAT" value="false" /> 677 <option name="CLEAR_LOGCAT" value="false" />
439 <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> 678 <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
440 - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> 679 + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
  680 + <option name="FORCE_STOP_RUNNING_APP" value="true" />
  681 + <option name="USE_LAST_SELECTED_DEVICE" value="false" />
  682 + <option name="PREFERRED_AVD" value="" />
  683 + <option name="DEEP_LINK" value="" />
  684 + <option name="ACTIVITY_CLASS" value="" />
441 <method /> 685 <method />
442 </configuration> 686 </configuration>
443 <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> 687 <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
@@ -447,18 +691,15 @@ @@ -447,18 +691,15 @@
447 <option name="METHOD_NAME" value="" /> 691 <option name="METHOD_NAME" value="" />
448 <option name="CLASS_NAME" value="" /> 692 <option name="CLASS_NAME" value="" />
449 <option name="PACKAGE_NAME" value="" /> 693 <option name="PACKAGE_NAME" value="" />
  694 + <option name="EXTRA_OPTIONS" value="" />
450 <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> 695 <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
451 - <option name="USE_LAST_SELECTED_DEVICE" value="false" />  
452 <option name="PREFERRED_AVD" value="" /> 696 <option name="PREFERRED_AVD" value="" />
453 - <option name="USE_COMMAND_LINE" value="true" />  
454 - <option name="COMMAND_LINE" value="" />  
455 - <option name="WIPE_USER_DATA" value="false" />  
456 - <option name="DISABLE_BOOT_ANIMATION" value="false" />  
457 - <option name="NETWORK_SPEED" value="full" />  
458 - <option name="NETWORK_LATENCY" value="none" />  
459 <option name="CLEAR_LOGCAT" value="false" /> 697 <option name="CLEAR_LOGCAT" value="false" />
460 <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> 698 <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
461 - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> 699 + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
  700 + <option name="FORCE_STOP_RUNNING_APP" value="true" />
  701 + <option name="USE_LAST_SELECTED_DEVICE" value="false" />
  702 + <option name="PREFERRED_AVD" value="" />
462 <method /> 703 <method />
463 </configuration> 704 </configuration>
464 <configuration default="true" type="Applet" factoryName="Applet"> 705 <configuration default="true" type="Applet" factoryName="Applet">
@@ -483,6 +724,65 @@ @@ -483,6 +724,65 @@
483 <envs /> 724 <envs />
484 <method /> 725 <method />
485 </configuration> 726 </configuration>
  727 + <configuration default="true" type="ArquillianJUnit" factoryName="">
  728 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  729 + <module name="" />
  730 + <option name="arquillianRunConfiguration">
  731 + <value>
  732 + <option name="containerStateName" value="" />
  733 + </value>
  734 + </option>
  735 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  736 + <option name="ALTERNATIVE_JRE_PATH" />
  737 + <option name="PACKAGE_NAME" />
  738 + <option name="MAIN_CLASS_NAME" />
  739 + <option name="METHOD_NAME" />
  740 + <option name="TEST_OBJECT" value="class" />
  741 + <option name="VM_PARAMETERS" />
  742 + <option name="PARAMETERS" />
  743 + <option name="WORKING_DIRECTORY" />
  744 + <option name="ENV_VARIABLES" />
  745 + <option name="PASS_PARENT_ENVS" value="true" />
  746 + <option name="TEST_SEARCH_SCOPE">
  747 + <value defaultName="singleModule" />
  748 + </option>
  749 + <envs />
  750 + <patterns />
  751 + <method />
  752 + </configuration>
  753 + <configuration default="true" type="ArquillianTestNG" factoryName="">
  754 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  755 + <module name="" />
  756 + <option name="arquillianRunConfiguration">
  757 + <value>
  758 + <option name="containerStateName" value="" />
  759 + </value>
  760 + </option>
  761 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  762 + <option name="ALTERNATIVE_JRE_PATH" />
  763 + <option name="SUITE_NAME" />
  764 + <option name="PACKAGE_NAME" />
  765 + <option name="MAIN_CLASS_NAME" />
  766 + <option name="METHOD_NAME" />
  767 + <option name="GROUP_NAME" />
  768 + <option name="TEST_OBJECT" value="CLASS" />
  769 + <option name="VM_PARAMETERS" />
  770 + <option name="PARAMETERS" />
  771 + <option name="WORKING_DIRECTORY" />
  772 + <option name="OUTPUT_DIRECTORY" />
  773 + <option name="ANNOTATION_TYPE" />
  774 + <option name="ENV_VARIABLES" />
  775 + <option name="PASS_PARENT_ENVS" value="true" />
  776 + <option name="TEST_SEARCH_SCOPE">
  777 + <value defaultName="singleModule" />
  778 + </option>
  779 + <option name="USE_DEFAULT_REPORTERS" value="false" />
  780 + <option name="PROPERTIES_FILE" />
  781 + <envs />
  782 + <properties />
  783 + <listeners />
  784 + <method />
  785 + </configuration>
486 <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java"> 786 <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
487 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> 787 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
488 <option name="myFilePath" /> 788 <option name="myFilePath" />
@@ -568,13 +868,12 @@ @@ -568,13 +868,12 @@
568 <method /> 868 <method />
569 </configuration> 869 </configuration>
570 <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails"> 870 <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
571 - <module name="" />  
572 <setting name="vmparams" value="" /> 871 <setting name="vmparams" value="" />
573 <setting name="cmdLine" value="run-app" /> 872 <setting name="cmdLine" value="run-app" />
574 - <setting name="depsClasspath" value="false" />  
575 <setting name="passParentEnv" value="true" /> 873 <setting name="passParentEnv" value="true" />
576 - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />  
577 <setting name="launchBrowser" value="false" /> 874 <setting name="launchBrowser" value="false" />
  875 + <setting name="depsClasspath" value="false" />
  876 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
578 <method /> 877 <method />
579 </configuration> 878 </configuration>
580 <configuration default="true" type="JUnit" factoryName="JUnit"> 879 <configuration default="true" type="JUnit" factoryName="JUnit">
@@ -598,14 +897,76 @@ @@ -598,14 +897,76 @@
598 <patterns /> 897 <patterns />
599 <method /> 898 <method />
600 </configuration> 899 </configuration>
  900 + <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
  901 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  902 + <module name="" />
  903 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  904 + <option name="ALTERNATIVE_JRE_PATH" />
  905 + <option name="PACKAGE_NAME" />
  906 + <option name="MAIN_CLASS_NAME" />
  907 + <option name="METHOD_NAME" />
  908 + <option name="TEST_OBJECT" value="class" />
  909 + <option name="VM_PARAMETERS" />
  910 + <option name="PARAMETERS" />
  911 + <option name="WORKING_DIRECTORY" />
  912 + <option name="ENV_VARIABLES" />
  913 + <option name="PASS_PARENT_ENVS" value="true" />
  914 + <option name="TEST_SEARCH_SCOPE">
  915 + <value defaultName="singleModule" />
  916 + </option>
  917 + <envs />
  918 + <patterns />
  919 + <method />
  920 + </configuration>
601 <configuration default="true" type="JarApplication" factoryName="JAR Application"> 921 <configuration default="true" type="JarApplication" factoryName="JAR Application">
602 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> 922 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
603 <envs /> 923 <envs />
604 <method /> 924 <method />
605 </configuration> 925 </configuration>
  926 + <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
  927 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  928 + <option name="SCRATCH_FILE_ID" value="0" />
  929 + <option name="MAIN_CLASS_NAME" />
  930 + <option name="VM_PARAMETERS" />
  931 + <option name="PROGRAM_PARAMETERS" />
  932 + <option name="WORKING_DIRECTORY" />
  933 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  934 + <option name="ALTERNATIVE_JRE_PATH" />
  935 + <option name="ENABLE_SWING_INSPECTOR" value="false" />
  936 + <option name="ENV_VARIABLES" />
  937 + <option name="PASS_PARENT_ENVS" value="true" />
  938 + <module name="" />
  939 + <envs />
  940 + <method />
  941 + </configuration>
606 <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> 942 <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
607 <method /> 943 <method />
608 </configuration> 944 </configuration>
  945 + <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
  946 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  947 + <option name="MAIN_CLASS_NAME" />
  948 + <option name="VM_PARAMETERS" />
  949 + <option name="PROGRAM_PARAMETERS" />
  950 + <option name="WORKING_DIRECTORY" />
  951 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  952 + <option name="ALTERNATIVE_JRE_PATH" />
  953 + <option name="PASS_PARENT_ENVS" value="true" />
  954 + <module name="patent" />
  955 + <envs />
  956 + <method />
  957 + </configuration>
  958 + <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
  959 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  960 + <option name="filePath" />
  961 + <option name="vmParameters" />
  962 + <option name="alternativeJrePath" />
  963 + <option name="programParameters" />
  964 + <option name="passParentEnvs" value="true" />
  965 + <option name="workingDirectory" />
  966 + <option name="isAlternativeJrePathEnabled" value="false" />
  967 + <envs />
  968 + <method />
  969 + </configuration>
609 <configuration default="true" type="MavenRunConfiguration" factoryName="Maven"> 970 <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
610 <MavenSettings> 971 <MavenSettings>
611 <option name="myGeneralSettings" /> 972 <option name="myGeneralSettings" />
@@ -670,7 +1031,36 @@ @@ -670,7 +1031,36 @@
670 <listeners /> 1031 <listeners />
671 <method /> 1032 <method />
672 </configuration> 1033 </configuration>
  1034 + <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
  1035 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  1036 + <module name="" />
  1037 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  1038 + <option name="ALTERNATIVE_JRE_PATH" />
  1039 + <option name="SUITE_NAME" />
  1040 + <option name="PACKAGE_NAME" />
  1041 + <option name="MAIN_CLASS_NAME" />
  1042 + <option name="METHOD_NAME" />
  1043 + <option name="GROUP_NAME" />
  1044 + <option name="TEST_OBJECT" value="CLASS" />
  1045 + <option name="VM_PARAMETERS" />
  1046 + <option name="PARAMETERS" />
  1047 + <option name="WORKING_DIRECTORY" />
  1048 + <option name="OUTPUT_DIRECTORY" />
  1049 + <option name="ANNOTATION_TYPE" />
  1050 + <option name="ENV_VARIABLES" />
  1051 + <option name="PASS_PARENT_ENVS" value="true" />
  1052 + <option name="TEST_SEARCH_SCOPE">
  1053 + <value defaultName="singleModule" />
  1054 + </option>
  1055 + <option name="USE_DEFAULT_REPORTERS" value="false" />
  1056 + <option name="PROPERTIES_FILE" />
  1057 + <envs />
  1058 + <properties />
  1059 + <listeners />
  1060 + <method />
  1061 + </configuration>
673 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> 1062 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
  1063 + <node-interpreter>project</node-interpreter>
674 <node-options /> 1064 <node-options />
675 <gulpfile /> 1065 <gulpfile />
676 <tasks /> 1066 <tasks />
@@ -679,13 +1069,20 @@ @@ -679,13 +1069,20 @@
679 <envs /> 1069 <envs />
680 <method /> 1070 <method />
681 </configuration> 1071 </configuration>
  1072 + <configuration default="true" type="js.build_tools.npm" factoryName="npm">
  1073 + <command value="run-script" />
  1074 + <scripts />
  1075 + <node-interpreter value="project" />
  1076 + <envs />
  1077 + <method />
  1078 + </configuration>
682 <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher"> 1079 <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
683 <method /> 1080 <method />
684 </configuration> 1081 </configuration>
685 <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)"> 1082 <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
686 <method /> 1083 <method />
687 </configuration> 1084 </configuration>
688 - <configuration default="false" name="patent" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH=""> 1085 + <configuration default="false" name="patent" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
689 <option name="SHOW_DIALOG_ON_UPDATE" value="false" /> 1086 <option name="SHOW_DIALOG_ON_UPDATE" value="false" />
690 <deployment> 1087 <deployment>
691 <artifact name="patent:war exploded"> 1088 <artifact name="patent:war exploded">
@@ -757,21 +1154,27 @@ @@ -757,21 +1154,27 @@
757 </option> 1154 </option>
758 </method> 1155 </method>
759 </configuration> 1156 </configuration>
760 - <list size="4"> 1157 + <list size="6">
761 <item index="0" class="java.lang.String" itemvalue="Tomcat Server.patent" /> 1158 <item index="0" class="java.lang.String" itemvalue="Tomcat Server.patent" />
762 - <item index="1" class="java.lang.String" itemvalue="Application.CaseTypeEnum" />  
763 - <item index="2" class="java.lang.String" itemvalue="Application.TextUtils" />  
764 - <item index="3" class="java.lang.String" itemvalue="Application.CasementService" /> 1159 + <item index="1" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp" />
  1160 + <item index="2" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp (1)" />
  1161 + <item index="3" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp (2)" />
  1162 + <item index="4" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp (3)" />
  1163 + <item index="5" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp (4)" />
765 </list> 1164 </list>
766 <recent_temporary> 1165 <recent_temporary>
767 - <list size="3">  
768 - <item index="0" class="java.lang.String" itemvalue="Application.CasementService" />  
769 - <item index="1" class="java.lang.String" itemvalue="Application.CaseTypeEnum" />  
770 - <item index="2" class="java.lang.String" itemvalue="Application.TextUtils" /> 1166 + <list size="5">
  1167 + <item index="0" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp (4)" />
  1168 + <item index="1" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp (3)" />
  1169 + <item index="2" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp (2)" />
  1170 + <item index="3" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp (1)" />
  1171 + <item index="4" class="java.lang.String" itemvalue="Tomcat Server.example_home_patent.jsp" />
771 </list> 1172 </list>
772 </recent_temporary> 1173 </recent_temporary>
773 </component> 1174 </component>
774 - <component name="ShelveChangesManager" show_recycled="false" /> 1175 + <component name="ShelveChangesManager" show_recycled="false">
  1176 + <option name="remove_strategy" value="false" />
  1177 + </component>
775 <component name="SvnConfiguration"> 1178 <component name="SvnConfiguration">
776 <configuration /> 1179 <configuration />
777 </component> 1180 </component>
@@ -780,6 +1183,7 @@ @@ -780,6 +1183,7 @@
780 <changelist id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" /> 1183 <changelist id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" />
781 <created>1468214759106</created> 1184 <created>1468214759106</created>
782 <option name="number" value="Default" /> 1185 <option name="number" value="Default" />
  1186 + <option name="presentableId" value="Default" />
783 <updated>1468214759106</updated> 1187 <updated>1468214759106</updated>
784 <workItem from="1468214760432" duration="1049000" /> 1188 <workItem from="1468214760432" duration="1049000" />
785 <workItem from="1468234772794" duration="330000" /> 1189 <workItem from="1468234772794" duration="330000" />
@@ -797,70 +1201,76 @@ @@ -797,70 +1201,76 @@
797 <workItem from="1469260205882" duration="12837000" /> 1201 <workItem from="1469260205882" duration="12837000" />
798 <workItem from="1469585749367" duration="1353000" /> 1202 <workItem from="1469585749367" duration="1353000" />
799 <workItem from="1469889447244" duration="6184000" /> 1203 <workItem from="1469889447244" duration="6184000" />
  1204 + <workItem from="1470030495033" duration="4738000" />
  1205 + <workItem from="1470107274922" duration="10206000" />
  1206 + <workItem from="1470185235786" duration="479000" />
800 </task> 1207 </task>
801 <servers /> 1208 <servers />
802 </component> 1209 </component>
803 <component name="TimeTrackingManager"> 1210 <component name="TimeTrackingManager">
804 - <option name="totallyTimeSpent" value="101912000" /> 1211 + <option name="totallyTimeSpent" value="117335000" />
805 </component> 1212 </component>
806 <component name="ToolWindowManager"> 1213 <component name="ToolWindowManager">
807 - <frame x="0" y="23" width="1280" height="737" extended-state="6" /> 1214 + <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
808 <editor active="true" /> 1215 <editor active="true" />
809 <layout> 1216 <layout>
810 - <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />  
811 - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />  
812 - <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
813 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.55129534" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
814 - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
815 - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
816 - <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
817 - <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
818 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.36899224" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
819 - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />  
820 - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />  
821 - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
822 - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4496124" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
823 - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />  
824 - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />  
825 - <window_info id="Structure" active="false" anchor="left" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
826 - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1914378" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
827 - <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
828 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14378029" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
829 - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />  
830 - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />  
831 - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />  
832 - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />  
833 - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
834 - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />  
835 - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 1217 + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1218 + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  1219 + <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  1220 + <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1221 + <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  1222 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24678111" sideWeight="0.5063571" order="7" side_tool="true" content_ui="tabs" />
  1223 + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33583692" sideWeight="0.49806523" order="7" side_tool="false" content_ui="tabs" />
  1224 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1914378" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1225 + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1226 + <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
  1227 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24678111" sideWeight="0.4936429" order="7" side_tool="false" content_ui="tabs" />
  1228 + <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1229 + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1230 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25538972" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  1231 + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  1232 + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1233 + <window_info id="Structure" active="false" anchor="left" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1234 + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1235 + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  1236 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  1237 + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  1238 + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  1239 + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  1240 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
  1241 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36802575" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1242 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4495708" sideWeight="0.49806523" order="7" side_tool="false" content_ui="tabs" />
  1243 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  1244 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2746781" sideWeight="0.49143174" order="2" side_tool="false" content_ui="tabs" />
  1245 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
836 </layout> 1246 </layout>
837 <layout-to-restore> 1247 <layout-to-restore>
838 - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />  
839 - <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
840 - <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
841 - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
842 - <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
843 - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />  
844 - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />  
845 - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />  
846 - <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />  
847 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19951534" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
848 - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />  
849 - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />  
850 - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />  
851 - <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />  
852 - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />  
853 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.55129534" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />  
854 - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />  
855 - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
856 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26666668" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
857 - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />  
858 - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4496124" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />  
859 - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />  
860 - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
861 - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1914378" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />  
862 - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />  
863 - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 1248 + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  1249 + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  1250 + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  1251 + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  1252 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
  1253 + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.53812635" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
  1254 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1914378" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  1255 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
  1256 + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  1257 + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1258 + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1259 + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1260 + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  1261 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26666668" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1262 + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  1263 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4496124" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
  1264 + <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1265 + <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1266 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  1267 + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
  1268 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  1269 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.55129534" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
  1270 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19951534" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  1271 + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
  1272 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1273 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
864 </layout-to-restore> 1274 </layout-to-restore>
865 </component> 1275 </component>
866 <component name="Vcs.Log.UiProperties"> 1276 <component name="Vcs.Log.UiProperties">
@@ -885,271 +1295,191 @@ @@ -885,271 +1295,191 @@
885 <option name="FILTER_TARGETS" value="false" /> 1295 <option name="FILTER_TARGETS" value="false" />
886 </component> 1296 </component>
887 <component name="editorHistoryManager"> 1297 <component name="editorHistoryManager">
888 - <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc">  
889 - <provider selected="true" editor-type-id="text-editor">  
890 - <state vertical-scroll-proportion="0.0">  
891 - <caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />  
892 - <folding />  
893 - </state>  
894 - </provider>  
895 - </entry>  
896 - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css">  
897 - <provider selected="true" editor-type-id="text-editor">  
898 - <state vertical-scroll-proportion="0.0">  
899 - <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />  
900 - </state>  
901 - </provider>  
902 - </entry>  
903 - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml">  
904 - <provider selected="true" editor-type-id="text-editor">  
905 - <state vertical-scroll-proportion="0.0">  
906 - <caret line="181" column="20" selection-start-line="181" selection-start-column="20" selection-end-line="181" selection-end-column="20" />  
907 - </state>  
908 - </provider>  
909 - </entry>  
910 - <entry file="file://$PROJECT_DIR$/src/main/resources.local/logback.xml">  
911 - <provider selected="true" editor-type-id="text-editor">  
912 - <state vertical-scroll-proportion="-6.111111">  
913 - <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />  
914 - <folding />  
915 - </state>  
916 - </provider>  
917 - </entry>  
918 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/OrderMapper.java">  
919 - <provider selected="true" editor-type-id="text-editor">  
920 - <state vertical-scroll-proportion="0.0">  
921 - <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />  
922 - </state>  
923 - </provider>  
924 - </entry>  
925 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java">  
926 - <provider selected="true" editor-type-id="text-editor">  
927 - <state vertical-scroll-proportion="0.0">  
928 - <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />  
929 - </state>  
930 - </provider>  
931 - </entry>  
932 - <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">  
933 - <provider selected="true" editor-type-id="text-editor">  
934 - <state vertical-scroll-proportion="0.0">  
935 - <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />  
936 - </state>  
937 - </provider>  
938 - </entry>  
939 - <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp">  
940 - <provider selected="true" editor-type-id="text-editor">  
941 - <state vertical-scroll-proportion="0.0">  
942 - <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />  
943 - </state>  
944 - </provider>  
945 - </entry>  
946 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">  
947 - <provider selected="true" editor-type-id="text-editor">  
948 - <state vertical-scroll-proportion="0.0">  
949 - <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />  
950 - </state>  
951 - </provider>  
952 - </entry>  
953 <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml"> 1298 <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
954 <provider selected="true" editor-type-id="text-editor"> 1299 <provider selected="true" editor-type-id="text-editor">
955 - <state vertical-scroll-proportion="0.0"> 1300 + <state relative-caret-position="0">
956 <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" /> 1301 <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
957 - <folding />  
958 </state> 1302 </state>
959 </provider> 1303 </provider>
960 </entry> 1304 </entry>
961 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java"> 1305 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java">
962 <provider selected="true" editor-type-id="text-editor"> 1306 <provider selected="true" editor-type-id="text-editor">
963 - <state vertical-scroll-proportion="0.0"> 1307 + <state relative-caret-position="0">
964 <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> 1308 <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
965 </state> 1309 </state>
966 </provider> 1310 </provider>
967 </entry> 1311 </entry>
968 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/CasementMapper.java"> 1312 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/CasementMapper.java">
969 <provider selected="true" editor-type-id="text-editor"> 1313 <provider selected="true" editor-type-id="text-editor">
970 - <state vertical-scroll-proportion="0.0"> 1314 + <state relative-caret-position="0">
971 <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" /> 1315 <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
972 </state> 1316 </state>
973 </provider> 1317 </provider>
974 </entry> 1318 </entry>
975 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java"> 1319 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
976 <provider selected="true" editor-type-id="text-editor"> 1320 <provider selected="true" editor-type-id="text-editor">
977 - <state vertical-scroll-proportion="0.0"> 1321 + <state relative-caret-position="0">
978 <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" /> 1322 <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
979 </state> 1323 </state>
980 </provider> 1324 </provider>
981 </entry> 1325 </entry>
982 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java"> 1326 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
983 <provider selected="true" editor-type-id="text-editor"> 1327 <provider selected="true" editor-type-id="text-editor">
984 - <state vertical-scroll-proportion="0.0"> 1328 + <state relative-caret-position="0">
985 <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" /> 1329 <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
986 </state> 1330 </state>
987 </provider> 1331 </provider>
988 </entry> 1332 </entry>
989 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java"> 1333 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
990 <provider selected="true" editor-type-id="text-editor"> 1334 <provider selected="true" editor-type-id="text-editor">
991 - <state vertical-scroll-proportion="0.0"> 1335 + <state relative-caret-position="0">
992 <caret line="49" column="21" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" /> 1336 <caret line="49" column="21" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
993 </state> 1337 </state>
994 </provider> 1338 </provider>
995 </entry> 1339 </entry>
996 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java"> 1340 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
997 <provider selected="true" editor-type-id="text-editor"> 1341 <provider selected="true" editor-type-id="text-editor">
998 - <state vertical-scroll-proportion="0.0"> 1342 + <state relative-caret-position="0">
999 <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" /> 1343 <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
1000 </state> 1344 </state>
1001 </provider> 1345 </provider>
1002 </entry> 1346 </entry>
1003 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java"> 1347 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java">
1004 <provider selected="true" editor-type-id="text-editor"> 1348 <provider selected="true" editor-type-id="text-editor">
1005 - <state vertical-scroll-proportion="-6.148148"> 1349 + <state relative-caret-position="0">
1006 <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> 1350 <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
1007 </state> 1351 </state>
1008 </provider> 1352 </provider>
1009 </entry> 1353 </entry>
1010 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java"> 1354 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
1011 <provider selected="true" editor-type-id="text-editor"> 1355 <provider selected="true" editor-type-id="text-editor">
1012 - <state vertical-scroll-proportion="0.0"> 1356 + <state relative-caret-position="0">
1013 <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> 1357 <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
1014 </state> 1358 </state>
1015 </provider> 1359 </provider>
1016 </entry> 1360 </entry>
1017 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java"> 1361 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
1018 <provider selected="true" editor-type-id="text-editor"> 1362 <provider selected="true" editor-type-id="text-editor">
1019 - <state vertical-scroll-proportion="0.0"> 1363 + <state relative-caret-position="0">
1020 <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" /> 1364 <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" />
1021 </state> 1365 </state>
1022 </provider> 1366 </provider>
1023 </entry> 1367 </entry>
1024 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java"> 1368 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java">
1025 <provider selected="true" editor-type-id="text-editor"> 1369 <provider selected="true" editor-type-id="text-editor">
1026 - <state vertical-scroll-proportion="0.0"> 1370 + <state relative-caret-position="0">
1027 <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> 1371 <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
1028 </state> 1372 </state>
1029 </provider> 1373 </provider>
1030 </entry> 1374 </entry>
1031 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/footer.css"> 1375 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/footer.css">
1032 <provider selected="true" editor-type-id="text-editor"> 1376 <provider selected="true" editor-type-id="text-editor">
1033 - <state vertical-scroll-proportion="-1.1945702"> 1377 + <state relative-caret-position="0">
1034 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1378 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1035 </state> 1379 </state>
1036 </provider> 1380 </provider>
1037 </entry> 1381 </entry>
1038 - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">  
1039 - <provider selected="true" editor-type-id="text-editor">  
1040 - <state vertical-scroll-proportion="-5.0">  
1041 - <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />  
1042 - </state>  
1043 - </provider>  
1044 - </entry>  
1045 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java"> 1382 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
1046 <provider selected="true" editor-type-id="text-editor"> 1383 <provider selected="true" editor-type-id="text-editor">
1047 - <state vertical-scroll-proportion="0.0"> 1384 + <state relative-caret-position="0">
1048 <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> 1385 <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
1049 </state> 1386 </state>
1050 </provider> 1387 </provider>
1051 </entry> 1388 </entry>
1052 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java"> 1389 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java">
1053 <provider selected="true" editor-type-id="text-editor"> 1390 <provider selected="true" editor-type-id="text-editor">
1054 - <state vertical-scroll-proportion="0.0"> 1391 + <state relative-caret-position="0">
1055 <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" /> 1392 <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" />
1056 </state> 1393 </state>
1057 </provider> 1394 </provider>
1058 </entry> 1395 </entry>
1059 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java"> 1396 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
1060 <provider selected="true" editor-type-id="text-editor"> 1397 <provider selected="true" editor-type-id="text-editor">
1061 - <state vertical-scroll-proportion="0.0"> 1398 + <state relative-caret-position="0">
1062 <caret line="80" column="58" selection-start-line="80" selection-start-column="58" selection-end-line="80" selection-end-column="58" /> 1399 <caret line="80" column="58" selection-start-line="80" selection-start-column="58" selection-end-line="80" selection-end-column="58" />
1063 </state> 1400 </state>
1064 </provider> 1401 </provider>
1065 </entry> 1402 </entry>
1066 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/user_side_bar.css"> 1403 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/user_side_bar.css">
1067 <provider selected="true" editor-type-id="text-editor"> 1404 <provider selected="true" editor-type-id="text-editor">
1068 - <state vertical-scroll-proportion="0.0"> 1405 + <state relative-caret-position="0">
1069 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1406 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1070 </state> 1407 </state>
1071 </provider> 1408 </provider>
1072 </entry> 1409 </entry>
1073 <entry file="file://$PROJECT_DIR$/src/main/webapp/include/user_side.jsp"> 1410 <entry file="file://$PROJECT_DIR$/src/main/webapp/include/user_side.jsp">
1074 <provider selected="true" editor-type-id="text-editor"> 1411 <provider selected="true" editor-type-id="text-editor">
1075 - <state vertical-scroll-proportion="-5.0"> 1412 + <state relative-caret-position="0">
1076 <caret line="8" column="67" selection-start-line="8" selection-start-column="67" selection-end-line="8" selection-end-column="67" /> 1413 <caret line="8" column="67" selection-start-line="8" selection-start-column="67" selection-end-line="8" selection-end-column="67" />
1077 </state> 1414 </state>
1078 </provider> 1415 </provider>
1079 </entry> 1416 </entry>
1080 - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-detail.css">  
1081 - <provider selected="true" editor-type-id="text-editor">  
1082 - <state vertical-scroll-proportion="0.0">  
1083 - <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />  
1084 - </state>  
1085 - </provider>  
1086 - </entry>  
1087 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/order_detail.css"> 1417 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/order_detail.css">
1088 <provider selected="true" editor-type-id="text-editor"> 1418 <provider selected="true" editor-type-id="text-editor">
1089 - <state vertical-scroll-proportion="0.0"> 1419 + <state relative-caret-position="0">
1090 <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" /> 1420 <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
1091 </state> 1421 </state>
1092 </provider> 1422 </provider>
1093 </entry> 1423 </entry>
1094 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css"> 1424 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css">
1095 <provider selected="true" editor-type-id="text-editor"> 1425 <provider selected="true" editor-type-id="text-editor">
1096 - <state vertical-scroll-proportion="0.0"> 1426 + <state relative-caret-position="0">
1097 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="32" selection-end-column="1" /> 1427 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="32" selection-end-column="1" />
1098 </state> 1428 </state>
1099 </provider> 1429 </provider>
1100 </entry> 1430 </entry>
1101 <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp"> 1431 <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
1102 <provider selected="true" editor-type-id="text-editor"> 1432 <provider selected="true" editor-type-id="text-editor">
1103 - <state vertical-scroll-proportion="58.75"> 1433 + <state relative-caret-position="0">
1104 <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" /> 1434 <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
1105 </state> 1435 </state>
1106 </provider> 1436 </provider>
1107 </entry> 1437 </entry>
1108 <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp"> 1438 <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
1109 <provider selected="true" editor-type-id="text-editor"> 1439 <provider selected="true" editor-type-id="text-editor">
1110 - <state vertical-scroll-proportion="-12.5"> 1440 + <state relative-caret-position="0">
1111 <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="69" /> 1441 <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="69" />
1112 </state> 1442 </state>
1113 </provider> 1443 </provider>
1114 </entry> 1444 </entry>
1115 <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp"> 1445 <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
1116 <provider selected="true" editor-type-id="text-editor"> 1446 <provider selected="true" editor-type-id="text-editor">
1117 - <state vertical-scroll-proportion="-3.75"> 1447 + <state relative-caret-position="0">
1118 <caret line="6" column="61" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" /> 1448 <caret line="6" column="61" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" />
1119 </state> 1449 </state>
1120 </provider> 1450 </provider>
1121 </entry> 1451 </entry>
1122 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-manage.css"> 1452 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-manage.css">
1123 <provider selected="true" editor-type-id="text-editor"> 1453 <provider selected="true" editor-type-id="text-editor">
1124 - <state vertical-scroll-proportion="0.0"> 1454 + <state relative-caret-position="0">
1125 <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" /> 1455 <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
1126 </state> 1456 </state>
1127 </provider> 1457 </provider>
1128 </entry> 1458 </entry>
1129 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp"> 1459 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1130 <provider selected="true" editor-type-id="text-editor"> 1460 <provider selected="true" editor-type-id="text-editor">
1131 - <state vertical-scroll-proportion="0.9375"> 1461 + <state relative-caret-position="0">
1132 <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" /> 1462 <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />
1133 </state> 1463 </state>
1134 </provider> 1464 </provider>
1135 </entry> 1465 </entry>
1136 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp"> 1466 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
1137 <provider selected="true" editor-type-id="text-editor"> 1467 <provider selected="true" editor-type-id="text-editor">
1138 - <state vertical-scroll-proportion="0.8238636"> 1468 + <state relative-caret-position="0">
1139 <caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="64" /> 1469 <caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="64" />
1140 </state> 1470 </state>
1141 </provider> 1471 </provider>
1142 </entry> 1472 </entry>
1143 <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp"> 1473 <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp">
1144 <provider selected="true" editor-type-id="text-editor"> 1474 <provider selected="true" editor-type-id="text-editor">
1145 - <state vertical-scroll-proportion="-1.1931819"> 1475 + <state relative-caret-position="0">
1146 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1476 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1147 </state> 1477 </state>
1148 </provider> 1478 </provider>
1149 </entry> 1479 </entry>
1150 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/patent-index.css"> 1480 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/patent-index.css">
1151 <provider selected="true" editor-type-id="text-editor"> 1481 <provider selected="true" editor-type-id="text-editor">
1152 - <state vertical-scroll-proportion="-7.703704"> 1482 + <state relative-caret-position="0">
1153 <caret line="116" column="2" selection-start-line="116" selection-start-column="1" selection-end-line="116" selection-end-column="2" /> 1483 <caret line="116" column="2" selection-start-line="116" selection-start-column="1" selection-end-line="116" selection-end-column="2" />
1154 </state> 1484 </state>
1155 </provider> 1485 </provider>
@@ -1181,67 +1511,251 @@ @@ -1181,67 +1511,251 @@
1181 </entry> 1511 </entry>
1182 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> 1512 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
1183 <provider selected="true" editor-type-id="text-editor"> 1513 <provider selected="true" editor-type-id="text-editor">
1184 - <state vertical-scroll-proportion="0.0"> 1514 + <state relative-caret-position="0">
1185 <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> 1515 <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
1186 - <folding />  
1187 </state> 1516 </state>
1188 </provider> 1517 </provider>
1189 </entry> 1518 </entry>
1190 <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql"> 1519 <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
1191 <provider selected="true" editor-type-id="text-editor"> 1520 <provider selected="true" editor-type-id="text-editor">
1192 - <state vertical-scroll-proportion="0.0"> 1521 + <state relative-caret-position="0">
1193 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> 1522 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
1194 - <folding />  
1195 </state> 1523 </state>
1196 </provider> 1524 </provider>
1197 </entry> 1525 </entry>
1198 <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql"> 1526 <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql">
1199 <provider selected="true" editor-type-id="text-editor"> 1527 <provider selected="true" editor-type-id="text-editor">
1200 - <state vertical-scroll-proportion="0.0"> 1528 + <state relative-caret-position="0">
1201 <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" /> 1529 <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
1202 - <folding />  
1203 </state> 1530 </state>
1204 </provider> 1531 </provider>
1205 </entry> 1532 </entry>
1206 <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/fdfs.properties"> 1533 <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/fdfs.properties">
1207 <provider selected="true" editor-type-id="text-editor"> 1534 <provider selected="true" editor-type-id="text-editor">
1208 - <state vertical-scroll-proportion="0.0"> 1535 + <state relative-caret-position="0">
1209 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1536 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1210 - <folding />  
1211 </state> 1537 </state>
1212 </provider> 1538 </provider>
1213 </entry> 1539 </entry>
1214 <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> 1540 <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties">
1215 <provider selected="true" editor-type-id="text-editor"> 1541 <provider selected="true" editor-type-id="text-editor">
1216 - <state vertical-scroll-proportion="0.0"> 1542 + <state relative-caret-position="0">
1217 <caret line="1" column="51" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" /> 1543 <caret line="1" column="51" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" />
1218 - <folding />  
1219 </state> 1544 </state>
1220 </provider> 1545 </provider>
1221 </entry> 1546 </entry>
1222 <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> 1547 <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
1223 <provider selected="true" editor-type-id="text-editor"> 1548 <provider selected="true" editor-type-id="text-editor">
1224 - <state vertical-scroll-proportion="0.0"> 1549 + <state relative-caret-position="0">
1225 <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" /> 1550 <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
1226 <folding /> 1551 <folding />
1227 </state> 1552 </state>
1228 </provider> 1553 </provider>
1229 </entry> 1554 </entry>
1230 - <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> 1555 + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/tool.xml">
  1556 + <provider selected="true" editor-type-id="text-editor">
  1557 + <state relative-caret-position="0">
  1558 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1559 + </state>
  1560 + </provider>
  1561 + </entry>
  1562 + <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml">
  1563 + <provider selected="true" editor-type-id="text-editor">
  1564 + <state relative-caret-position="0">
  1565 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1566 + <folding />
  1567 + </state>
  1568 + </provider>
  1569 + </entry>
  1570 + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/task.xml">
  1571 + <provider selected="true" editor-type-id="text-editor">
  1572 + <state relative-caret-position="300">
  1573 + <caret line="20" column="34" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
  1574 + </state>
  1575 + </provider>
  1576 + </entry>
  1577 + <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
1231 <provider selected="true" editor-type-id="text-editor"> 1578 <provider selected="true" editor-type-id="text-editor">
1232 - <state vertical-scroll-proportion="-5.8039217">  
1233 - <caret line="43" column="28" selection-start-line="43" selection-start-column="28" selection-end-line="43" selection-end-column="28" /> 1579 + <state relative-caret-position="0">
  1580 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1234 <folding /> 1581 <folding />
1235 </state> 1582 </state>
1236 </provider> 1583 </provider>
1237 </entry> 1584 </entry>
  1585 + <entry file="file://$PROJECT_DIR$/src/main/webapp/example.html" />
  1586 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
  1587 + <provider selected="true" editor-type-id="text-editor">
  1588 + <state relative-caret-position="120">
  1589 + <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
  1590 + </state>
  1591 + </provider>
  1592 + </entry>
  1593 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-detail.css">
  1594 + <provider selected="true" editor-type-id="text-editor">
  1595 + <state relative-caret-position="-3855">
  1596 + <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
  1597 + </state>
  1598 + </provider>
  1599 + </entry>
1238 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css"> 1600 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
1239 <provider selected="true" editor-type-id="text-editor"> 1601 <provider selected="true" editor-type-id="text-editor">
1240 - <state vertical-scroll-proportion="0.97727275">  
1241 - <caret line="103" column="1" selection-start-line="103" selection-start-column="1" selection-end-line="103" selection-end-column="1" /> 1602 + <state relative-caret-position="270">
  1603 + <caret line="18" column="18" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
  1604 + <folding />
  1605 + </state>
  1606 + </provider>
  1607 + </entry>
  1608 + <entry file="file://$PROJECT_DIR$/src/main/webapp/example.jsp">
  1609 + <provider selected="true" editor-type-id="text-editor">
  1610 + <state relative-caret-position="7935">
  1611 + <caret line="529" column="23" selection-start-line="529" selection-start-column="23" selection-end-line="529" selection-end-column="23" />
  1612 + <folding>
  1613 + <marker date="1470117932544" expanded="true" signature="1866:1912" ph="..." />
  1614 + <marker date="1470117932544" expanded="true" signature="1976:2044" ph="..." />
  1615 + <marker date="1470117932544" expanded="true" signature="56669:57235" ph="..." />
  1616 + <marker date="1470117932544" expanded="true" signature="56783:56962" ph="..." />
  1617 + <marker date="1470117932544" expanded="true" signature="56992:57194" ph="..." />
  1618 + <marker date="1470117932544" expanded="true" signature="57220:57235" ph="..." />
  1619 + <marker date="1470117932544" expanded="true" signature="60749:60937" ph="..." />
  1620 + <marker date="1470117932544" expanded="true" signature="60866:60937" ph="..." />
  1621 + <marker date="1470117932544" expanded="true" signature="61062:61292" ph="..." />
  1622 + <marker date="1470117932544" expanded="true" signature="61318:61333" ph="..." />
  1623 + </folding>
  1624 + </state>
  1625 + </provider>
  1626 + </entry>
  1627 + <entry file="file://$PROJECT_DIR$/pom.xml">
  1628 + <provider selected="true" editor-type-id="text-editor">
  1629 + <state relative-caret-position="-2753">
  1630 + <caret line="37" column="18" selection-start-line="37" selection-start-column="18" selection-end-line="37" selection-end-column="18" />
  1631 + <folding />
  1632 + </state>
  1633 + </provider>
  1634 + </entry>
  1635 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/example_home_patent.css">
  1636 + <provider selected="true" editor-type-id="text-editor">
  1637 + <state relative-caret-position="255">
  1638 + <caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
  1639 + <folding />
  1640 + </state>
  1641 + </provider>
  1642 + </entry>
  1643 + <entry file="file://$PROJECT_DIR$/src/main/webapp/example_home_patent.jsp">
  1644 + <provider selected="true" editor-type-id="text-editor">
  1645 + <state relative-caret-position="225">
  1646 + <caret line="15" column="40" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="40" />
  1647 + <folding />
  1648 + </state>
  1649 + </provider>
  1650 + </entry>
  1651 + <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
  1652 + <provider selected="true" editor-type-id="text-editor">
  1653 + <state relative-caret-position="157">
  1654 + <caret line="58" column="7" selection-start-line="58" selection-start-column="7" selection-end-line="58" selection-end-column="7" />
1242 <folding /> 1655 <folding />
1243 </state> 1656 </state>
1244 </provider> 1657 </provider>
1245 </entry> 1658 </entry>
1246 </component> 1659 </component>
  1660 + <component name="masterDetails">
  1661 + <states>
  1662 + <state key="ArtifactsStructureConfigurable.UI">
  1663 + <settings>
  1664 + <artifact-editor />
  1665 + <last-edited>patent:war</last-edited>
  1666 + <splitter-proportions>
  1667 + <option name="proportions">
  1668 + <list>
  1669 + <option value="0.2" />
  1670 + <option value="0.5" />
  1671 + </list>
  1672 + </option>
  1673 + </splitter-proportions>
  1674 + </settings>
  1675 + </state>
  1676 + <state key="FacetStructureConfigurable.UI">
  1677 + <settings>
  1678 + <last-edited>Web (patent)|Web</last-edited>
  1679 + <splitter-proportions>
  1680 + <option name="proportions">
  1681 + <list>
  1682 + <option value="0.2" />
  1683 + </list>
  1684 + </option>
  1685 + </splitter-proportions>
  1686 + </settings>
  1687 + </state>
  1688 + <state key="GlobalLibrariesConfigurable.UI">
  1689 + <settings>
  1690 + <splitter-proportions>
  1691 + <option name="proportions">
  1692 + <list>
  1693 + <option value="0.2" />
  1694 + </list>
  1695 + </option>
  1696 + </splitter-proportions>
  1697 + </settings>
  1698 + </state>
  1699 + <state key="JdkListConfigurable.UI">
  1700 + <settings>
  1701 + <last-edited>1.8</last-edited>
  1702 + <splitter-proportions>
  1703 + <option name="proportions">
  1704 + <list>
  1705 + <option value="0.2" />
  1706 + </list>
  1707 + </option>
  1708 + </splitter-proportions>
  1709 + </settings>
  1710 + </state>
  1711 + <state key="ModuleStructureConfigurable.UI">
  1712 + <settings>
  1713 + <last-edited>patent</last-edited>
  1714 + <splitter-proportions>
  1715 + <option name="proportions">
  1716 + <list>
  1717 + <option value="0.2" />
  1718 + <option value="0.6" />
  1719 + </list>
  1720 + </option>
  1721 + </splitter-proportions>
  1722 + </settings>
  1723 + </state>
  1724 + <state key="ProjectJDKs.UI">
  1725 + <settings>
  1726 + <last-edited>1.8</last-edited>
  1727 + <splitter-proportions>
  1728 + <option name="proportions">
  1729 + <list>
  1730 + <option value="0.2" />
  1731 + </list>
  1732 + </option>
  1733 + </splitter-proportions>
  1734 + </settings>
  1735 + </state>
  1736 + <state key="ProjectLibrariesConfigurable.UI">
  1737 + <settings>
  1738 + <last-edited>Maven: aopalliance:aopalliance:1.0</last-edited>
  1739 + <splitter-proportions>
  1740 + <option name="proportions">
  1741 + <list>
  1742 + <option value="0.2" />
  1743 + </list>
  1744 + </option>
  1745 + </splitter-proportions>
  1746 + </settings>
  1747 + </state>
  1748 + <state key="ScopeChooserConfigurable.UI">
  1749 + <settings>
  1750 + <splitter-proportions>
  1751 + <option name="proportions">
  1752 + <list>
  1753 + <option value="0.2" />
  1754 + </list>
  1755 + </option>
  1756 + </splitter-proportions>
  1757 + </settings>
  1758 + </state>
  1759 + </states>
  1760 + </component>
1247 </project> 1761 </project>
1248 \ No newline at end of file 1762 \ No newline at end of file
patent.iml
@@ -16,6 +16,17 @@ @@ -16,6 +16,17 @@
16 </sourceRoots> 16 </sourceRoots>
17 </configuration> 17 </configuration>
18 </facet> 18 </facet>
  19 + <facet type="Spring" name="Spring">
  20 + <configuration>
  21 + <fileset id="fileset" name="Spring Application Context" removed="false">
  22 + <file>file://$MODULE_DIR$/src/main/resources/spring/task.xml</file>
  23 + <file>file://$MODULE_DIR$/src/main/resources/spring/dao.xml</file>
  24 + <file>file://$MODULE_DIR$/src/main/resources/spring/tool.xml</file>
  25 + <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml</file>
  26 + <file>file://$MODULE_DIR$/src/main/resources/applicationContext.xml</file>
  27 + </fileset>
  28 + </configuration>
  29 + </facet>
19 </component> 30 </component>
20 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> 31 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
21 <output url="file://$MODULE_DIR$/target/classes" /> 32 <output url="file://$MODULE_DIR$/target/classes" />
@@ -32,11 +43,12 @@ @@ -32,11 +43,12 @@
32 <orderEntry type="sourceFolder" forTests="false" /> 43 <orderEntry type="sourceFolder" forTests="false" />
33 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" level="project" /> 44 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" level="project" />
34 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" level="project" /> 45 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" level="project" />
  46 + <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.3.RELEASE" level="project" />
35 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" level="project" /> 47 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" level="project" />
36 <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" level="project" /> 48 <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" level="project" />
37 <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" /> 49 <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
38 - <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.3.RELEASE" level="project" />  
39 <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" level="project" /> 50 <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" level="project" />
  51 + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
40 <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" level="project" /> 52 <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" level="project" />
41 <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" level="project" /> 53 <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" level="project" />
42 <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" level="project" /> 54 <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" level="project" />
@@ -47,12 +59,18 @@ @@ -47,12 +59,18 @@
47 <orderEntry type="library" name="Maven: us.codecraft:webmagic-core:0.5.2" level="project" /> 59 <orderEntry type="library" name="Maven: us.codecraft:webmagic-core:0.5.2" level="project" />
48 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" /> 60 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" />
49 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" /> 61 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
  62 + <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
  63 + <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
  64 + <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
50 <orderEntry type="library" name="Maven: us.codecraft:xsoup:0.2.4" level="project" /> 65 <orderEntry type="library" name="Maven: us.codecraft:xsoup:0.2.4" level="project" />
51 - <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> 66 + <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.3" level="project" />
52 <orderEntry type="library" name="Maven: org.assertj:assertj-core:1.5.0" level="project" /> 67 <orderEntry type="library" name="Maven: org.assertj:assertj-core:1.5.0" level="project" />
  68 + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
  69 + <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
53 <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" /> 70 <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
54 <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:0.8.1" level="project" /> 71 <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:0.8.1" level="project" />
55 <orderEntry type="library" name="Maven: net.minidev:json-smart:1.1.1" level="project" /> 72 <orderEntry type="library" name="Maven: net.minidev:json-smart:1.1.1" level="project" />
  73 + <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
56 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.7" level="project" /> 74 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.7" level="project" />
57 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" level="project" /> 75 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" level="project" />
58 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" level="project" /> 76 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" level="project" />
@@ -61,23 +79,20 @@ @@ -61,23 +79,20 @@
61 <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" /> 79 <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
62 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" level="project" /> 80 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" level="project" />
63 <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" /> 81 <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" />
  82 + <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
64 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" level="project" /> 83 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" level="project" />
65 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" level="project" /> 84 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" level="project" />
66 <orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" /> 85 <orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" />
67 <orderEntry type="library" name="Maven: io.netty:netty:3.9.8.Final" level="project" /> 86 <orderEntry type="library" name="Maven: io.netty:netty:3.9.8.Final" level="project" />
68 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" level="project" /> 87 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" level="project" />
69 <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" /> 88 <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
70 - <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />  
71 <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" /> 89 <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
72 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> 90 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
73 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" /> 91 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" />
74 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> 92 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" />
75 <orderEntry type="library" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" level="project" /> 93 <orderEntry type="library" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" level="project" />
76 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" /> 94 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
77 - <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.3" level="project" />  
78 - <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />  
79 <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.1" level="project" /> 95 <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.1" level="project" />
80 - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />  
81 <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.3" level="project" /> 96 <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.3" level="project" />
82 <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.3" level="project" /> 97 <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.3" level="project" />
83 <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" level="project" /> 98 <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" level="project" />
@@ -88,7 +103,6 @@ @@ -88,7 +103,6 @@
88 <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" /> 103 <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
89 <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> 104 <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
90 <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> 105 <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
91 - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />  
92 <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" level="project" /> 106 <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" level="project" />
93 <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" level="project" /> 107 <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" level="project" />
94 <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" /> 108 <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
@@ -103,16 +117,13 @@ @@ -103,16 +117,13 @@
103 <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" level="project" /> 117 <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" level="project" />
104 <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.34" level="project" /> 118 <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.34" level="project" />
105 <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" /> 119 <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
106 - <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />  
107 - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />  
108 <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0.1" level="project" /> 120 <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0.1" level="project" />
109 - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> 121 + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
110 <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> 122 <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
111 <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> 123 <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
112 <orderEntry type="library" name="Maven: jaxen:jaxen:1.1-beta" level="project" /> 124 <orderEntry type="library" name="Maven: jaxen:jaxen:1.1-beta" level="project" />
113 <orderEntry type="library" name="Maven: sshxcute:sshxcute:1.0" level="project" /> 125 <orderEntry type="library" name="Maven: sshxcute:sshxcute:1.0" level="project" />
114 <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.2.3.RELEASE" level="project" /> 126 <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.2.3.RELEASE" level="project" />
115 - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />  
116 <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> 127 <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
117 </component> 128 </component>
118 </module> 129 </module>
119 \ No newline at end of file 130 \ No newline at end of file
src/main/webapp/css/example_home_patent.css 0 → 100644
  1 +/*example_home_patent.css*/
  2 +@charset "utf-8";
  3 +
  4 +body {
  5 + width:100%;
  6 + height:auto;
  7 + margin:0;
  8 + padding:0;
  9 + font:16px 'Hiragino Sans GB', 'Microsoft YaHei', 微软雅黑, arial, Tahoma, SimSun, sans-serif;
  10 +}
  11 +
  12 +table, tbody,th, td {
  13 + border: 1px solid black;
  14 +}
  15 +
  16 +.tcontent {
  17 + width:120px;
  18 +}
0 \ No newline at end of file 19 \ No newline at end of file
src/main/webapp/example.jsp 0 → 100644
  1 +<%--
  2 + Created by IntelliJ IDEA.
  3 + User: litao
  4 + Date: 16-8-2
  5 + Time: 下午2:02
  6 + To change this template use File | Settings | File Templates.
  7 +--%>
  8 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  9 +
  10 +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
  11 +<html xmlns="http://www.w3.org/1999/xhtml" lang="zh">
  12 +
  13 +<head>
  14 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  15 + <meta http-equiv="Pragma" content="no-cache" />
  16 + <meta http-equiv="Cache-Control" content="no-cache" />
  17 + <meta http-equiv="Expires" content="0" />
  18 + <meta name="sogou_site_verification" content="Sc7p270i8P"/>
  19 + <meta content="知呱呱、专利申请、发明专利、实用新型专利、外观专利申请、专利申请代理、专利申请多少钱" name="Keywords"/>
  20 + <meta name="description" content="知呱呱是最值得信赖的专利申请服务平台,费用低、授权率高、时间短.公司业务有发明专利申请、实用新型专利申请、外观专利申请、专利申请代理."/>
  21 + <meta http-equiv="Cache-Control" content="no-transform " />
  22 + <title>专利申请-知呱呱</title>
  23 + <link rel="stylesheet" href="/static/com/css/reset.css?v=448f32ca18807174cd1411b2ef6a906b" />
  24 + <link rel="stylesheet" href="/static/com/css/base.css?v=954d7acc3609af94b6e7bbae99ed4784" />
  25 +
  26 + <script type="text/javascript" src="/static/js/jQuery1.9.1.js?v=775107b983ea67b4be72a50891d3974e"></script>
  27 + <script type="text/javascript" src="/static/com/js/base.js?v=dde50026719cb36bf72b999c40507968"></script>
  28 + <script type="text/javascript" src="/static/com/js/zggnav.js?v=fc979f01761c146f2807906e4ccefb4a" ></script>
  29 + <script type="text/javascript" src="/static/com/js/cnzz.js?v=82a6d312e80b5d72894d0fa6e32c8d4f" ></script>
  30 + <!--[if lt IE 10]>
  31 + <script type="text/javascript" src="/static/com/js/PIE.js?v=c15da940666362b333924a4cda28596a"></script>
  32 + <![endif]-->
  33 + <!--[if IE 6]>
  34 + <script src="/static/com/js/DD_belatedPNG_0.0.8a-min.js?v=849d70044bc54678f4835308534513bd"></script>
  35 + <script>
  36 + DD_belatedPNG.fix('*');
  37 + </script>
  38 + <![endif]-->
  39 + <!--[if IE 8]>
  40 + <style type="text/css">
  41 + .zggNaSubSub .iNav li.iNavFirst{height:128px;}
  42 + </style>
  43 + <![endif]-->
  44 + <script src="/static/js/cookie.js?v=81bee4be23f237a6aa8c30e991f11adf"></script>
  45 + <script>
  46 + var uid='';
  47 + $(function(){
  48 + try{
  49 + uid = $.cookie('userID');
  50 + var url = encodeURIComponent(document.location.href);
  51 + var obj = $('#lnkLogin');
  52 + obj.attr('href', obj.attr('href') + '?gourl=' + url);
  53 + obj = $('#lnkLogout');
  54 + obj.attr('href', obj.attr('href') + '?gourl=' + url);
  55 + if(uid!=null){
  56 + $('#divLoginBtn').hide();
  57 + $('#divUserInfo').show();
  58 + $('#spUserName').html($.cookie('userName'));
  59 + $('#lnkUser').attr('href', 'https://user.zhiguagua.com/user/info.html');
  60 + $('#mesUser').attr('href', 'https://user.zhiguagua.com/user');
  61 + }
  62 + }catch(e){}
  63 + });
  64 + var DataDeal = {
  65 +//将从form中通过$('#form').serialize()获取的值转成json
  66 + formToJson: function (data) {
  67 + data=data.replace(/&/g,"\",\"");
  68 + data=data.replace(/=/g,"\":\"");
  69 + data="{\""+data+"\"}";
  70 + return data;
  71 + },
  72 + };
  73 + function suggest(){
  74 + var $sugform = $("#suggestForm")
  75 + url = $sugform.attr('action');
  76 + var datasug = $sugform.serialize();
  77 + datasug = decodeURIComponent(datasug, true);
  78 + var json = DataDeal.formToJson(datasug);
  79 + var datajson = eval("("+json+")");
  80 + if(datajson.content.length >=200 ){alert('反馈内容超过200字,请调整字数,谢谢!');return false;}
  81 + $.post(url, $sugform.serialize(), function(data){
  82 + alert(data.desc);
  83 + window.location.reload()
  84 + })
  85 + };
  86 + </script>
  87 +
  88 +
  89 + <link rel="stylesheet" href="/static/com/css/product.css?v=2be1b063c18e7c392db310eee37fcb1c" />
  90 + <script type="text/javascript" src="/static/com/js/base.js?v=dde50026719cb36bf72b999c40507968" ></script>
  91 + <script type="text/javascript" src="/static/com/js/radio.js?v=2ef2ce47a7025f5531e148a025203649" ></script>
  92 + <script type="text/javascript" src="/static/com/js/area.js?v=0814fdb1451103aea3b964bf49b8abc1"></script>
  93 + <script type="text/javascript" src="/static/com/js/location.js?v=b1ae8577787689f7ab5c3f7eafe93d2e"></script>
  94 + <script type="text/javascript" src="/static/com/js/myform.js?v=9c621a542d93d11eebfcfd208a3c5832"></script>
  95 + <script type="text/javascript" src="/static/com/js/cart.js?v=347a43edc161d6780ea077b8d6ab796b"></script>
  96 + <script>
  97 + $.get('?view=json&reset=1&t=' + Math.random(), function(data){
  98 + if(data.code == 1){
  99 + document.location.reload();
  100 + }
  101 + }, 'json')
  102 + </script>
  103 +
  104 + <script>
  105 + $(function(){
  106 + var cls = "";
  107 + var url = document.location.href;
  108 + if(url == 'http://' + document.location.host + '/'){
  109 + cls = 'nav_index';
  110 + $('.zggNaSub .zggNaSubSub').addClass('zggNaSubSubIsHome');
  111 + $('.zggNaSub a .classification').addClass('hideh');
  112 + }else if(url.indexOf('/zixun')>0){
  113 + cls = 'nav_zixun';
  114 + }
  115 + else if(url.indexOf('/domore')>0){
  116 + cls = 'nav_domore';
  117 + $('.' + cls).addClass('selected');return;
  118 + }
  119 + else if(url.indexOf('/liucheng')>0){
  120 + cls = 'nav_liucheng';
  121 + $('.' + cls).addClass('selected');return;
  122 + }
  123 + else if(url.indexOf('/zhuanjia')>0){
  124 + cls = 'nav_zhuanjia';
  125 + }
  126 +//else if(url.indexOf('http://www.zhiguagua.com/shenqing')>0 || url.indexOf('/sq_')>0){
  127 +// cls = 'nav_shenqing';
  128 +//}
  129 + else if(url.indexOf('/youhui')>0){
  130 + cls = 'nav_youhui';
  131 + }else if(url.indexOf('/guojizhuanli.html')>0){
  132 + cls = 'nav_guojizhuanli';
  133 + }else if(url.indexOf('/shangbiaozhuce.html')>0){
  134 + cls = 'nav_zizhirenzheng';
  135 + }else if(url.indexOf('/invention.html')>0){
  136 + cls = 'nav_shenqing';
  137 + }
  138 + else if(url.indexOf('/research')>0){
  139 + cls = 'nav_liudaxitong';
  140 + }else if(url.indexOf('/qitazhuanli.html')>0){
  141 + cls = 'nav_zenzhifuwu';
  142 + }else if(url.indexOf('/banquandengji.html')>0){
  143 + cls = 'nav_banquan';
  144 + }
  145 +//if(cls != 'nav_index'){
  146 +// $('.nav_index').removeClass('active');
  147 + if(cls != ''){
  148 + $('.' + cls).addClass('active');
  149 + }
  150 +//}
  151 + });
  152 + $(function(){
  153 + $('.eventTopClick').click(function(){
  154 + $(".eventTop").hide('fast');
  155 + $(".topBar1").removeClass("evenTopBar");
  156 + $(".focusBar_index").removeClass("evenFocusBar")
  157 + return false;
  158 + });
  159 + $('.eventAdClose').click(function(){
  160 + $(".eventAd").removeClass('eventAd2');
  161 +//$('.gdt').css('overflow','auto');
  162 + $(window).unbind( "scroll" );
  163 + });
  164 + })
  165 + </script>
  166 +</head>
  167 +<body class="gdt">
  168 +
  169 +
  170 +<div class="topBar1">
  171 + <div class="top commWith">
  172 + <div class="top_left fl">
  173 + <a href="http://www.zhiguagua.com/help/guanyuguagua.html" target="_blank">呱呱简介</a><span class="sg">|</span>
  174 +
  175 + <a href="http://www.zhiguagua.com/help/moban.html" target="_blank">常用模板</a><span class="sg">|</span>
  176 + <a class="gzgg-icon">关注呱呱<i></i></a>
  177 +
  178 + </div>
  179 + <div class="top_right fr">
  180 + <div class="top_right_span fr">
  181 + <span class="help"><a href="http://www.zhiguagua.com/help/dayi.html" target="_blank">帮助中心</a></span>
  182 +
  183 + <span>客服热线:</span>
  184 + <span class="span_400">400-650-1606</span>
  185 + </div>
  186 +
  187 + <div class="top_message fr">
  188 + <a id="lnkMsg" style="display:none"><span>消息</span></a>
  189 + <a class="mes_sl" style="display:none" href="https://user.zhiguagua.com/user/xiaoxi.html"><span class="count_sz"></span></a>
  190 + </div>
  191 + <div id="divUserInfo" class="top_right_login fr" style="display: none;">
  192 + <span>欢迎您</span><span class="pa5p">|</span><a id="lnkUser" href="#" class="userA"><span id="spUserName" class="userA"></span></a>
  193 + <span><a href="https://user.zhiguagua.com/reg/logout.aspx" id="lnkLogout" class="quite">退出</a></span>
  194 + <a id="mesUser" href="#" class="userA" style="margin-left:20px;"><span class="userA">案件管理</span></a>
  195 + </div>
  196 + <div id="divLoginBtn" class="top_right_btn fr">
  197 + <a href="https://user.zhiguagua.com/reg/login.aspx" id="lnkLogin" class="login_btn">立即登录</a>
  198 + <a href="https://user.zhiguagua.com/reg/register.aspx" class="zhuce_btn" id="zhuce_btn">免费注册</a>
  199 + </div>
  200 + <div class="clearfix"></div>
  201 + </div>
  202 + </div>
  203 +</div>
  204 +
  205 +<!--
  206 +topBar结束
  207 +-->
  208 +
  209 +<div class="focusBar_index commWith">
  210 + <div class="logo fl">
  211 + <a href="http://www.zhiguagua.com" style="display: inline-block;"><img src="/static/com/img/logo.png?v=13d78a7888f06364cbd8d1cc58eb2afe" alt="专利申请首选平台,费用低,授权率高" /></a>
  212 + <a href="http://www.zhiguagua.com" style="display: inline-block; padding-left: 24px;"><img src="/static/com/img/logo1.png?v=52c9b174d70a96059cb4d240b23f5f08" alt="专利申请首选平台,费用低,授权率高" /></a>
  213 + </div>
  214 + <div class="logoGwc fr">
  215 + <a href="https://user.zhiguagua.com/user/gouwuche.html">
  216 + <b></b>
  217 + <span>购物车<i>|</i></span>
  218 + <span class="count_gwc red">0</span>
  219 + </a>
  220 + </div>
  221 +</div><!--focusBar结束-->
  222 +<div class="focusNavBar">
  223 + <div class="commWith zggNav headerOverflowInherit">
  224 + <div class="fl zggNaSub headerOverflowInherit">
  225 + <a href="javascript:">知识产权服务<i class="classification"></i></a>
  226 + <div class="zggNaSubSub zggSubS">
  227 + <div class="fl headerOverflowInherit zggISubNav">
  228 + <ul class="iNav overflowhidden headerOverflowInherit">
  229 + <li class="iNavFirst">
  230 + <a href="http://www.zhiguagua.com/shenqing/invention.html" target="_blank">
  231 + <div class="isnav-first">
  232 + <div class="fl isnaleft isnaleft1">
  233 + </div>
  234 + <div class="fl isnaMar">
  235 + <h2>专利服务</h2>
  236 + <p>担保授权&gt;&gt;</p>
  237 + </div>
  238 + </div>
  239 + </a>
  240 + </li>
  241 + <li>
  242 + <a href="http://www.zhiguagua.com/shenqing/shangbiaozhuce.html?type=1" target="_blank">
  243 + <div class="isnav-first">
  244 + <div class="fl isnaleft isnaleft2">
  245 + </div>
  246 + <div class="fl isnaMar">
  247 + <h2>商标服务</h2>
  248 + <p>担保注册&gt;&gt;</p>
  249 + </div>
  250 + </div>
  251 + </a>
  252 + </li>
  253 + <li>
  254 + <a href="http://www.zhiguagua.com/shenqing/banquandengji.html?type=1" target="_blank">
  255 + <div class="isnav-first">
  256 + <div class="fl isnaleft isnaleft3">
  257 + </div>
  258 + <div class="fl isnaMar">
  259 + <h2>版权服务</h2>
  260 + <p>加急服务&gt;&gt;</p>
  261 + </div>
  262 + </div>
  263 + </a>
  264 + </li>
  265 + <li>
  266 + <a href="http://www.zhiguagua.com/topic/gaoxinrendingzhuanti.html" target="_blank">
  267 + <div class="isnav-first">
  268 + <div class="fl isnaleft isnaleft4">
  269 + </div>
  270 + <div class="fl isnaMar">
  271 + <h2>资质认证</h2>
  272 + <p>高新企业担保认定&gt;&gt;</p>
  273 + </div>
  274 + </div>
  275 + </a>
  276 + </li>
  277 + </ul>
  278 + </div>
  279 + <div class="fl iSubNav">
  280 + <div class="zgganimate first">
  281 + <ul class="fl iSubNavLe overflowhidden">
  282 + <li>
  283 + <h3>国内专利</h3>
  284 + <div class="kfwNavOne">
  285 + <a href="http://www.zhiguagua.com/shenqing/invention.html" target="_blank">发明专利</a>
  286 + <a href="http://www.zhiguagua.com/shenqing/shiyongxinxing.html" target="_blank">实用新型</a>
  287 + <a href="http://www.zhiguagua.com/shenqing/waiguansheji.html" target="_blank">外观设计</a>
  288 + <a href="http://www.zhiguagua.com/shenqing/tongrishenqing.html" target="_blank">发明新型同日申请</a>
  289 + </div>
  290 + </li>
  291 + <li>
  292 + <h3>国际专利</h3>
  293 + <div class="kfwNavOne kfNavNO">
  294 + <a href="http://www.zhiguagua.com/shenqing/guojizhuanli.html?type=1" target="_blank">pct申请</a>
  295 + <a href="http://www.zhiguagua.com/shenqing/guojizhuanli.html?type=2" target="_blank">巴黎公约国家申请</a>
  296 + <a href="http://www.zhiguagua.com/shenqing/guojizhuanli.html?type=3" target="_blank">欧盟专利申请</a>
  297 + <a href="http://www.zhiguagua.com/shenqing/guojizhuanli.html?type=4" class="no-mar" target="_blank">美国专利申请</a>
  298 + </div>
  299 + <div class="kfwNavOne">
  300 + <a href="http://www.zhiguagua.com/shenqing/guojizhuanli.html?type=5" target="_blank">韩国专利申请</a>
  301 + <a href="http://www.zhiguagua.com/shenqing/guojizhuanli.html?type=6" target="_blank">日本专利申请</a>
  302 + <a href="http://www.zhiguagua.com/shenqing/guojizhuanli.html?type=7" target="_blank">俄罗斯专利申请</a>
  303 + <a href="http://www.zhiguagua.com/shenqing/guojizhuanli.html?type=8" target="_blank" class="no-mar">澳大利亚专利申请</a>
  304 + </div>
  305 + </li>
  306 + <li>
  307 + <h3>专利疑难服务</h3>
  308 + <div class="kfwNavOne kfNavNO">
  309 + <a href="http://www.zhiguagua.com/shenqing/qitazhuanli.html?type=1" target="_blank">专利申请复审</a>
  310 + <a href="http://www.zhiguagua.com/shenqing/qitazhuanli.html?type=2" target="_blank">专利无效宣告</a>
  311 + <a href="http://www.zhiguagua.com/shenqing/qitazhuanli.html?type=3" target="_blank">专利无效答辩</a>
  312 + <a href="http://www.zhiguagua.com/shenqing/qitazhuanli.html?type=4" target="_blank" class="no-mar">审查意见答复</a>
  313 + </div>
  314 + <div class="kfwNavOne kfNavNO">
  315 + <a href="http://www.zhiguagua.com/shenqing/qitazhuanli.html?type=5" target="_blank">著录项目变更</a>
  316 + <a href="http://www.zhiguagua.com/shenqing/qitazhuanli.html?type=6" target="_blank">专利权恢复</a>
  317 + <a href="http://www.zhiguagua.com/shenqing/qitazhuanli.html?type=7" target="_blank">专利权评价报告</a>
  318 + <a href="http://www.zhiguagua.com/shenqing/qitazhuanli.html?type=8" target="_blank" class="no-mar">专利实施许可备案</a>
  319 + </div>
  320 + </li>
  321 + </ul>
  322 + <ul class="fl iSubNavRi overflowhidden">
  323 + <li class="first">
  324 + <a href="http://www.zhiguagua.com/shenqing/jiansuofenxi.html">
  325 + <h3>免费检索分析</h3>
  326 + <p>检索分析,一键搞定</p>
  327 + </a>
  328 + </li>
  329 + <li class="second">
  330 + <a href="http://www.zhiguagua.com/shenqing/mianfeidaijiaonianfei.html">
  331 + <h3>免费代缴年费</h3>
  332 + <p>免费代缴,省心省力</p>
  333 + </a>
  334 + </li>
  335 + <li class="third no-mar">
  336 + <a href="http://www.zhiguagua.com/shenqing/jishupingjia.html">
  337 + <h3>专利技术评价</h3>
  338 + <p>价值评估,商业化必备</p>
  339 + </a>
  340 + </li>
  341 + </ul>
  342 + </div>
  343 + <div class="zgganimate second">
  344 + <ul class="fl iSubNavLe overflowhidden">
  345 +
  346 + <li>
  347 + <h3>国内商标</h3>
  348 + <div class="kfwNavOne kfNavNO">
  349 + <a href="http://www.zhiguagua.com/shenqing/shangbiaozhuce.html?type=1">商标担保注册</a>
  350 + <a href="http://www.zhiguagua.com/shenqing/shangbiaozhuce.html?type=2">普通商标注册</a>
  351 + <a href="http://www.zhiguagua.com/shenqing/guoneishangbiao.html?type=1">集体商标注册</a>
  352 + <a href="http://www.zhiguagua.com/shenqing/guoneishangbiao.html?type=2" class="no-mar">证明商标注册</a>
  353 + </div>
  354 + <div class="kfwNavOne">
  355 + <a href="http://www.zhiguagua.com/shenqing/guoneishangbiao.html?type=3">申请商标更正</a>
  356 + <a href="http://www.zhiguagua.com/shenqing/guoneishangbiao.html?type=4">补发商标注册证申请</a>
  357 + <a href="http://www.zhiguagua.com/shenqing/guoneishangbiao.html?type=5" class="no-mar">出具商标注册证明申请</a>
  358 + </div>
  359 + </li>
  360 + <li>
  361 + <h3>国际商标</h3>
  362 + <div class="kfwNavOne kfNavNO">
  363 + <a href="http://www.zhiguagua.com/shenqing/guojishangbiao.html?type=1">美国商标注册</a>
  364 + <a href="http://www.zhiguagua.com/shenqing/guojishangbiao.html?type=2">日本商标注册</a>
  365 + <a href="http://www.zhiguagua.com/shenqing/guojishangbiao.html?type=3">韩国商标注册</a>
  366 + <a href="http://www.zhiguagua.com/shenqing/guojishangbiao.html?type=4" class="no-mar">台湾商标注册</a>
  367 + </div>
  368 + <div class="kfwNavOne kfNavNO">
  369 + <a href="http://www.zhiguagua.com/shenqing/guojishangbiao.html?type=5">香港商标注册</a>
  370 + <a href="http://www.zhiguagua.com/shenqing/guojishangbiao.html?type=6">德国商标注册</a>
  371 + <a href="http://www.zhiguagua.com/shenqing/guojishangbiao.html?type=7">欧盟商标注册</a>
  372 + <a href="http://www.zhiguagua.com/shenqing/guojishangbiao.html?type=8" class="no-mar">马德里国际商标</a>
  373 + </div>
  374 + <div class="kfwNavOne">
  375 + <a href="http://www.zhiguagua.com/shenqing/guojishangbiao.html?type=9">非洲知识产权组织</a>
  376 + </div>
  377 + </li>
  378 + <li>
  379 + <h3>商标疑难服务</h3>
  380 + <div class="kfwNavOne kfNavNO">
  381 + <a href="http://www.zhiguagua.com/shenqing/zengzhishangbiao.html?type=1">商标驳回复审</a>
  382 + <a href="http://www.zhiguagua.com/shenqing/zengzhishangbiao.html?type=2">商标异议</a>
  383 + <a href="http://www.zhiguagua.com/shenqing/zengzhishangbiao.html?type=3">商标撤销</a>
  384 + <a href="http://www.zhiguagua.com/shenqing/zengzhishangbiao.html?type=4">商标续展</a>
  385 + <a href="http://www.zhiguagua.com/shenqing/zengzhishangbiao.html?type=5" class="no-mar">商标变更</a>
  386 + </div>
  387 + <div class="kfwNavOne kfNavNO">
  388 + <a href="http://www.zhiguagua.com/shenqing/zengzhishangbiao.html?type=6">商标许可备案</a>
  389 + <a href="http://www.zhiguagua.com/shenqing/zengzhishangbiao.html?type=7">商标注销</a>
  390 + <a href="http://www.zhiguagua.com/shenqing/zengzhishangbiao.html?type=8">商标转让</a>
  391 + <a href="http://www.zhiguagua.com/shenqing/zengzhishangbiao.html?type=9" class="no-mar">商标无效</a>
  392 + </div>
  393 + </li>
  394 + </ul>
  395 + <ul class="fl iSubNavRi overflowhidden">
  396 + <li class="first">
  397 + <a href="http://www.zhiguagua.com/shenqing/jiansuofenxi.html">
  398 + <h3>免费检索分析</h3>
  399 + <p>检索分析,一键搞定</p>
  400 + </a>
  401 + </li>
  402 + <li class="second">
  403 + <a href="http://www.zhiguagua.com/shenqing/mianfeidaijiaonianfei.html">
  404 + <h3>免费代缴年费</h3>
  405 + <p>免费代缴,省心省力</p>
  406 + </a>
  407 + </li>
  408 + <li class="third no-mar">
  409 + <a href="http://www.zhiguagua.com/shenqing/jishupingjia.html">
  410 + <h3>专利技术评价</h3>
  411 + <p>价值评估,商业化必备</p>
  412 + </a>
  413 + </li>
  414 + </ul>
  415 + </div>
  416 + <div class="zgganimate third">
  417 + <ul class="fl iSubNavLe overflowhidden">
  418 + <li>
  419 + <h3>版权登记</h3>
  420 + <div class="kfwNavOne kfNavNO">
  421 + <a href="http://www.zhiguagua.com/shenqing/banquandengji.html?type=1" target="_blank">计算机软件著作权登记</a>
  422 + <a href="http://www.zhiguagua.com/shenqing/banquandengji.html?type=2" target="_blank">美术作品著作权登记</a>
  423 + <a href="http://www.zhiguagua.com/shenqing/banquandengji.html?type=3" target="_blank" class="no-mar">文字作品著作权登记</a>
  424 + </div>
  425 + </li>
  426 + </ul>
  427 + <ul class="fl iSubNavRi overflowhidden">
  428 + <li class="first">
  429 + <a href="http://www.zhiguagua.com/shenqing/jiansuofenxi.html">
  430 + <h3>免费检索分析</h3>
  431 + <p>检索分析,一键搞定</p>
  432 + </a>
  433 + </li>
  434 + <li class="second">
  435 + <a href="http://www.zhiguagua.com/shenqing/mianfeidaijiaonianfei.html">
  436 + <h3>免费代缴年费</h3>
  437 + <p>免费代缴,省心省力</p>
  438 + </a>
  439 + </li>
  440 + <li class="third no-mar">
  441 + <a href="http://www.zhiguagua.com/shenqing/jishupingjia.html">
  442 + <h3>专利技术评价</h3>
  443 + <p>价值评估,商业化必备</p>
  444 + </a>
  445 + </li>
  446 + </ul>
  447 + </div>
  448 + <div class="zgganimate four">
  449 + <ul class="fl iSubNavLe overflowhidden">
  450 + <li>
  451 + <h3>高新企业认定</h3>
  452 + <div class="kfwNavOne kfNavNO">
  453 + <a href="http://www.zhiguagua.com/shenqing/gaoxinqiyerenzheng.html">担保认定</a>
  454 + </div>
  455 + </li>
  456 + </ul>
  457 + <ul class="fl iSubNavRi overflowhidden">
  458 + <li class="first">
  459 + <a href="http://www.zhiguagua.com/shenqing/jiansuofenxi.html">
  460 + <h3>免费检索分析</h3>
  461 + <p>检索分析,一键搞定</p>
  462 + </a>
  463 + </li>
  464 + <li class="second">
  465 + <a href="http://www.zhiguagua.com/shenqing/mianfeidaijiaonianfei.html">
  466 + <h3>免费代缴年费</h3>
  467 + <p>免费代缴,省心省力</p>
  468 + </a>
  469 + </li>
  470 + <li class="third no-mar">
  471 + <a href="http://www.zhiguagua.com/shenqing/jishupingjia.html">
  472 + <h3>专利技术评价</h3>
  473 + <p>价值评估,商业化必备</p>
  474 + </a>
  475 + </li>
  476 + </ul>
  477 + </div>
  478 + </div>
  479 + </div>
  480 + </div>
  481 + <div class="fl zggNavs" id="menu">
  482 + <a href="http://www.zhiguagua.com" class="item nav_index first">
  483 + <span>首页</span>
  484 + </a><a href="http://www.zhiguagua.com/shenqing/invention.html" class="item nav_shenqing">
  485 + <span>国内专利</span>
  486 + <i class="gn-bsqtk"></i>
  487 + </a><a href="http://www.zhiguagua.com/shenqing/guojizhuanli.html" class="item nav_guojizhuanli">
  488 + <span>国际专利</span>
  489 + </a><a href="http://www.zhiguagua.com/shenqing/qitazhuanli.html" class="item nav_zenzhifuwu">
  490 + <span>专利疑难服务</span>
  491 + </a><a href="http://www.zhiguagua.com/shenqing/shangbiaozhuce.html" class="item nav_zizhirenzheng">
  492 + <span>商标注册</span>
  493 + <i class="sb-bcgtk"></i>
  494 + </a><a href="http://www.zhiguagua.com/shenqing/banquandengji.html" class="item nav_banquan">
  495 + <span>版权登记</span>
  496 + </a><a href="http://www.zhiguagua.com/research" class="item nav_liudaxitong">
  497 + <span>知呱呱研究院</span>
  498 + </a><a href="http://www.zhiguagua.com/zixun" class="item nav_zixun">
  499 + <span>呱呱资讯</span>
  500 + </a>
  501 + </div>
  502 + </div>
  503 +</div>
  504 +<div class="clearfix"></div>
  505 +
  506 +
  507 +
  508 +
  509 +
  510 +
  511 +
  512 +
  513 +
  514 +
  515 +
  516 +
  517 +
  518 +<div class="bor_top"></div>
  519 +<div class="perfectBar commWith">
  520 + <div class="perfectTop">
  521 + <span> 提交案件</span>
  522 + </div>
  523 +
  524 + <div class="fwxxBar">
  525 + <div class="zffsTit">
  526 + <span>请核对立案信息</span>
  527 + </div>
  528 + <div class="zffs-table">
  529 + <table cellspacing="0" cellpadding="0" class="zffs-tab-tit" style="margin-bottom:30px;">
  530 + <tbody><tr>
  531 + <td class="td-ajlx">案件类型</td>
  532 + <td class="td-ajmc">案件名称</td>
  533 + <td class="td-ajbh">案件编号</td>
  534 + <td class="td-fwf">费用(元)</td>
  535 + </tr>
  536 + </tbody></table>
  537 + <table cellspacing="0" cellpadding="0" class="zffs-tab-comm tit-apply">
  538 + <tbody>
  539 +
  540 +
  541 +
  542 +
  543 + <tr class="tr-comm">
  544 + <td class="td-ajlx td_bor_b_r">发明专利</td>
  545 + <td class="td-ajmc td_bor_b_r">暂无名称</td>
  546 + <td class="td-ajbh td_bor_b_r">GG1606917A</td>
  547 + <td class="td-fwf td_bor_b">2999.00 </td>
  548 + </tr>
  549 +
  550 +
  551 + </tbody></table>
  552 + </div>
  553 + </div>
  554 +
  555 + <div class="sjxxBar">
  556 + <div class="ui-sjxx">
  557 + <div class="sjxxTit">
  558 + <span>收件信息</span>
  559 + <a class="xzsjxx" href="javascript:showBg('新增收件信息')">【新增收件信息】</a>
  560 + </div>
  561 + <div class="sjxxComm sjxx-bar" id="sjxxNau">
  562 + <ul class="sjxxAdd ui-sjxx-item">
  563 + </ul>
  564 + </div>
  565 + <div class="ui-sqdz ui-sqdz-add hide" id="consigneeItemAllClick" onclick="show_ConsigneeAll()">
  566 + <a class="zkDz gddz">更多收件信息</a>
  567 + </div>
  568 + <div class="ui-sqdz ui-sqdz-add hide" id="consigneeItemHideClick" onclick="hide_ConsigneeAll()" >
  569 + <a class="zkDz sqdz" >收起收件信息</a>
  570 + </div>
  571 + </div>
  572 + </div>
  573 + <div class="sjxxBar">
  574 + <div class="ui-sjxx">
  575 + <div class="sjxxTit">
  576 + <span>发票信息</span>
  577 + <a class="xzsjfp" href="javascript:showBgFp('新增发票信息')">【新增发票信息】</a>
  578 + </div>
  579 + <div class="sjxxComm fpxx-bar" id="fpxxNau">
  580 + <ul class="sjxxAdd ui-fpxx-item">
  581 + </ul>
  582 + </div>
  583 + <div class="ui-sqdz ui-fpxx-add" id="consigneeAllClick" onclick="show_FpAll()">
  584 + <a class="zkDz gddz">更多发票信息</a>
  585 + </div>
  586 + <div class="ui-sqdz ui-fpxx-add hide" id="consigneeHideClick" onclick="hide_FpAll()" >
  587 + <a class="zkDz sqdz" >收起发票信息</a>
  588 + </div>
  589 + </div>
  590 + </div>
  591 +
  592 + <div class="yhqBar">
  593 + <script>
  594 + $(function(){
  595 + tabs.set("nav","menu_con");
  596 + });
  597 + </script>
  598 +
  599 +
  600 + <div class="yhqComm">
  601 + <p>优惠券</p>
  602 + <div class="zkss">
  603 + <a onclick="openShutManager(this,'zkssComm',false,'&lt;img src=/static/com/img/icon/zk_icon.png?v=b37932f415c959c541f011367a3615d3 /&gt;','&lt;img src=/static/com/img/icon/add_icon.png?v=a18b7446968de90e2ed49e153ec06ebc /&gt;')" class="fl">
  604 + <img src="/static/com/img/icon/zk_icon.png?v=b37932f415c959c541f011367a3615d3"></a><span>使用优惠券</span>
  605 + </div>
  606 + <div id="zkssComm" class="zkssCom">
  607 + <div class="yhqH">
  608 + <ul id="nav">
  609 + <li><a class="selected" href="#">我的优惠券<span>(0)</span></a></li>
  610 +
  611 + </ul>
  612 + </div>
  613 + <div id="menu_con">
  614 + <div style="display: block;" class="yhqZd">
  615 + <div class="yhqP">
  616 + <span>您可以<a href="https://user.zhiguagua.com/user/youhuiquan.html">查看所有优惠券</a>了解使用限制。</span>
  617 + <a class="yhqa" href="http://www.zhiguagua.com/help/youhuiquan_yonghuxuqiu.html" target="_blank">【了解知呱呱优惠券发放和使用规则】</a>
  618 + </div>
  619 + <div class="yhqC" id="divcoupon">
  620 + <dl id="type" class="fl">
  621 +
  622 + </dl>
  623 + <ul class="kyye-bcky">
  624 +
  625 + </ul>
  626 + <ul class="gray">
  627 +
  628 + </ul>
  629 + </div>
  630 + <div class="yhqB" style="display:none;">
  631 + <span>共使用优惠券<label>1</label> 张</span><span>可以优惠<label>50.00</label>元</span>
  632 + </div>
  633 + </div>
  634 + <div style="display: none;" class="yhqZd">
  635 + <div class="yhqP">
  636 + <span>此处仅展示不符合本次订单商品使用的优惠券</span>
  637 + <a class="yhqa" href="http://www.zhiguagua.com/help/youhuiquan_yonghuxuqiu.html" target="_blank">【了解知呱呱优惠券发放和使用规则】</a>
  638 + </div>
  639 + <div class="yhqC bornone">
  640 + <ul class="fl">
  641 +
  642 + </ul>
  643 + <ul class="gray">
  644 +
  645 + </ul>
  646 + </div>
  647 + </div>
  648 + </div>
  649 + <div class="yhqBB"></div>
  650 + </div>
  651 + </div>
  652 + </div>
  653 +
  654 + <div class="syyeBar">
  655 + <div class="syComm">
  656 + <div class="zkss">
  657 + <a onclick="openShutManager(this,'syBB',false,'&lt;img src=/static/com/img/icon/zk_icon.png?v=b37932f415c959c541f011367a3615d3 /&gt;','&lt;img src=/static/com/img/icon/add_icon.png?v=a18b7446968de90e2ed49e153ec06ebc /&gt;')" class="fl"><img src="/static/com/img/icon/zk_icon.png?v=b37932f415c959c541f011367a3615d3"></a><span>使用余额</span>
  658 + </div>
  659 + <div id="syBB" class="dqyeComm">
  660 + <div class="dqye-ny">
  661 + <p>您的账户当前余额为:<span>0.00元</span></p>
  662 + </div>
  663 +
  664 + </div>
  665 + </div>
  666 + </div>
  667 + <div class="zffsBar">
  668 + <div class="zffsTit">
  669 + <span>支付方式</span>
  670 + </div>
  671 + <div class="ui-zf">
  672 + <div class="zffsComm">
  673 + <ul class="ui-zffs" id="zffs-info">
  674 + <li class="focus2 selected" onclick="show(1,'zffs-info')" dataid="1">支付宝<i></i></li>
  675 + <li class="focus4" onclick="show(3,'zffs-info')" dataid="4" style="display:block;">微信支付<i></i></li>
  676 + <li class="focus3" onclick="show(2,'zffs-info')" dataid="3">网银支付<i></i></li>
  677 + <li class="focus1" onclick="show(0,'zffs-info')" dataid="2">转账汇款<i></i></li>
  678 + </ul>
  679 + </div>
  680 + <div class="zfbComm focus2 fore1" style="display: block;">
  681 + <div class="zfbZf">
  682 + <a><img src="/static/com/img/yinghang/zhifubao.png?v=bc8d5a3d8c4fc5a455187f68847389f6" alt="支付宝"/><i></i></a>
  683 + </div>
  684 + </div>
  685 + <div class="zfbComm focus4 fore1" style="display: none;">
  686 + <div class="zfbZf">
  687 + <a><img src="/static/com/img/yinghang/weixinzhifu.png?v=323c503657ed3d068e96a898fbc99851" alt="微信支付"/><i></i></a>
  688 + </div>
  689 + </div>
  690 + <div class="wyzfComm focus3 fore1" style="display: none;">
  691 + <div class="yinghang_img">
  692 + <a bank="ICBC-DEBIT"><img src="/static/com/img/yinghang/gongshang.png?v=e641b0c392a2d06ab6d404d6353fd384"/><i></i></a>
  693 + <a bank="CMB-DEBIT"><img src="/static/com/img/yinghang/zhaoshang.png?v=4d5ecd8247b1a22413fdbf148d1bd618"/><i></i></a>
  694 + <a bank="CCB-DEBIT"><img src="/static/com/img/yinghang/jianshe.png?v=172bbf129679de9df16c04b42a60d871" /><i></i></a>
  695 + <a bank="ABCBTB"><img src="/static/com/img/yinghang/nongye.png?v=0e725ed6e08d6f56f165e16077534af8" /><i></i></a>
  696 + <a bank="SPDB"><img src="/static/com/img/yinghang/pufa.png?v=2dc5c99c1f4aa94599cc45b9c2d3158a" /><i></i></a>
  697 + <a bank="GDB"><img src="/static/com/img/yinghang/guangfa.png?v=d9b6ec13d1ed3c993a13977bd9c191b8" /><i></i></a>
  698 + <a bank="CIB"><img src="/static/com/img/yinghang/xingye.png?v=3e8507ef5e1ea71b6fc166eed905a4eb" /><i></i></a>
  699 + <a bank="CMBC"><img src="/static/com/img/yinghang/minsheng.png?v=555069cb8f62977e8307b059f65ff38d" /><i></i></a>
  700 + <a bank="COMM-DEBIT"><img src="/static/com/img/yinghang/jiaotong.png?v=1a36e4e335b0a9e58132da4934703164" /><i></i></a>
  701 + <a bank="PSBC-DEBIT"><img src="/static/com/img/yinghang/youzheng.png?v=85dea9b0588be529a65903b8339d8d1e" /><i></i></a>
  702 + <a bank="CITIC-DEBIT"><img src="/static/com/img/yinghang/zhongxin.png?v=b37da2e34512a58625011cd04bd6fe31" /><i></i></a>
  703 + <a bank="CEB-DEBIT"><img src="/static/com/img/yinghang/guangda.png?v=5ef8723fbff02a6f4599bcd4e2195a22" /><i></i></a>
  704 + <a bank="HZCBB2C"><img src="/static/com/img/yinghang/hangzhou.png?v=1bdb7ef1dcdfcb39fd84342672001aca" /><i></i></a>
  705 + <a bank="BOCB2C"><img src="/static/com/img/yinghang/zhongguo.png?v=e42b65ae8f777f92a021508454130bb5" /><i></i></a>
  706 + <a bank="SHBANK"><img src="/static/com/img/yinghang/shanghai.png?v=7b1ad272df984dff6ecf0a1613e96786" /><i></i></a>
  707 + <a bank="NBBANK"><img src="/static/com/img/yinghang/mingbo.png?v=7e66bcd765275c74f9320f6f004e0a8e" /><i></i></a>
  708 + <a bank="BJRCB"><img src="/static/com/img/yinghang/nongshang.png?v=6ef05df893238df2cb3efe9bd44ec36e" /><i></i></a>
  709 + <a bank="FDB"><img src="/static/com/img/yinghang/fudian.png?v=f05b1a57a1d1f24e9494749685bf2f97" /><i></i></a>
  710 + <a bank="BJBANK"><img src="/static/com/img/yinghang/beijing.png?v=a1d0e3a13fe9e1f0f23632a0999034a6" /><i></i></a>
  711 + <a bank="WZCBB2C-DEBIT"><img src="/static/com/img/yinghang/wenzhou.png?v=a274f884d3f429e45be1732a5821a147" /><i></i></a>
  712 + <a bank="SPA-DEBIT"><img src="/static/com/img/yinghang/pingan.png?v=fc56cd73eef2eb594ef7b080484434a7" /><i></i></a>
  713 + </div>
  714 + </div>
  715 + <div class="zzhkComm focus1 fore1" style="display: none;">
  716 + <div class="zzhkTop">
  717 + <div class="zzhktopCo">
  718 + <p>收款方:北京创遇科技服务有限公司</p>
  719 + <p>开户行:工商银行北京花园桥支行</p>
  720 + <p>银行账号:0200 2831 0920 1046 105</p>
  721 + <p>付汇识别码:<i style="font-size:16px;">点击页面右下角按钮后,请注意查收!</i></p>
  722 + </div>
  723 + </div>
  724 + <div class="zzhkBottom">
  725 + <div class="zzhkbotCo">
  726 + <p><i>注意事项:汇款时需要注意以下信息,请牢记!</i></p>
  727 + <p>1、银行汇款转账需将此汇款识别码填写至电汇凭证的【汇款用途】或【备注】栏内。</p>
  728 + <p>2、银行汇款转账订单,一个识别码对应一个订单和相应的金额,请勿多转账或者少转账。</p>
  729 + <p>3、汇款完后,请通知接待您的顾问进行查账,谢谢!</p>
  730 + </div>
  731 + </div>
  732 + </div>
  733 + </div>
  734 + </div>
  735 +
  736 + <div class="fwxxBar">
  737 + <div class="">
  738 + <div class="zffs-je fr">
  739 + <div class="list">
  740 + <span>1 个案件,总费用:</span>
  741 + <em class="price">¥2999.00</em>
  742 + </div>
  743 +
  744 + <div class="list">
  745 + <span>优惠券:</span>
  746 + <em class="price">-¥<label id="lbcoupon">0.00</label></em>
  747 + </div>
  748 + <div class="list">
  749 + <span>余额:</span>
  750 + <em class="price">-¥<label id="lbbalance">0.00</label></em>
  751 + </div>
  752 + <div class="list">
  753 + <span>应付总额:</span>
  754 + <em class="price"> ¥<label class="lbneedpay">2999.00</label></em>
  755 + </div>
  756 + </div>
  757 + <div class="clearfix"></div>
  758 + <div class="hr"></div>
  759 + </div>
  760 + <div class="tjaj-Bar commWith">
  761 + <div id="checkout-floatbar" class="group commWith">
  762 + <div class="ui-ceilinglamp checkout-buttons ui-ceilinglamp-current">
  763 + <div class="sticky-placeholder hide" style="display: none;">
  764 + </div>
  765 + <div class="sticky-wrap">
  766 + <div class="inner">
  767 + <div class="tjaj-com">
  768 + <span>应付总额:<strong> ¥<label class="lbneedpay">2999.00</label></strong></span>
  769 + <a href="" id="lnkPay" onclick="return addorder(this)" target="_blank" class="tjdd-btn">提交案件</a>
  770 + </div>
  771 + </div>
  772 + </div>
  773 + </div>
  774 + </div>
  775 +
  776 + </div>
  777 + </div>
  778 +</div><!--perfectBar结束-->
  779 +<div class="clearfix"></div>
  780 +<div id="fullbg"></div>
  781 +<div class="recipBox" id="dialog">
  782 + <input type="hidden" field="id" value=""/>
  783 + <div class="recip_tit">
  784 + <span>新增收件人信息</span>
  785 + <a href="javascript:void(0)" onclick="closeBg();"><img src="/static/com/img/icon/cha.png?v=9bb493e47616de7a6ecc252c5034bf79"/></a>
  786 + </div>
  787 + <div class="recipComm">
  788 + <ul>
  789 + <li>
  790 + <span class="reg_span"><i>*</i>收件人:</span>
  791 + <input type="text" class="recip_inpt" placeholder="请输入您的姓名全称" autocomplete="off" field="takename" title="收件人" r="1"/></li>
  792 + <li class="li_wid">
  793 + <span class="reg_span fl"><i>*</i>收件地址:</span>
  794 + <div class="liststyle fl">
  795 + <select id="loc_province" class="loc_province" field="provinceid" title="省份" r="1"></select>
  796 + <select id="loc_city" class="loc_city" field="cityid" title="市" r="1"></select>
  797 + <select id="loc_town" class="loc_town" field="areaid" title="区县" r="0"></select>
  798 + <input type="hidden" name="location_id" value=""/>
  799 + </div>
  800 + </li>
  801 + <li>
  802 + <span class="reg_span"><i>*</i>详细地址:</span>
  803 + <input type="text" class="recipt_add" placeholder="地址限制在50个字以内" autocomplete="off" field="address" title="详细地址" r="1"/></li>
  804 + <li>
  805 + <span class="reg_span"><i>*</i>邮编:</span>
  806 + <input type="text" class="recip_inpt" autocomplete="off" field="zip" title="邮编" r="1" id="txt_zip"/></li>
  807 + <li>
  808 + <span class="reg_span"><i>*</i>手机:</span>
  809 + <input type="text" class="recip_inpt" autocomplete="off" field="mobile" id="txt_mobile" title="手机" r="1"/></li>
  810 + <li>
  811 + <span class="reg_span">坐机号:</span>
  812 + <input type="text" class="recip_inpt" autocomplete="off" field="phone" title="座机号"/></li>
  813 + </li>
  814 + <li class="recip_But">
  815 + <a href="javascript:saveaddress()" class="recip_su" >确认地址信息</a>
  816 + <a href="javascript:closeBg()" class="recip_qx">取消</a>
  817 + </li>
  818 + </ul>
  819 + </div>
  820 +</div><!--修改信息-->
  821 +</div>
  822 +<div id="fullbg2"></div>
  823 +<div class="ui-dialog" id="mainId">
  824 + <div class="recip_tit">
  825 + <span>发票信息</span>
  826 + <a href="#" onclick="closeBgFp();"><img src="/static/com/img/icon/cha.png?v=9bb493e47616de7a6ecc252c5034bf79"/></a>
  827 + </div>
  828 + <div class="invoice-thickbox" id="invoice-tab">
  829 + <input type="hidden" field="id" value=""/>
  830 + <div class="form" id="fapiao" style="display: block;">
  831 + <div class="fa-type-item">
  832 + <span class="fa-type">发票种类:</span><span class="pp-type">普通发票</span>
  833 + </div>
  834 + <div class="clearfix"></div>
  835 + <div class="item">
  836 + <span class="label">发票抬头:</span>
  837 + <div class="fl">
  838 + <div class="invoice-list invoice-tit-list" id="invoice-tit-list">
  839 + <div class="gr-dw" style="cursor: pointer;">
  840 + <dl id="gr-type">
  841 + <dd class="selected" val="单位" onclick="show(0,'gr-type')"><a href="javascript:void(0)"><b></b>单位</a></dd>
  842 + <dd onclick="show(1,'gr-type')" val="个人"><a href="javascript:void(0)"><b></b>个人</a></dd>
  843 + </dl>
  844 + </div>
  845 + <div class="invoice-item-tp">
  846 + <input type="text" class="tou_inp" id="invoice_title" placeholder="请输入发票抬头,不超过40个字符" autocomplete="off" field="title" r="1" title="发票抬头"/>
  847 + </div>
  848 + </div>
  849 + </div>
  850 + </div>
  851 + <div class="clearfix"></div>
  852 + </div>
  853 + <div class="bc-bottom">
  854 + <div class="op-btns bc-qx-btns">
  855 + <a href="javascript:void(0)" class="bc-btn" onclick="saveinvoice()">保存发票信息</a>
  856 + <a href="javascript:void(0)" class="qx-btn ml10" onclick="closeBgFp()">取消</a>
  857 + </div>
  858 + <div class="wxts-op">
  859 + <p>温馨提示:发票的开票内容不包括红包支付部分</p>
  860 + <a href="help/shouhoufuwu_fapiaoguanli.html">发票相关问题&gt;&gt;</a>
  861 + </div>
  862 + </div>
  863 + </div>
  864 +</div>
  865 +<div id="fullbg3"></div>
  866 +<div class="zfjgBox" id="dlgPay" style="display: none;">
  867 + <div class="recip_tit">
  868 + <span>确认支付结果</span>
  869 + <a onclick="closeBgPay();"><img src="/static/com/img/icon/cha.png?v=9bb493e47616de7a6ecc252c5034bf79"/></a>
  870 + </div>
  871 + <div class="wczfBox">
  872 + <span class="wczf_span">请在新打开的页面完成支付</span>
  873 + <p class="djwczf">点击“已完成支付”,您可以直接查看案件</p>
  874 + <p>点击“支付遇到困难”,您可以查看支付帮助信息</p>
  875 + <a href="javascript:closeBgPay();" class="czyz">重新选择支付方式</a>
  876 + </div>
  877 + <div class="wczfBtn">
  878 + <input type="button" class="ywcbtn knbtn" value="已完成支付" onclick="finish()"/><a target="_blank" href="http://www.zhiguagua.com/help/zhifufangshi.html"><input type="button" class="zfknbtn knbtn" value="支付遇到困难"/></a>
  879 + </div>
  880 +</div>
  881 +<div id="fullbg4"></div>
  882 +<div class="zfjgBox1" id="dlg_wx_Pay" style="display: none;">
  883 + <div class="recip_tit">
  884 + <span>扫码支付</span>
  885 + <a onclick="closeBg_wxPay();"><img src="/static/com/img/icon/cha.png?v=9bb493e47616de7a6ecc252c5034bf79"/></a>
  886 + </div>
  887 + <div class="wczfBox">
  888 + <img id="img_wxcode" src=""/>
  889 + </div>
  890 + <div class="wczfBtn">
  891 + <input type="button" class="ywcbtn knbtn" value="已完成支付" onclick="finish()"/><a target="_blank" href="http://www.zhiguagua.com/help/zhifufangshi.html"><input type="button" class="zfknbtn knbtn" value="支付遇到困难"/></a>
  892 + </div>
  893 +</div>
  894 +<script type="text/javascript">
  895 + function showBgPay() {
  896 + var bh = $("body").height();
  897 + var bw = $("body").width();
  898 + $("#fullbg3").css({
  899 + height:bh,
  900 + width:bw,
  901 + display:"block",
  902 + "z-index":101
  903 + });
  904 + $("#dlgPay").css({"z-index":102}).show();
  905 + }
  906 + function closeBgPay() {
  907 + return finish();
  908 + var url = "batch_6917_2.html?" + Math.random();
  909 +//document.location = url;
  910 +//$("#fullbg3,#dlgPay").hide();
  911 + }
  912 + function showBg_wxPay() {
  913 + var bh = $("body").height();
  914 + var bw = $("body").width();
  915 + $("#fullbg4").css({
  916 + height:bh,
  917 + width:bw,
  918 + display:"block",
  919 + "z-index":101
  920 + });
  921 + $("#dlg_wx_Pay").css({"z-index":102}).show();
  922 + }
  923 + function closeBg_wxPay() {
  924 + return finish();
  925 + }
  926 +
  927 + function finish(){
  928 + document.location = 'https://user.zhiguagua.com/user';
  929 + }
  930 + function geturl(){
  931 + return "batch_6917_4.html";
  932 + }
  933 +
  934 + //应付金额,跟屏
  935 + $(document).scroll(function(){
  936 + var baseheight=$(document).scrollTop();
  937 + var scrollTop=document.body.scrollTop || document.documentElement.scrollTopTop;
  938 + var baseH=$('.perfectBar').height()-500;
  939 + var bodyH=$(window).height();
  940 + if(bodyH<=730){
  941 + if(scrollTop>baseH){
  942 + $(".tjaj_tj").removeClass("tjaj-BarFix");
  943 + $(".tjaj-BarFix").addClass("tjaj_tj");
  944 + }else {
  945 + $(".tjaj_tj").addClass("tjaj-BarFix");
  946 + $(".tjaj-BarFix").removeClass("tjaj_tj");
  947 + }
  948 + }else{
  949 + baseH=baseH-300;
  950 + if(scrollTop>baseH){
  951 + $(".tjaj_tj").removeClass("tjaj-BarFix");
  952 + $(".tjaj-BarFix").addClass("tjaj_tj");
  953 + }else {
  954 + $(".tjaj_tj").addClass("tjaj-BarFix");
  955 + $(".tjaj-BarFix").removeClass("tjaj_tj");
  956 + }
  957 + }
  958 + });
  959 + //选择省市
  960 + $(document).ready(function() {
  961 + showLocation();
  962 + });
  963 + $('#zffs-info .zzhk-info').click(function(){
  964 + $('.zfbComm').hide();
  965 + $('.wyzfComm').hide();
  966 + $('.zzhkComm').show();
  967 + });
  968 + $('#zffs-info .zfb-info').click(function(){
  969 + $('.zzhkComm').hide();
  970 + $('.wyzfComm').hide();
  971 + $('.zfbComm').show();
  972 + });
  973 + $('#zffs-info .wyzf-info').click(function(){
  974 + $('.zzhkComm').hide();
  975 + $('.zfbComm').hide();
  976 + $('.wyzfComm').show();
  977 + });
  978 + var addressform = null;
  979 + var invoiceform = null;
  980 + function showBg(text) {
  981 + var bh = $("body").height();
  982 + var bw = $("body").width();
  983 + $("#fullbg").css({
  984 + height:bh,
  985 + width:bw,
  986 + display:"block"
  987 + });
  988 + $("#dialog").show();
  989 + $('.recip_tit span').html(text);
  990 + addressform = $("#dialog").setform({api:'/reg/api/addaddress', method:'post', prepost: function(data){
  991 + data.provincename = $('#loc_province option:selected').text();
  992 + data.cityname = $('#loc_city option:selected').text();
  993 + data.areaname = $('#loc_town option:selected').text();
  994 + }, cb: function(data){
  995 + closeBg();
  996 + newid = data.id;
  997 + loadaddress();
  998 + }
  999 + });
  1000 + }
  1001 + //保存收件地址
  1002 + function saveaddress(){
  1003 + var re= /^[0-9][0-9]{5}$/;
  1004 + zip = $.trim($('#txt_zip').val());
  1005 + if (zip == '') {
  1006 + return alert('请输入邮编!');
  1007 + } else if (!re.test(zip)) {
  1008 + return alert("邮编格式不正确!");
  1009 + }
  1010 + var rePhone = /^1[3|4|5|7|8][0-9]\d{4,8}$/;
  1011 + phone = $.trim($('#txt_mobile').val());
  1012 + if (phone == '') {
  1013 + return alert('请输入手机号!');
  1014 + } else if (!rePhone.test(phone)) {
  1015 + return alert("手机号格式不正确!");
  1016 + }
  1017 + addressform.submit();
  1018 + }
  1019 + //保存收件地址
  1020 + function saveinvoice(){
  1021 + var title = $('#invoice_title').val();
  1022 + if(title.length>40){
  1023 + return alert('发票台头不能超过40个字');
  1024 + }
  1025 + invoiceform.submit();
  1026 + }
  1027 + function closeBg() {
  1028 + $("#fullbg,#dialog").hide();
  1029 + }
  1030 + function showBgFp(text) {
  1031 + var bh = $("body").height();
  1032 + var bw = $("body").width();
  1033 + $("#fullbg2").css({
  1034 + height:bh,
  1035 + width:bw,
  1036 + display:"block"
  1037 + });
  1038 + $("#mainId").show();
  1039 + $('.recip_tit span').html(text);
  1040 + invoiceform = $("#mainId").setform({api:'/reg/api/addinvoice', method:'post', prepost: function(data){
  1041 +//单位,个人
  1042 + data.type = $('#gr-type .selected').attr('val');
  1043 + data.content = '普通发票';
  1044 + }, cb: function(data){
  1045 + closeBgFp();
  1046 + newid=data.id;
  1047 + loadinvoice();
  1048 + }
  1049 + });
  1050 + }
  1051 + function closeBgFp() {
  1052 + $("#fullbg2,#mainId").hide();
  1053 + }
  1054 + var needpay = 2999.0;
  1055 + //账户余额
  1056 + var ubalance = 0.00;
  1057 + //本次使用的余额
  1058 + var balancepay = 0;
  1059 + //本次实用的红包金额
  1060 + var couponpay = 0;
  1061 + var voucherids = "";
  1062 + function bcsyShow(){
  1063 + var val = $('#txtUse').val();
  1064 + if(val == ''){
  1065 + val = '0.00';
  1066 + }
  1067 + val = parseFloat(val);
  1068 + var np = needpay - couponpay;
  1069 + if(val>np){
  1070 + alert('您当前只需要使用:' + np + ' 元');
  1071 + val = np;
  1072 + }else if(val>ubalance){
  1073 + alert('您当前最多可使用:' + ubalance + ' 元');
  1074 + val = ublance;
  1075 + }
  1076 + balancepay = val;
  1077 + $('#txtUse').val(val);
  1078 + $('#lbUse').html(val);
  1079 + $(".basy-left").hide();
  1080 + $(".basy-right").show();
  1081 + $('#lbbalance').html(val.toFixed(2));
  1082 + calpay();
  1083 + }
  1084 + function bcsyHide(){
  1085 + $(".basy-right").hide();
  1086 + $(".basy-left").show();
  1087 + }
  1088 + //重新计算支付信息
  1089 + function calpay(){
  1090 +//计算应付金额
  1091 +//1. 余额支付
  1092 + var np = needpay - balancepay - couponpay;
  1093 + $('.lbneedpay').html(np.toFixed(2));
  1094 + }
  1095 + function setcoupon(idx, obj){
  1096 + obj = $(obj)
  1097 + if(obj.attr('class') == 'selected'){
  1098 + obj.attr('class', '');
  1099 + idx = -1;
  1100 + }
  1101 + show(idx);
  1102 + var obj = $('#divcoupon .selected');
  1103 + var coupon = obj.length>0? parseFloat(obj.attr('val')):0;
  1104 + var maxcoupon = parseFloat(obj.attr('maxcoupon')) || 0;
  1105 + couponpay = Math.min(maxcoupon, coupon);
  1106 + $('#lbcoupon').html(couponpay.toFixed(2));
  1107 +//重新设置余额
  1108 + bcsyHide();
  1109 + $('#txtUse').val('');
  1110 + $('#lbbalance').html('0.00');
  1111 + balancepay = 0;
  1112 + calpay();
  1113 + }
  1114 + //添加订单
  1115 + var lock = false;
  1116 + function addorder(){
  1117 + if(lock){alert('正在提交,请稍候');return false;}
  1118 + lock = true;
  1119 + if(curaddrid==0){
  1120 + alert('请设置收件信息');
  1121 + lock = false;
  1122 + return false;
  1123 + }
  1124 + var balance = balancepay;
  1125 + var objs = $('#divcoupon .selected');
  1126 + var couponid = objs.length>0?objs.attr('dataid'):0;
  1127 + var pay_type = $('#zffs-info .selected').attr('dataid');
  1128 + var bank = '';
  1129 + if(pay_type == '3'){
  1130 + var barr = $('.yinghang_img .select_hang');
  1131 + if(barr.length==0){
  1132 + alert('请选择银行');
  1133 + lock = false;
  1134 + return false;
  1135 + }
  1136 + bank = barr.attr('bank');
  1137 + pay_type = '1';
  1138 + }
  1139 +//设置是否在新窗口打开,银行汇款在当前也打开,在线支付在新页面打开
  1140 + /*
  1141 + if(pay_type == '2'){
  1142 + $('.tjdd-btn').attr('target', '_self');
  1143 + }else{
  1144 + $('.tjdd-btn').attr('target', '_blank');
  1145 + }*/
  1146 + var np = needpay - balancepay - couponpay;
  1147 + var data = {
  1148 + voucher_id:6917,
  1149 + good_type:100,
  1150 + number:1,
  1151 + invoice: curinvid,
  1152 + balance: balance,
  1153 + address: curaddrid,
  1154 + couponid: couponid,
  1155 + pay_type: pay_type,
  1156 + bank: bank,
  1157 + voucherids: voucherids
  1158 + };
  1159 +
  1160 +//alert(JSON.stringify(data));
  1161 + lock = false;
  1162 + var ret = false;
  1163 + $.ajax({
  1164 + url: '/order/create/ggorder',
  1165 + data: data,
  1166 + type: 'POST',
  1167 + async: false,
  1168 + dataType: 'json',
  1169 + success: function (obj) {
  1170 + NTKF_PARAM = {
  1171 + siteid:"kf_9333", //企业ID,为固定值,必填
  1172 + settingid:"kf_9333_1467281384560", //接待组ID,为固定值,必填
  1173 + uid:"2055", //用户ID,未登录可以为空,但不能给null,uid赋予的值显示到小能客户端上
  1174 + uname:"leeruohai@126.com", //用户名,未登录可以为空,但不能给null,uname赋予的值显示到小能客户端上
  1175 + isvip:"0", //是否为vip用户,0代表非会员,1代表会员,取值显示到小能客户端上
  1176 + userlevel:"普通会员", //网站自定义会员级别,0-N,可根据选择判断,取值显示到小能客户端上
  1177 + erpparam:"zgg", //erpparam为erp功能的扩展字段,可选,购买erp功能后用于erp功能集成
  1178 + orderid:obj.order.order_id, //订单ID
  1179 + orderprice:$('.lbneedpay').html() //订单总价
  1180 + }
  1181 + if(obj.code == 0){
  1182 + var url = document.location.href.replace('_3.html', '_4.html');
  1183 + if(parseFloat(obj.order.total_fee)==0){
  1184 + alert('提交成功');
  1185 + url = 'https://user.zhiguagua.com/user';
  1186 +//document.location = url;
  1187 +//return false;
  1188 + return finish();
  1189 + }else if(data.pay_type == '2'){
  1190 + url = document.location.href.replace('_2.html', '_3.html');
  1191 + }else{
  1192 + url = 'https://mapi.alipay.com/gateway.do?' + obj.order.pay_para;
  1193 + }
  1194 +//document.location = url;
  1195 +//打开支付对话框
  1196 + if(np>0){
  1197 + showBgPay();
  1198 + }
  1199 + $('#lnkPay').attr('href', geturl());
  1200 + if(np==0) return false;
  1201 + ret = true;
  1202 + }
  1203 + else{
  1204 + alert(obj.desc);
  1205 + }
  1206 + lock = false;
  1207 + },
  1208 + error: function (obj) {
  1209 + alert('提交出错');
  1210 + lock = false;
  1211 + return false;
  1212 + }
  1213 + });
  1214 + return ret;
  1215 + }
  1216 + //收件地址、发票
  1217 + var address = null;
  1218 + var invoice = null;
  1219 + var curaddrid = 0;
  1220 + var curinvid = 0;
  1221 + var newid = 0;
  1222 + function loadaddress(){
  1223 +//加载地址
  1224 + $.ajax({url:'/reg/api/listaddress', dataType:'json',
  1225 + success:function(data){
  1226 + var html = '';
  1227 + address = data;
  1228 + $(data).each(function(i,o){
  1229 + if(o.isdefault==1){
  1230 + curaddrid = o.id;
  1231 + }
  1232 + html += '<li class="ui-item-selected addr_' + o.id + '">\
  1233 +<div onclick="selectaddr('+o.id+', this)" class="consignee-item ' + (o.isdefault==1?'item-selected':'') + ' fl">\
  1234 +<span>' + (o.isdefault==1?'默认地址' :'<label class="takename1">'+ o.takename +'</label>'+ ' ' +'<label class="provinname">'+ o.provincename + '</label>') +'</span>\
  1235 +<b></b>\
  1236 +</div>\
  1237 +<div class="addr-detail fl">\
  1238 +<span class="add-name fl">'+o.takename+'</span>\
  1239 +<span class="add-info fl" title="">'+o.address+'</span>\
  1240 +<span class="add-tel fl">'+o.mobile+'</span>\
  1241 +<span class="add-yb fl">'+o.zip+'</span>\
  1242 +</div>\
  1243 +<div class="op-btns fr">\
  1244 +<span></span>';
  1245 + if(o.isdefault!=1){
  1246 + html += '<a href="javascript:setdefaultaddr('+o.id+')" class="ftx-05 mr-address" >设为默认地址</a>';
  1247 + }
  1248 + html += '<a href="javascript:editaddr('+o.id+')" class="ftx-05 edit-consignee" >编辑</a>\
  1249 +<a href="javascript:deladdr('+o.id+')" class="ftx-05 del-consignee">删除</a>\
  1250 +</div>\
  1251 +</li>';
  1252 + });
  1253 + $('.ui-sjxx-item').html(html);
  1254 + var temp1=0;
  1255 + var ullen=$(".ui-sjxx-item li").length;
  1256 + $(data).each(function(i,o){
  1257 + if(o.isdefault==1){
  1258 + temp1=1;
  1259 + }
  1260 + });
  1261 + if(temp1!=1){
  1262 + $(".ui-sjxx-item .consignee-item").parents("li").css("display","list-item");
  1263 + $(".ui-sjxx-item .consignee-item.item-selected").parent("li").css("display","list-item");
  1264 + if(ullen>2){
  1265 + $("#consigneeItemAllClick").addClass("hide");
  1266 + $("#consigneeItemHideClick").removeClass("hide");
  1267 + }else{
  1268 + $("#consigneeItemAllClick").addClass("hide");
  1269 + $("#consigneeItemHideClick").addClass("hide");
  1270 + }
  1271 + }else{
  1272 + $(".ui-sjxx-item .consignee-item").parents("li").css("display","none");
  1273 + $(".ui-sjxx-item .consignee-item.item-selected").parent("li").css("display","list-item");
  1274 + if(ullen>1){
  1275 + $("#consigneeItemHideClick").addClass("hide");
  1276 + $("#consigneeItemAllClick").removeClass("hide");
  1277 + }else{
  1278 + $("#consigneeItemHideClick").addClass("hide");
  1279 + $("#consigneeItemAllClick").addClass("hide");
  1280 + }
  1281 + }
  1282 +//编辑按钮
  1283 + $('#sjxxNau .sjxxAdd li').hover(function() {
  1284 + $(this).addClass('li-hover');
  1285 + $('.sjxxAdd .li-hover .op-btns a').show();
  1286 + },
  1287 + function() {
  1288 + $('.sjxxAdd .li-hover .op-btns a').hide();
  1289 + $(this).removeClass('li-hover');
  1290 + });
  1291 +//如果是新增地址,选中第一个
  1292 + if(newid>0){
  1293 + $('.addr_' + newid + ' .consignee-item').trigger('click');
  1294 + $(".ui-sjxx-item .consignee-item").parents("li").css("display","list-item");
  1295 + $(".ui-sjxx-item").children("li").first().css("display","list-item");
  1296 + $('.addr_' + newid + ' .consignee-item.item-selected').parent("li").css("display","list-item");
  1297 + newid = 0;
  1298 + }
  1299 + }
  1300 + });
  1301 + $.ajaxSetup({cache:false});
  1302 + }
  1303 + function loadinvoice(){
  1304 +//加载发票
  1305 + $.ajax({url:'/reg/api/listinvoice', dataType:'json',
  1306 + success:function(data){
  1307 + var html = '';
  1308 + invoice = data;
  1309 + data.splice(0,0,{id:0, type:'不开发票'});
  1310 + $(data).each(function(i,o){
  1311 + if(o.isdefault==1){
  1312 + curinvid = o.id;
  1313 + }
  1314 + var title = o.type;
  1315 + if(i>0){
  1316 + title = o.title.substr(0,5) +(o.title.length>5?'...':'');
  1317 + }
  1318 + html += '<li class="ui-item-selected inv_'+o.id+'">\
  1319 +<div onclick="selectinvoice('+o.id+', this)" class="consignee-item ' + (o.isdefault==1?'item-selected':'') + ' fl">\
  1320 +<span>' + (o.isdefault==1?'默认发票' : title ) +'</span>\
  1321 +<b></b>\
  1322 +</div>';
  1323 + if(i>0){
  1324 + html +=
  1325 + '<div class="addr-detail fl">\
  1326 + <span class="add-name fl">'+o.type+'</span>\
  1327 +<span class="add-info fl" title="">'+o.content+'</span>\
  1328 +<span class="add-tel fl">'+o.title.substr(0,18) +(o.title.length>18?'...':'')+'</span>\
  1329 +</div>\
  1330 +<div class="op-btns fr">\
  1331 +<span></span>';
  1332 + if(o.isdefault!=1){
  1333 + html += '<a href="javascript:setdefaultinv('+o.id+')" class="ftx-05 mr-address" >设为默认发票</a>';
  1334 + }
  1335 + html += '<a href="javascript:editinv('+o.id+')" class="ftx-05 edit-consignee" >编辑</a>\
  1336 +<a href="javascript:delinv('+o.id+')" class="ftx-05 del-consignee">删除</a>\
  1337 +</div>';
  1338 + }
  1339 + html += '</li>';
  1340 + });
  1341 + $('.ui-fpxx-item').html(html);
  1342 + var temp2=0;
  1343 + var fplen=$(".ui-fpxx-item li").length;
  1344 + $(data).each(function(i,o){
  1345 + if(o.isdefault==1){
  1346 + temp2=1;
  1347 + }
  1348 + });
  1349 + if(temp2!=1){
  1350 + $(".ui-fpxx-item .consignee-item").parents("li").css("display","list-item");
  1351 + $(".ui-fpxx-item").children("li").first().css("display","list-item");
  1352 + if(fplen>2){
  1353 + $("#consigneeAllClick").addClass("hide");
  1354 + $("#consigneeHideClick").removeClass("hide");
  1355 + }else{
  1356 + $("#consigneeAllClick").addClass("hide");
  1357 + $("#consigneeHideClick").addClass("hide");
  1358 + }
  1359 + }else{
  1360 + $(".ui-fpxx-item .consignee-item").parents("li").css("display","none");
  1361 + $(".ui-fpxx-item .consignee-item.item-selected").parent("li").css("display","list-item");
  1362 + $(".ui-fpxx-item").children("li").first().css("display","list-item");
  1363 + if(fplen>2){
  1364 + $("#consigneeHideClick").removeClass("hide");
  1365 + $("#consigneeAllClick").addClass("hide");
  1366 + }else{
  1367 + $("#consigneeHideClick").addClass("hide");
  1368 + $("#consigneeAllClick").addClass("hide");
  1369 + }
  1370 + }
  1371 +//编辑按钮
  1372 + $('#fpxxNau .sjxxAdd li').hover(function() {
  1373 + $(this).addClass('li-hover');
  1374 + $('.sjxxAdd .li-hover .op-btns a').show();
  1375 + },
  1376 + function() {
  1377 + $('.sjxxAdd .li-hover .op-btns a').hide();
  1378 + $(this).removeClass('li-hover');
  1379 + });
  1380 + if(newid>0){
  1381 + $('.inv_'+newid+' .consignee-item').trigger('click');
  1382 + $(".ui-fpxx-item .consignee-item").parents("li").css("display","list-item");
  1383 + $(".ui-fpxx-item").children("li").eq(1).css("display","list-item");
  1384 + $('.inv_'+newid+' .consignee-item.item-selected').parent("li").css("display","list-item");
  1385 + newid = 0;
  1386 + }
  1387 + }
  1388 + });
  1389 + $.ajaxSetup({cache:false});
  1390 + }
  1391 + function editaddr(id){
  1392 + var edit="编辑收件人信息";
  1393 + showBg(edit);
  1394 + var data = null;
  1395 + $(address).each(function(i,o){
  1396 + if(o.id == id){
  1397 + data = o;
  1398 + }
  1399 + });
  1400 + addressform = $("#dialog").setform({api:'/reg/api/addaddress', method:'post', prepost: function(data){
  1401 + data.provincename = $('#loc_province option:selected').text();
  1402 + data.cityname = $('#loc_city option:selected').text();
  1403 + data.areaname = $('#loc_town option:selected').text();
  1404 + }, cb: function(data){
  1405 + closeBg();
  1406 + newid = data.id;
  1407 + loadaddress();
  1408 + }
  1409 + },data);
  1410 + }
  1411 + function deladdr(id){
  1412 + if(confirm('确定要删除吗?')){
  1413 + var data = {id:id, state:0};
  1414 + data = JSON.stringify(data);
  1415 + $.get('/reg/api/addaddress?paras=' + data, function(data){
  1416 + loadaddress();
  1417 + }, 'json');
  1418 + }
  1419 + }
  1420 + function setdefaultaddr(id){
  1421 + $.get('/reg/api/setdefaultaddress?id=' + id, function(data){
  1422 + loadaddress();
  1423 + }, 'json');
  1424 + }
  1425 + function editinv(id){
  1426 + var editi="编辑发票信息";
  1427 + showBgFp(editi);
  1428 + var data = null;
  1429 + $(invoice).each(function(i,o){
  1430 + if(o.id == id){
  1431 + data = o;
  1432 + }
  1433 + });
  1434 + invoiceform = $("#mainId").setform({api:'/reg/api/addinvoice', method:'post', prepost: function(data){
  1435 +//单位,个人
  1436 + data.type = $('#gr-type .selected').attr('val');
  1437 + data.content = '普通发票';
  1438 + }, cb: function(data){
  1439 + closeBgFp();
  1440 + newid = data.id;
  1441 + loadinvoice();
  1442 + }
  1443 + },data);
  1444 + }
  1445 + function delinv(id){
  1446 + if(confirm('确定要删除吗?')){
  1447 + var data = {id:id, state:0};
  1448 + data = JSON.stringify(data);
  1449 + $.get('/reg/api/addinvoice?paras=' + data, function(data){
  1450 + loadinvoice();
  1451 + }, 'json');
  1452 + }
  1453 + }
  1454 + function setdefaultinv(id){
  1455 + $.get('/reg/api/setdefaultinvoice?id=' + id, function(data){
  1456 + loadinvoice();
  1457 + }, 'json');
  1458 + }
  1459 + $(function(){
  1460 + loadaddress();
  1461 + loadinvoice();
  1462 +//选择银行
  1463 + $('.yinghang_img a').click(function(){
  1464 + $('.yinghang_img a').attr('class', '');
  1465 + $(this).attr('class', 'select_hang');
  1466 + return false;
  1467 + });
  1468 + });
  1469 + function selectaddr(id, obj){
  1470 + curaddrid = id;
  1471 + $('#sjxxNau .item-selected').removeClass('item-selected');
  1472 + $(obj).addClass('item-selected');
  1473 + }
  1474 + function selectinvoice(id, obj){
  1475 + curinvid = id;
  1476 + $('#fpxxNau .item-selected').removeClass('item-selected');
  1477 + $(obj).addClass('item-selected');
  1478 + }
  1479 + $('#sjxxNau .sjxxAdd li').hover(function() {
  1480 + $(this).addClass('li-hover');
  1481 + $('.sjxxAdd .li-hover .op-btns a').show();
  1482 + },
  1483 + function() {
  1484 + $('.sjxxAdd .li-hover .op-btns a').hide();
  1485 + $(this).removeClass('li-hover');
  1486 + });
  1487 + $('#fpxxNau .sjxxAdd li').hover(function() {
  1488 + $(this).addClass('li-hover');
  1489 + $('.sjxxAdd .li-hover .op-btns a').show();
  1490 + },
  1491 + function() {
  1492 + $('.sjxxAdd .li-hover .op-btns a').hide();
  1493 + $(this).removeClass('li-hover');
  1494 + });
  1495 + $(function() {
  1496 + function b() {
  1497 + var b; {
  1498 + var c = $(window).height(),
  1499 + e = ($(window).width(), $(".ui-ceilinglamp").outerHeight()),
  1500 + f = $("#checkout-floatbar").offset().top + e;
  1501 + 6 == $.support.version
  1502 + }
  1503 + $(window).scroll(function() {
  1504 + f = $("#checkout-floatbar").offset().top + e;
  1505 + var a = $(document).scrollTop();
  1506 + f > c + a ? $(".ui-ceilinglamp").addClass("ui-ceilinglamp-current") : $(".ui-ceilinglamp").removeClass("ui-ceilinglamp-current").removeAttr("style")
  1507 + }).resize(function() {
  1508 + clearTimeout(b),
  1509 + b = setTimeout(function() {
  1510 + c = $(window).height()
  1511 + },
  1512 + 500)
  1513 + })
  1514 + }
  1515 + $("#checkout-floatbar").length && b();
  1516 + });
  1517 + function show_FpAll(){
  1518 + $("#consigneeAllClick").addClass("hide");
  1519 + $("#consigneeHideClick").removeClass("hide");
  1520 + $("#consignee1").removeClass("consignee-off");
  1521 + $(".ui-fpxx-item .consignee-item").parents("li").css("display","list-item");
  1522 + }
  1523 + function hide_FpAll() {
  1524 + $("#consigneeAllClick").removeClass("hide");
  1525 + $("#consigneeHideClick").addClass("hide");
  1526 + $("#consignee1").addClass("consignee-off");
  1527 + $(".ui-fpxx-item .consignee-item").parents("li").css("display","none");
  1528 + $(".ui-fpxx-item .consignee-item.item-selected").parent("li").css("display","list-item");
  1529 + }
  1530 + function show_ConsigneeAll(){
  1531 + $("#consigneeItemAllClick").addClass("hide");
  1532 + $("#consigneeItemHideClick").removeClass("hide");
  1533 + $("#consignee1").removeClass("consignee-off");
  1534 + $(".ui-sjxx-item .consignee-item").parents("li").css("display","list-item");
  1535 + }
  1536 + function hide_ConsigneeAll() {
  1537 + $("#consigneeItemAllClick").removeClass("hide");
  1538 + $("#consigneeItemHideClick").addClass("hide");
  1539 + $("#consignee1").addClass("consignee-off");
  1540 + $(".ui-sjxx-item .consignee-item").parents("li").css("display","none");
  1541 + $(".ui-sjxx-item .consignee-item.item-selected").parent("li").css("display","list-item");
  1542 + }
  1543 +</script>
  1544 +
  1545 +
  1546 +<div class="zgg-foot1">
  1547 + <div class="zgg-footTop">
  1548 + <div class="commWith">
  1549 + <div class="footLeft">
  1550 + <ul class="footUl fl">
  1551 + <li>
  1552 + <h5>关于呱呱</h5>
  1553 + <a href="http://www.zhiguagua.com/help/guanyuguagua.html" target="_blank">呱呱简介</a>
  1554 + <a href="http://www.zhiguagua.com/help/guanyuguagua.html?type=2" target="_blank">业务范围</a>
  1555 + <a href="http://www.zhiguagua.com/help/guanyuguagua.html?type=4" target="_blank">呱呱文化</a>
  1556 + <a href="http://www.zhiguagua.com/help/guanyuguagua.html?type=7" target="_blank">联系我们</a>
  1557 + </li>
  1558 + <li>
  1559 + <h5>帮助中心</h5>
  1560 + <a href="http://www.zhiguagua.com/help/shouhoufuwu.html" target="_blank">售后服务</a>
  1561 + <a href="http://www.zhiguagua.com/help/falubaozhang.html" target="_blank">法律保障</a>
  1562 + <a href="http://www.zhiguagua.com/help/shouhoufuwu_fapiaoguanli.html" target="_blank">发票管理</a>
  1563 + <a href="http://www.zhiguagua.com/help/zhifufangshi.html" target="_blank">支付方式</a>
  1564 + </li>
  1565 + <li>
  1566 + <h5>特色服务</h5>
  1567 + <a href="/shenqing/invention.html" target="_blank">专利担保授权</a>
  1568 + <a href="/shenqing/shangbiaozhuce.html" target="_blank">商标担保注册</a>
  1569 + <a href="/shenqing/banquandengji.html" target="_blank">版权加急服务</a>
  1570 + <a href="/shenqing/gaoxinqiyerenzheng.html" target="_blank">高企担保认定</a>
  1571 + </li>
  1572 + <li>
  1573 + <h5>专题活动</h5>
  1574 + <a href="http://www.zhiguagua.com/research" target="_blank">知呱呱研究院</a>
  1575 + <a href="http://www.zhiguagua.com/youhui" target="_blank">最新优惠</a>
  1576 + <a href="http://www.zhiguagua.com/zhuanjia" target="_blank">加盟合作</a>
  1577 + </li>
  1578 + </ul>
  1579 + <div class="footCode fl">
  1580 + <img src="/static/com/img/code.png?v=2e02c5fdfd37a62a9d549c29a7f3724a" />
  1581 + <div class="footP">
  1582 + <h3>400-650-1606</h3>
  1583 + <p class="week">(周一至周日 8:30-18:00)</p>
  1584 + <i class="wbicon"></i><span class="wbspan">新浪官方微博</span><a href="http://weibo.com/zhiguagua" target="_blank" rel="nofollow">+&nbsp;&nbsp;关注</a>
  1585 + </div>
  1586 + </div>
  1587 + <div class="clearfix"></div>
  1588 + </div>
  1589 + <div class="foot-friend">
  1590 + <div class="friend-left fl">
  1591 + 友情链接:
  1592 + </div>
  1593 + <div class="friend-right">
  1594 + <a href="http://www.sipo.gov.cn/" target="_blank" rel="nofollow">国家知识产权局</a><span>|</span>
  1595 + <a href="http://www.ctmo.gov.cn" target="_blank" rel="nofollow">国家商标局</a><span>|</span>
  1596 + <a href="http://www.ncac.gov.cn/" target="_blank" rel="nofollow">国家版权局</a><span>|</span>
  1597 + <a href="http://www.sipo.gov.cn/xglj/201310/t20131025_870731.html" target="_blank" rel="nofollow">地方知识产权局</a><span>|</span>
  1598 + <a href="http://www.zkhc.org/" target="_blank" rel="nofollow">中科合创</a><span>|</span>
  1599 + <a href="http://www.sihta.org/" target="_blank" rel="nofollow">中关村高新技术转移促进会</a><span>|</span>
  1600 + <a href="http://www.iprdaily.com/" target="_blank" rel="nofollow">IPRDAILY</a>
  1601 + </div>
  1602 + <div class="clearfix"></div>
  1603 + </div>
  1604 + </div>
  1605 + </div>
  1606 + <div class="zgg-footBottom">
  1607 + <div class="footbot commWith">
  1608 + <p>Copyright &copy; 2015&nbsp;zhiguagua.com&nbsp;&nbsp;版权所有&nbsp;&nbsp;北京创遇科技服务有限公司|京ICP备15033495号</p>
  1609 + <p>旗下代理机构:北京创遇知识产权代理有限公司&nbsp;&nbsp;国家知识产权局批准机构代码:11577</p>
  1610 + <a id='___szfw_logo___' href='https://credit.szfw.org/CX20150820011005160165.html' target='_blank' rel="nofollow"><img src="/static/com/img/footer_01.png?v=b731f293165586ae584d9689327b7ccd" border='0' alt="知呱呱诚信网站"/></a><script type='text/javascript'>(function(){document.getElementById('___szfw_logo___').oncontextmenu = function(){return false;}})();</script>
  1611 + <a href="http://www.cyberpolice.cn/wfjb/" target='_blank' rel="nofollow"><img src="/static/com/img/footer_02.png?v=d4b5b8f8314b8e6d5002de150f1490b7" alt="知呱呱报警服务"/></a>
  1612 + <a href="http://qyxy.baic.gov.cn/" target='_blank' rel="nofollow"><img src="/static/com/img/footer_03.png?v=5a8941a7558380f4e2fc389b15193714" alt="知呱呱信息信用网"/></a>
  1613 + <a href="http://dlgl.sipo.gov.cn/txnqueryAgencyOrg.do" target="_blank" style="display:none"><img src="/static/com/img/anlihao.png?v=a2a1eb75b6b8815fc9804e15a0a3c44d"/></a>
  1614 + </div>
  1615 + </div>
  1616 +</div>
  1617 +
  1618 +<ul class="overflowhidden consultationBar headerOverflowInherit">
  1619 + <li class="li-1">
  1620 + <a href="javascript:;" class="mx-a-1">
  1621 + <i class="zx"></i>
  1622 + <div class="my-zx">在线咨询</div>
  1623 + </a>
  1624 + <div class="consuKeTal">
  1625 + <div class="consuKefu">
  1626 + <div class="consuKeFudiv">
  1627 + <div class="tit">选择顾问分组</div>
  1628 + <a onclick="openConsultation('zl')" class="kfclass kf01" id="zlConsultation">
  1629 + <span class="kfL kfLsame01"></span>
  1630 + <span class="kfR">专利咨询</span>
  1631 + </a>
  1632 + <a onclick="openConsultation('tm')" class="kfclass kf01" id="sbConsultation">
  1633 + <span class="kfL kfLsame02"></span>
  1634 + <span class="kfR">商标咨询</span>
  1635 + </a>
  1636 + <a onclick="openConsultation('cr')" class="kfclass kf01" id="bqConsultation">
  1637 + <span class="kfL kfLsame03"></span>
  1638 + <span class="kfR">版权咨询</span>
  1639 + </a>
  1640 + <a onclick="openConsultation('rd')" class="kfclass kf01 no-border" id="rzConsultation">
  1641 + <span class="kfL kfLsame04"></span>
  1642 + <span class="kfR">认证咨询</span>
  1643 + </a>
  1644 + <div class="triangle"></div>
  1645 + </div>
  1646 + </div>
  1647 + </div>
  1648 + </li>
  1649 + <li>
  1650 + <a href="https://user.zhiguagua.com/user/gouwuche.html" target="_blank">
  1651 + <i class="gwc"></i>
  1652 + <div class="my-gwc">购物车</div>
  1653 + </a>
  1654 + </li>
  1655 + <li>
  1656 + <a onclick="javascript:showOpion();">
  1657 + <i class="fk"></i>
  1658 + <div class="my-gwc">意见反馈</div>
  1659 + </a>
  1660 + </li>
  1661 + <li class="complainLe" style="opacity:0;">
  1662 + <a href="javascript:;" class="opionClick">
  1663 + <i class="fhdb"></i>
  1664 + <div class="my-gwc">返回顶部</div>
  1665 + </a>
  1666 + </li>
  1667 +</ul>
  1668 +<div id="fullbg3"></div>
  1669 +<div class="opinionBar" id="opinionBar">
  1670 + <div class="opinionDiv">
  1671 + <div class="tit">
  1672 + <div class="fl">
  1673 + <b>意见反馈</b><span>对您的每一条问题的反馈和帮助支持,我们深表感谢!</span>
  1674 + </div>
  1675 + <div class="fr">
  1676 + <a href="javascript:;" onclick="javascript:closeOpion();"><img src="/static/com/img/icon/gaoxing-delete.png?v=a7d80e6855e10760ccd81df0e34d2d4f"/></a>
  1677 + </div>
  1678 + </div>
  1679 + <div class="clearfix"></div>
  1680 + <form id='suggestForm' method="post" class="opinionForm" action='/com/api/addsuggest'>
  1681 + <ul class="comm">
  1682 + <li class="hei126">
  1683 + <div class="opinionFl fl">
  1684 + <span>反馈内容:</span>
  1685 + </div>
  1686 + <div class="opinionFr fl">
  1687 + <textarea class="opinion-area" name='content' onblur="if(this.value=='') this.value='输入描述内容';"onfocus="if(this.value=='输入描述内容') this.value='';" >输入描述内容</textarea>
  1688 + </div>
  1689 + </li>
  1690 + <li class="hei40">
  1691 + <div class="opinionFl fl">
  1692 + <span>邮件地址:</span>
  1693 + </div>
  1694 + <div class="opinionFr fl">
  1695 + <input type="text" name='email' class="opinionEmail" placeholder="您的Email地址"/>
  1696 + </div>
  1697 + </li>
  1698 + <li class="hei40">
  1699 + <div class="opinionFl fl">
  1700 + <span>电话号码:</span>
  1701 + </div>
  1702 + <div class="opinionFr fl">
  1703 + <input type="text" name='phone' class="opinionEmail" placeholder="您的电话号码"/>
  1704 + </div>
  1705 + </li>
  1706 + </ul>
  1707 + <div class="clearfix"></div>
  1708 + <div class="opinionBatt">
  1709 + <a href="javascript:suggest();">提交反馈</a>
  1710 + </div>
  1711 + </form>
  1712 + </div>
  1713 +</div>
  1714 +<!-- 侧边栏 -->
  1715 +<script>
  1716 + //判断返回顶部出现的位置
  1717 + $(window).scroll(function(){
  1718 + if ($(document).scrollTop() >= $(window).height() ) {
  1719 + $(".complainLe").css("opacity","1");
  1720 + }else{
  1721 + $(".complainLe").css("opacity","0");
  1722 + }
  1723 + });
  1724 + //点击返回顶部
  1725 + $(".complainLe").on("click",function(){
  1726 + $('html,body').animate({scrollTop: '0'}, 600);
  1727 + });
  1728 +</script>
  1729 +<script>
  1730 + function online_advice(){
  1731 + var o=(window.screen.availWidth-796)/2;
  1732 + var x=(window.screen.availHeight-562)/2;
  1733 + var v="left="+o+",top="+x+",resizable=yes,width=795,height=561";
  1734 + var k=window.open("http://p.qiao.baidu.com//im/index?siteid=7312301&ucid=11030523","newwindow",v);
  1735 + k.focus()}
  1736 +</script>
  1737 +<!-- WPA Button Begin -->
  1738 +
  1739 +<!-- WPA Button END -->
  1740 +<div style="">
  1741 +
  1742 + <script type="text/javascript">
  1743 + var _mvq = window._mvq || [];
  1744 + window._mvq = _mvq;
  1745 + _mvq.push(['$setAccount', 'm-208378-0']);
  1746 + _mvq.push(['$setGeneral', '', '', /*用户名*/ '', /*用户id*/ '']);//如果不传用户名、用户id,此句可以删掉
  1747 + _mvq.push(['$logConversion']);
  1748 + (function() {
  1749 + var mvl = document.createElement('script');
  1750 + mvl.type = 'text/javascript'; mvl.async = true;
  1751 + mvl.src = ('https:' == document.location.protocol ? 'https://static-ssl.mediav.com/mvl.js' : 'http://static.mediav.com/mvl.js');
  1752 + var s = document.getElementsByTagName('script')[0];
  1753 + s.parentNode.insertBefore(mvl, s);
  1754 + })();
  1755 + </script>
  1756 +</div>
  1757 +<!--百度统计-->
  1758 +<script>
  1759 + var _hmt = _hmt || [];
  1760 + (function() {
  1761 + var hm = document.createElement("script");
  1762 + hm.src = "//hm.baidu.com/hm.js?0eaa3be1a1b4ffd7be2065d4c04c3a3f";
  1763 + var s = document.getElementsByTagName("script")[0];
  1764 + s.parentNode.insertBefore(hm, s);
  1765 + })();
  1766 +</script>
  1767 +<!--腾讯统计-->
  1768 +<script type="text/javascript">
  1769 + var gdt_tracker = gdt_tracker || [];
  1770 + gdt_tracker.push(["set_source_id", "27367"]);
  1771 + (function() {
  1772 + var doc=document, h=doc.getElementsByTagName("head")[0], s=doc.createElement("script");
  1773 + s.async=true; s.src="https://qzs.qq.com/qzone/biz/res/gt.js";
  1774 + h && h.insertBefore(s,h.firstChild)
  1775 + })();
  1776 +</script>
  1777 +<!--品友统计-->
  1778 +<script type="text/javascript">
  1779 + var _py = _py || [];
  1780 + _py.push(['a', 'lXs..gHN_zWSbteghI-7d48f_t0']);
  1781 + _py.push(['domain','stats.bjglxf.com']);
  1782 + _py.push(['e','']);
  1783 + -function(d) {
  1784 + var s = d.createElement('script'),
  1785 + e = d.body.getElementsByTagName('script')[0]; e.parentNode.insertBefore(s, e),
  1786 + f = 'https:' == location.protocol;
  1787 + s.src = (f ? 'https' : 'http') + '://'+(f?'sjs.bjglxf.com ':'js.bjglxf.com')+'/j/adv.js';
  1788 + }(document);
  1789 +</script>
  1790 +<!--CNZZ统计-->
  1791 +<div style="display:none">
  1792 + <script type="text/javascript">
  1793 + var cnzz_protocol = (("https:" == document.location.protocol) ? " https://" : " http://");
  1794 + document.write(unescape("%3Cspan id='cnzz_stat_icon_1259629797'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s4.cnzz.com/z_stat.php%3Fid%3D1259629797' type='text/javascript'%3E%3C/script%3E"));
  1795 + </script>
  1796 +</div>
  1797 +<script>
  1798 + var _czc = _czc || [];
  1799 + //绑定siteid,请用您的siteid替换下方"XXXXXXXX"部分
  1800 + _czc.push(["_setAccount", "1259629797"]);
  1801 +</script>
  1802 +<!--小能客服 -->
  1803 +<script language="javascript" type="text/javascript">
  1804 + NTKF_PARAM = {
  1805 + siteid:"kf_9333", //企业ID,为固定值,必填
  1806 + settingid:"kf_9333_1467281384560", //接待组ID,为固定值,必填
  1807 + uid:"2055", //用户ID,未登录可以为空,但不能给null,uid赋予的值显示到小能客户端上
  1808 + uname:"leeruohai@126.com", //用户名,未登录可以为空,但不能给null,uname赋予的值显示到小能客户端上
  1809 + isvip:"0", //是否为vip用户,0代表非会员,1代表会员,取值显示到小能客户端上
  1810 + userlevel:"普通会员", //网站自定义会员级别,0-N,可根据选择判断,取值显示到小能客户端上
  1811 + erpparam:"zgg", //erpparam为erp功能的扩展字段,可选,购买erp功能后用于erp功能集成
  1812 + ntalkerparam:{
  1813 + category:"国内专利;国际专利;专利疑难服务;国内商标;国际商标;商标疑难服务;版权登记;资质认证;高新企业认定;担保认定", //分类名称,多分类可以用分号(;)分隔, 长路径父子间用冒号(:)分割
  1814 + brand:"专利服务;商标服务;版权服务" //品牌名称,多品牌可以用分号(;)分隔
  1815 + }
  1816 + }
  1817 +</script>
  1818 +<!--小能基础脚本加载 -->
  1819 +<script type="text/javascript" src="https://dl.ntalker.com/js/xn6/ntkfstat.js?siteid=kf_9333" charset="utf-8"></script>
  1820 +<noscript><img src="//stats.bjglxf.com/adv.gif?a=lXs..gHN_zWSbteghI-7d48f_t0&e=" style="display:none;"/>
  1821 +</noscript>
  1822 +<script type="text/javascript">
  1823 + $(function(){
  1824 + $.ajax({url:'/reg/api/messagecount',
  1825 + type:'get',
  1826 + dataType:'jsonp',
  1827 + jsonp:'callback',
  1828 + success:function(data){
  1829 + var url = 'https://user.zhiguagua.com/user';
  1830 + if(data.count>=0){
  1831 + $('.mes_sl').css("display","inline-block");
  1832 + $('#lnkMsg, .top-gwc').show();
  1833 + $('.count_sz').html(data.count);
  1834 + $('.count_gwc').html(data.cartcount);
  1835 + $('.shopCout').html(data.cartcount);
  1836 + $('.mes_sl').attr('href', url);
  1837 + }else{
  1838 + $('.mes_sl').css("display","none");
  1839 + }
  1840 + $('#lnkMsg').attr('href', url + '/xiaoxiguanli.html');
  1841 + },
  1842 + error: function(data){
  1843 + }
  1844 + });
  1845 + });
  1846 + $(function(){
  1847 + var str=window.location.search;
  1848 + t=str.charAt(str.length - 1);
  1849 + $('.ui-zlsq-type .focr' + t).trigger('click');
  1850 + });
  1851 +</script>
  1852 +
  1853 +</body>
  1854 +
  1855 +</html>
  1856 +
src/main/webapp/example_home_patent.jsp 0 → 100644
  1 +<%--
  2 + Created by IntelliJ IDEA.
  3 + User: litao
  4 + Date: 16-8-2
  5 + Time: 下午3:16
  6 + To change this template use File | Settings | File Templates.
  7 +--%>
  8 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  9 +<html>
  10 +<head>
  11 + <title>国内专利</title>
  12 + <link rel="stylesheet" type="text/css" href="css/example_home_patent.css"/>
  13 + <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
  14 +</head>
  15 +<body>
  16 +<jsp:include page="include/header.jsp"/>
  17 +
  18 +<div class="patent-wrap">
  19 + <div class="patent-top">
  20 + <span>提交案件</span>
  21 + </div>
  22 + <div class="patent-table">
  23 + <div class="patent-check">
  24 + <span>请核对案件信息</span>
  25 + </div>
  26 + <div class="patent-content">
  27 + <table cellspacing="0" cellpadding="0" class="patent-heder">
  28 + <tbody>
  29 + <tr>
  30 + <th class="tcontent">案件编号</th>
  31 + <th class="tcontent">案件类型</th>
  32 + <th class="tcontent">案件名称</th>
  33 + <th class="tcontent">费用(元)</th>
  34 + </tr>
  35 + </tbody>
  36 + </table>
  37 + <table cellspacing="0" cellpadding="0" style="border-top:0px;">
  38 + <tbody>
  39 + <tr class="tr-generic">
  40 + <td class="tcontent">P123123123</td>
  41 + <td class="tcontent">发明专利</td>
  42 + <td class="tcontent">暂无名称</td>
  43 + <td class="tcontent">2900.00</td>
  44 + </tr>
  45 + </tbody>
  46 + </table>
  47 + </div>
  48 + </div>
  49 +</div>
  50 +</body>
  51 +</html>
target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class
No preview for this file type
target/patent.war
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class
No preview for this file type