@ -11794,12 +11813,12 @@
11794 11813
      "integrity": "sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==",
11795 11814
      "dev": true,
11796 11815
      "requires": {
11797
        "debug": "3.2.6",
11798
        "eslint-scope": "3.7.1",
11799
        "eslint-visitor-keys": "1.0.0",
11800
        "espree": "3.5.4",
11801
        "esquery": "1.0.1",
11802
        "lodash": "4.17.11"
11816
        "debug": "^3.1.0",
11817
        "eslint-scope": "^3.7.1",
11818
        "eslint-visitor-keys": "^1.0.0",
11819
        "espree": "^3.5.2",
11820
        "esquery": "^1.0.0",
11821
        "lodash": "^4.17.4"
11803 11822
      }
11804 11823
    },
11805 11824
    "vue-hot-reload-api": {
@ -11814,11 +11833,11 @@
11814 11833
      "integrity": "sha512-nVV27GNIA9MeoD8yQ3dkUzwlAaAsWeYSWZHsu/K04KCD339lW0Jv2sJWsjj3721SP7sl2lYdPmjcHgkWQSp5bg==",
11815 11834
      "dev": true,
11816 11835
      "requires": {
11817
        "@vue/component-compiler-utils": "2.3.0",
11818
        "hash-sum": "1.0.2",
11819
        "loader-utils": "1.1.0",
11820
        "vue-hot-reload-api": "2.3.1",
11821
        "vue-style-loader": "4.1.2"
11836
        "@vue/component-compiler-utils": "^2.0.0",
11837
        "hash-sum": "^1.0.2",
11838
        "loader-utils": "^1.1.0",
11839
        "vue-hot-reload-api": "^2.3.0",
11840
        "vue-style-loader": "^4.1.0"
11822 11841
      }
11823 11842
    },
11824 11843
    "vue-router": {
@ -11832,8 +11851,8 @@
11832 11851
      "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==",
11833 11852
      "dev": true,
11834 11853
      "requires": {
11835
        "hash-sum": "1.0.2",
11836
        "loader-utils": "1.1.0"
11854
        "hash-sum": "^1.0.2",
11855
        "loader-utils": "^1.0.2"
11837 11856
      }
11838 11857
    },
11839 11858
    "vue-template-compiler": {
@ -11842,8 +11861,8 @@
11842 11861
      "integrity": "sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg==",
11843 11862
      "dev": true,
11844 11863
      "requires": {
11845
        "de-indent": "1.0.2",
11846
        "he": "1.1.1"
11864
        "de-indent": "^1.0.2",
11865
        "he": "^1.1.0"
11847 11866
      }
11848 11867
    },
11849 11868
    "vue-template-es2015-compiler": {
@ -11858,9 +11877,9 @@
11858 11877
      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
11859 11878
      "dev": true,
11860 11879
      "requires": {
11861
        "chokidar": "2.0.4",
11862
        "graceful-fs": "4.1.11",
11863
        "neo-async": "2.6.0"
11880
        "chokidar": "^2.0.2",
11881
        "graceful-fs": "^4.1.2",
11882
        "neo-async": "^2.5.0"
11864 11883
      }
11865 11884
    },
11866 11885
    "wbuf": {
@ -11869,7 +11888,7 @@
11869 11888
      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
11870 11889
      "dev": true,
11871 11890
      "requires": {
11872
        "minimalistic-assert": "1.0.1"
11891
        "minimalistic-assert": "^1.0.0"
11873 11892
      }
11874 11893
    },
11875 11894
    "wcwidth": {
@ -11878,7 +11897,7 @@
11878 11897
      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
11879 11898
      "dev": true,
11880 11899
      "requires": {
11881
        "defaults": "1.0.3"
11900
        "defaults": "^1.0.3"
11882 11901
      }
11883 11902
    },
11884 11903
    "webpack": {
@ -11891,26 +11910,26 @@
11891 11910
        "@webassemblyjs/helper-module-context": "1.7.8",
11892 11911
        "@webassemblyjs/wasm-edit": "1.7.8",
11893 11912
        "@webassemblyjs/wasm-parser": "1.7.8",
11894
        "acorn": "5.7.3",
11895
        "acorn-dynamic-import": "3.0.0",
11896
        "ajv": "6.5.4",
11897
        "ajv-keywords": "3.2.0",
11898
        "chrome-trace-event": "1.0.0",
11899
        "enhanced-resolve": "4.1.0",
11900
        "eslint-scope": "4.0.0",
11901
        "json-parse-better-errors": "1.0.2",
11902
        "loader-runner": "2.3.1",
11903
        "loader-utils": "1.1.0",
11904
        "memory-fs": "0.4.1",
11905
        "micromatch": "3.1.10",
11906
        "mkdirp": "0.5.1",
11907
        "neo-async": "2.6.0",
11908
        "node-libs-browser": "2.1.0",
11909
        "schema-utils": "0.4.7",
11910
        "tapable": "1.1.0",
11911
        "uglifyjs-webpack-plugin": "1.3.0",
11912
        "watchpack": "1.6.0",
11913
        "webpack-sources": "1.3.0"
11913
        "acorn": "^5.6.2",
11914
        "acorn-dynamic-import": "^3.0.0",
11915
        "ajv": "^6.1.0",
11916
        "ajv-keywords": "^3.1.0",
11917
        "chrome-trace-event": "^1.0.0",
11918
        "enhanced-resolve": "^4.1.0",
11919
        "eslint-scope": "^4.0.0",
11920
        "json-parse-better-errors": "^1.0.2",
11921
        "loader-runner": "^2.3.0",
11922
        "loader-utils": "^1.1.0",
11923
        "memory-fs": "~0.4.1",
11924
        "micromatch": "^3.1.8",
11925
        "mkdirp": "~0.5.0",
11926
        "neo-async": "^2.5.0",
11927
        "node-libs-browser": "^2.0.0",
11928
        "schema-utils": "^0.4.4",
11929
        "tapable": "^1.1.0",
11930
        "uglifyjs-webpack-plugin": "^1.2.4",
11931
        "watchpack": "^1.5.0",
11932
        "webpack-sources": "^1.3.0"
11914 11933
      },
11915 11934
      "dependencies": {
11916 11935
        "ajv": {
@ -11919,10 +11938,10 @@
11919 11938
          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
11920 11939
          "dev": true,
11921 11940
          "requires": {
11922
            "fast-deep-equal": "2.0.1",
11923
            "fast-json-stable-stringify": "2.0.0",
11924
            "json-schema-traverse": "0.4.1",
11925
            "uri-js": "4.2.2"
11941
            "fast-deep-equal": "^2.0.1",
11942
            "fast-json-stable-stringify": "^2.0.0",
11943
            "json-schema-traverse": "^0.4.1",
11944
            "uri-js": "^4.2.2"
11926 11945
          }
11927 11946
        },
11928 11947
        "ajv-keywords": {
@ -11949,16 +11968,16 @@
11949 11968
          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
11950 11969
          "dev": true,
11951 11970
          "requires": {
11952
            "arr-flatten": "1.1.0",
11953
            "array-unique": "0.3.2",
11954
            "extend-shallow": "2.0.1",
11955
            "fill-range": "4.0.0",
11956
            "isobject": "3.0.1",
11957
            "repeat-element": "1.1.3",
11958
            "snapdragon": "0.8.2",
11959
            "snapdragon-node": "2.1.1",
11960
            "split-string": "3.1.0",
11961
            "to-regex": "3.0.2"
11971
            "arr-flatten": "^1.1.0",
11972
            "array-unique": "^0.3.2",
11973
            "extend-shallow": "^2.0.1",
11974
            "fill-range": "^4.0.0",
11975
            "isobject": "^3.0.1",
11976
            "repeat-element": "^1.1.2",
11977
            "snapdragon": "^0.8.1",
11978
            "snapdragon-node": "^2.0.1",
11979
            "split-string": "^3.0.2",
11980
            "to-regex": "^3.0.1"
11962 11981
          },
11963 11982
          "dependencies": {
11964 11983
            "extend-shallow": {
@ -11967,7 +11986,7 @@
11967 11986
              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
11968 11987
              "dev": true,
11969 11988
              "requires": {
11970
                "is-extendable": "0.1.1"
11989
                "is-extendable": "^0.1.0"
11971 11990
              }
11972 11991
            }
11973 11992
          }
@ -11987,8 +12006,8 @@
11987 12006
          "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
11988 12007
          "dev": true,
11989 12008
          "requires": {
11990
            "esrecurse": "4.2.1",
11991
            "estraverse": "4.2.0"
12009
            "esrecurse": "^4.1.0",
12010
            "estraverse": "^4.1.1"
11992 12011
          }
11993 12012
        },
11994 12013
        "expand-brackets": {
@ -11997,13 +12016,13 @@
11997 12016
          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
11998 12017
          "dev": true,
11999 12018
          "requires": {
12000
            "debug": "2.6.9",
12001
            "define-property": "0.2.5",
12002
            "extend-shallow": "2.0.1",
12003
            "posix-character-classes": "0.1.1",
12004
            "regex-not": "1.0.2",
12005
            "snapdragon": "0.8.2",
12006
            "to-regex": "3.0.2"
12019
            "debug": "^2.3.3",
12020
            "define-property": "^0.2.5",
12021
            "extend-shallow": "^2.0.1",
12022
            "posix-character-classes": "^0.1.0",
12023
            "regex-not": "^1.0.0",
12024
            "snapdragon": "^0.8.1",
12025
            "to-regex": "^3.0.1"
12007 12026
          },
12008 12027
          "dependencies": {
12009 12028
            "define-property": {
@ -12012,7 +12031,7 @@
12012 12031
              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
12013 12032
              "dev": true,
12014 12033
              "requires": {
12015
                "is-descriptor": "0.1.6"
12034
                "is-descriptor": "^0.1.0"
12016 12035
              }
12017 12036
            },
12018 12037
            "extend-shallow": {
@ -12021,7 +12040,7 @@
12021 12040
              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
12022 12041
              "dev": true,
12023 12042
              "requires": {
12024
                "is-extendable": "0.1.1"
12043
                "is-extendable": "^0.1.0"
12025 12044
              }
12026 12045
            },
12027 12046
            "is-accessor-descriptor": {
@ -12030,7 +12049,7 @@
12030 12049
              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
12031 12050
              "dev": true,
12032 12051
              "requires": {
12033
                "kind-of": "3.2.2"
12052
                "kind-of": "^3.0.2"
12034 12053
              },
12035 12054
              "dependencies": {
12036 12055
                "kind-of": {
@ -12039,7 +12058,7 @@
12039 12058
                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
12040 12059
                  "dev": true,
12041 12060
                  "requires": {
12042
                    "is-buffer": "1.1.6"
12061
                    "is-buffer": "^1.1.5"
12043 12062
                  }
12044 12063
                }
12045 12064
              }
@ -12050,7 +12069,7 @@
12050 12069
              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
12051 12070
              "dev": true,
12052 12071
              "requires": {
12053
                "kind-of": "3.2.2"
12072
                "kind-of": "^3.0.2"
12054 12073
              },
12055 12074
              "dependencies": {
12056 12075
                "kind-of": {
@ -12059,7 +12078,7 @@
12059 12078
                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
12060 12079
                  "dev": true,
12061 12080
                  "requires": {
12062
                    "is-buffer": "1.1.6"
12081
                    "is-buffer": "^1.1.5"
12063 12082
                  }
12064 12083
                }
12065 12084
              }
@ -12070,9 +12089,9 @@
12070 12089
              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
12071 12090
              "dev": true,
12072 12091
              "requires": {
12073
                "is-accessor-descriptor": "0.1.6",
12074
                "is-data-descriptor": "0.1.4",
12075
                "kind-of": "5.1.0"
12092
                "is-accessor-descriptor": "^0.1.6",
12093
                "is-data-descriptor": "^0.1.4",
12094
                "kind-of": "^5.0.0"
12076 12095
              }
12077 12096
            },
12078 12097
            "kind-of": {
@ -12089,14 +12108,14 @@
12089 12108
          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
12090 12109
          "dev": true,
12091 12110
          "requires": {
12092
            "array-unique": "0.3.2",
12093
            "define-property": "1.0.0",
12094
            "expand-brackets": "2.1.4",
12095
            "extend-shallow": "2.0.1",
12096
            "fragment-cache": "0.2.1",
12097
            "regex-not": "1.0.2",
12098
            "snapdragon": "0.8.2",
12099
            "to-regex": "3.0.2"
12111
            "array-unique": "^0.3.2",
12112
            "define-property": "^1.0.0",
12113
            "expand-brackets": "^2.1.4",
12114
            "extend-shallow": "^2.0.1",
12115
            "fragment-cache": "^0.2.1",
12116
            "regex-not": "^1.0.0",
12117
            "snapdragon": "^0.8.1",
12118
            "to-regex": "^3.0.1"
12100 12119
          },
12101 12120
          "dependencies": {
12102 12121
            "define-property": {
@ -12105,7 +12124,7 @@
12105 12124
              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
12106 12125
              "dev": true,
12107 12126
              "requires": {
12108
                "is-descriptor": "1.0.2"
12127
                "is-descriptor": "^1.0.0"
12109 12128
              }
12110 12129
            },
12111 12130
            "extend-shallow": {
@ -12114,7 +12133,7 @@
12114 12133
              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
12115 12134
              "dev": true,
12116 12135
              "requires": {
12117
                "is-extendable": "0.1.1"
12136
                "is-extendable": "^0.1.0"
12118 12137
              }
12119 12138
            }
12120 12139
          }
@ -12131,10 +12150,10 @@
12131 12150
          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
12132 12151
          "dev": true,
12133 12152
          "requires": {
12134
            "extend-shallow": "2.0.1",
12135
            "is-number": "3.0.0",
12136
            "repeat-string": "1.6.1",
12137
            "to-regex-range": "2.1.1"
12153
            "extend-shallow": "^2.0.1",
12154
            "is-number": "^3.0.0",
12155
            "repeat-string": "^1.6.1",
12156
            "to-regex-range": "^2.1.0"
12138 12157
          },
12139 12158
          "dependencies": {
12140 12159
            "extend-shallow": {
@ -12143,7 +12162,7 @@
12143 12162
              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
12144 12163
              "dev": true,
12145 12164
              "requires": {
12146
                "is-extendable": "0.1.1"
12165
                "is-extendable": "^0.1.0"
12147 12166
              }
12148 12167
            }
12149 12168
          }
@ -12154,7 +12173,7 @@
12154 12173
          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
12155 12174
          "dev": true,
12156 12175
          "requires": {
12157
            "kind-of": "6.0.2"
12176
            "kind-of": "^6.0.0"
12158 12177
          }
12159 12178
        },
12160 12179
        "is-data-descriptor": {
@ -12163,7 +12182,7 @@
12163 12182
          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
12164 12183
          "dev": true,
12165 12184
          "requires": {
12166
            "kind-of": "6.0.2"
12185
            "kind-of": "^6.0.0"
12167 12186
          }
12168 12187
        },
12169 12188
        "is-descriptor": {
@ -12172,9 +12191,9 @@
12172 12191
          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
12173 12192
          "dev": true,
12174 12193
          "requires": {
12175
            "is-accessor-descriptor": "1.0.0",
12176
            "is-data-descriptor": "1.0.0",
12177
            "kind-of": "6.0.2"
12194
            "is-accessor-descriptor": "^1.0.0",
12195
            "is-data-descriptor": "^1.0.0",
12196
            "kind-of": "^6.0.2"
12178 12197
          }
12179 12198
        },
12180 12199
        "is-number": {
@ -12183,7 +12202,7 @@
12183 12202
          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
12184 12203
          "dev": true,
12185 12204
          "requires": {
12186
            "kind-of": "3.2.2"
12205
            "kind-of": "^3.0.2"
12187 12206
          },
12188 12207
          "dependencies": {
12189 12208
            "kind-of": {
@ -12192,7 +12211,7 @@
12192 12211
              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
12193 12212
              "dev": true,
12194 12213
              "requires": {
12195
                "is-buffer": "1.1.6"
12214
                "is-buffer": "^1.1.5"
12196 12215
              }
12197 12216
            }
12198 12217
          }
@ -12221,19 +12240,19 @@
12221 12240
          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
12222 12241
          "dev": true,
12223 12242
          "requires": {
12224
            "arr-diff": "4.0.0",
12225
            "array-unique": "0.3.2",
12226
            "braces": "2.3.2",
12227
            "define-property": "2.0.2",
12228
            "extend-shallow": "3.0.2",
12229
            "extglob": "2.0.4",
12230
            "fragment-cache": "0.2.1",
12231
            "kind-of": "6.0.2",
12232
            "nanomatch": "1.2.13",
12233
            "object.pick": "1.3.0",
12234
            "regex-not": "1.0.2",
12235
            "snapdragon": "0.8.2",
12236
            "to-regex": "3.0.2"
12243
            "arr-diff": "^4.0.0",
12244
            "array-unique": "^0.3.2",
12245
            "braces": "^2.3.1",
12246
            "define-property": "^2.0.2",
12247
            "extend-shallow": "^3.0.2",
12248
            "extglob": "^2.0.4",
12249
            "fragment-cache": "^0.2.1",
12250
            "kind-of": "^6.0.2",
12251
            "nanomatch": "^1.2.9",
12252
            "object.pick": "^1.3.0",
12253
            "regex-not": "^1.0.0",
12254
            "snapdragon": "^0.8.1",
12255
            "to-regex": "^3.0.2"
12237 12256
          }
12238 12257
        },
12239 12258
        "ms": {
@ -12250,18 +12269,18 @@
12250 12269
      "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
12251 12270
      "dev": true,
12252 12271
      "requires": {
12253
        "acorn": "5.7.3",
12254
        "bfj-node4": "5.3.1",
12255
        "chalk": "2.4.1",
12256
        "commander": "2.17.1",
12257
        "ejs": "2.6.1",
12258
        "express": "4.16.4",
12259
        "filesize": "3.6.1",
12260
        "gzip-size": "4.1.0",
12261
        "lodash": "4.17.11",
12262
        "mkdirp": "0.5.1",
12263
        "opener": "1.5.1",
12264
        "ws": "4.1.0"
12272
        "acorn": "^5.3.0",
12273
        "bfj-node4": "^5.2.0",
12274
        "chalk": "^2.3.0",
12275
        "commander": "^2.13.0",
12276
        "ejs": "^2.5.7",
12277
        "express": "^4.16.2",
12278
        "filesize": "^3.5.11",
12279
        "gzip-size": "^4.1.0",
12280
        "lodash": "^4.17.4",
12281
        "mkdirp": "^0.5.1",
12282
        "opener": "^1.4.3",
12283
        "ws": "^4.0.0"
12265 12284
      }
12266 12285
    },
12267 12286
    "webpack-chain": {
@ -12270,8 +12289,8 @@
12270 12289
      "integrity": "sha512-BCfKo2YkDe2ByqkEWe1Rw+zko4LsyS75LVr29C6xIrxAg9JHJ4pl8kaIZ396SUSNp6b4815dRZPSTAS8LlURRQ==",
12271 12290
      "dev": true,
12272 12291
      "requires": {
12273
        "deepmerge": "1.5.2",
12274
        "javascript-stringify": "1.6.0"
12292
        "deepmerge": "^1.5.2",
12293
        "javascript-stringify": "^1.6.0"
12275 12294
      }
12276 12295
    },
12277 12296
    "webpack-dev-middleware": {
@ -12280,10 +12299,10 @@
12280 12299
      "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
12281 12300
      "dev": true,
12282 12301
      "requires": {
12283
        "memory-fs": "0.4.1",
12284
        "mime": "2.3.1",
12285
        "range-parser": "1.2.0",
12286
        "webpack-log": "2.0.0"
12302
        "memory-fs": "~0.4.1",
12303
        "mime": "^2.3.1",
12304
        "range-parser": "^1.0.3",
12305
        "webpack-log": "^2.0.0"
12287 12306
      }
12288 12307
    },
12289 12308
    "webpack-dev-server": {
@ -12293,32 +12312,32 @@
12293 12312
      "dev": true,
12294 12313
      "requires": {
12295 12314
        "ansi-html": "0.0.7",
12296
        "bonjour": "3.5.0",
12297
        "chokidar": "2.0.4",
12298
        "compression": "1.7.3",
12299
        "connect-history-api-fallback": "1.5.0",
12300
        "debug": "3.2.6",
12301
        "del": "3.0.0",
12302
        "express": "4.16.4",
12303
        "html-entities": "1.2.1",
12304
        "http-proxy-middleware": "0.18.0",
12305
        "import-local": "2.0.0",
12306
        "internal-ip": "3.0.1",
12307
        "ip": "1.1.5",
12308
        "killable": "1.0.1",
12309
        "loglevel": "1.6.1",
12310
        "opn": "5.4.0",
12311
        "portfinder": "1.0.19",
12312
        "schema-utils": "1.0.0",
12313
        "selfsigned": "1.10.4",
12314
        "serve-index": "1.9.1",
12315
        "bonjour": "^3.5.0",
12316
        "chokidar": "^2.0.0",
12317
        "compression": "^1.5.2",
12318
        "connect-history-api-fallback": "^1.3.0",
12319
        "debug": "^3.1.0",
12320
        "del": "^3.0.0",
12321
        "express": "^4.16.2",
12322
        "html-entities": "^1.2.0",
12323
        "http-proxy-middleware": "~0.18.0",
12324
        "import-local": "^2.0.0",
12325
        "internal-ip": "^3.0.1",
12326
        "ip": "^1.1.5",
12327
        "killable": "^1.0.0",
12328
        "loglevel": "^1.4.1",
12329
        "opn": "^5.1.0",
12330
        "portfinder": "^1.0.9",
12331
        "schema-utils": "^1.0.0",
12332
        "selfsigned": "^1.9.1",
12333
        "serve-index": "^1.7.2",
12315 12334
        "sockjs": "0.3.19",
12316 12335
        "sockjs-client": "1.3.0",
12317
        "spdy": "3.4.7",
12318
        "strip-ansi": "3.0.1",
12319
        "supports-color": "5.5.0",
12336
        "spdy": "^3.4.1",
12337
        "strip-ansi": "^3.0.0",
12338
        "supports-color": "^5.1.0",
12320 12339
        "webpack-dev-middleware": "3.4.0",
12321
        "webpack-log": "2.0.0",
12340
        "webpack-log": "^2.0.0",
12322 12341
        "yargs": "12.0.2"
12323 12342
      },
12324 12343
      "dependencies": {
@ -12328,10 +12347,10 @@
12328 12347
          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
12329 12348
          "dev": true,
12330 12349
          "requires": {
12331
            "fast-deep-equal": "2.0.1",
12332
            "fast-json-stable-stringify": "2.0.0",
12333
            "json-schema-traverse": "0.4.1",
12334
            "uri-js": "4.2.2"
12350
            "fast-deep-equal": "^2.0.1",
12351
            "fast-json-stable-stringify": "^2.0.0",
12352
            "json-schema-traverse": "^0.4.1",
12353
            "uri-js": "^4.2.2"
12335 12354
          }
12336 12355
        },
12337 12356
        "ajv-keywords": {
@ -12352,12 +12371,12 @@
12352 12371
          "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
12353 12372
          "dev": true,
12354 12373
          "requires": {
12355
            "globby": "6.1.0",
12356
            "is-path-cwd": "1.0.0",
12357
            "is-path-in-cwd": "1.0.1",
12358
            "p-map": "1.2.0",
12359
            "pify": "3.0.0",
12360
            "rimraf": "2.6.2"
12374
            "globby": "^6.1.0",
12375
            "is-path-cwd": "^1.0.0",
12376
            "is-path-in-cwd": "^1.0.0",
12377
            "p-map": "^1.1.1",
12378
            "pify": "^3.0.0",
12379
            "rimraf": "^2.2.8"
12361 12380
          }
12362 12381
        },
12363 12382
        "fast-deep-equal": {
@ -12372,11 +12391,11 @@
12372 12391
          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
12373 12392
          "dev": true,
12374 12393
          "requires": {
12375
            "array-union": "1.0.2",
12376
            "glob": "7.1.3",
12377
            "object-assign": "4.1.1",
12378
            "pify": "2.3.0",
12379
            "pinkie-promise": "2.0.1"
12394
            "array-union": "^1.0.1",
12395
            "glob": "^7.0.3",
12396
            "object-assign": "^4.0.1",
12397
            "pify": "^2.0.0",
12398
            "pinkie-promise": "^2.0.0"
12380 12399
          },
12381 12400
          "dependencies": {
12382 12401
            "pify": {
@ -12399,9 +12418,9 @@
12399 12418
          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
12400 12419
          "dev": true,
12401 12420
          "requires": {
12402
            "ajv": "6.5.4",
12403
            "ajv-errors": "1.0.0",
12404
            "ajv-keywords": "3.2.0"
12421
            "ajv": "^6.1.0",
12422
            "ajv-errors": "^1.0.0",
12423
            "ajv-keywords": "^3.1.0"
12405 12424
          }
12406 12425
        },
12407 12426
        "strip-ansi": {
@ -12410,7 +12429,7 @@
12410 12429
          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
12411 12430
          "dev": true,
12412 12431
          "requires": {
12413
            "ansi-regex": "2.1.1"
12432
            "ansi-regex": "^2.0.0"
12414 12433
          }
12415 12434
        }
12416 12435
      }
@ -12421,8 +12440,8 @@
12421 12440
      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
12422 12441
      "dev": true,
12423 12442
      "requires": {
12424
        "ansi-colors": "3.2.1",
12425
        "uuid": "3.3.2"
12443
        "ansi-colors": "^3.0.0",
12444
        "uuid": "^3.3.2"
12426 12445
      }
12427 12446
    },
12428 12447
    "webpack-merge": {
@ -12431,7 +12450,7 @@
12431 12450
      "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
12432 12451
      "dev": true,
12433 12452
      "requires": {
12434
        "lodash": "4.17.11"
12453
        "lodash": "^4.17.5"
12435 12454
      }
12436 12455
    },
12437 12456
    "webpack-sources": {
@ -12440,8 +12459,8 @@
12440 12459
      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
12441 12460
      "dev": true,
12442 12461
      "requires": {
12443
        "source-list-map": "2.0.1",
12444
        "source-map": "0.6.1"
12462
        "source-list-map": "^2.0.0",
12463
        "source-map": "~0.6.1"
12445 12464
      },
12446 12465
      "dependencies": {
12447 12466
        "source-map": {
@ -12458,8 +12477,8 @@
12458 12477
      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
12459 12478
      "dev": true,
12460 12479
      "requires": {
12461
        "http-parser-js": "0.5.0",
12462
        "websocket-extensions": "0.1.3"
12480
        "http-parser-js": ">=0.4.0",
12481
        "websocket-extensions": ">=0.1.1"
12463 12482
      }
12464 12483
    },
12465 12484
    "websocket-extensions": {
@ -12474,7 +12493,7 @@
12474 12493
      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
12475 12494
      "dev": true,
12476 12495
      "requires": {
12477
        "isexe": "2.0.0"
12496
        "isexe": "^2.0.0"
12478 12497
      }
12479 12498
    },
12480 12499
    "which-module": {
@ -12495,7 +12514,7 @@
12495 12514
      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
12496 12515
      "dev": true,
12497 12516
      "requires": {
12498
        "errno": "0.1.7"
12517
        "errno": "~0.1.7"
12499 12518
      }
12500 12519
    },
12501 12520
    "wrap-ansi": {
@ -12504,8 +12523,8 @@
12504 12523
      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
12505 12524
      "dev": true,
12506 12525
      "requires": {
12507
        "string-width": "1.0.2",
12508
        "strip-ansi": "3.0.1"
12526
        "string-width": "^1.0.1",
12527
        "strip-ansi": "^3.0.1"
12509 12528
      },
12510 12529
      "dependencies": {
12511 12530
        "ansi-regex": {
@ -12520,7 +12539,7 @@
12520 12539
          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
12521 12540
          "dev": true,
12522 12541
          "requires": {
12523
            "number-is-nan": "1.0.1"
12542
            "number-is-nan": "^1.0.0"
12524 12543
          }
12525 12544
        },
12526 12545
        "string-width": {
@ -12529,9 +12548,9 @@
12529 12548
          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
12530 12549
          "dev": true,
12531 12550
          "requires": {
12532
            "code-point-at": "1.1.0",
12533
            "is-fullwidth-code-point": "1.0.0",
12534
            "strip-ansi": "3.0.1"
12551
            "code-point-at": "^1.0.0",
12552
            "is-fullwidth-code-point": "^1.0.0",
12553
            "strip-ansi": "^3.0.0"
12535 12554
          }
12536 12555
        },
12537 12556
        "strip-ansi": {
@ -12540,7 +12559,7 @@
12540 12559
          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
12541 12560
          "dev": true,
12542 12561
          "requires": {
12543
            "ansi-regex": "2.1.1"
12562
            "ansi-regex": "^2.0.0"
12544 12563
          }
12545 12564
        }
12546 12565
      }
@ -12557,7 +12576,7 @@
12557 12576
      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
12558 12577
      "dev": true,
12559 12578
      "requires": {
12560
        "mkdirp": "0.5.1"
12579
        "mkdirp": "^0.5.1"
12561 12580
      }
12562 12581
    },
12563 12582
    "ws": {
@ -12566,8 +12585,8 @@
12566 12585
      "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
12567 12586
      "dev": true,
12568 12587
      "requires": {
12569
        "async-limiter": "1.0.0",
12570
        "safe-buffer": "5.1.2"
12588
        "async-limiter": "~1.0.0",
12589
        "safe-buffer": "~5.1.0"
12571 12590
      }
12572 12591
    },
12573 12592
    "xregexp": {
@ -12600,18 +12619,18 @@
12600 12619
      "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
12601 12620
      "dev": true,
12602 12621
      "requires": {
12603
        "cliui": "4.1.0",
12604
        "decamelize": "2.0.0",
12605
        "find-up": "3.0.0",
12606
        "get-caller-file": "1.0.3",
12607
        "os-locale": "3.0.1",
12608
        "require-directory": "2.1.1",
12609
        "require-main-filename": "1.0.1",
12610
        "set-blocking": "2.0.0",
12611
        "string-width": "2.1.1",
12612
        "which-module": "2.0.0",
12613
        "y18n": "4.0.0",
12614
        "yargs-parser": "10.1.0"
12622
        "cliui": "^4.0.0",
12623
        "decamelize": "^2.0.0",
12624
        "find-up": "^3.0.0",
12625
        "get-caller-file": "^1.0.1",
12626
        "os-locale": "^3.0.0",
12627
        "require-directory": "^2.1.1",
12628
        "require-main-filename": "^1.0.1",
12629
        "set-blocking": "^2.0.0",
12630
        "string-width": "^2.0.0",
12631
        "which-module": "^2.0.0",
12632
        "y18n": "^3.2.1 || ^4.0.0",
12633
        "yargs-parser": "^10.1.0"
12615 12634
      },
12616 12635
      "dependencies": {
12617 12636
        "find-up": {
@ -12620,7 +12639,7 @@
12620 12639
          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
12621 12640
          "dev": true,
12622 12641
          "requires": {
12623
            "locate-path": "3.0.0"
12642
            "locate-path": "^3.0.0"
12624 12643
          }
12625 12644
        },
12626 12645
        "locate-path": {
@ -12629,8 +12648,8 @@
12629 12648
          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
12630 12649
          "dev": true,
12631 12650
          "requires": {
12632
            "p-locate": "3.0.0",
12633
            "path-exists": "3.0.0"
12651
            "p-locate": "^3.0.0",
12652
            "path-exists": "^3.0.0"
12634 12653
          }
12635 12654
        },
12636 12655
        "p-limit": {
@ -12639,7 +12658,7 @@
12639 12658
          "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
12640 12659
          "dev": true,
12641 12660
          "requires": {
12642
            "p-try": "2.0.0"
12661
            "p-try": "^2.0.0"
12643 12662
          }
12644 12663
        },
12645 12664
        "p-locate": {
@ -12648,7 +12667,7 @@
12648 12667
          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
12649 12668
          "dev": true,
12650 12669
          "requires": {
12651
            "p-limit": "2.0.0"
12670
            "p-limit": "^2.0.0"
12652 12671
          }
12653 12672
        },
12654 12673
        "p-try": {
@ -12665,7 +12684,7 @@
12665 12684
      "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
12666 12685
      "dev": true,
12667 12686
      "requires": {
12668
        "camelcase": "4.1.0"
12687
        "camelcase": "^4.1.0"
12669 12688
      }
12670 12689
    },
12671 12690
    "yorkie": {
@ -12674,10 +12693,10 @@
12674 12693
      "integrity": "sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==",
12675 12694
      "dev": true,
12676 12695
      "requires": {
12677
        "execa": "0.8.0",
12678
        "is-ci": "1.2.1",
12679
        "normalize-path": "1.0.0",
12680
        "strip-indent": "2.0.0"
12696
        "execa": "^0.8.0",
12697
        "is-ci": "^1.0.10",
12698
        "normalize-path": "^1.0.0",
12699
        "strip-indent": "^2.0.0"
12681 12700
      },
12682 12701
      "dependencies": {
12683 12702
        "cross-spawn": {
@ -12686,9 +12705,9 @@
12686 12705
          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
12687 12706
          "dev": true,
12688 12707
          "requires": {
12689
            "lru-cache": "4.1.3",
12690
            "shebang-command": "1.2.0",
12691
            "which": "1.3.1"
12708
            "lru-cache": "^4.0.1",
12709
            "shebang-command": "^1.2.0",
12710
            "which": "^1.2.9"
12692 12711
          }
12693 12712
        },
12694 12713
        "execa": {
@ -12697,13 +12716,13 @@
12697 12716
          "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
12698 12717
          "dev": true,
12699 12718
          "requires": {
12700
            "cross-spawn": "5.1.0",
12701
            "get-stream": "3.0.0",
12702
            "is-stream": "1.1.0",
12703
            "npm-run-path": "2.0.2",
12704
            "p-finally": "1.0.0",
12705
            "signal-exit": "3.0.2",
12706
            "strip-eof": "1.0.0"
12719
            "cross-spawn": "^5.0.1",
12720
            "get-stream": "^3.0.0",
12721
            "is-stream": "^1.1.0",
12722
            "npm-run-path": "^2.0.0",
12723
            "p-finally": "^1.0.0",
12724
            "signal-exit": "^3.0.0",
12725
            "strip-eof": "^1.0.0"
12707 12726
          }
12708 12727
        },
12709 12728
        "normalize-path": {

+ 1 - 1
static-res/json-edit/public/index.html

@ -5,7 +5,7 @@
5 5
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 6
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
7 7
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
8
    <link rel="stylesheet" href="//at.alicdn.com/t/font_887867_2ymz9v1whck.css">
8
    <link rel="stylesheet" href="https://at.alicdn.com/t/font_887867_2ymz9v1whck.css">
9 9
    <title>IPU项目请求模拟器</title>
10 10
  </head>
11 11
  <body>

+ 2 - 2
static-res/json-edit/src/style/css/jsonedit.less

@ -32,7 +32,7 @@
32 32
      }
33 33
      .ipt-base{
34 34
        float: left;
35
        width: 308px;
35
        width: 570px;
36 36
        .el-input-group__prepend{
37 37
          padding: 0 6px;
38 38
        }
@ -62,7 +62,7 @@
62 62
        position: absolute;
63 63
        top: 42px;
64 64
        left: 0;
65
        width: 574px;
65
        width: 570px;
66 66
        border: 1px solid #dcdfe6;
67 67
        border-radius: 2px;
68 68
        background-color: #fff;

+ 24 - 26
static-res/json-edit/src/views/jsonedit.vue

@ -7,12 +7,12 @@
7 7
      </div>
8 8
      <div class="hand-content">
9 9
        <div class="request clearfix">
10
          <el-input class="ipt-base" v-model="requestPath" placeholder="请输入地址">
11
            <template slot="prepend">BaseUrl:</template>
10
          <el-input class="ipt-base" v-model="requestPath" placeholder="请输入请求地址">
11
            <template slot="prepend">RequestUrl:</template>
12 12
          </el-input>
13
          <el-input class="ipt-path" v-model="path" placeholder="请输入路径">
13
          <!-- <el-input class="ipt-path" v-model="path" placeholder="请输入路径">
14 14
            <template slot="prepend">Path:</template>
15
          </el-input>
15
          </el-input> -->
16 16
          <el-select class="sel" v-model="requestType" placeholder="请选择请求方式">
17 17
            <el-option label="POST" value="post"></el-option>
18 18
            <el-option label="GET" value="get"></el-option>
@ -20,7 +20,7 @@
20 20
          <el-button class="btn" type="info" @click="handHistory()">历史纪录</el-button>
21 21
          <el-button class="btn" type="primary" @click="handSend()">发送请求</el-button>
22 22
          <div class="history-box" v-if="historyShow">
23
            <div class="history-item" v-for="(item, index) in history" :key="index" @click="handHistorySend(item)">{{item.basePath + item.path}}</div>
23
            <div class="history-item" v-for="(item, index) in history" :key="index" @click="handHistorySend(item)">{{item.path}}</div>
24 24
            <div class="history-nodata" v-if="history.length == 0">暂无历史纪录</div>
25 25
          </div>
26 26
        </div>
@ -50,7 +50,7 @@ export default {
50 50
  data () {
51 51
    return {
52 52
      requestPath: '',
53
      path: '',
53
      // path: '',
54 54
      requestType: '',
55 55
      postType: 'application/x-www-from-urlencoded',
56 56
      jsonEditContainer: '', //编辑容器
@ -93,8 +93,7 @@ export default {
93 93
    if (localStorage.getItem("history")) {
94 94
      this.history = [].concat(JSON.parse(localStorage.getItem("history")))
95 95
      console.log('this.history', this.history)
96
      this.requestPath = this.history[0].basePath
97
      this.path = this.history[0].path
96
      this.requestPath = this.history[0].path
98 97
      this.requestType = this.history[0].type
99 98
      this.editor.set(this.history[0].params)
100 99
    } else {
@ -121,8 +120,7 @@ export default {
121 120
    },
122 121
    handHistorySend (item) {
123 122
      this.historyShow = false
124
      this.requestPath = item.basePath
125
      this.path = item.path
123
      this.requestPath = item.path
126 124
      this.requestType = item.type
127 125
      this.editor.set(item.params)
128 126
    },
@ -151,11 +149,10 @@ export default {
151 149
      }
152 150
    },
153 151
    handSend () {
154
      if (this.requestPath && this.path && this.requestType) {
152
      if (this.requestPath && this.requestType) {
155 153
        // lru数组
156 154
        let tempObj = {
157
          basePath: this.requestPath,
158
          path: this.path,
155
          path: this.requestPath,
159 156
          type: this.requestType,
160 157
          params: this.editor.get() || {},
161 158
          times: 0
@ -166,7 +163,7 @@ export default {
166 163
        }
167 164
        // 替换已有的历史
168 165
        for (let i = 0; i < this.history.length; i++) {
169
          if ((this.history[i].basePath + this.history[i].path) === (tempObj.basePath + tempObj.path)) {
166
          if (this.history[i].path === tempObj.path) {
170 167
            this.history.splice(i, 1)
171 168
            break
172 169
          }
@ -183,7 +180,7 @@ export default {
183 180
          }
184 181
          // 删除过期多余
185 182
          for (let k = 0; k < this.history.length; k++) {
186
            if ((this.history[k].basePath + this.history[k].path) === (oldOne.basePath + oldOne.path)) {
183
            if (this.history[k].path === oldOne.path) {
187 184
              this.history.splice(k, 1)
188 185
              break
189 186
            }
@ -197,11 +194,12 @@ export default {
197 194
          if (this.postType === 'application/x-www-from-urlencoded') {
198 195
            let sendData = this.editor.get()
199 196
            let arr = Object.keys(sendData)
200
            console.log(sendData, typeof(sendData))
197
            let qsStr = Qs.stringify(sendData)
198
            console.log('qsStr', qsStr)
201 199
            if (arr.length !== 0) {
202
              console.log(1 + 'post')
200
              console.log(1 + 'post' + 'application/x-www-from-urlencoded')
203 201
              this.NProgress.start()
204
              this.axios.post(this.requestPath + this.path, sendData, {headers: {'content-type': 'application/x-www-form-urlencoded'}}).then((res) => {
202
              this.axios.post(this.requestPath, qsStr, {headers: {'content-type': 'application/x-www-form-urlencoded'}}).then((res) => {
205 203
                console.log('ok')
206 204
                this.responser.set(res)
207 205
                this.NProgress.done()
@ -216,9 +214,9 @@ export default {
216 214
                this.$message.error('服务请求报错!')
217 215
              })
218 216
            } else {
219
              console.log(2 + 'post')
217
              console.log(2 + 'post' + 'application/x-www-from-urlencoded')
220 218
              this.NProgress.start()
221
              this.axios.post(this.requestPath + this.path, {headers: {'content-type': 'application/x-www-form-urlencoded'}}).then((res) => {
219
              this.axios.post(this.requestPath, {headers: {'content-type': 'application/x-www-form-urlencoded'}}).then((res) => {
222 220
                console.log('ok')
223 221
                this.responser.set(res)
224 222
                this.NProgress.done()
@ -238,9 +236,9 @@ export default {
238 236
            let arr = Object.keys(sendData)
239 237
            console.log(sendData, typeof(sendData))
240 238
            if (arr.length !== 0) {
241
              console.log(1 + 'post')
239
              console.log(1 + 'post' + 'multipart/form-data')
242 240
              this.NProgress.start()
243
              this.axios.post(this.requestPath + this.path, sendData, {headers: {'content-type': 'multipart/form-data'}}).then((res) => {
241
              this.axios.post(this.requestPath, sendData, {headers: {'content-type': 'multipart/form-data'}}).then((res) => {
244 242
                console.log('ok')
245 243
                this.responser.set(res)
246 244
                this.NProgress.done()
@ -255,9 +253,9 @@ export default {
255 253
                this.$message.error('服务请求报错!')
256 254
              })
257 255
            } else {
258
              console.log(2 + 'post')
256
              console.log(2 + 'post' + 'multipart/form-data')
259 257
              this.NProgress.start()
260
              this.axios.post(this.requestPath + this.path, {headers: {'content-type': 'multipart/form-data'}}).then((res) => {
258
              this.axios.post(this.requestPath, {headers: {'content-type': 'multipart/form-data'}}).then((res) => {
261 259
                console.log('ok')
262 260
                this.responser.set(res)
263 261
                this.NProgress.done()
@ -280,7 +278,7 @@ export default {
280 278
          if (arr.length !== 0) {
281 279
            console.log(1 + 'get')
282 280
            this.NProgress.start()
283
            this.axios.get(this.requestPath + this.path, {params: getData}).then((res) => {
281
            this.axios.get(this.requestPath, {params: getData}).then((res) => {
284 282
              console.log('ok')
285 283
              this.responser.set(res)
286 284
              this.NProgress.done()
@ -297,7 +295,7 @@ export default {
297 295
          } else {
298 296
            console.log(2 + 'get')
299 297
            this.NProgress.start()
300
            this.axios.get(this.requestPath + this.path).then((res) => {
298
            this.axios.get(this.requestPath).then((res) => {
301 299
              console.log('ok')
302 300
              this.responser.set(res)
303 301
              this.NProgress.done()

+ 1 - 1
static-res/json-edit/vue.config.js

@ -1,4 +1,4 @@
1 1
module.exports = {
2 2
  lintOnSave: false,
3
  baseUrl: process.env.NODE_ENV === 'production' ? '/' : '/'
3
  baseUrl: process.env.NODE_ENV === 'production' ? './' : '/'
4 4
}

bug修复:@完善ipu-checkbox组件功能-1 · 8b2cf13744 - Nuosi Git Service
Przeglądaj źródła

bug修复:@完善ipu-checkbox组件功能-1

chenxy41 3 lat temu
rodzic
commit
8b2cf13744

Informacje nt. zmiany nie są dostępne.

android-share - Nuosi Git Service

ipu的trunk版的android工程和服务端工程。

huangbo 22bd19543c 初始化 10 lat temu
..
build 22bd19543c 初始化 10 lat temu
etc 22bd19543c 初始化 10 lat temu
lib 22bd19543c 初始化 10 lat temu
src 22bd19543c 初始化 10 lat temu
web 22bd19543c 初始化 10 lat temu
.gitignore 22bd19543c 初始化 10 lat temu
.project 22bd19543c 初始化 10 lat temu
支持spring boot的ipu服务服务端工程 · bdf3302431 - Nuosi Git Service
Просмотр исходного кода

支持spring boot的ipu服务服务端工程

huangbo лет назад: 6
Родитель
Сommit
bdf3302431
50 измененных файлов с 44 добавлено и 398 удалено
  1. BIN
      ipu-server-libs/all/antlr4-annotations-4.2.jar
  2. BIN
      ipu-server-libs/all/antlr4-runtime-4.2.jar
  3. BIN
      ipu-server-libs/all/beetl-core-2.2.3.jar
  4. BIN
      ipu-server-libs/all/commons-codec-1.3.jar
  5. BIN
      ipu-server-libs/all/commons-collections-3.2.1.jar
  6. BIN
      ipu-server-libs/all/commons-dbcp-1.4.jar
  7. BIN
      ipu-server-libs/all/commons-fileupload-1.3.1.jar
  8. BIN
      ipu-server-libs/all/commons-io-2.2.jar
  9. BIN
      ipu-server-libs/all/commons-lang-2.4.jar
  10. BIN
      ipu-server-libs/all/commons-lang3-3.4.jar
  11. BIN
      ipu-server-libs/all/commons-logging-1.1.3.jar
  12. BIN
      ipu-server-libs/all/commons-pool-1.5.4.jar
  13. BIN
      ipu-server-libs/all/dom4j-1.6.1.jar
  14. BIN
      ipu-server-libs/all/httpasyncclient-4.0.1.jar
  15. BIN
      ipu-server-libs/all/httpclient-4.3.2.jar
  16. BIN
      ipu-server-libs/all/httpcore-4.3.1.jar
  17. BIN
      ipu-server-libs/all/httpcore-nio-4.3.2.jar
  18. BIN
      ipu-server-libs/all/httpmime-4.3.2.jar
  19. BIN
      ipu-server-libs/all/icu4j-2.6.1.jar
  20. BIN
      ipu-server-libs/all/ipu-basic-3.0.jar
  21. BIN
      ipu-server-libs/all/ipu-common-3.0.jar
  22. BIN
      ipu-server-libs/all/ipu-file-system-3.0.jar
  23. BIN
      ipu-server-libs/all/ipu-server-web-3.0.jar
  24. BIN
      ipu-server-libs/all/java_memcache-release-2.5.3.jar
  25. BIN
      ipu-server-libs/all/jaxen-1.1.1.jar
  26. BIN
      ipu-server-libs/all/jdom-1.0.jar
  27. BIN
      ipu-server-libs/all/json-20131018.jar
  28. BIN
      ipu-server-libs/all/jsoup-1.7.2.jar
  29. BIN
      ipu-server-libs/all/junit-3.8.1.jar
  30. BIN
      ipu-server-libs/all/log4j-1.2.8.jar
  31. BIN
      ipu-server-libs/all/mysql-connector-java-5.1.38.jar
  32. BIN
      ipu-server-libs/all/org.abego.treelayout.core-1.0.1.jar
  33. BIN
      ipu-server-libs/all/poi-3.9.jar
  34. BIN
      ipu-server-libs/all/servlet-api-2.5.jar
  35. BIN
      ipu-server-libs/all/unirest-java-1.3.8.jar
  36. BIN
      ipu-server-libs/all/velocity-1.7.jar
  37. BIN
      ipu-server-libs/all/wade-apache-1.0.jar
  38. BIN
      ipu-server-libs/all/wade-cache-1.0.jar
  39. BIN
      ipu-server-libs/all/wade-common-1.0.jar
  40. BIN
      ipu-server-libs/all/wade-data-1.0.jar
  41. BIN
      ipu-server-libs/all/wade-database-1.0.jar
  42. BIN
      ipu-server-libs/all/wade-mobile-data-1.0.jar
  43. BIN
      ipu-server-libs/all/wade-sqlite-jdbc-1.0.jar
  44. BIN
      ipu-server-libs/all/xalan-2.6.0.jar
  45. BIN
      ipu-server-libs/all/xercesImpl-2.6.2.jar
  46. BIN
      ipu-server-libs/all/xml-apis-1.0.b2.jar
  47. BIN
      ipu-server-libs/all/xmlParserAPIs-2.6.2.jar
  48. BIN
      ipu-server-libs/all/xom-1.0.jar
  49. BIN
      ipu-server-libs/ant-contrib-1.0b3.jar
  50. 44 398
      ipu-server-libs/pom.xml

BIN
ipu-server-libs/all/antlr4-annotations-4.2.jar


BIN
ipu-server-libs/all/antlr4-runtime-4.2.jar


BIN
ipu-server-libs/all/beetl-core-2.2.3.jar


BIN
ipu-server-libs/all/commons-codec-1.3.jar


BIN
ipu-server-libs/all/commons-collections-3.2.1.jar


BIN
ipu-server-libs/all/commons-dbcp-1.4.jar


BIN
ipu-server-libs/all/commons-fileupload-1.3.1.jar


BIN
ipu-server-libs/all/commons-io-2.2.jar


BIN
ipu-server-libs/all/commons-lang-2.4.jar


BIN
ipu-server-libs/all/commons-lang3-3.4.jar


BIN
ipu-server-libs/all/commons-logging-1.1.3.jar


BIN
ipu-server-libs/all/commons-pool-1.5.4.jar


BIN
ipu-server-libs/all/dom4j-1.6.1.jar


BIN
ipu-server-libs/all/httpasyncclient-4.0.1.jar


BIN
ipu-server-libs/all/httpclient-4.3.2.jar


BIN
ipu-server-libs/all/httpcore-4.3.1.jar


BIN
ipu-server-libs/all/httpcore-nio-4.3.2.jar


BIN
ipu-server-libs/all/httpmime-4.3.2.jar


BIN
ipu-server-libs/all/icu4j-2.6.1.jar


BIN
ipu-server-libs/all/ipu-basic-3.0.jar


BIN
ipu-server-libs/all/ipu-common-3.0.jar


BIN
ipu-server-libs/all/ipu-file-system-3.0.jar


BIN
ipu-server-libs/all/ipu-server-web-3.0.jar


BIN
ipu-server-libs/all/java_memcache-release-2.5.3.jar


BIN
ipu-server-libs/all/jaxen-1.1.1.jar


BIN
ipu-server-libs/all/jdom-1.0.jar


BIN
ipu-server-libs/all/json-20131018.jar


BIN
ipu-server-libs/all/jsoup-1.7.2.jar


BIN
ipu-server-libs/all/junit-3.8.1.jar


BIN
ipu-server-libs/all/log4j-1.2.8.jar


BIN
ipu-server-libs/all/mysql-connector-java-5.1.38.jar


BIN
ipu-server-libs/all/org.abego.treelayout.core-1.0.1.jar


BIN
ipu-server-libs/all/poi-3.9.jar


BIN
ipu-server-libs/all/servlet-api-2.5.jar


BIN
ipu-server-libs/all/unirest-java-1.3.8.jar


BIN
ipu-server-libs/all/velocity-1.7.jar


BIN
ipu-server-libs/all/wade-apache-1.0.jar


BIN
ipu-server-libs/all/wade-cache-1.0.jar


BIN
ipu-server-libs/all/wade-common-1.0.jar


BIN
ipu-server-libs/all/wade-data-1.0.jar


BIN
ipu-server-libs/all/wade-database-1.0.jar


BIN
ipu-server-libs/all/wade-mobile-data-1.0.jar


BIN
ipu-server-libs/all/wade-sqlite-jdbc-1.0.jar


BIN
ipu-server-libs/all/xalan-2.6.0.jar


BIN
ipu-server-libs/all/xercesImpl-2.6.2.jar


BIN
ipu-server-libs/all/xml-apis-1.0.b2.jar


BIN
ipu-server-libs/all/xmlParserAPIs-2.6.2.jar


BIN
ipu-server-libs/all/xom-1.0.jar


BIN
ipu-server-libs/ant-contrib-1.0b3.jar


+ 44 - 398
ipu-server-libs/pom.xml

@ -1,24 +1,17 @@
1 1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2 2
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 3
	<modelVersion>4.0.0</modelVersion>
4
	<!-- display-server等ipu服务端工程继承使用 -->
4
	<parent>
5
		<groupId>com.ai.ipu.server</groupId>
6
		<artifactId>ipu-rest-libs</artifactId>
7
		<version>3.1-SNAPSHOT</version>
8
	</parent>
5 9
6
	<groupId>com.ai.ipu</groupId>
7 10
	<artifactId>ipu-server-libs</artifactId>
8
	<version>3.0-SNAPSHOT</version>
9 11
	<packaging>pom</packaging>
10
	<name>ipu-server-libs</name>
11 12
12
	<distributionManagement>
13
		<repository>
14
			<id>ipu-nexus</id>
15
			<url>http://114.215.100.48:9090/nexus/content/repositories/ipu/</url>
16
		</repository>
17
		<snapshotRepository>
18
			<id>ipu-snapshots-nexus</id>
19
			<url>http://114.215.100.48:9090/nexus/content/repositories/ipu-snapshots/</url>
20
		</snapshotRepository>
21
	</distributionManagement>
13
	<name>ipu-server-libs</name>
14
	<url>http://maven.apache.org</url>
22 15
	
23 16
	<repositories>
24 17
		<repository>
@ -35,348 +28,29 @@
35 28
		</repository>
36 29
	</repositories>
37 30
38
	<!-- 定义公共变量 -->
39 31
	<properties>
40
		<!-- ipu jar -->
41
		<ipu>3.0-SNAPSHOT</ipu>
42
		<wade>1.0</wade>
43
		
44
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
45
		<encoding>UTF-8</encoding>
46
47
		<!-- Central jar -->
48
		<junit>3.8.1</junit>
49
		<servlet-api>2.5</servlet-api>
50
		<log4j>1.2.8</log4j>
51
		<unirest-java>1.3.8</unirest-java>
52
		<dom4j>1.6.1</dom4j>
53
		<jaxen>1.1.1</jaxen>
54
		<commons-lang3>3.4</commons-lang3>
55
		<beetl-core>2.2.3</beetl-core>
56
		<velocity>1.7</velocity>
57
		<jsoup>1.7.2</jsoup>
58
		<commons-fileupload>1.3.1</commons-fileupload>
59
		<commons-dbcp>1.4</commons-dbcp>
60
		<mysql-connector-java>5.1.39</mysql-connector-java>
61
		<commons-codec>1.3</commons-codec>
62
		<jdom>1.1.3</jdom>
63
		<commons-collections>3.2</commons-collections>
64
		<quartz-all>1.6.3</quartz-all>
65
		<jta>1.1</jta>
66
67
		<!-- 3rd party jar -->
68
		<ojdbc>14</ojdbc>
69
		<java_memcache-release>2.5.3</java_memcache-release>
70
		<amail>1.0</amail>
71
		<zxing>1.0</zxing>
32
		<webapp-path>${basedir}/src/main/resources/webapp</webapp-path>
72 33
73 34
		<!-- 公共插件 -->
35
		<!--
74 36
		<maven-clean-plugin>3.0.0</maven-clean-plugin>
75 37
		<maven-resources-plugin>3.0.1</maven-resources-plugin>
76
		<maven-compiler-plugin>3.1</maven-compiler-plugin>
77
		<compiler-version>1.6</compiler-version>
78
		<maven-surefire-plugin>2.5</maven-surefire-plugin>
79 38
		<maven-war-plugin>2.6</maven-war-plugin>
80 39
		<exec-maven-plugin>1.5.0</exec-maven-plugin>
81 40
		<maven-dependency-plugin>2.4</maven-dependency-plugin>
82
83
		<!-- 本地jar路径all -->
84
		<jar-path-all>${project.basedir}/all</jar-path-all>
85
41
		-->
86 42
	</properties>
87 43
88
	<dependencyManagement>
89
		<dependencies>
90
			<!-- Central jar -->
91
			<dependency>
92
				<groupId>commons-collections</groupId>
93
				<artifactId>commons-collections</artifactId>
94
				<version>${commons-collections}</version>
95
			</dependency>
96
			<dependency>
97
				<groupId>javax.transaction</groupId>
98
				<artifactId>jta</artifactId>
99
				<version>${jta}</version>
100
			</dependency>
101
			<dependency>
102
				<groupId>opensymphony</groupId>
103
				<artifactId>quartz-all</artifactId>
104
				<version>${quartz-all}</version>
105
			</dependency>
106
			<dependency>
107
				<groupId>junit</groupId>
108
				<artifactId>junit</artifactId>
109
				<version>${junit}</version>
110
				<scope>test</scope>
111
			</dependency>
112
			<dependency>
113
				<groupId>javax.servlet</groupId>
114
				<artifactId>servlet-api</artifactId>
115
				<version>${servlet-api}</version>
116
				<scope>provided</scope>
117
			</dependency>
118
			<dependency>
119
				<groupId>org.apache.commons</groupId>
120
				<artifactId>commons-lang3</artifactId>
121
				<version>${commons-lang3}</version>
122
			</dependency>
123
			<dependency>
124
				<groupId>log4j</groupId>
125
				<artifactId>log4j</artifactId>
126
				<version>${log4j}</version>
127
			</dependency>
128
			<dependency>
129
				<groupId>dom4j</groupId>
130
				<artifactId>dom4j</artifactId>
131
				<version>${dom4j}</version>
132
			</dependency>
133
			<dependency>
134
				<groupId>jaxen</groupId>
135
				<artifactId>jaxen</artifactId>
136
				<version>${jaxen}</version>
137
			</dependency>
138
			<dependency>
139
				<groupId>com.mashape.unirest</groupId>
140
				<artifactId>unirest-java</artifactId>
141
				<version>${unirest-java}</version>
142
			</dependency>
143
			<dependency>
144
				<groupId>org.beetl</groupId>
145
				<artifactId>beetl-core</artifactId>
146
				<version>${beetl-core}</version>
147
			</dependency>
148
			<dependency>
149
				<groupId>org.apache.velocity</groupId>
150
				<artifactId>velocity</artifactId>
151
				<version>${velocity}</version>
152
			</dependency>
153
			<dependency>
154
				<groupId>org.jsoup</groupId>
155
				<artifactId>jsoup</artifactId>
156
				<version>${jsoup}</version>
157
			</dependency>
158
			<dependency>
159
				<groupId>commons-fileupload</groupId>
160
				<artifactId>commons-fileupload</artifactId>
161
				<version>${commons-fileupload}</version>
162
			</dependency>
163
			<dependency>
164
				<groupId>commons-dbcp</groupId>
165
				<artifactId>commons-dbcp</artifactId>
166
				<version>${commons-dbcp}</version>
167
			</dependency>
168
			<dependency>
169
				<groupId>mysql</groupId>
170
				<artifactId>mysql-connector-java</artifactId>
171
				<version>${mysql-connector-java}</version>
172
			</dependency>
173
			<dependency>
174
				<groupId>commons-codec</groupId>
175
				<artifactId>commons-codec</artifactId>
176
				<version>${commons-codec}</version>
177
			</dependency>
178
179
			<!-- 3rd party jar -->
180
			<dependency>
181
				<groupId>com</groupId>
182
				<artifactId>java_memcache-release</artifactId>
183
				<version>${java_memcache-release}</version>
184
			</dependency>
185
			<dependency>
186
				<groupId>com.amail</groupId>
187
				<artifactId>amail</artifactId>
188
				<version>${amail}</version>
189
			</dependency>
190
			<dependency>
191
				<groupId>com.zxing</groupId>
192
				<artifactId>zxing</artifactId>
193
				<version>${zxing}</version>
194
			</dependency>
195
			<dependency>
196
				<groupId>ojdbc</groupId>
197
				<artifactId>ojdbc</artifactId>
198
				<version>${ojdbc}</version>
199
			</dependency>
200
201
			<!-- ipu jar -->
202
			<dependency>
203
				<groupId>com.ai.ipu</groupId>
204
				<artifactId>ipu-basic</artifactId>
205
				<version>${ipu}</version>
206
			</dependency>
207
			<dependency>
208
				<groupId>com.ai.ipu</groupId>
209
				<artifactId>ipu-common</artifactId>
210
				<version>${ipu}</version>
211
			</dependency>
212
			<dependency>
213
				<groupId>com.ai.ipu</groupId>
214
				<artifactId>ipu-database</artifactId>
215
				<version>${ipu}</version>
216
			</dependency>
217
			<dependency>
218
				<groupId>com.ai.ipu</groupId>
219
				<artifactId>ipu-remote-clinet</artifactId>
220
				<version>${ipu}</version>
221
			</dependency>
222
			<dependency>
223
				<groupId>com.ai.ipu</groupId>
224
				<artifactId>ipu-server-web</artifactId>
225
				<version>${ipu}</version>
226
			</dependency>
227
			<dependency>
228
				<groupId>com.ai.ipu</groupId>
229
				<artifactId>ipu-spring-boot</artifactId>
230
				<version>${ipu}</version>
231
			</dependency>
232
			<dependency>
233
				<groupId>com.ai.ipu</groupId>
234
				<artifactId>ipu-file-system</artifactId>
235
				<version>${ipu}</version>
236
			</dependency>
237
238
			<dependency>
239
				<!-- 不推荐使用,推荐使用wade-mobile-data -->
240
				<groupId>com.ai.wade</groupId>
241
				<artifactId>wade-data</artifactId>
242
				<version>${wade}</version>
243
			</dependency>
244
			<dependency>
245
				<!-- 不依赖其他jar -->
246
				<groupId>com.ai.wade</groupId>
247
				<artifactId>wade-mobile-data</artifactId>
248
				<version>${wade}</version>
249
			</dependency>
250
			<dependency>
251
				<!-- commons-collections-3.2.jar,quartz-all-1.6.3.jar,jdom1.0.jar,wade-apache,wade-common,wade-mobile-data -->
252
				<groupId>com.ai.wade</groupId>
253
				<artifactId>wade-cache</artifactId>
254
				<version>${wade}</version>
255
			</dependency>
256
			<dependency>
257
				<groupId>com.ai.wade</groupId>
258
				<artifactId>wade-apache</artifactId>
259
				<version>${wade}</version>
260
			</dependency>
261
			<dependency>
262
				<groupId>com.ai.wade</groupId>
263
				<artifactId>wade-common</artifactId>
264
				<version>${wade}</version>
265
			</dependency>
266
			<dependency>
267
				<!-- commons-dbcp-1.4.jar,dom4j-1.6.1.jar,jaxen-1.1.1.jar,jta.jar,ojdbc14.jar,mysql-connector-5.1.39.jar,wade-apache,wade-cache,wade-common,wade-mobile-data -->
268
				<groupId>com.ai.wade</groupId>
269
				<artifactId>wade-database</artifactId>
270
				<version>${wade}</version>
271
			</dependency>
272
			<dependency>
273
				<groupId>com.ai.wade</groupId>
274
				<artifactId>wade-sqlite-jdbc</artifactId>
275
				<version>${wade}</version>
276
			</dependency>
277
			<dependency>
278
				<!-- ipu-basic,ipu-server-web,wade-apache,wade-cache,wade-common,wade-database,wade-mobile-data -->
279
				<groupId>com.ai.wade</groupId>
280
				<artifactId>wade-codecode</artifactId>
281
				<version>${wade}</version>
282
			</dependency>
283
284
		</dependencies>
285
	</dependencyManagement>
44
	<dependencies>
45
	</dependencies>
286 46
287 47
	<build>
288 48
		<pluginManagement>
289 49
			<plugins>
290
				<!-- 默认插件,不引入也可使用 -->
291
				<!-- 默认jre编译版本:1.6 -->
292
				<plugin>
293
					<groupId>org.apache.maven.plugins</groupId>
294
					<artifactId>maven-compiler-plugin</artifactId>
295
					<version>${maven-compiler-plugin}</version>
296
					<configuration>
297
						<source>${compiler-version}</source>
298
						<target>${compiler-version}</target>
299
						<encoding>${encoding}</encoding>
300
					</configuration>
301
				</plugin>
302
				<!-- war包去除servlet-api的jar包 -->
303
				<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> 
304
					<version>${maven-war-plugin}</version> <configuration> servlet-api相关jar不打包,前面的scope=provided已解决 
305
					<packagingExcludes> WEB-INF/lib/servlet-api*.jar </packagingExcludes> <webResources> 
306
					<resource> <directory>${jar-path}</directory> <includes> <include>*.jar</include> 
307
					</includes> <targetPath>WEB-INF/lib</targetPath> </resource> </webResources> 
308
					</configuration> </plugin> -->
309
				<!-- 跳过单元测试 -->
310
				<plugin>
311
					<groupId>org.apache.maven.plugins</groupId>
312
					<artifactId>maven-surefire-plugin</artifactId>
313
					<version>${maven-surefire-plugin}</version>
314
					<configuration>
315
						<!-- 跳过单元测试 -->
316
						<skip>true</skip>
317
					</configuration>
318
				</plugin>
319
				<!-- clean中间文件 -->
320
				<plugin>
321
					<artifactId>maven-clean-plugin</artifactId>
322
					<version>${maven-clean-plugin}</version>
323
					<executions>
324
						<execution>
325
							<id>clean-all</id>
326
							<phase>clean</phase>
327
							<goals>
328
								<goal>clean</goal>
329
							</goals>
330
							<configuration>
331
								<filesets>
332
									<fileset>
333
										<directory>${basedir}/src/main/webapp/encrypt</directory>
334
										<includes>
335
											<include>**/*</include>
336
										</includes>
337
									</fileset>
338
									<fileset>
339
										<directory>${basedir}/src/main/webapp</directory>
340
										<includes>
341
											<include>res.version.properties</include>
342
										</includes>
343
									</fileset>
344
									<fileset>
345
										<directory>${basedir}/src/main/webapp/template/lua</directory>
346
										<includes>
347
											<include>**/*</include>
348
										</includes>
349
									</fileset>
350
								</filesets>
351
							</configuration>
352
						</execution>
353
						<!-- 打包之前clean掉明文配置文件 -->
354
						<execution>
355
							<id>clean-config</id>
356
							<phase>prepare-package</phase><!-- 打包之前 -->
357
							<goals>
358
								<goal>clean</goal>
359
							</goals>
360
							<configuration>
361
								<excludeDefaultDirectories>true</excludeDefaultDirectories>
362
								<filesets>
363
									<fileset>
364
										<directory>${basedir}/src/main/webapp/template</directory>
365
										<includes>
366
											<include>server-config.xml</include>
367
											<include>server-data.xml</include>
368
											<include>server-page.xml</include>
369
										</includes>
370
									</fileset>
371
								</filesets>
372
							</configuration>
373
						</execution>
374
					</executions>
375
				</plugin>
376
				<!-- 复制资源 -->
50
				<!-- 1.复制资源 -->
51
				<!-- IDE可在编译态实时的将指定文件和目录复制到指定路径下,该插件不需显性调用 -->
377 52
				<plugin>
378 53
					<artifactId>maven-resources-plugin</artifactId>
379
					<version>${maven-resources-plugin}</version>
380 54
					<configuration>
381 55
						<encoding>${encoding}</encoding>
382 56
					</configuration>
@ -388,7 +62,7 @@
388 62
								<goal>copy-resources</goal>
389 63
							</goals>
390 64
							<configuration>
391
								<outputDirectory>${basedir}/src/main/webapp/template</outputDirectory>
65
								<outputDirectory>${webapp-path}/template</outputDirectory>
392 66
								<resources>
393 67
									<resource>
394 68
										<directory>${basedir}/src/main/resources</directory>
@ -408,7 +82,7 @@
408 82
								<goal>copy-resources</goal>
409 83
							</goals>
410 84
							<configuration>
411
								<outputDirectory>${basedir}/src/main/webapp/template/lua</outputDirectory>
85
								<outputDirectory>${webapp-path}/template/lua</outputDirectory>
412 86
								<resources>
413 87
									<resource>
414 88
										<directory>${basedir}/src/main/resources/lua</directory>
@ -418,11 +92,11 @@
418 92
						</execution>
419 93
					</executions>
420 94
				</plugin>
421
				<!-- 生成文件版本号和文件加密 -->
95
				<!-- 2.文件加密和生成版本号 -->
96
				<!-- 驱动java程序完成此功能 -->
422 97
				<plugin>
423 98
					<groupId>org.codehaus.mojo</groupId>
424 99
					<artifactId>exec-maven-plugin</artifactId>
425
					<version>${exec-maven-plugin}</version>
426 100
					<executions>
427 101
						<execution>
428 102
							<id>res-encrypt</id>
@ -433,9 +107,8 @@
433 107
							<configuration>
434 108
								<classpathScope>compile</classpathScope>
435 109
								<includeProjectDependencies>true</includeProjectDependencies>
436
								<mainClass>com.ai.ipu.server.tool.FileEncryptToolMaven</mainClass>
110
								<mainClass>com.ai.ipu.server.tool.FileEncryptToolRest</mainClass>
437 111
								<arguments>
438
									<argument>src/main/webapp/</argument>
439 112
									<argument>false</argument>
440 113
									<argument></argument>
441 114
								</arguments>
@ -450,9 +123,8 @@
450 123
							<configuration>
451 124
								<classpathScope>compile</classpathScope>
452 125
								<includeProjectDependencies>true</includeProjectDependencies>
453
								<mainClass>com.ai.ipu.server.tool.VersionToolMaven</mainClass>
126
								<mainClass>com.ai.ipu.server.tool.VersionToolRest</mainClass>
454 127
								<arguments>
455
									<argument>src/main/webapp/</argument>
456 128
									<argument>false</argument>
457 129
									<argument>upload|setup|.gitignore|.DS_Store</argument>
458 130
								</arguments>
@ -460,21 +132,28 @@
460 132
						</execution>
461 133
					</executions>
462 134
				</plugin>
135
				<!-- clean掉明文配置文件,打包之前 -->
463 136
				<plugin>
464
					<groupId>org.apache.maven.plugins</groupId>
465
					<artifactId>maven-dependency-plugin</artifactId>
466
					<version>${maven-dependency-plugin}</version>
137
					<artifactId>maven-clean-plugin</artifactId>
467 138
					<executions>
468 139
						<execution>
469
							<id>copy-dep</id>
470
							<phase>package</phase>
140
							<id>clean-config</id>
141
							<phase>test</phase>
471 142
							<goals>
472
								<goal>copy-dependencies</goal>
143
								<goal>clean</goal>
473 144
							</goals>
474 145
							<configuration>
475
								<outputDirectory>${basedir}/src/main/webapp/WEB-INF/lib</outputDirectory>
476
								<excludeScope>provided</excludeScope>
477
								<excludeArtifactIds>junit</excludeArtifactIds>
146
								<excludeDefaultDirectories>true</excludeDefaultDirectories>
147
								<filesets>
148
									<fileset>
149
										<directory>${webapp-path}/template</directory>
150
										<includes>
151
											<include>server-config.xml</include>
152
											<include>server-data.xml</include>
153
											<include>server-page.xml</include>
154
										</includes>
155
									</fileset>
156
								</filesets>
478 157
							</configuration>
479 158
						</execution>
480 159
					</executions>
@ -482,46 +161,13 @@
482 161
			</plugins>
483 162
		</pluginManagement>
484 163
485
		<outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
486
		<resources>
487
			<resource>
488
				<directory>${project.basedir}/src/main/resources</directory>
489
				<!-- 资源根目录排除各环境的配置,防止在生成目录中多余其它目录 -->
490
				<excludes>
491
					<exclude>test/*</exclude>
492
					<exclude>pro/*</exclude>
493
					<exclude>dev/*</exclude>
494
				</excludes>
495
			</resource>
496
			<resource>
497
				<directory>src/main/resources/${profiles.active}</directory>
498
			</resource>
499
		</resources>
164
		<plugins>
165
			<!-- 通过修改Tool类,解决此时执行插件会报错的问题 -->
166
			<!-- 生成文件版本号和文件加密 -->
167
			<plugin>
168
				<groupId>org.codehaus.mojo</groupId>
169
				<artifactId>exec-maven-plugin</artifactId>
170
			</plugin>
171
		</plugins>
500 172
	</build>
501
	<profiles>
502
		<profile>
503
			<!-- 本地开发环境 -->
504
			<id>dev</id>
505
			<properties>
506
				<profiles.active>dev</profiles.active>
507
			</properties>
508
			<activation>
509
				<activeByDefault>true</activeByDefault>
510
			</activation>
511
		</profile>
512
		<profile>
513
			<!-- 测试环境 -->
514
			<id>test</id>
515
			<properties>
516
				<profiles.active>test</profiles.active>
517
			</properties>
518
		</profile>
519
		<profile>
520
			<!-- 生产环境 -->
521
			<id>pro</id>
522
			<properties>
523
				<profiles.active>pro</profiles.active>
524
			</properties>
525
		</profile>
526
	</profiles>
527 173
</project>

android-share - Nuosi Git Service

ipu的trunk版的android工程和服务端工程。

huangbo 710312f9bc 工程优化 9 years ago
..
build 710312f9bc 工程优化 9 years ago
libs 710312f9bc 工程优化 9 years ago
src 1f191c2a19 初始化 10 years ago
.gitignore 61ff9d2503 Merge branch 'master' of 9 years ago
.project 1f191c2a19 初始化 10 years ago