From 3fbb65980664eafd8092bd8e55da8c92d99d6ee0 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 8 Aug 2022 10:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=8D=E7=AB=AF=E6=BA=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  11 ++--
 .../desreport_/cdn/axios/axios.min.js         |   0
 .../jmreport}/desreport_/cdn/axios/qs.min.js  |   0
 .../cdn/html2canvas/canvas2image.js           |   0
 .../cdn/html2canvas/html2canvas.min.js        |   0
 .../desreport_/cdn/iview/fonts/ionicons.svg   |   0
 .../desreport_/cdn/iview/fonts/ionicons.ttf   | Bin
 .../desreport_/cdn/iview/fonts/ionicons.woff  | Bin
 .../desreport_/cdn/iview/fonts/ionicons.woff2 | Bin
 .../jmreport}/desreport_/cdn/iview/iview.css  |   0
 .../desreport_/cdn/iview/iview.min.js         |   0
 .../jmreport}/desreport_/cdn/vue/md5.min.js   |   0
 .../jmreport}/desreport_/cdn/vue/vue.min.js   |   0
 .../desreport_/cdn/vue/xss-0.3.3.min.js       |   0
 .../desreport_/chartjson/bar.background.json  |   0
 .../chartjson/bar.multi.horizontal.json       |   0
 .../desreport_/chartjson/bar.multi.json       |   0
 .../desreport_/chartjson/bar.negative.json    |   0
 .../desreport_/chartjson/bar.simple.json      |   0
 .../chartjson/bar.stack.horizontal.json       |   0
 .../desreport_/chartjson/bar.stack.json       |   0
 .../desreport_/chartjson/echartslist.json     |   0
 .../desreport_/chartjson/funnel.pyramid.json  |   0
 .../desreport_/chartjson/funnel.simple.json   |   0
 .../desreport_/chartjson/gauge.simple.json    |   0
 .../desreport_/chartjson/gauge.simple180.json |   0
 .../desreport_/chartjson/graph.simple.json    |   0
 .../desreport_/chartjson/line.area.json       |   0
 .../desreport_/chartjson/line.multi.json      |   0
 .../desreport_/chartjson/line.simple.json     |   0
 .../desreport_/chartjson/line.smooth.json     |   0
 .../desreport_/chartjson/line.step.json       |   0
 .../desreport_/chartjson/map.scatter.json     |   0
 .../desreport_/chartjson/map.simple.json      |   0
 .../desreport_/chartjson/mixed.linebar.json   |   0
 .../chartjson/pictorial.spirits.json          |   0
 .../desreport_/chartjson/pie.doughnut.json    |   0
 .../desreport_/chartjson/pie.rose.json        |   0
 .../desreport_/chartjson/pie.simple.json      |   0
 .../desreport_/chartjson/radar.basic.json     |   0
 .../desreport_/chartjson/radar.custom.json    |   0
 .../desreport_/chartjson/scatter.bubble.json  |   0
 .../desreport_/chartjson/scatter.simple.json  |   0
 .../chartsImg/authority/no-authority.png      | Bin
 .../jmreport}/desreport_/chartsImg/bar-1.jpg  | Bin
 .../jmreport}/desreport_/chartsImg/bar-2.jpg  | Bin
 .../jmreport}/desreport_/chartsImg/bar-3.jpg  | Bin
 .../jmreport}/desreport_/chartsImg/bar-4.jpg  | Bin
 .../jmreport}/desreport_/chartsImg/bar-5.jpg  | Bin
 .../jmreport}/desreport_/chartsImg/bar-5.png  | Bin
 .../jmreport}/desreport_/chartsImg/bar-6.png  | Bin
 .../jmreport}/desreport_/chartsImg/bar-7.png  | Bin
 .../desreport_/chartsImg/funnel-simple.jpg    | Bin
 .../jmreport}/desreport_/chartsImg/funnel.jpg | Bin
 .../jmreport}/desreport_/chartsImg/funnel.png | Bin
 .../desreport_/chartsImg/funnel.pyramid.png   | Bin
 .../jmreport}/desreport_/chartsImg/gauge.png  | Bin
 .../desreport_/chartsImg/gauge180.png         | Bin
 .../jmreport}/desreport_/chartsImg/graph.png  | Bin
 .../jmreport}/desreport_/chartsImg/line-1.jpg | Bin
 .../jmreport}/desreport_/chartsImg/line-2.jpg | Bin
 .../jmreport}/desreport_/chartsImg/line-3.jpg | Bin
 .../jmreport}/desreport_/chartsImg/line-4.jpg | Bin
 .../jmreport}/desreport_/chartsImg/line-4.png | Bin
 .../jmreport}/desreport_/chartsImg/line-5.jpg | Bin
 .../jmreport}/desreport_/chartsImg/line-6.png | Bin
 .../jmreport}/desreport_/chartsImg/map.png    | Bin
 .../desreport_/chartsImg/map_scatter.png      | Bin
 .../desreport_/chartsImg/mix-line-bar.jpg     | Bin
 .../chartsImg/pictorialBar-spirit.jpg         | Bin
 .../chartsImg/pictorialBar-spirit.png         | Bin
 .../chartsImg/pictorialIcon/spirits.png       | Bin
 .../jmreport}/desreport_/chartsImg/pie-1.jpg  | Bin
 .../jmreport}/desreport_/chartsImg/pie-1.png  | Bin
 .../jmreport}/desreport_/chartsImg/pie-2.jpg  | Bin
 .../jmreport}/desreport_/chartsImg/pie-2.png  | Bin
 .../jmreport}/desreport_/chartsImg/pie-3.jpg  | Bin
 .../jmreport}/desreport_/chartsImg/pie-3.png  | Bin
 .../desreport_/chartsImg/radar-2.png          | Bin
 .../jmreport}/desreport_/chartsImg/radar.jpg  | Bin
 .../jmreport}/desreport_/chartsImg/radar.png  | Bin
 .../desreport_/chartsImg/scatter-simple.jpg   | Bin
 .../desreport_/chartsImg/scatter_bubble.png   | Bin
 .../58eaeb4e52248a5c75936c6f4c33a370.svg      |   0
 .../jmreport}/desreport_/corelib/cust.css     |   0
 .../ece3e4fa05d4292823fdef970eaf1233.svg      |   0
 .../0540532988b0d225f543519753f72473.png      | Bin
 .../0c74968b940136baec8566b2d95adeed.png      | Bin
 .../127a607b97c089a43dc00347b09fea99.png      | Bin
 .../1d1bc9c519706fbb04e69f9bc367f398.png      | Bin
 .../2b9b4872cd25494093c1eb14f0264a0b.svg      |   0
 .../30e25c2abce295834a60fd9637bb4e0a.png      | Bin
 .../4319ed3209e5999879d00e2ea7eef42d.png      | Bin
 .../4b6b5c111a1a164649257c1d4bfbf784.png      | Bin
 .../50ddfa9d040f3585bd86a5f72c9cafe6.png      | Bin
 .../53b3da298ce02fdde6fd5a09a7624b4a.png      | Bin
 .../58eaeb4e52248a5c75936c6f4c33a370.svg      |   0
 .../5b9b5a635a5014af2f54df4c3fe5ea5c.png      | Bin
 .../5ea0efc04b8a7bd10eb8eac1374caaf9.png      | Bin
 .../6fbd5b02ca40d102e573ab55768b5c08.png      | Bin
 .../74aa67bdfaa3827c67bfb829433aa6c9.png      | Bin
 .../78f3bf387adad79f4aaf0baa6937c571.png      | Bin
 .../8c26a72edb95539833e59dc60817f093.png      | Bin
 .../941009d2ba77ac605c0b0cf976931cb6.png      | Bin
 .../981779d39b3c085d1305ef248a5f5a6b.png      | Bin
 .../aab2ab4f4ef98d8eb7cb3db78d079d92.png      | Bin
 .../be747d3e2eeb3c0b7168db78c84dd5af.png      | Bin
 .../c7c31dcc0ccce538b22a063debbc1a02.png      | Bin
 .../c9d011bdbaec17669808f9d88fc2d366.png      | Bin
 .../cdf358d837ec38982530cc913c10531b.png      | Bin
 .../ce8f3da2d9d63cebccc6f2365cdc84f3.svg      |   0
 .../d8824fbc7c3613b473675a158a0c2d98.png      | Bin
 .../e63176859cc9386023017a70852fa2c1.png      | Bin
 .../e67b7bdc19df9ede78820d9bf5f59b73.png      | Bin
 .../ea47d3fbf0039f36b102f070a8ac8967.png      | Bin
 .../eeb304b0fee557ba71000e62afc97837.png      | Bin
 .../f08cce4fc757983ae0c5e705ed6324ad.png      | Bin
 .../f7acc34b75af97e7db9055c698236f80.png      | Bin
 .../jmreport}/desreport_/corelib/index.html   |   0
 .../jmreport}/desreport_/corelib/jiade.jpg    | Bin
 .../jmreport}/desreport_/corelib/jmsheet.css  |  52 +++++++++---------
 .../jmreport}/desreport_/corelib/jmsheet.js   |   0
 .../jmreport}/desreport_/corelib/locale/de.js |   0
 .../jmreport}/desreport_/corelib/locale/en.js |   0
 .../jmreport}/desreport_/corelib/locale/nl.js |   0
 .../desreport_/corelib/locale/zh-cn.js        |   0
 .../jmreport}/desreport_/corelib/logo.png     | Bin
 .../jmreport}/desreport_/corelib/report.css   |   0
 .../desreport_/jquery/jquery-3.4.1.min.js     |   0
 .../desreport_/jquery/jquery.excel.js         |   0
 .../desreport_/js/biz/SignMd5Util.js          |   0
 .../jmreport}/desreport_/js/biz/design.js     |   0
 .../jmreport}/desreport_/js/biz/manager.js    |   0
 .../jmreport}/desreport_/js/biz/row.cycle.js  |   0
 .../desreport_/js/biz/row.express.js          |   0
 .../jmreport}/desreport_/js/biz/view.js       |   0
 .../desreport_/js/config/chart_type_list.js   |   0
 .../desreport_/js/config/excel.virtual.json   |   0
 .../desreport_/js/config/map_type_list.js     |   0
 .../jmreport}/desreport_/js/core/api.js       |   0
 .../jmreport}/desreport_/js/core/request.js   |   0
 .../jmreport}/desreport_/js/util.js           |   0
 .../logoimage/jim_logo_20200814094127.png     | Bin
 .../regionaljson/mapjson/100000.json          |   0
 .../regionaljson/mapjson/110000.json          |   0
 .../regionaljson/mapjson/120000.json          |   0
 .../regionaljson/mapjson/310000.json          |   0
 .../regionaljson/mapjson/440000.json          |   0
 .../regionaljson/province.city.area.json      |   0
 .../regionaljson/province.city.json           |   0
 .../desreport_/regionaljson/province.json     |   0
 .../jmreport}/desreport/authority.ftl         |   2 +-
 .../jmreport}/desreport/common/resource.ftl   |   0
 .../jmreport}/desreport/common/tj.ftl         |   0
 .../jmreport}/desreport/demo.ftl              |   0
 .../jmreport}/desreport/index.ftl             |  50 ++++++++---------
 .../jmreport}/desreport/list.ftl              |   8 +--
 .../jmreport}/desreport/modal.ftl             |   0
 .../jmreport}/desreport/print.ftl             |   0
 .../components/background_setting.ftl         |   0
 .../components/bar_series_setting.ftl         |   0
 .../template/components/bar_setting.ftl       |   0
 .../desreport/template/components/barcode.ftl |   0
 .../template/components/cell_linkage.ftl      |   0
 .../components/central_point_setting.ftl      |   0
 .../template/components/chart_linkage.ftl     |   0
 .../template/components/data_dictionary.ftl   |   0
 .../components/data_source_setting.ftl        |   0
 .../components/function_interpretation.ftl    |   0
 .../template/components/funnel_setting.ftl    |   0
 .../template/components/gauge_setting.ftl     |   0
 .../template/components/grid_setting.ftl      |   0
 .../template/components/hyperlinks.ftl        |   0
 .../template/components/javabean_setting.ftl  |   0
 .../template/components/jurisdiction.ftl      |   0
 .../template/components/legend_setting.ftl    |   0
 .../template/components/line_setting.ftl      |   0
 .../template/components/map_setting.ftl       |   0
 .../template/components/margin_setting.ftl    |   0
 .../template/components/match_setting.ftl     |   0
 .../template/components/pictorial_setting.ftl |   0
 .../template/components/pie_setting.ftl       |   0
 .../components/primary_sub_report.ftl         |   0
 .../template/components/print_setting.ftl     |   0
 .../desreport/template/components/qrcode.ftl  |   0
 .../template/components/radar_setting.ftl     |   0
 .../template/components/scatter_setting.ftl   |   0
 .../template/components/select_input.ftl      |   0
 .../components/select_scroll_multiple.ftl     |   0
 .../components/select_scroll_radio.ftl        |   0
 .../template/components/series_setting.ftl    |   0
 .../components/sql_function_replace.ftl       |   0
 .../template/components/title_setting.ftl     |   0
 .../template/components/tooltip_setting.ftl   |   0
 .../template/components/tree_select.ftl       |   0
 .../template/components/view_setting.ftl      |   0
 .../template/components/xAxis_setting.ftl     |   0
 .../template/components/yAxis_setting.ftl     |   0
 .../jmreport}/desreport/template/index.ftl    |   0
 .../jmreport}/desreport/template/list.ftl     |   0
 .../jmreport}/desreport/template/view.ftl     |   0
 .../jmreport}/desreport/view.ftl              |  16 +++---
 202 files changed, 70 insertions(+), 69 deletions(-)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/axios/axios.min.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/axios/qs.min.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/html2canvas/canvas2image.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/html2canvas/html2canvas.min.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/iview/fonts/ionicons.svg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/iview/fonts/ionicons.ttf (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/iview/fonts/ionicons.woff (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/iview/fonts/ionicons.woff2 (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/iview/iview.css (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/iview/iview.min.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/vue/md5.min.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/vue/vue.min.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/cdn/vue/xss-0.3.3.min.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/bar.background.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/bar.multi.horizontal.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/bar.multi.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/bar.negative.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/bar.simple.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/bar.stack.horizontal.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/bar.stack.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/echartslist.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/funnel.pyramid.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/funnel.simple.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/gauge.simple.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/gauge.simple180.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/graph.simple.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/line.area.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/line.multi.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/line.simple.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/line.smooth.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/line.step.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/map.scatter.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/map.simple.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/mixed.linebar.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/pictorial.spirits.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/pie.doughnut.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/pie.rose.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/pie.simple.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/radar.basic.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/radar.custom.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/scatter.bubble.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartjson/scatter.simple.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/authority/no-authority.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/bar-1.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/bar-2.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/bar-3.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/bar-4.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/bar-5.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/bar-5.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/bar-6.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/bar-7.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/funnel-simple.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/funnel.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/funnel.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/funnel.pyramid.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/gauge.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/gauge180.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/graph.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/line-1.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/line-2.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/line-3.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/line-4.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/line-4.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/line-5.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/line-6.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/map.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/map_scatter.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/mix-line-bar.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/pictorialBar-spirit.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/pictorialBar-spirit.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/pictorialIcon/spirits.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/pie-1.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/pie-1.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/pie-2.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/pie-2.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/pie-3.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/pie-3.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/radar-2.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/radar.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/radar.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/scatter-simple.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/chartsImg/scatter_bubble.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/58eaeb4e52248a5c75936c6f4c33a370.svg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/cust.css (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/ece3e4fa05d4292823fdef970eaf1233.svg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/0540532988b0d225f543519753f72473.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/0c74968b940136baec8566b2d95adeed.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/127a607b97c089a43dc00347b09fea99.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/1d1bc9c519706fbb04e69f9bc367f398.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/2b9b4872cd25494093c1eb14f0264a0b.svg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/30e25c2abce295834a60fd9637bb4e0a.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/4319ed3209e5999879d00e2ea7eef42d.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/4b6b5c111a1a164649257c1d4bfbf784.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/50ddfa9d040f3585bd86a5f72c9cafe6.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/53b3da298ce02fdde6fd5a09a7624b4a.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/58eaeb4e52248a5c75936c6f4c33a370.svg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/5b9b5a635a5014af2f54df4c3fe5ea5c.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/5ea0efc04b8a7bd10eb8eac1374caaf9.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/6fbd5b02ca40d102e573ab55768b5c08.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/74aa67bdfaa3827c67bfb829433aa6c9.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/78f3bf387adad79f4aaf0baa6937c571.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/8c26a72edb95539833e59dc60817f093.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/941009d2ba77ac605c0b0cf976931cb6.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/981779d39b3c085d1305ef248a5f5a6b.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/aab2ab4f4ef98d8eb7cb3db78d079d92.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/be747d3e2eeb3c0b7168db78c84dd5af.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/c7c31dcc0ccce538b22a063debbc1a02.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/c9d011bdbaec17669808f9d88fc2d366.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/cdf358d837ec38982530cc913c10531b.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/ce8f3da2d9d63cebccc6f2365cdc84f3.svg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/d8824fbc7c3613b473675a158a0c2d98.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/e63176859cc9386023017a70852fa2c1.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/e67b7bdc19df9ede78820d9bf5f59b73.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/ea47d3fbf0039f36b102f070a8ac8967.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/eeb304b0fee557ba71000e62afc97837.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/f08cce4fc757983ae0c5e705ed6324ad.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/icons/f7acc34b75af97e7db9055c698236f80.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/index.html (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/jiade.jpg (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/jmsheet.css (95%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/jmsheet.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/locale/de.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/locale/en.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/locale/nl.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/locale/zh-cn.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/logo.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/corelib/report.css (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/jquery/jquery-3.4.1.min.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/jquery/jquery.excel.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/biz/SignMd5Util.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/biz/design.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/biz/manager.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/biz/row.cycle.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/biz/row.express.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/biz/view.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/config/chart_type_list.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/config/excel.virtual.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/config/map_type_list.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/core/api.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/core/request.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/js/util.js (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/logoimage/jim_logo_20200814094127.png (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/regionaljson/mapjson/100000.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/regionaljson/mapjson/110000.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/regionaljson/mapjson/120000.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/regionaljson/mapjson/310000.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/regionaljson/mapjson/440000.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/regionaljson/province.city.area.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/regionaljson/province.city.json (100%)
 rename src/main/resources/{ => static/jmreport}/desreport_/regionaljson/province.json (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/authority.ftl (95%)
 rename src/main/resources/{ => templates/jmreport}/desreport/common/resource.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/common/tj.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/demo.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/index.ftl (98%)
 rename src/main/resources/{ => templates/jmreport}/desreport/list.ftl (99%)
 rename src/main/resources/{ => templates/jmreport}/desreport/modal.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/print.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/background_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/bar_series_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/bar_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/barcode.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/cell_linkage.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/central_point_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/chart_linkage.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/data_dictionary.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/data_source_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/function_interpretation.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/funnel_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/gauge_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/grid_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/hyperlinks.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/javabean_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/jurisdiction.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/legend_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/line_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/map_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/margin_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/match_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/pictorial_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/pie_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/primary_sub_report.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/print_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/qrcode.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/radar_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/scatter_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/select_input.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/select_scroll_multiple.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/select_scroll_radio.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/series_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/sql_function_replace.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/title_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/tooltip_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/tree_select.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/view_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/xAxis_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/components/yAxis_setting.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/index.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/list.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/template/view.ftl (100%)
 rename src/main/resources/{ => templates/jmreport}/desreport/view.ftl (98%)

diff --git a/pom.xml b/pom.xml
index 4d68aca..bbd1291 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,12 +70,12 @@
         </dependency>
 
         <!-- minio oss-->
-        <dependency>
+        <!--<dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
             <version>${minio.version}</version>
             <optional>true</optional>
-        </dependency>
+        </dependency>-->
 
         <!-- ============================数据库驱动========================== -->
         <!--mysql-->
@@ -85,14 +85,15 @@
             <version>${mysql-connector-java.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <!-- oracle驱动-->
+        <!-- ===需要什么数据库，手工打开注释=== -->
+        <!-- oracle驱动
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc6</artifactId>
             <version>11.2.0.3</version>
             <scope>runtime</scope>
-        </dependency>
-        <!-- ===需要什么数据库，手工打开注释=== -->
+        </dependency>-->
+
         <!--  sqlserver
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
diff --git a/src/main/resources/desreport_/cdn/axios/axios.min.js b/src/main/resources/static/jmreport/desreport_/cdn/axios/axios.min.js
similarity index 100%
rename from src/main/resources/desreport_/cdn/axios/axios.min.js
rename to src/main/resources/static/jmreport/desreport_/cdn/axios/axios.min.js
diff --git a/src/main/resources/desreport_/cdn/axios/qs.min.js b/src/main/resources/static/jmreport/desreport_/cdn/axios/qs.min.js
similarity index 100%
rename from src/main/resources/desreport_/cdn/axios/qs.min.js
rename to src/main/resources/static/jmreport/desreport_/cdn/axios/qs.min.js
diff --git a/src/main/resources/desreport_/cdn/html2canvas/canvas2image.js b/src/main/resources/static/jmreport/desreport_/cdn/html2canvas/canvas2image.js
similarity index 100%
rename from src/main/resources/desreport_/cdn/html2canvas/canvas2image.js
rename to src/main/resources/static/jmreport/desreport_/cdn/html2canvas/canvas2image.js
diff --git a/src/main/resources/desreport_/cdn/html2canvas/html2canvas.min.js b/src/main/resources/static/jmreport/desreport_/cdn/html2canvas/html2canvas.min.js
similarity index 100%
rename from src/main/resources/desreport_/cdn/html2canvas/html2canvas.min.js
rename to src/main/resources/static/jmreport/desreport_/cdn/html2canvas/html2canvas.min.js
diff --git a/src/main/resources/desreport_/cdn/iview/fonts/ionicons.svg b/src/main/resources/static/jmreport/desreport_/cdn/iview/fonts/ionicons.svg
similarity index 100%
rename from src/main/resources/desreport_/cdn/iview/fonts/ionicons.svg
rename to src/main/resources/static/jmreport/desreport_/cdn/iview/fonts/ionicons.svg
diff --git a/src/main/resources/desreport_/cdn/iview/fonts/ionicons.ttf b/src/main/resources/static/jmreport/desreport_/cdn/iview/fonts/ionicons.ttf
similarity index 100%
rename from src/main/resources/desreport_/cdn/iview/fonts/ionicons.ttf
rename to src/main/resources/static/jmreport/desreport_/cdn/iview/fonts/ionicons.ttf
diff --git a/src/main/resources/desreport_/cdn/iview/fonts/ionicons.woff b/src/main/resources/static/jmreport/desreport_/cdn/iview/fonts/ionicons.woff
similarity index 100%
rename from src/main/resources/desreport_/cdn/iview/fonts/ionicons.woff
rename to src/main/resources/static/jmreport/desreport_/cdn/iview/fonts/ionicons.woff
diff --git a/src/main/resources/desreport_/cdn/iview/fonts/ionicons.woff2 b/src/main/resources/static/jmreport/desreport_/cdn/iview/fonts/ionicons.woff2
similarity index 100%
rename from src/main/resources/desreport_/cdn/iview/fonts/ionicons.woff2
rename to src/main/resources/static/jmreport/desreport_/cdn/iview/fonts/ionicons.woff2
diff --git a/src/main/resources/desreport_/cdn/iview/iview.css b/src/main/resources/static/jmreport/desreport_/cdn/iview/iview.css
similarity index 100%
rename from src/main/resources/desreport_/cdn/iview/iview.css
rename to src/main/resources/static/jmreport/desreport_/cdn/iview/iview.css
diff --git a/src/main/resources/desreport_/cdn/iview/iview.min.js b/src/main/resources/static/jmreport/desreport_/cdn/iview/iview.min.js
similarity index 100%
rename from src/main/resources/desreport_/cdn/iview/iview.min.js
rename to src/main/resources/static/jmreport/desreport_/cdn/iview/iview.min.js
diff --git a/src/main/resources/desreport_/cdn/vue/md5.min.js b/src/main/resources/static/jmreport/desreport_/cdn/vue/md5.min.js
similarity index 100%
rename from src/main/resources/desreport_/cdn/vue/md5.min.js
rename to src/main/resources/static/jmreport/desreport_/cdn/vue/md5.min.js
diff --git a/src/main/resources/desreport_/cdn/vue/vue.min.js b/src/main/resources/static/jmreport/desreport_/cdn/vue/vue.min.js
similarity index 100%
rename from src/main/resources/desreport_/cdn/vue/vue.min.js
rename to src/main/resources/static/jmreport/desreport_/cdn/vue/vue.min.js
diff --git a/src/main/resources/desreport_/cdn/vue/xss-0.3.3.min.js b/src/main/resources/static/jmreport/desreport_/cdn/vue/xss-0.3.3.min.js
similarity index 100%
rename from src/main/resources/desreport_/cdn/vue/xss-0.3.3.min.js
rename to src/main/resources/static/jmreport/desreport_/cdn/vue/xss-0.3.3.min.js
diff --git a/src/main/resources/desreport_/chartjson/bar.background.json b/src/main/resources/static/jmreport/desreport_/chartjson/bar.background.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/bar.background.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/bar.background.json
diff --git a/src/main/resources/desreport_/chartjson/bar.multi.horizontal.json b/src/main/resources/static/jmreport/desreport_/chartjson/bar.multi.horizontal.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/bar.multi.horizontal.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/bar.multi.horizontal.json
diff --git a/src/main/resources/desreport_/chartjson/bar.multi.json b/src/main/resources/static/jmreport/desreport_/chartjson/bar.multi.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/bar.multi.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/bar.multi.json
diff --git a/src/main/resources/desreport_/chartjson/bar.negative.json b/src/main/resources/static/jmreport/desreport_/chartjson/bar.negative.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/bar.negative.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/bar.negative.json
diff --git a/src/main/resources/desreport_/chartjson/bar.simple.json b/src/main/resources/static/jmreport/desreport_/chartjson/bar.simple.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/bar.simple.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/bar.simple.json
diff --git a/src/main/resources/desreport_/chartjson/bar.stack.horizontal.json b/src/main/resources/static/jmreport/desreport_/chartjson/bar.stack.horizontal.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/bar.stack.horizontal.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/bar.stack.horizontal.json
diff --git a/src/main/resources/desreport_/chartjson/bar.stack.json b/src/main/resources/static/jmreport/desreport_/chartjson/bar.stack.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/bar.stack.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/bar.stack.json
diff --git a/src/main/resources/desreport_/chartjson/echartslist.json b/src/main/resources/static/jmreport/desreport_/chartjson/echartslist.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/echartslist.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/echartslist.json
diff --git a/src/main/resources/desreport_/chartjson/funnel.pyramid.json b/src/main/resources/static/jmreport/desreport_/chartjson/funnel.pyramid.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/funnel.pyramid.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/funnel.pyramid.json
diff --git a/src/main/resources/desreport_/chartjson/funnel.simple.json b/src/main/resources/static/jmreport/desreport_/chartjson/funnel.simple.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/funnel.simple.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/funnel.simple.json
diff --git a/src/main/resources/desreport_/chartjson/gauge.simple.json b/src/main/resources/static/jmreport/desreport_/chartjson/gauge.simple.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/gauge.simple.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/gauge.simple.json
diff --git a/src/main/resources/desreport_/chartjson/gauge.simple180.json b/src/main/resources/static/jmreport/desreport_/chartjson/gauge.simple180.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/gauge.simple180.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/gauge.simple180.json
diff --git a/src/main/resources/desreport_/chartjson/graph.simple.json b/src/main/resources/static/jmreport/desreport_/chartjson/graph.simple.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/graph.simple.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/graph.simple.json
diff --git a/src/main/resources/desreport_/chartjson/line.area.json b/src/main/resources/static/jmreport/desreport_/chartjson/line.area.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/line.area.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/line.area.json
diff --git a/src/main/resources/desreport_/chartjson/line.multi.json b/src/main/resources/static/jmreport/desreport_/chartjson/line.multi.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/line.multi.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/line.multi.json
diff --git a/src/main/resources/desreport_/chartjson/line.simple.json b/src/main/resources/static/jmreport/desreport_/chartjson/line.simple.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/line.simple.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/line.simple.json
diff --git a/src/main/resources/desreport_/chartjson/line.smooth.json b/src/main/resources/static/jmreport/desreport_/chartjson/line.smooth.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/line.smooth.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/line.smooth.json
diff --git a/src/main/resources/desreport_/chartjson/line.step.json b/src/main/resources/static/jmreport/desreport_/chartjson/line.step.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/line.step.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/line.step.json
diff --git a/src/main/resources/desreport_/chartjson/map.scatter.json b/src/main/resources/static/jmreport/desreport_/chartjson/map.scatter.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/map.scatter.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/map.scatter.json
diff --git a/src/main/resources/desreport_/chartjson/map.simple.json b/src/main/resources/static/jmreport/desreport_/chartjson/map.simple.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/map.simple.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/map.simple.json
diff --git a/src/main/resources/desreport_/chartjson/mixed.linebar.json b/src/main/resources/static/jmreport/desreport_/chartjson/mixed.linebar.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/mixed.linebar.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/mixed.linebar.json
diff --git a/src/main/resources/desreport_/chartjson/pictorial.spirits.json b/src/main/resources/static/jmreport/desreport_/chartjson/pictorial.spirits.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/pictorial.spirits.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/pictorial.spirits.json
diff --git a/src/main/resources/desreport_/chartjson/pie.doughnut.json b/src/main/resources/static/jmreport/desreport_/chartjson/pie.doughnut.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/pie.doughnut.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/pie.doughnut.json
diff --git a/src/main/resources/desreport_/chartjson/pie.rose.json b/src/main/resources/static/jmreport/desreport_/chartjson/pie.rose.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/pie.rose.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/pie.rose.json
diff --git a/src/main/resources/desreport_/chartjson/pie.simple.json b/src/main/resources/static/jmreport/desreport_/chartjson/pie.simple.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/pie.simple.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/pie.simple.json
diff --git a/src/main/resources/desreport_/chartjson/radar.basic.json b/src/main/resources/static/jmreport/desreport_/chartjson/radar.basic.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/radar.basic.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/radar.basic.json
diff --git a/src/main/resources/desreport_/chartjson/radar.custom.json b/src/main/resources/static/jmreport/desreport_/chartjson/radar.custom.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/radar.custom.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/radar.custom.json
diff --git a/src/main/resources/desreport_/chartjson/scatter.bubble.json b/src/main/resources/static/jmreport/desreport_/chartjson/scatter.bubble.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/scatter.bubble.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/scatter.bubble.json
diff --git a/src/main/resources/desreport_/chartjson/scatter.simple.json b/src/main/resources/static/jmreport/desreport_/chartjson/scatter.simple.json
similarity index 100%
rename from src/main/resources/desreport_/chartjson/scatter.simple.json
rename to src/main/resources/static/jmreport/desreport_/chartjson/scatter.simple.json
diff --git a/src/main/resources/desreport_/chartsImg/authority/no-authority.png b/src/main/resources/static/jmreport/desreport_/chartsImg/authority/no-authority.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/authority/no-authority.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/authority/no-authority.png
diff --git a/src/main/resources/desreport_/chartsImg/bar-1.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/bar-1.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/bar-1.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/bar-1.jpg
diff --git a/src/main/resources/desreport_/chartsImg/bar-2.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/bar-2.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/bar-2.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/bar-2.jpg
diff --git a/src/main/resources/desreport_/chartsImg/bar-3.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/bar-3.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/bar-3.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/bar-3.jpg
diff --git a/src/main/resources/desreport_/chartsImg/bar-4.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/bar-4.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/bar-4.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/bar-4.jpg
diff --git a/src/main/resources/desreport_/chartsImg/bar-5.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/bar-5.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/bar-5.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/bar-5.jpg
diff --git a/src/main/resources/desreport_/chartsImg/bar-5.png b/src/main/resources/static/jmreport/desreport_/chartsImg/bar-5.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/bar-5.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/bar-5.png
diff --git a/src/main/resources/desreport_/chartsImg/bar-6.png b/src/main/resources/static/jmreport/desreport_/chartsImg/bar-6.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/bar-6.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/bar-6.png
diff --git a/src/main/resources/desreport_/chartsImg/bar-7.png b/src/main/resources/static/jmreport/desreport_/chartsImg/bar-7.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/bar-7.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/bar-7.png
diff --git a/src/main/resources/desreport_/chartsImg/funnel-simple.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/funnel-simple.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/funnel-simple.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/funnel-simple.jpg
diff --git a/src/main/resources/desreport_/chartsImg/funnel.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/funnel.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/funnel.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/funnel.jpg
diff --git a/src/main/resources/desreport_/chartsImg/funnel.png b/src/main/resources/static/jmreport/desreport_/chartsImg/funnel.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/funnel.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/funnel.png
diff --git a/src/main/resources/desreport_/chartsImg/funnel.pyramid.png b/src/main/resources/static/jmreport/desreport_/chartsImg/funnel.pyramid.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/funnel.pyramid.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/funnel.pyramid.png
diff --git a/src/main/resources/desreport_/chartsImg/gauge.png b/src/main/resources/static/jmreport/desreport_/chartsImg/gauge.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/gauge.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/gauge.png
diff --git a/src/main/resources/desreport_/chartsImg/gauge180.png b/src/main/resources/static/jmreport/desreport_/chartsImg/gauge180.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/gauge180.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/gauge180.png
diff --git a/src/main/resources/desreport_/chartsImg/graph.png b/src/main/resources/static/jmreport/desreport_/chartsImg/graph.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/graph.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/graph.png
diff --git a/src/main/resources/desreport_/chartsImg/line-1.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/line-1.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/line-1.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/line-1.jpg
diff --git a/src/main/resources/desreport_/chartsImg/line-2.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/line-2.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/line-2.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/line-2.jpg
diff --git a/src/main/resources/desreport_/chartsImg/line-3.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/line-3.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/line-3.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/line-3.jpg
diff --git a/src/main/resources/desreport_/chartsImg/line-4.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/line-4.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/line-4.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/line-4.jpg
diff --git a/src/main/resources/desreport_/chartsImg/line-4.png b/src/main/resources/static/jmreport/desreport_/chartsImg/line-4.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/line-4.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/line-4.png
diff --git a/src/main/resources/desreport_/chartsImg/line-5.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/line-5.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/line-5.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/line-5.jpg
diff --git a/src/main/resources/desreport_/chartsImg/line-6.png b/src/main/resources/static/jmreport/desreport_/chartsImg/line-6.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/line-6.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/line-6.png
diff --git a/src/main/resources/desreport_/chartsImg/map.png b/src/main/resources/static/jmreport/desreport_/chartsImg/map.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/map.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/map.png
diff --git a/src/main/resources/desreport_/chartsImg/map_scatter.png b/src/main/resources/static/jmreport/desreport_/chartsImg/map_scatter.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/map_scatter.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/map_scatter.png
diff --git a/src/main/resources/desreport_/chartsImg/mix-line-bar.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/mix-line-bar.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/mix-line-bar.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/mix-line-bar.jpg
diff --git a/src/main/resources/desreport_/chartsImg/pictorialBar-spirit.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/pictorialBar-spirit.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/pictorialBar-spirit.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/pictorialBar-spirit.jpg
diff --git a/src/main/resources/desreport_/chartsImg/pictorialBar-spirit.png b/src/main/resources/static/jmreport/desreport_/chartsImg/pictorialBar-spirit.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/pictorialBar-spirit.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/pictorialBar-spirit.png
diff --git a/src/main/resources/desreport_/chartsImg/pictorialIcon/spirits.png b/src/main/resources/static/jmreport/desreport_/chartsImg/pictorialIcon/spirits.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/pictorialIcon/spirits.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/pictorialIcon/spirits.png
diff --git a/src/main/resources/desreport_/chartsImg/pie-1.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/pie-1.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/pie-1.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/pie-1.jpg
diff --git a/src/main/resources/desreport_/chartsImg/pie-1.png b/src/main/resources/static/jmreport/desreport_/chartsImg/pie-1.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/pie-1.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/pie-1.png
diff --git a/src/main/resources/desreport_/chartsImg/pie-2.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/pie-2.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/pie-2.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/pie-2.jpg
diff --git a/src/main/resources/desreport_/chartsImg/pie-2.png b/src/main/resources/static/jmreport/desreport_/chartsImg/pie-2.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/pie-2.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/pie-2.png
diff --git a/src/main/resources/desreport_/chartsImg/pie-3.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/pie-3.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/pie-3.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/pie-3.jpg
diff --git a/src/main/resources/desreport_/chartsImg/pie-3.png b/src/main/resources/static/jmreport/desreport_/chartsImg/pie-3.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/pie-3.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/pie-3.png
diff --git a/src/main/resources/desreport_/chartsImg/radar-2.png b/src/main/resources/static/jmreport/desreport_/chartsImg/radar-2.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/radar-2.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/radar-2.png
diff --git a/src/main/resources/desreport_/chartsImg/radar.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/radar.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/radar.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/radar.jpg
diff --git a/src/main/resources/desreport_/chartsImg/radar.png b/src/main/resources/static/jmreport/desreport_/chartsImg/radar.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/radar.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/radar.png
diff --git a/src/main/resources/desreport_/chartsImg/scatter-simple.jpg b/src/main/resources/static/jmreport/desreport_/chartsImg/scatter-simple.jpg
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/scatter-simple.jpg
rename to src/main/resources/static/jmreport/desreport_/chartsImg/scatter-simple.jpg
diff --git a/src/main/resources/desreport_/chartsImg/scatter_bubble.png b/src/main/resources/static/jmreport/desreport_/chartsImg/scatter_bubble.png
similarity index 100%
rename from src/main/resources/desreport_/chartsImg/scatter_bubble.png
rename to src/main/resources/static/jmreport/desreport_/chartsImg/scatter_bubble.png
diff --git a/src/main/resources/desreport_/corelib/58eaeb4e52248a5c75936c6f4c33a370.svg b/src/main/resources/static/jmreport/desreport_/corelib/58eaeb4e52248a5c75936c6f4c33a370.svg
similarity index 100%
rename from src/main/resources/desreport_/corelib/58eaeb4e52248a5c75936c6f4c33a370.svg
rename to src/main/resources/static/jmreport/desreport_/corelib/58eaeb4e52248a5c75936c6f4c33a370.svg
diff --git a/src/main/resources/desreport_/corelib/cust.css b/src/main/resources/static/jmreport/desreport_/corelib/cust.css
similarity index 100%
rename from src/main/resources/desreport_/corelib/cust.css
rename to src/main/resources/static/jmreport/desreport_/corelib/cust.css
diff --git a/src/main/resources/desreport_/corelib/ece3e4fa05d4292823fdef970eaf1233.svg b/src/main/resources/static/jmreport/desreport_/corelib/ece3e4fa05d4292823fdef970eaf1233.svg
similarity index 100%
rename from src/main/resources/desreport_/corelib/ece3e4fa05d4292823fdef970eaf1233.svg
rename to src/main/resources/static/jmreport/desreport_/corelib/ece3e4fa05d4292823fdef970eaf1233.svg
diff --git a/src/main/resources/desreport_/corelib/icons/0540532988b0d225f543519753f72473.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/0540532988b0d225f543519753f72473.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/0540532988b0d225f543519753f72473.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/0540532988b0d225f543519753f72473.png
diff --git a/src/main/resources/desreport_/corelib/icons/0c74968b940136baec8566b2d95adeed.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/0c74968b940136baec8566b2d95adeed.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/0c74968b940136baec8566b2d95adeed.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/0c74968b940136baec8566b2d95adeed.png
diff --git a/src/main/resources/desreport_/corelib/icons/127a607b97c089a43dc00347b09fea99.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/127a607b97c089a43dc00347b09fea99.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/127a607b97c089a43dc00347b09fea99.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/127a607b97c089a43dc00347b09fea99.png
diff --git a/src/main/resources/desreport_/corelib/icons/1d1bc9c519706fbb04e69f9bc367f398.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/1d1bc9c519706fbb04e69f9bc367f398.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/1d1bc9c519706fbb04e69f9bc367f398.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/1d1bc9c519706fbb04e69f9bc367f398.png
diff --git a/src/main/resources/desreport_/corelib/icons/2b9b4872cd25494093c1eb14f0264a0b.svg b/src/main/resources/static/jmreport/desreport_/corelib/icons/2b9b4872cd25494093c1eb14f0264a0b.svg
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/2b9b4872cd25494093c1eb14f0264a0b.svg
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/2b9b4872cd25494093c1eb14f0264a0b.svg
diff --git a/src/main/resources/desreport_/corelib/icons/30e25c2abce295834a60fd9637bb4e0a.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/30e25c2abce295834a60fd9637bb4e0a.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/30e25c2abce295834a60fd9637bb4e0a.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/30e25c2abce295834a60fd9637bb4e0a.png
diff --git a/src/main/resources/desreport_/corelib/icons/4319ed3209e5999879d00e2ea7eef42d.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/4319ed3209e5999879d00e2ea7eef42d.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/4319ed3209e5999879d00e2ea7eef42d.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/4319ed3209e5999879d00e2ea7eef42d.png
diff --git a/src/main/resources/desreport_/corelib/icons/4b6b5c111a1a164649257c1d4bfbf784.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/4b6b5c111a1a164649257c1d4bfbf784.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/4b6b5c111a1a164649257c1d4bfbf784.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/4b6b5c111a1a164649257c1d4bfbf784.png
diff --git a/src/main/resources/desreport_/corelib/icons/50ddfa9d040f3585bd86a5f72c9cafe6.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/50ddfa9d040f3585bd86a5f72c9cafe6.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/50ddfa9d040f3585bd86a5f72c9cafe6.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/50ddfa9d040f3585bd86a5f72c9cafe6.png
diff --git a/src/main/resources/desreport_/corelib/icons/53b3da298ce02fdde6fd5a09a7624b4a.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/53b3da298ce02fdde6fd5a09a7624b4a.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/53b3da298ce02fdde6fd5a09a7624b4a.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/53b3da298ce02fdde6fd5a09a7624b4a.png
diff --git a/src/main/resources/desreport_/corelib/icons/58eaeb4e52248a5c75936c6f4c33a370.svg b/src/main/resources/static/jmreport/desreport_/corelib/icons/58eaeb4e52248a5c75936c6f4c33a370.svg
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/58eaeb4e52248a5c75936c6f4c33a370.svg
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/58eaeb4e52248a5c75936c6f4c33a370.svg
diff --git a/src/main/resources/desreport_/corelib/icons/5b9b5a635a5014af2f54df4c3fe5ea5c.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/5b9b5a635a5014af2f54df4c3fe5ea5c.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/5b9b5a635a5014af2f54df4c3fe5ea5c.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/5b9b5a635a5014af2f54df4c3fe5ea5c.png
diff --git a/src/main/resources/desreport_/corelib/icons/5ea0efc04b8a7bd10eb8eac1374caaf9.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/5ea0efc04b8a7bd10eb8eac1374caaf9.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/5ea0efc04b8a7bd10eb8eac1374caaf9.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/5ea0efc04b8a7bd10eb8eac1374caaf9.png
diff --git a/src/main/resources/desreport_/corelib/icons/6fbd5b02ca40d102e573ab55768b5c08.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/6fbd5b02ca40d102e573ab55768b5c08.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/6fbd5b02ca40d102e573ab55768b5c08.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/6fbd5b02ca40d102e573ab55768b5c08.png
diff --git a/src/main/resources/desreport_/corelib/icons/74aa67bdfaa3827c67bfb829433aa6c9.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/74aa67bdfaa3827c67bfb829433aa6c9.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/74aa67bdfaa3827c67bfb829433aa6c9.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/74aa67bdfaa3827c67bfb829433aa6c9.png
diff --git a/src/main/resources/desreport_/corelib/icons/78f3bf387adad79f4aaf0baa6937c571.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/78f3bf387adad79f4aaf0baa6937c571.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/78f3bf387adad79f4aaf0baa6937c571.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/78f3bf387adad79f4aaf0baa6937c571.png
diff --git a/src/main/resources/desreport_/corelib/icons/8c26a72edb95539833e59dc60817f093.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/8c26a72edb95539833e59dc60817f093.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/8c26a72edb95539833e59dc60817f093.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/8c26a72edb95539833e59dc60817f093.png
diff --git a/src/main/resources/desreport_/corelib/icons/941009d2ba77ac605c0b0cf976931cb6.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/941009d2ba77ac605c0b0cf976931cb6.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/941009d2ba77ac605c0b0cf976931cb6.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/941009d2ba77ac605c0b0cf976931cb6.png
diff --git a/src/main/resources/desreport_/corelib/icons/981779d39b3c085d1305ef248a5f5a6b.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/981779d39b3c085d1305ef248a5f5a6b.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/981779d39b3c085d1305ef248a5f5a6b.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/981779d39b3c085d1305ef248a5f5a6b.png
diff --git a/src/main/resources/desreport_/corelib/icons/aab2ab4f4ef98d8eb7cb3db78d079d92.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/aab2ab4f4ef98d8eb7cb3db78d079d92.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/aab2ab4f4ef98d8eb7cb3db78d079d92.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/aab2ab4f4ef98d8eb7cb3db78d079d92.png
diff --git a/src/main/resources/desreport_/corelib/icons/be747d3e2eeb3c0b7168db78c84dd5af.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/be747d3e2eeb3c0b7168db78c84dd5af.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/be747d3e2eeb3c0b7168db78c84dd5af.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/be747d3e2eeb3c0b7168db78c84dd5af.png
diff --git a/src/main/resources/desreport_/corelib/icons/c7c31dcc0ccce538b22a063debbc1a02.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/c7c31dcc0ccce538b22a063debbc1a02.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/c7c31dcc0ccce538b22a063debbc1a02.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/c7c31dcc0ccce538b22a063debbc1a02.png
diff --git a/src/main/resources/desreport_/corelib/icons/c9d011bdbaec17669808f9d88fc2d366.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/c9d011bdbaec17669808f9d88fc2d366.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/c9d011bdbaec17669808f9d88fc2d366.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/c9d011bdbaec17669808f9d88fc2d366.png
diff --git a/src/main/resources/desreport_/corelib/icons/cdf358d837ec38982530cc913c10531b.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/cdf358d837ec38982530cc913c10531b.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/cdf358d837ec38982530cc913c10531b.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/cdf358d837ec38982530cc913c10531b.png
diff --git a/src/main/resources/desreport_/corelib/icons/ce8f3da2d9d63cebccc6f2365cdc84f3.svg b/src/main/resources/static/jmreport/desreport_/corelib/icons/ce8f3da2d9d63cebccc6f2365cdc84f3.svg
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/ce8f3da2d9d63cebccc6f2365cdc84f3.svg
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/ce8f3da2d9d63cebccc6f2365cdc84f3.svg
diff --git a/src/main/resources/desreport_/corelib/icons/d8824fbc7c3613b473675a158a0c2d98.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/d8824fbc7c3613b473675a158a0c2d98.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/d8824fbc7c3613b473675a158a0c2d98.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/d8824fbc7c3613b473675a158a0c2d98.png
diff --git a/src/main/resources/desreport_/corelib/icons/e63176859cc9386023017a70852fa2c1.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/e63176859cc9386023017a70852fa2c1.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/e63176859cc9386023017a70852fa2c1.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/e63176859cc9386023017a70852fa2c1.png
diff --git a/src/main/resources/desreport_/corelib/icons/e67b7bdc19df9ede78820d9bf5f59b73.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/e67b7bdc19df9ede78820d9bf5f59b73.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/e67b7bdc19df9ede78820d9bf5f59b73.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/e67b7bdc19df9ede78820d9bf5f59b73.png
diff --git a/src/main/resources/desreport_/corelib/icons/ea47d3fbf0039f36b102f070a8ac8967.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/ea47d3fbf0039f36b102f070a8ac8967.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/ea47d3fbf0039f36b102f070a8ac8967.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/ea47d3fbf0039f36b102f070a8ac8967.png
diff --git a/src/main/resources/desreport_/corelib/icons/eeb304b0fee557ba71000e62afc97837.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/eeb304b0fee557ba71000e62afc97837.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/eeb304b0fee557ba71000e62afc97837.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/eeb304b0fee557ba71000e62afc97837.png
diff --git a/src/main/resources/desreport_/corelib/icons/f08cce4fc757983ae0c5e705ed6324ad.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/f08cce4fc757983ae0c5e705ed6324ad.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/f08cce4fc757983ae0c5e705ed6324ad.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/f08cce4fc757983ae0c5e705ed6324ad.png
diff --git a/src/main/resources/desreport_/corelib/icons/f7acc34b75af97e7db9055c698236f80.png b/src/main/resources/static/jmreport/desreport_/corelib/icons/f7acc34b75af97e7db9055c698236f80.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/icons/f7acc34b75af97e7db9055c698236f80.png
rename to src/main/resources/static/jmreport/desreport_/corelib/icons/f7acc34b75af97e7db9055c698236f80.png
diff --git a/src/main/resources/desreport_/corelib/index.html b/src/main/resources/static/jmreport/desreport_/corelib/index.html
similarity index 100%
rename from src/main/resources/desreport_/corelib/index.html
rename to src/main/resources/static/jmreport/desreport_/corelib/index.html
diff --git a/src/main/resources/desreport_/corelib/jiade.jpg b/src/main/resources/static/jmreport/desreport_/corelib/jiade.jpg
similarity index 100%
rename from src/main/resources/desreport_/corelib/jiade.jpg
rename to src/main/resources/static/jmreport/desreport_/corelib/jiade.jpg
diff --git a/src/main/resources/desreport_/corelib/jmsheet.css b/src/main/resources/static/jmreport/desreport_/corelib/jmsheet.css
similarity index 95%
rename from src/main/resources/desreport_/corelib/jmsheet.css
rename to src/main/resources/static/jmreport/desreport_/corelib/jmsheet.css
index 2e8c604..e35d373 100644
--- a/src/main/resources/desreport_/corelib/jmsheet.css
+++ b/src/main/resources/static/jmreport/desreport_/corelib/jmsheet.css
@@ -751,65 +751,65 @@ body {
   display: inline-block;
 }
 .jm-sheet-icon.right {
-  background-image: url(./icons/aab2ab4f4ef98d8eb7cb3db78d079d92.png);
+  background-image: url(icons/aab2ab4f4ef98d8eb7cb3db78d079d92.png);
   float: right;
 }
 .jm-sheet-icon .jm-sheet-icon-img {
-  background-image: url(./icons/58eaeb4e52248a5c75936c6f4c33a370.svg);
+  background-image: url(icons/58eaeb4e52248a5c75936c6f4c33a370.svg);
   position: absolute;
   width: 262px;
   height: 444px;
   opacity: 0.56;
 }
 .jm-sheet-icon .jm-sheet-icon-img.save {
-  background-image: url(./icons/ce8f3da2d9d63cebccc6f2365cdc84f3.svg);
+  background-image: url(icons/ce8f3da2d9d63cebccc6f2365cdc84f3.svg);
   opacity: 0.8;
 }
 .jm-sheet-icon .jm-sheet-icon-img.print-setting {
-  background-image: url(./icons/cdf358d837ec38982530cc913c10531b.png);
+  background-image: url(icons/cdf358d837ec38982530cc913c10531b.png);
   opacity: 0.9;
 }
 .jm-sheet-icon .jm-sheet-icon-img.help {
-  background-image: url(./icons/f08cce4fc757983ae0c5e705ed6324ad.png);
+  background-image: url(icons/f08cce4fc757983ae0c5e705ed6324ad.png);
   opacity: 0.9;
 }
 .jm-sheet-icon .jm-sheet-icon-img.view-setting {
-  background-image: url(./icons/4b6b5c111a1a164649257c1d4bfbf784.png);
+  background-image: url(icons/4b6b5c111a1a164649257c1d4bfbf784.png);
   opacity: 0.9;
 }
 .jm-sheet-icon .jm-sheet-icon-img.img {
-  background-image: url(./icons/5b9b5a635a5014af2f54df4c3fe5ea5c.png);
+  background-image: url(icons/5b9b5a635a5014af2f54df4c3fe5ea5c.png);
   opacity: 0.8;
 }
 .jm-sheet-icon .jm-sheet-icon-img.cell-prop {
-  background-image: url(./icons/941009d2ba77ac605c0b0cf976931cb6.png);
+  background-image: url(icons/941009d2ba77ac605c0b0cf976931cb6.png);
   opacity: 0.8;
 }
 .jm-sheet-icon .jm-sheet-icon-img.cell-line {
-  background-image: url(./icons/1d1bc9c519706fbb04e69f9bc367f398.png);
+  background-image: url(icons/1d1bc9c519706fbb04e69f9bc367f398.png);
 }
 .jm-sheet-icon .jm-sheet-icon-img.cell-exp {
-  background-image: url(./icons/0540532988b0d225f543519753f72473.png);
+  background-image: url(icons/0540532988b0d225f543519753f72473.png);
   opacity: 0.9;
 }
 .jm-sheet-icon .jm-sheet-icon-img.chart {
-  background-image: url(./icons/30e25c2abce295834a60fd9637bb4e0a.png);
+  background-image: url(icons/30e25c2abce295834a60fd9637bb4e0a.png);
   opacity: 0.8;
 }
 .jm-sheet-icon .jm-sheet-icon-img.view {
-  background-image: url(./icons/78f3bf387adad79f4aaf0baa6937c571.png);
+  background-image: url(icons/78f3bf387adad79f4aaf0baa6937c571.png);
   opacity: 0.8;
 }
 .jm-sheet-icon .jm-sheet-icon-img.uploadExcel {
-  background-image: url(./icons/5ea0efc04b8a7bd10eb8eac1374caaf9.png);
+  background-image: url(icons/5ea0efc04b8a7bd10eb8eac1374caaf9.png);
   opacity: 0.9;
 }
 .jm-sheet-icon .jm-sheet-icon-img.qrcode {
-  background-image: url(./icons/c9d011bdbaec17669808f9d88fc2d366.png);
+  background-image: url(icons/c9d011bdbaec17669808f9d88fc2d366.png);
   opacity: 0.8;
 }
 .jm-sheet-icon .jm-sheet-icon-img.barcode {
-  background-image: url(./icons/e67b7bdc19df9ede78820d9bf5f59b73.png);
+  background-image: url(icons/e67b7bdc19df9ede78820d9bf5f59b73.png);
   opacity: 0.8;
 }
 .jm-sheet-icon .jm-sheet-icon-img.undo {
@@ -1095,14 +1095,14 @@ body {
 }
 .ty-bar-btn .first {
   padding-left: 20px;
-  background-image: url(./icons/74aa67bdfaa3827c67bfb829433aa6c9.png) !important;
+  background-image: url(icons/74aa67bdfaa3827c67bfb829433aa6c9.png) !important;
   background-size: 16px 16px;
 }
 .ty-bar-btn .last {
   padding-left: 16px;
   height: 18px;
   line-height: 18px;
-  background-image: url(./icons/c7c31dcc0ccce538b22a063debbc1a02.png) !important;
+  background-image: url(icons/c7c31dcc0ccce538b22a063debbc1a02.png) !important;
   background-size: 16px 16px;
 }
 /**钻取返回上一页按钮样式*/
@@ -1110,36 +1110,36 @@ body {
   padding-left: 16px;
   height: 18px;
   line-height: 18px;
-  background-image: url(./icons/d8824fbc7c3613b473675a158a0c2d98.png) !important;
+  background-image: url(icons/d8824fbc7c3613b473675a158a0c2d98.png) !important;
   background-size: 16px 16px;
 }
 .ty-bar-btn .next {
   padding-left: 14px;
   line-height: 16px;
-  background-image: url(./icons/be747d3e2eeb3c0b7168db78c84dd5af.png) !important;
+  background-image: url(icons/be747d3e2eeb3c0b7168db78c84dd5af.png) !important;
   background-size: 16px 16px;
 }
 .ty-bar-btn .end {
   padding-left: 20px;
   line-height: 16px;
-  background-image: url(./icons/50ddfa9d040f3585bd86a5f72c9cafe6.png) !important;
+  background-image: url(icons/50ddfa9d040f3585bd86a5f72c9cafe6.png) !important;
   background-size: 16px 16px;
 }
 .ty-bar-btn .print {
   padding-left: 20px;
-  background-image: url(./icons/8c26a72edb95539833e59dc60817f093.png) !important;
+  background-image: url(icons/8c26a72edb95539833e59dc60817f093.png) !important;
   background-size: 16px 16px;
 }
 .ty-bar-btn .export {
   padding-left: 19px;
   line-height: 18px;
-  background-image: url(./icons/127a607b97c089a43dc00347b09fea99.png) !important;
+  background-image: url(icons/127a607b97c089a43dc00347b09fea99.png) !important;
   background-size: 17px 17px;
 }
 .ty-bar-btn .pdf {
   padding-left: 19px;
   line-height: 18px;
-  background-image: url(./icons/53b3da298ce02fdde6fd5a09a7624b4a.png) !important;
+  background-image: url(icons/53b3da298ce02fdde6fd5a09a7624b4a.png) !important;
   background-size: 17px 17px;
 }
 .ty-bar-input {
@@ -1329,7 +1329,7 @@ ty-drag-content > div {
   height: 24px;
   position: absolute;
   top: -50px;
-  background-image: url(./icons/4319ed3209e5999879d00e2ea7eef42d.png);
+  background-image: url(icons/4319ed3209e5999879d00e2ea7eef42d.png);
   left: calc(50% - 10px);
 }
 .ty-layer-menu {
@@ -1733,7 +1733,7 @@ input.ty-slider[type=range]::-webkit-slider-thumb {
 }
 /* 格式刷样式 */
 .gss {
-  cursor: url(./icons/e63176859cc9386023017a70852fa2c1.png), pointer;
+  cursor: url(icons/e63176859cc9386023017a70852fa2c1.png), pointer;
 }
 /* 右键菜单输入框样式 */
 .jm-menu-item-input {
@@ -1784,4 +1784,4 @@ input.ty-slider[type=range]::-webkit-slider-thumb {
 /* 滑块-end */
 
 
-/*# sourceMappingURL=jmsheet.css.map*/
\ No newline at end of file
+/*# sourceMappingURL=jmsheet.css.map*/
diff --git a/src/main/resources/desreport_/corelib/jmsheet.js b/src/main/resources/static/jmreport/desreport_/corelib/jmsheet.js
similarity index 100%
rename from src/main/resources/desreport_/corelib/jmsheet.js
rename to src/main/resources/static/jmreport/desreport_/corelib/jmsheet.js
diff --git a/src/main/resources/desreport_/corelib/locale/de.js b/src/main/resources/static/jmreport/desreport_/corelib/locale/de.js
similarity index 100%
rename from src/main/resources/desreport_/corelib/locale/de.js
rename to src/main/resources/static/jmreport/desreport_/corelib/locale/de.js
diff --git a/src/main/resources/desreport_/corelib/locale/en.js b/src/main/resources/static/jmreport/desreport_/corelib/locale/en.js
similarity index 100%
rename from src/main/resources/desreport_/corelib/locale/en.js
rename to src/main/resources/static/jmreport/desreport_/corelib/locale/en.js
diff --git a/src/main/resources/desreport_/corelib/locale/nl.js b/src/main/resources/static/jmreport/desreport_/corelib/locale/nl.js
similarity index 100%
rename from src/main/resources/desreport_/corelib/locale/nl.js
rename to src/main/resources/static/jmreport/desreport_/corelib/locale/nl.js
diff --git a/src/main/resources/desreport_/corelib/locale/zh-cn.js b/src/main/resources/static/jmreport/desreport_/corelib/locale/zh-cn.js
similarity index 100%
rename from src/main/resources/desreport_/corelib/locale/zh-cn.js
rename to src/main/resources/static/jmreport/desreport_/corelib/locale/zh-cn.js
diff --git a/src/main/resources/desreport_/corelib/logo.png b/src/main/resources/static/jmreport/desreport_/corelib/logo.png
similarity index 100%
rename from src/main/resources/desreport_/corelib/logo.png
rename to src/main/resources/static/jmreport/desreport_/corelib/logo.png
diff --git a/src/main/resources/desreport_/corelib/report.css b/src/main/resources/static/jmreport/desreport_/corelib/report.css
similarity index 100%
rename from src/main/resources/desreport_/corelib/report.css
rename to src/main/resources/static/jmreport/desreport_/corelib/report.css
diff --git a/src/main/resources/desreport_/jquery/jquery-3.4.1.min.js b/src/main/resources/static/jmreport/desreport_/jquery/jquery-3.4.1.min.js
similarity index 100%
rename from src/main/resources/desreport_/jquery/jquery-3.4.1.min.js
rename to src/main/resources/static/jmreport/desreport_/jquery/jquery-3.4.1.min.js
diff --git a/src/main/resources/desreport_/jquery/jquery.excel.js b/src/main/resources/static/jmreport/desreport_/jquery/jquery.excel.js
similarity index 100%
rename from src/main/resources/desreport_/jquery/jquery.excel.js
rename to src/main/resources/static/jmreport/desreport_/jquery/jquery.excel.js
diff --git a/src/main/resources/desreport_/js/biz/SignMd5Util.js b/src/main/resources/static/jmreport/desreport_/js/biz/SignMd5Util.js
similarity index 100%
rename from src/main/resources/desreport_/js/biz/SignMd5Util.js
rename to src/main/resources/static/jmreport/desreport_/js/biz/SignMd5Util.js
diff --git a/src/main/resources/desreport_/js/biz/design.js b/src/main/resources/static/jmreport/desreport_/js/biz/design.js
similarity index 100%
rename from src/main/resources/desreport_/js/biz/design.js
rename to src/main/resources/static/jmreport/desreport_/js/biz/design.js
diff --git a/src/main/resources/desreport_/js/biz/manager.js b/src/main/resources/static/jmreport/desreport_/js/biz/manager.js
similarity index 100%
rename from src/main/resources/desreport_/js/biz/manager.js
rename to src/main/resources/static/jmreport/desreport_/js/biz/manager.js
diff --git a/src/main/resources/desreport_/js/biz/row.cycle.js b/src/main/resources/static/jmreport/desreport_/js/biz/row.cycle.js
similarity index 100%
rename from src/main/resources/desreport_/js/biz/row.cycle.js
rename to src/main/resources/static/jmreport/desreport_/js/biz/row.cycle.js
diff --git a/src/main/resources/desreport_/js/biz/row.express.js b/src/main/resources/static/jmreport/desreport_/js/biz/row.express.js
similarity index 100%
rename from src/main/resources/desreport_/js/biz/row.express.js
rename to src/main/resources/static/jmreport/desreport_/js/biz/row.express.js
diff --git a/src/main/resources/desreport_/js/biz/view.js b/src/main/resources/static/jmreport/desreport_/js/biz/view.js
similarity index 100%
rename from src/main/resources/desreport_/js/biz/view.js
rename to src/main/resources/static/jmreport/desreport_/js/biz/view.js
diff --git a/src/main/resources/desreport_/js/config/chart_type_list.js b/src/main/resources/static/jmreport/desreport_/js/config/chart_type_list.js
similarity index 100%
rename from src/main/resources/desreport_/js/config/chart_type_list.js
rename to src/main/resources/static/jmreport/desreport_/js/config/chart_type_list.js
diff --git a/src/main/resources/desreport_/js/config/excel.virtual.json b/src/main/resources/static/jmreport/desreport_/js/config/excel.virtual.json
similarity index 100%
rename from src/main/resources/desreport_/js/config/excel.virtual.json
rename to src/main/resources/static/jmreport/desreport_/js/config/excel.virtual.json
diff --git a/src/main/resources/desreport_/js/config/map_type_list.js b/src/main/resources/static/jmreport/desreport_/js/config/map_type_list.js
similarity index 100%
rename from src/main/resources/desreport_/js/config/map_type_list.js
rename to src/main/resources/static/jmreport/desreport_/js/config/map_type_list.js
diff --git a/src/main/resources/desreport_/js/core/api.js b/src/main/resources/static/jmreport/desreport_/js/core/api.js
similarity index 100%
rename from src/main/resources/desreport_/js/core/api.js
rename to src/main/resources/static/jmreport/desreport_/js/core/api.js
diff --git a/src/main/resources/desreport_/js/core/request.js b/src/main/resources/static/jmreport/desreport_/js/core/request.js
similarity index 100%
rename from src/main/resources/desreport_/js/core/request.js
rename to src/main/resources/static/jmreport/desreport_/js/core/request.js
diff --git a/src/main/resources/desreport_/js/util.js b/src/main/resources/static/jmreport/desreport_/js/util.js
similarity index 100%
rename from src/main/resources/desreport_/js/util.js
rename to src/main/resources/static/jmreport/desreport_/js/util.js
diff --git a/src/main/resources/desreport_/logoimage/jim_logo_20200814094127.png b/src/main/resources/static/jmreport/desreport_/logoimage/jim_logo_20200814094127.png
similarity index 100%
rename from src/main/resources/desreport_/logoimage/jim_logo_20200814094127.png
rename to src/main/resources/static/jmreport/desreport_/logoimage/jim_logo_20200814094127.png
diff --git a/src/main/resources/desreport_/regionaljson/mapjson/100000.json b/src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/100000.json
similarity index 100%
rename from src/main/resources/desreport_/regionaljson/mapjson/100000.json
rename to src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/100000.json
diff --git a/src/main/resources/desreport_/regionaljson/mapjson/110000.json b/src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/110000.json
similarity index 100%
rename from src/main/resources/desreport_/regionaljson/mapjson/110000.json
rename to src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/110000.json
diff --git a/src/main/resources/desreport_/regionaljson/mapjson/120000.json b/src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/120000.json
similarity index 100%
rename from src/main/resources/desreport_/regionaljson/mapjson/120000.json
rename to src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/120000.json
diff --git a/src/main/resources/desreport_/regionaljson/mapjson/310000.json b/src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/310000.json
similarity index 100%
rename from src/main/resources/desreport_/regionaljson/mapjson/310000.json
rename to src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/310000.json
diff --git a/src/main/resources/desreport_/regionaljson/mapjson/440000.json b/src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/440000.json
similarity index 100%
rename from src/main/resources/desreport_/regionaljson/mapjson/440000.json
rename to src/main/resources/static/jmreport/desreport_/regionaljson/mapjson/440000.json
diff --git a/src/main/resources/desreport_/regionaljson/province.city.area.json b/src/main/resources/static/jmreport/desreport_/regionaljson/province.city.area.json
similarity index 100%
rename from src/main/resources/desreport_/regionaljson/province.city.area.json
rename to src/main/resources/static/jmreport/desreport_/regionaljson/province.city.area.json
diff --git a/src/main/resources/desreport_/regionaljson/province.city.json b/src/main/resources/static/jmreport/desreport_/regionaljson/province.city.json
similarity index 100%
rename from src/main/resources/desreport_/regionaljson/province.city.json
rename to src/main/resources/static/jmreport/desreport_/regionaljson/province.city.json
diff --git a/src/main/resources/desreport_/regionaljson/province.json b/src/main/resources/static/jmreport/desreport_/regionaljson/province.json
similarity index 100%
rename from src/main/resources/desreport_/regionaljson/province.json
rename to src/main/resources/static/jmreport/desreport_/regionaljson/province.json
diff --git a/src/main/resources/desreport/authority.ftl b/src/main/resources/templates/jmreport/desreport/authority.ftl
similarity index 95%
rename from src/main/resources/desreport/authority.ftl
rename to src/main/resources/templates/jmreport/desreport/authority.ftl
index 7eab376..ae1e9f0 100644
--- a/src/main/resources/desreport/authority.ftl
+++ b/src/main/resources/templates/jmreport/desreport/authority.ftl
@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
-  <title>没有权限123123123123123123</title>
+  <title>没有权限</title>
   <script>
     let base = "${base}";
   </script>
diff --git a/src/main/resources/desreport/common/resource.ftl b/src/main/resources/templates/jmreport/desreport/common/resource.ftl
similarity index 100%
rename from src/main/resources/desreport/common/resource.ftl
rename to src/main/resources/templates/jmreport/desreport/common/resource.ftl
diff --git a/src/main/resources/desreport/common/tj.ftl b/src/main/resources/templates/jmreport/desreport/common/tj.ftl
similarity index 100%
rename from src/main/resources/desreport/common/tj.ftl
rename to src/main/resources/templates/jmreport/desreport/common/tj.ftl
diff --git a/src/main/resources/desreport/demo.ftl b/src/main/resources/templates/jmreport/desreport/demo.ftl
similarity index 100%
rename from src/main/resources/desreport/demo.ftl
rename to src/main/resources/templates/jmreport/desreport/demo.ftl
diff --git a/src/main/resources/desreport/index.ftl b/src/main/resources/templates/jmreport/desreport/index.ftl
similarity index 98%
rename from src/main/resources/desreport/index.ftl
rename to src/main/resources/templates/jmreport/desreport/index.ftl
index 19eb6d9..e39a34c 100644
--- a/src/main/resources/desreport/index.ftl
+++ b/src/main/resources/templates/jmreport/desreport/index.ftl
@@ -34,7 +34,7 @@
         window.localStorage.setItem('JmReport-Access-Token',token);
     </script>
     <!--引入公共资源-->
-    <#include "./common/resource.ftl">
+    <#include "common/resource.ftl">
     <link rel="stylesheet" href="${base}${customPrePath}/jmreport/desreport_/corelib/report.css?${CACHE_VERSION}">
     <link rel="stylesheet" href="${base}${customPrePath}/jmreport/desreport_/corelib/jmsheet.css?${CACHE_VERSION}">
     <link rel="shortcut icon" href="${base}${customPrePath}/jmreport/desreport_/corelib/logo.png?${CACHE_VERSION}" type="image/x-ico">
@@ -46,7 +46,7 @@
     <script src="${base}${customPrePath}/jmreport/desreport_/js/config/chart_type_list.js?${CACHE_VERSION}"></script>
     <script src="${base}${customPrePath}/jmreport/desreport_/js/config/map_type_list.js?${CACHE_VERSION}"></script>
     <!--引入自定义组件-->
-    <#include "./template/index.ftl">
+    <#include "template/index.ftl">
     <style>
         .ivu-form-item {
             margin-bottom: 10px;
@@ -193,7 +193,7 @@
            background-color:  #ffffff !important;
         }
         .match_setting .ivu-table:before{
-           background-color:  #ffffff !important; 
+           background-color:  #ffffff !important;
         }
         .pictorial-icon-upload{
             width: 36px;
@@ -270,7 +270,7 @@
             /*border-bottom: 1px solid #e8e8e8;*/
         }
         /*删除弹窗样式-end*/
-        
+
         /*自定义表达式样式 -begin*/
         .expression .fontColor{
             color:#888;
@@ -278,10 +278,10 @@
         }
         .expression .ivu-modal-body{
             background: rgb(248,248,248);
-        }  
+        }
         .expression .expressionInput textarea{
             height: 100px;
-        }  
+        }
         .expression .expressionHeight textarea{
             height: calc(45vh);
         }
@@ -299,7 +299,7 @@
         }
         .expression .functionDiv span{
             margin-left: 10px;
-        }     
+        }
         .expression .childrenDiv{
             height: 200px;
             border: 1px solid #dcdee2;
@@ -355,11 +355,11 @@
             font-size: 12px;
         }
         .rightFontSize{
-            font-size: 12px !important; 
+            font-size: 12px !important;
         }
         .rightFontSize .ivu-input{
             font-size: 12px;
-        } 
+        }
         .rightFontSize .ivu-table-cell{
             font-size: 12px;
         }
@@ -377,7 +377,7 @@
             margin-top: 15px;
         }
         #dataTree .ivu-tree ul{
-           font-size: 13px; 
+           font-size: 13px;
         }
         #dataTree .ivu-btn-icon-only.ivu-btn-small{
             position: relative;
@@ -385,19 +385,19 @@
         }
         #dataTree .ivu-tree-title{
            width: 100%;
-        }     
+        }
         .reportIfo .ivu-menu-submenu-title{
            width: 224px;
         }
         .rightPadding .ivu-card-body {
             padding: 8px;
-        }   
+        }
         .rightPadding .ivu-form-item-content {
             display: flex;
         }
         .rightPadding  .ivu-menu-vertical .ivu-menu-submenu-title{
             padding:14px 0;
-        } 
+        }
         .stylePadding  .ivu-menu-vertical .ivu-menu-submenu-title{
             padding:14px 30px;
         }
@@ -421,7 +421,7 @@
         }
         .icnoRight{
             position:relative;
-            left: 169px;    
+            left: 169px;
         }
         .title-setting-fontsize .ivu-select-selected-value{
             font-size: 10px !important;
@@ -463,7 +463,7 @@
         <Icon type="ios-loading" size=24></Icon>
         <div>Loading</div>
     </Spin>
-<#include "./modal.ftl">
+<#include "modal.ftl">
     <div class="layout">
         <div class="jm-rp-left-container">
             <div id="treeDiv">
@@ -621,7 +621,7 @@
                                           <span class="rightFontSize">分组设置
                                              <Tooltip :transfer="true" content="分组设置文档" placement="left" class="jimu-tooltip">
                                                 <a class="jimu-table-tip help-color help-margin" href="http://report.jeecg.com/2032023" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                            </Tooltip>      
+                                            </Tooltip>
                                           </span>
                                         </template>
                                         <div>
@@ -649,7 +649,7 @@
                                                 <i-option class="rightFontSize" v-for="item in advancedList" :value="item.value">{{ item.label }}</i-option>
                                               </i-select>
                                             </div>
-                                        </div>    
+                                        </div>
                                       </Submenu>
                                          <!--分组小计设置-->
                                         <Submenu name="subtotalSetting">
@@ -657,7 +657,7 @@
                                                 <span class="rightFontSize">小计设置
                                                     <Tooltip :transfer="true" content="分组小计文档" placement="left" class="jimu-tooltip">
                                                         <a class="jimu-table-tip help-color help-margin" href="http://report.jeecg.com/2333594" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                                    </Tooltip>  
+                                                    </Tooltip>
                                                 </span>
                                             </template>
 
@@ -712,7 +712,7 @@
                                           <span class="rightFontSize">其他设置
                                               <Tooltip :transfer="true" content="数据格式化文档" placement="left" class="jimu-tooltip">
                                                   <a class="jimu-table-tip help-color help-margin" href="http://report.jeecg.com/2084138" target="_blank"><Icon size="14" type="ios-help-circle-outline" style="margin-top: 2px"/></a>
-                                              </Tooltip>  
+                                              </Tooltip>
                                           </span>
                                       </template>
                                     <div class="rightFontSize">
@@ -723,7 +723,7 @@
                                         <i-button @click="showEnhanceConfig" icon="md-code-working" size="small" long type="primary" ghost>增强配置</i-button>
                                     </div>
                                   </Submenu>
-                                  <!--参数设置-->  
+                                  <!--参数设置-->
                                   <Submenu name="primarySubreportSetting">
                                       <template slot="title">
                                           <span class="rightFontSize">主子报表参数设置
@@ -906,8 +906,8 @@
                                   <i-option class="rightFontSize" v-for="item in jsonDataList" :value="item.dbId">{{ item.title }}</i-option>
                                 </i-select>
                               </div>
-                            </div>   
-                            
+                            </div>
+
                             <!-- javaBean数据集 -->
                             <div class="datastyle rightFontSize dataSourceForm" v-if="dataSettings.dataType == 'javabean'">
                               <div>
@@ -1192,7 +1192,7 @@
                      vm.customExpressionShow=true
                      //记录坐标
                      if(res){
-                       vm.expression=res 
+                       vm.expression=res
                        //判断是哪个函数，循环list
                        let functionList = vm.functionList;
                        let left = 0;
@@ -1210,7 +1210,7 @@
                                 text = functionElement[j];
                                 left = i;
                                 right = j;
-                              } 
+                              }
                             }
                          }
                        }
@@ -1308,6 +1308,6 @@
 	   return '您可能有数据没有保存';
      };
 </script>
-<#include "./common/tj.ftl">
+<#include "common/tj.ftl">
 </body>
 </html>
diff --git a/src/main/resources/desreport/list.ftl b/src/main/resources/templates/jmreport/desreport/list.ftl
similarity index 99%
rename from src/main/resources/desreport/list.ftl
rename to src/main/resources/templates/jmreport/desreport/list.ftl
index 5df0ad1..e776a4b 100644
--- a/src/main/resources/desreport/list.ftl
+++ b/src/main/resources/templates/jmreport/desreport/list.ftl
@@ -30,7 +30,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width">
 <title>在线设计</title>
-    <#include "./common/resource.ftl">
+    <#include "common/resource.ftl">
     <link rel="stylesheet" href="${base}${customPrePath}/jmreport/desreport_/corelib/cust.css?${CACHE_VERSION}">
     <link rel="shortcut icon" href="${base}${customPrePath}/jmreport/desreport_/corelib/logo.png?${CACHE_VERSION}" type="image/x-ico">
 </head>
@@ -113,12 +113,12 @@
     }
 </style>
 <!--引入自定义组件-->
-<#include "./template/list.ftl">
+<#include "template/list.ftl">
 <div id="app" style="padding-left: 30px">
     <div class="layout" style="margin-left: -30px;margin-top: -10px;">
       <div style="background-color: #1890FF;height: 47px">
         <span class="aui-logo"></span>
-        <span class="jimu-header">欢迎进入积木报表工作台123123 </span>
+        <span class="jimu-header">欢迎进入积木报表工作台</span>
       </div>
         <Layout>
             <Sider breakpoint="md" collapsible :collapsed-width="78" v-model="isCollapsed">
@@ -772,6 +772,6 @@
         }
     })
 </script>
- <#include "./common/tj.ftl">
+ <#include "common/tj.ftl">
 </body>
 </html>
diff --git a/src/main/resources/desreport/modal.ftl b/src/main/resources/templates/jmreport/desreport/modal.ftl
similarity index 100%
rename from src/main/resources/desreport/modal.ftl
rename to src/main/resources/templates/jmreport/desreport/modal.ftl
diff --git a/src/main/resources/desreport/print.ftl b/src/main/resources/templates/jmreport/desreport/print.ftl
similarity index 100%
rename from src/main/resources/desreport/print.ftl
rename to src/main/resources/templates/jmreport/desreport/print.ftl
diff --git a/src/main/resources/desreport/template/components/background_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/background_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl
diff --git a/src/main/resources/desreport/template/components/bar_series_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/bar_series_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl
diff --git a/src/main/resources/desreport/template/components/bar_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/bar_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/bar_setting.ftl
diff --git a/src/main/resources/desreport/template/components/barcode.ftl b/src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/barcode.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/barcode.ftl
diff --git a/src/main/resources/desreport/template/components/cell_linkage.ftl b/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/cell_linkage.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl
diff --git a/src/main/resources/desreport/template/components/central_point_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/central_point_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl
diff --git a/src/main/resources/desreport/template/components/chart_linkage.ftl b/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/chart_linkage.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl
diff --git a/src/main/resources/desreport/template/components/data_dictionary.ftl b/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/data_dictionary.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl
diff --git a/src/main/resources/desreport/template/components/data_source_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/data_source_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl
diff --git a/src/main/resources/desreport/template/components/function_interpretation.ftl b/src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/function_interpretation.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/function_interpretation.ftl
diff --git a/src/main/resources/desreport/template/components/funnel_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/funnel_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/funnel_setting.ftl
diff --git a/src/main/resources/desreport/template/components/gauge_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/gauge_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/gauge_setting.ftl
diff --git a/src/main/resources/desreport/template/components/grid_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/grid_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/grid_setting.ftl
diff --git a/src/main/resources/desreport/template/components/hyperlinks.ftl b/src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/hyperlinks.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/hyperlinks.ftl
diff --git a/src/main/resources/desreport/template/components/javabean_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/javabean_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl
diff --git a/src/main/resources/desreport/template/components/jurisdiction.ftl b/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/jurisdiction.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl
diff --git a/src/main/resources/desreport/template/components/legend_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/legend_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl
diff --git a/src/main/resources/desreport/template/components/line_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/line_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/line_setting.ftl
diff --git a/src/main/resources/desreport/template/components/map_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/map_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl
diff --git a/src/main/resources/desreport/template/components/margin_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/margin_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/margin_setting.ftl
diff --git a/src/main/resources/desreport/template/components/match_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/match_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl
diff --git a/src/main/resources/desreport/template/components/pictorial_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/pictorial_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl
diff --git a/src/main/resources/desreport/template/components/pie_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/pie_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/pie_setting.ftl
diff --git a/src/main/resources/desreport/template/components/primary_sub_report.ftl b/src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/primary_sub_report.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/primary_sub_report.ftl
diff --git a/src/main/resources/desreport/template/components/print_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/print_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl
diff --git a/src/main/resources/desreport/template/components/qrcode.ftl b/src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/qrcode.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/qrcode.ftl
diff --git a/src/main/resources/desreport/template/components/radar_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/radar_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/radar_setting.ftl
diff --git a/src/main/resources/desreport/template/components/scatter_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/scatter_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/scatter_setting.ftl
diff --git a/src/main/resources/desreport/template/components/select_input.ftl b/src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/select_input.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/select_input.ftl
diff --git a/src/main/resources/desreport/template/components/select_scroll_multiple.ftl b/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/select_scroll_multiple.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl
diff --git a/src/main/resources/desreport/template/components/select_scroll_radio.ftl b/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/select_scroll_radio.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl
diff --git a/src/main/resources/desreport/template/components/series_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/series_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl
diff --git a/src/main/resources/desreport/template/components/sql_function_replace.ftl b/src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/sql_function_replace.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/sql_function_replace.ftl
diff --git a/src/main/resources/desreport/template/components/title_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/title_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/title_setting.ftl
diff --git a/src/main/resources/desreport/template/components/tooltip_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/tooltip_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/tooltip_setting.ftl
diff --git a/src/main/resources/desreport/template/components/tree_select.ftl b/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/tree_select.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl
diff --git a/src/main/resources/desreport/template/components/view_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/view_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl
diff --git a/src/main/resources/desreport/template/components/xAxis_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/xAxis_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/xAxis_setting.ftl
diff --git a/src/main/resources/desreport/template/components/yAxis_setting.ftl b/src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl
similarity index 100%
rename from src/main/resources/desreport/template/components/yAxis_setting.ftl
rename to src/main/resources/templates/jmreport/desreport/template/components/yAxis_setting.ftl
diff --git a/src/main/resources/desreport/template/index.ftl b/src/main/resources/templates/jmreport/desreport/template/index.ftl
similarity index 100%
rename from src/main/resources/desreport/template/index.ftl
rename to src/main/resources/templates/jmreport/desreport/template/index.ftl
diff --git a/src/main/resources/desreport/template/list.ftl b/src/main/resources/templates/jmreport/desreport/template/list.ftl
similarity index 100%
rename from src/main/resources/desreport/template/list.ftl
rename to src/main/resources/templates/jmreport/desreport/template/list.ftl
diff --git a/src/main/resources/desreport/template/view.ftl b/src/main/resources/templates/jmreport/desreport/template/view.ftl
similarity index 100%
rename from src/main/resources/desreport/template/view.ftl
rename to src/main/resources/templates/jmreport/desreport/template/view.ftl
diff --git a/src/main/resources/desreport/view.ftl b/src/main/resources/templates/jmreport/desreport/view.ftl
similarity index 98%
rename from src/main/resources/desreport/view.ftl
rename to src/main/resources/templates/jmreport/desreport/view.ftl
index 1ff8e34..91d3770 100644
--- a/src/main/resources/desreport/view.ftl
+++ b/src/main/resources/templates/jmreport/desreport/view.ftl
@@ -46,9 +46,9 @@ function getLocalRequestUrl() {
         return JSON.parse(str)
     }
 </script>
-<#include "./common/resource.ftl">
-<#include "./template/components/tree_select.ftl">
-<#include "./template/view.ftl">
+<#include "common/resource.ftl">
+<#include "template/components/tree_select.ftl">
+<#include "template/view.ftl">
 <!-- Import via CDN -->
 <link rel="stylesheet" href="${base}${customPrePath}/jmreport/desreport_/corelib/jmsheet.css?${CACHE_VERSION}">
 <script src="${base}${customPrePath}/jmreport/desreport_/corelib/jmsheet.js?${CACHE_VERSION}"></script>
@@ -104,7 +104,7 @@ function getLocalRequestUrl() {
   .jm-query-form .ivu-select-multiple .ivu-select-selection{
       width: 200px;
   }
-  
+
   /*多选输入框鼠标位置显示问题*/
   /*.jm-query-form .ivu-select-multiple .ivu-tag{*/
   /*    height: 20px;*/
@@ -113,7 +113,7 @@ function getLocalRequestUrl() {
   /*    vertical-align: baseline;*/
   /*    max-width: 62% !important;*/
   /*}*/
-  
+
   .jm-query-form .ivu-select-multiple .ivu-tag i{
       top: 3px;
   }
@@ -148,8 +148,8 @@ function getLocalRequestUrl() {
   }
   .jm-select-box{
       width: 200px
-  }  
-  
+  }
+
   .jm-select-box .ivu-select-input{
       height: 28px
   }
@@ -237,7 +237,7 @@ function getLocalRequestUrl() {
                                </template>
                             </form-item>
                         </template>
-               
+
                         <form-item class="jm-search-btns">
                             <i-button type="primary" icon="ios-search-outline" @click="doReportQuery">查询</i-button>
                             <i-button style="margin-left: 8px" icon="ios-redo-outline" @click="resetReportQuery">重置</i-button>