diff --git a/baogutang-admin/src/main/resources/bootstrap.yml b/baogutang-admin/src/main/resources/bootstrap.yml index 5d065cc..7beeda9 100644 --- a/baogutang-admin/src/main/resources/bootstrap.yml +++ b/baogutang-admin/src/main/resources/bootstrap.yml @@ -4,5 +4,5 @@ spring: main: allow-bean-definition-overriding: true -# resources: -# static-locations: classpath:/templates/ \ No newline at end of file + resources: + static-locations: classpath:/templates/ \ No newline at end of file diff --git a/baogutang-admin/src/main/resources/static/NIKO.png b/baogutang-admin/src/main/resources/templates/NIKO.png similarity index 100% rename from baogutang-admin/src/main/resources/static/NIKO.png rename to baogutang-admin/src/main/resources/templates/NIKO.png diff --git a/baogutang-admin/src/main/resources/static/css/base.css b/baogutang-admin/src/main/resources/templates/css/base.css similarity index 100% rename from baogutang-admin/src/main/resources/static/css/base.css rename to baogutang-admin/src/main/resources/templates/css/base.css diff --git a/baogutang-admin/src/main/resources/static/css/bootstrap.min.css b/baogutang-admin/src/main/resources/templates/css/bootstrap.min.css similarity index 100% rename from baogutang-admin/src/main/resources/static/css/bootstrap.min.css rename to baogutang-admin/src/main/resources/templates/css/bootstrap.min.css diff --git a/baogutang-admin/src/main/resources/static/css/font-awesome.min.css b/baogutang-admin/src/main/resources/templates/css/font-awesome.min.css similarity index 100% rename from baogutang-admin/src/main/resources/static/css/font-awesome.min.css rename to baogutang-admin/src/main/resources/templates/css/font-awesome.min.css diff --git a/baogutang-admin/src/main/resources/static/css/jquery.numberedtextarea.css b/baogutang-admin/src/main/resources/templates/css/jquery.numberedtextarea.css similarity index 100% rename from baogutang-admin/src/main/resources/static/css/jquery.numberedtextarea.css rename to baogutang-admin/src/main/resources/templates/css/jquery.numberedtextarea.css diff --git a/baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.eot@ b/baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.eot@ similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.eot@ rename to baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.eot@ diff --git a/baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.eot@v=4.2.0 b/baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.eot@v=4.2.0 similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.eot@v=4.2.0 rename to baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.eot@v=4.2.0 diff --git a/baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.svg@v=4.2.0 b/baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.svg@v=4.2.0 similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.svg@v=4.2.0 rename to baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.svg@v=4.2.0 diff --git a/baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.ttf@v=4.2.0 b/baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.ttf@v=4.2.0 similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.ttf@v=4.2.0 rename to baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.ttf@v=4.2.0 diff --git a/baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.woff@v=4.2.0 b/baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.woff@v=4.2.0 similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/fontawesome-webfont.woff@v=4.2.0 rename to baogutang-admin/src/main/resources/templates/fonts/fontawesome-webfont.woff@v=4.2.0 diff --git a/baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.eot b/baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.eot rename to baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.eot diff --git a/baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.eot@ b/baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.eot@ similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.eot@ rename to baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.eot@ diff --git a/baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.svg b/baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.svg rename to baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.svg diff --git a/baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf b/baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.ttf rename to baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.ttf diff --git a/baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.woff b/baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from baogutang-admin/src/main/resources/static/fonts/glyphicons-halflings-regular.woff rename to baogutang-admin/src/main/resources/templates/fonts/glyphicons-halflings-regular.woff diff --git a/baogutang-admin/src/main/resources/static/js/FileSaver.min.js b/baogutang-admin/src/main/resources/templates/js/FileSaver.min.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/FileSaver.min.js rename to baogutang-admin/src/main/resources/templates/js/FileSaver.min.js diff --git a/baogutang-admin/src/main/resources/static/js/bootstrap.min.js b/baogutang-admin/src/main/resources/templates/js/bootstrap.min.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/bootstrap.min.js rename to baogutang-admin/src/main/resources/templates/js/bootstrap.min.js diff --git a/baogutang-admin/src/main/resources/static/js/clipboard.min.js b/baogutang-admin/src/main/resources/templates/js/clipboard.min.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/clipboard.min.js rename to baogutang-admin/src/main/resources/templates/js/clipboard.min.js diff --git a/baogutang-admin/src/main/resources/static/js/jquery.json.js b/baogutang-admin/src/main/resources/templates/js/jquery.json.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/jquery.json.js rename to baogutang-admin/src/main/resources/templates/js/jquery.json.js diff --git a/baogutang-admin/src/main/resources/static/js/jquery.json2xml.js b/baogutang-admin/src/main/resources/templates/js/jquery.json2xml.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/jquery.json2xml.js rename to baogutang-admin/src/main/resources/templates/js/jquery.json2xml.js diff --git a/baogutang-admin/src/main/resources/static/js/jquery.message.js b/baogutang-admin/src/main/resources/templates/js/jquery.message.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/jquery.message.js rename to baogutang-admin/src/main/resources/templates/js/jquery.message.js diff --git a/baogutang-admin/src/main/resources/static/js/jquery.min.js b/baogutang-admin/src/main/resources/templates/js/jquery.min.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/jquery.min.js rename to baogutang-admin/src/main/resources/templates/js/jquery.min.js diff --git a/baogutang-admin/src/main/resources/static/js/jquery.numberedtextarea.js b/baogutang-admin/src/main/resources/templates/js/jquery.numberedtextarea.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/jquery.numberedtextarea.js rename to baogutang-admin/src/main/resources/templates/js/jquery.numberedtextarea.js diff --git a/baogutang-admin/src/main/resources/static/js/jquery.xml2json.js b/baogutang-admin/src/main/resources/templates/js/jquery.xml2json.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/jquery.xml2json.js rename to baogutang-admin/src/main/resources/templates/js/jquery.xml2json.js diff --git a/baogutang-admin/src/main/resources/static/js/json2.js b/baogutang-admin/src/main/resources/templates/js/json2.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/json2.js rename to baogutang-admin/src/main/resources/templates/js/json2.js diff --git a/baogutang-admin/src/main/resources/static/js/jsonlint.js b/baogutang-admin/src/main/resources/templates/js/jsonlint.js similarity index 100% rename from baogutang-admin/src/main/resources/static/js/jsonlint.js rename to baogutang-admin/src/main/resources/templates/js/jsonlint.js diff --git a/baogutang-admin/src/main/resources/templates/json-parse.html b/baogutang-admin/src/main/resources/templates/json-parse.html index 2c6f0e4..3d711c5 100644 --- a/baogutang-admin/src/main/resources/templates/json-parse.html +++ b/baogutang-admin/src/main/resources/templates/json-parse.html @@ -1,7 +1,7 @@ - + JSON在线解析及格式化验证 @@ -11,9 +11,9 @@ - - - + + +