kelude / canrd-patent · Commits

Commit ad7fd48778c2033066cc00db34410a7eb5db8773

Authored by maoyangou
1 parent c1000e12
build: skipped

add .gitignore

Inline Side-by-side
Showing 2 changed files with 23 additions and 55 deletions
.gitignore 0 → 100644
  View file @ad7fd48
  1 +# eclipse
  2 +/.project
  3 +/.classpath
  4 +/.springBeans
  5 +/.settings/
  6 +
  7 +# idea
  8 +/.idea/
  9 +/*.ipr
  10 +/*.iml
  11 +/*.iws
  12 +
  13 +# p4merge
  14 +*.orig
  15 +
  16 +# maven
  17 +/target/
  18 +
  19 +# logs
  20 +/logs/
... ...
.idea/workspace.xml
  View file @ad7fd48
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="">
5   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
6   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
7   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/notice.jsp" />
8   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" />
9   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
10   - <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/PaymentMapper.java" afterPath="" />
11   - <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Payment.java" afterPath="" />
12   - <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/PaymentExample.java" afterPath="" />
13   - <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java" afterPath="" />
14   - <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java" afterPath="" />
15   - <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/resources/mapper/PaymentMapper.xml" afterPath="" />
16   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/mapper/PaymentMapper.class" afterPath="" />
17   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Payment.class" afterPath="" />
18   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/PaymentExample$Criteria.class" afterPath="" />
19   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/PaymentExample$Criterion.class" afterPath="" />
20   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/PaymentExample$GeneratedCriteria.class" afterPath="" />
21   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/PaymentExample.class" afterPath="" />
22   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/PaymentService.class" afterPath="" />
23   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/PaymentDataController.class" afterPath="" />
24   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/PaymentPageController.class" afterPath="" />
25   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/mapper/PaymentMapper.xml" afterPath="" />
26   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/mapper/PaymentMapper.class" afterPath="" />
27   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Payment.class" afterPath="" />
28   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$Criteria.class" afterPath="" />
29   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$Criterion.class" afterPath="" />
30   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$GeneratedCriteria.class" afterPath="" />
31   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample.class" afterPath="" />
32   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/PaymentService.class" afterPath="" />
33   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/PaymentDataController.class" afterPath="" />
34   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/PaymentPageController.class" afterPath="" />
35   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/PaymentMapper.xml" afterPath="" />
36   - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java" />
37   - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/case-detail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_detail.jsp" />
38   - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
39   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/CasementPageController.class" />
40   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class" />
41   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/test-classes/com/canrd/patent/CommonTest.class" afterPath="$PROJECT_DIR$/target/test-classes/com/canrd/patent/CommonTest.class" />
42   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/patent.mwb.bak" afterPath="$PROJECT_DIR$/doc/patent.mwb.bak" />
43   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
44   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/com/canrd/patent/CommonTest.java" afterPath="$PROJECT_DIR$/src/test/java/com/canrd/patent/CommonTest.java" />
45   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/error.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/error.jsp" />
46   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/error.jsp" afterPath="$PROJECT_DIR$/target/patent/error.jsp" />
47   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" afterPath="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
48   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" afterPath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" />
49   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.local/logback.xml" afterPath="$PROJECT_DIR$/src/main/resources.local/logback.xml" />
50   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/logback.xml" afterPath="$PROJECT_DIR$/target/classes/logback.xml" />
51   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/logback.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/logback.xml" />
52   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/patent.mwb" afterPath="$PROJECT_DIR$/doc/patent.mwb" />
53   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
54   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay.jsp" afterPath="$PROJECT_DIR$/target/patent/pay.jsp" />
55   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
56   - </list>
  4 + <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" />
57 5 <ignored path="patent.iws" />
58 6 <ignored path=".idea/workspace.xml" />
59 7 <ignored path="$PROJECT_DIR$/target/" />
... ... @@ -873,12 +821,12 @@
873 821 <workItem from="1469026864774" duration="4528000" />
874 822 <workItem from="1469112269396" duration="6881000" />
875 823 <workItem from="1469242140776" duration="1637000" />
876   - <workItem from="1469243959439" duration="3634000" />
  824 + <workItem from="1469243959439" duration="3683000" />
877 825 </task>
878 826 <servers />
879 827 </component>
880 828 <component name="TimeTrackingManager">
881   - <option name="totallyTimeSpent" value="81489000" />
  829 + <option name="totallyTimeSpent" value="81538000" />
882 830 </component>
883 831 <component name="ToolWindowManager">
884 832 <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
... ...