From 988569068d02ccfa18058f1449a054f7c8cf3384 Mon Sep 17 00:00:00 2001 From: rekoe Date: Sat, 11 Jan 2020 18:34:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAnboot=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .settings/org.eclipse.core.resources.prefs | 4 + .settings/org.eclipse.jdt.core.prefs | 9 + .settings/org.eclipse.m2e.core.prefs | 4 + pom.xml | 239 +++++++----------- src/main/java/com/rekoe/MainModule.java | 76 +++++- src/main/java/com/rekoe/MvcSetup.java | 2 +- .../java/com/rekoe/module/OauthLoginAct.java | 4 +- .../com/rekoe/module/admin/AdminLoginAct.java | 4 +- .../com/rekoe/service/EmailServiceImpl.java | 2 +- ...conf.properties => application.properties} | 0 .../WEB-INF => resources}/ftl/pony/index.ftl | 0 .../ftl/pony/operate_right.ftl | 0 .../ftl/pony/ui/button.ftl | 0 .../ftl/pony/ui/checkbox.ftl | 0 .../ftl/pony/ui/checkboxlist-item.ftl | 0 .../ftl/pony/ui/checkboxlist.ftl | 0 .../ftl/pony/ui/common-attributes.ftl | 0 .../ftl/pony/ui/control-close.ftl | 0 .../ftl/pony/ui/control.ftl | 0 .../ftl/pony/ui/editor.ftl | 0 .../ftl/pony/ui/file.ftl | 0 .../ftl/pony/ui/form.ftl | 0 .../ftl/pony/ui/hidden.ftl | 0 .../ftl/pony/ui/index.ftl | 0 .../ftl/pony/ui/kindeditor.ftl | 0 .../ftl/pony/ui/password.ftl | 0 .../ftl/pony/ui/radio-item.ftl | 0 .../ftl/pony/ui/radio.ftl | 0 .../ftl/pony/ui/scripting-events.ftl | 0 .../ftl/pony/ui/select.ftl | 0 .../ftl/pony/ui/self_define_widget.ftl | 0 .../ftl/pony/ui/span.ftl | 0 .../ftl/pony/ui/table-batchoperate.ftl | 0 .../ftl/pony/ui/table-column.ftl | 0 .../ftl/pony/ui/table.ftl | 0 .../ftl/pony/ui/table2.ftl | 0 .../WEB-INF => resources}/ftl/pony/ui/td.ftl | 0 .../ftl/pony/ui/text.ftl | 0 .../ftl/pony/ui/textarea.ftl | 0 .../WEB-INF => resources}/ftl/pony/ui/tr.ftl | 0 .../ftl/pony/ui/tree.ftl | 0 .../WEB-INF => resources}/ftl/spring.ftl | 0 src/main/resources/quartz.properties | 4 - src/main/resources/shiro.ini | 40 --- .../static}/res/cms/css/admin.css | 0 .../static}/res/cms/css/common.css | 0 .../static}/res/cms/img/admin/LMBg1.jpg | Bin .../static}/res/cms/img/admin/LMBg2.jpg | Bin .../static}/res/cms/img/admin/allBG.jpg | Bin .../static}/res/cms/img/admin/arrow.gif | Bin .../static}/res/cms/img/admin/bg.png | Bin .../static}/res/cms/img/admin/bluemenu.gif | Bin .../static}/res/cms/img/admin/circle.gif | Bin .../static}/res/cms/img/admin/comm.gif | Bin .../res/cms/img/admin/content-type.png | Bin .../static}/res/cms/img/admin/dateBG.gif | Bin .../static}/res/cms/img/admin/dqwzBG.jpg | Bin .../static}/res/cms/img/admin/h1_icon.gif | Bin .../static}/res/cms/img/admin/h2_icon.gif | Bin .../static}/res/cms/img/admin/h3_icon.gif | Bin .../static}/res/cms/img/admin/h4_icon.gif | Bin .../static}/res/cms/img/admin/house.jpg | Bin .../static}/res/cms/img/admin/ico1.gif | Bin .../static}/res/cms/img/admin/ico2.jpg | Bin .../static}/res/cms/img/admin/ico3.jpg | Bin .../static}/res/cms/img/admin/icon.png | Bin .../static}/res/cms/img/admin/jeecms.png | Bin .../static}/res/cms/img/admin/lbg.jpg | Bin .../static}/res/cms/img/admin/left-line.png | Bin .../res/cms/img/admin/loginout-icon.png | Bin .../static}/res/cms/img/admin/logo.gif | Bin .../static}/res/cms/img/admin/logo.png | Bin .../res/cms/img/admin/message-unread.png | Bin .../static}/res/cms/img/admin/model-icon.png | Bin .../static}/res/cms/img/admin/msg_bg.jpg | Bin .../static}/res/cms/img/admin/nav-left.png | Bin .../static}/res/cms/img/admin/nav_bg.jpg | Bin .../static}/res/cms/img/admin/nav_current.jpg | Bin .../static}/res/cms/img/admin/navcurrbg.gif | Bin .../static}/res/cms/img/admin/newtopbg1.jpg | Bin .../static}/res/cms/img/admin/newtopbg2.jpg | Bin .../static}/res/cms/img/admin/operateMsg.jpg | Bin .../static}/res/cms/img/admin/phbBG1.gif | Bin .../static}/res/cms/img/admin/phbBG2.gif | Bin .../res/cms/img/admin/refresh-icon.png | Bin .../static}/res/cms/img/admin/ruler.gif | Bin .../static}/res/cms/img/admin/sep.jpg | Bin .../static}/res/cms/img/admin/set.png | Bin .../static}/res/cms/img/admin/shuxinBG.gif | Bin .../static}/res/cms/img/admin/step.png | Bin .../static}/res/cms/img/admin/sxicon.gif | Bin .../static}/res/cms/img/admin/time.gif | Bin .../static}/res/cms/img/admin/time_bg.jpg | Bin .../static}/res/cms/img/admin/top-tbg.png | Bin .../static}/res/cms/img/admin/top_07.jpg | Bin .../static}/res/cms/img/admin/top_bg.jpg | Bin .../res/cms/img/admin/top_menu_Divideline.png | Bin .../res/cms/img/admin/top_menu_selected.png | Bin .../res/cms/img/admin/top_useinfo_icon_01.png | Bin .../res/cms/img/admin/top_useinfo_icon_02.png | Bin .../res/cms/img/admin/top_useinfo_icon_03.png | Bin .../static}/res/cms/img/admin/topbg.gif | Bin .../static}/res/cms/img/admin/topic.png | Bin .../static}/res/cms/img/admin/tuijian.png | Bin .../static}/res/cms/img/admin/vote_bar.gif | Bin .../res/cms/img/admin/welconlogin-icon.png | Bin .../static}/res/cms/img/admin/ycz.png | Bin .../static}/res/cms/img/common.gif | Bin .../static}/res/cms/img/dialog_overlay.png | Bin .../static}/res/cms/img/login/bg.jpg | Bin .../static}/res/cms/img/login/facebook.jpg | Bin .../static}/res/cms/img/login/line.gif | Bin .../static}/res/cms/img/login/line.jpg | Bin .../static}/res/cms/img/login/llogo.jpg | Bin .../static}/res/cms/img/login/llogo.png | Bin .../static}/res/cms/img/login/login.jpg | Bin .../static}/res/cms/img/login/ltitle.jpg | Bin .../static}/res/cms/img/login/ltop.jpg | Bin .../static}/res/cms/img/login/reset.jpg | Bin .../static}/res/cms/js/admin.js | 0 .../static}/res/cms/js/login.js | 0 .../static}/res/cms/js/pictures.js | 0 .../static}/res/common/css/base.css | 0 .../static}/res/common/css/bootstrap.min.css | 0 .../static}/res/common/css/common.css | 0 .../static}/res/common/css/error.css | 0 .../res/common/css/jquery.treeview.css | 0 .../static}/res/common/css/jquery.ui.css | 0 .../res/common/css/jquery.validate.css | 0 .../static}/res/common/css/style.css | 0 .../static}/res/common/css/theme.css | 0 .../static}/res/common/images/ajax-loader.gif | Bin .../static}/res/common/images/base_button.gif | Bin .../static}/res/common/images/base_icon.gif | Bin .../res/common/images/base_loading_bar.gif | Bin .../res/common/images/base_loading_icon.gif | Bin .../res/common/images/base_overlay_bg.png | Bin .../static}/res/common/images/base_x_bg.gif | Bin .../static}/res/common/images/common.gif | Bin .../static}/res/common/images/error.gif | Bin .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin .../jquery_ui/ui-bg_flat_10_000000_40x100.png | Bin .../ui-bg_glass_100_f6f6f6_1x400.png | Bin .../ui-bg_glass_100_fdf5ce_1x400.png | Bin .../jquery_ui/ui-bg_glass_65_ffffff_1x400.png | Bin .../ui-bg_gloss-wave_35_f6a828_500x100.png | Bin .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin .../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin .../img/jquery_ui/ui-icons_222222_256x240.png | Bin .../img/jquery_ui/ui-icons_228ef1_256x240.png | Bin .../img/jquery_ui/ui-icons_ef8c08_256x240.png | Bin .../img/jquery_ui/ui-icons_ffd27a_256x240.png | Bin .../img/jquery_ui/ui-icons_ffffff_256x240.png | Bin .../static}/res/common/img/theme/FmenuBG.gif | Bin .../static}/res/common/img/theme/add-step.png | Bin .../static}/res/common/img/theme/add_item.png | Bin .../res/common/img/theme/add_subTopic.png | Bin .../res/common/img/theme/background.png | Bin .../res/common/img/theme/baocunguding.jpg | Bin .../static}/res/common/img/theme/bcplxx.jpg | Bin .../static}/res/common/img/theme/bcxtmrzd.jpg | Bin .../res/common/img/theme/boxTitleBG.jpg | Bin .../res/common/img/theme/browse-button.png | Bin .../static}/res/common/img/theme/button.png | Bin .../static}/res/common/img/theme/bzyyfjyx.jpg | Bin .../static}/res/common/img/theme/cjwj.jpg | Bin .../res/common/img/theme/content_move.png | Bin .../static}/res/common/img/theme/cz.jpg | Bin .../res/common/img/theme/danye-button.gif | Bin .../res/common/img/theme/del-button.png | Bin .../static}/res/common/img/theme/depart.png | Bin .../static}/res/common/img/theme/design.png | Bin .../static}/res/common/img/theme/dlsz.jpg | Bin .../static}/res/common/img/theme/down.png | Bin .../res/common/img/theme/down_disabled.png | Bin .../static}/res/common/img/theme/eidtorbg.jpg | Bin .../static}/res/common/img/theme/fhlb.jpg | Bin .../static}/res/common/img/theme/finish.png | Bin .../static}/res/common/img/theme/fjxgl.jpg | Bin .../static}/res/common/img/theme/fsznx.jpg | Bin .../static}/res/common/img/theme/fuzhi.jpg | Bin .../static}/res/common/img/theme/fzbq.jpg | Bin .../static}/res/common/img/theme/go.gif | Bin .../static}/res/common/img/theme/huanyuan.jpg | Bin .../static}/res/common/img/theme/hysz.jpg | Bin .../static}/res/common/img/theme/hyzcmx.jpg | Bin .../static}/res/common/img/theme/jbsz.jpg | Bin .../static}/res/common/img/theme/kscj.jpg | Bin .../res/common/img/theme/lanmu-positionbg.png | Bin .../static}/res/common/img/theme/leftBg.jpg | Bin .../static}/res/common/img/theme/ljxgl.jpg | Bin .../res/common/img/theme/menu_search.jpg | Bin .../static}/res/common/img/theme/model-0.gif | Bin .../static}/res/common/img/theme/model-1.gif | Bin .../static}/res/common/img/theme/model-2.gif | Bin .../static}/res/common/img/theme/model-3.gif | Bin .../static}/res/common/img/theme/model-4.gif | Bin .../static}/res/common/img/theme/model-5.gif | Bin .../static}/res/common/img/theme/model-6.gif | Bin .../static}/res/common/img/theme/model-7.gif | Bin .../static}/res/common/img/theme/model-8.gif | Bin .../static}/res/common/img/theme/model-9.gif | Bin .../static}/res/common/img/theme/msg_bg.jpg | Bin .../res/common/img/theme/news-button.gif | Bin .../res/common/img/theme/nopicture.png | Bin .../common/img/theme/pagenumber_icon_001.png | Bin .../common/img/theme/pagenumber_icon_003.png | Bin .../common/img/theme/pagenumber_icon_004.png | Bin .../common/img/theme/pagenumber_icon_01.png | Bin .../common/img/theme/pagenumber_icon_02.png | Bin .../common/img/theme/pagenumber_icon_022.png | Bin .../common/img/theme/pagenumber_icon_03.png | Bin .../common/img/theme/pagenumber_icon_04.png | Bin .../common/img/theme/pagenumber_icon_05.png | Bin .../res/common/img/theme/parent-depart.png | Bin .../static}/res/common/img/theme/pbg.jpg | Bin .../static}/res/common/img/theme/pfzgl.jpg | Bin .../res/common/img/theme/pic-button.gif | Bin .../res/common/img/theme/preview-button.png | Bin .../static}/res/common/img/theme/qtpz.jpg | Bin .../static}/res/common/img/theme/qtyl.jpg | Bin .../static}/res/common/img/theme/quxiao.jpg | Bin .../static}/res/common/img/theme/ruler.gif | Bin .../res/common/img/theme/save-button.png | Bin .../static}/res/common/img/theme/scgx.jpg | Bin .../static}/res/common/img/theme/scsx.jpg | Bin .../static}/res/common/img/theme/scsy.jpg | Bin .../static}/res/common/img/theme/scsysxfj.jpg | Bin .../static}/res/common/img/theme/shanchu.jpg | Bin .../static}/res/common/img/theme/shangyi.jpg | Bin .../common/img/theme/shengchengjingtaiye.jpg | Bin .../static}/res/common/img/theme/shenhe.jpg | Bin .../static}/res/common/img/theme/sjxgl.jpg | Bin .../static}/res/common/img/theme/sy.gif | Bin .../static}/res/common/img/theme/sysz.jpg | Bin .../static}/res/common/img/theme/syy.gif | Bin .../static}/res/common/img/theme/tb-bg.jpg | Bin .../res/common/img/theme/theme-button.png | Bin .../static}/res/common/img/theme/tianjia.jpg | Bin .../static}/res/common/img/theme/tijiao.jpg | Bin .../static}/res/common/img/theme/tijiao2.jpg | Bin .../static}/res/common/img/theme/tit-tdbg.png | Bin .../res/common/img/theme/top_menu_butten.png | Bin .../static}/res/common/img/theme/tuihui.jpg | Bin .../static}/res/common/img/theme/tuisong.jpg | Bin .../common/img/theme/tuisongzhizhuanti.gif | Bin .../res/common/img/theme/tv-button.gif | Bin .../static}/res/common/img/theme/up.png | Bin .../res/common/img/theme/up_disabled.png | Bin .../static}/res/common/img/theme/wlfhqpz.jpg | Bin .../static}/res/common/img/theme/wy.gif | Bin .../static}/res/common/img/theme/xiayi.jpg | Bin .../res/common/img/theme/xiazai-button.gif | Bin .../static}/res/common/img/theme/xiazai.jpg | Bin .../static}/res/common/img/theme/xinjian.jpg | Bin .../static}/res/common/img/theme/xiugai.jpg | Bin .../static}/res/common/img/theme/xtsz.jpg | Bin .../static}/res/common/img/theme/xyy.gif | Bin .../static}/res/common/img/theme/xzwj.jpg | Bin .../static}/res/common/img/theme/ycz.png | Bin .../static}/res/common/img/theme/yidong.jpg | Bin .../static}/res/common/img/theme/yingyong.jpg | Bin .../static}/res/common/img/theme/zjtctm.jpg | Bin .../static}/res/common/js/base.js | 0 .../res/common/js/jquery-ui-1.10.4.min.js | 0 .../static}/res/common/js/jquery.ext.js | 0 .../static}/res/common/js/jquery.form.js | 0 .../static}/res/common/js/jquery.form.min.js | 0 .../res/common/js/jquery.imgareaselect.js | 0 .../static}/res/common/js/jquery.js | 0 .../static}/res/common/js/message.js | 0 .../static}/res/common/js/pony.js | 0 .../resources/bootstrap-responsive.min.css | 0 .../static}/resources/bootstrap.min.css | 0 .../static}/resources/incomplete.gif | Bin .../static}/resources/jquery-1.7.min.js | 0 .../static}/resources/sorttable.js | 0 .../static}/resources/svnadmin.css | 0 .../static}/resources/svnadmin.js | 0 .../resources/treeview/images/ajax-loader.gif | Bin .../resources/treeview/images/file.gif | Bin .../treeview/images/folder-closed.gif | Bin .../resources/treeview/images/folder.gif | Bin .../treeview/images/treeview-default-line.gif | Bin .../treeview/images/treeview-default.gif | Bin .../static}/resources/treeview/treeview.css | 0 .../static}/resources/treeview/treeview.js | 0 .../template/admin/account/change_pwd.ftl | 0 .../template/admin/account/frame/left.ftl | 0 .../template/admin/account/frame/main.ftl | 0 .../template/admin/account/frame/right.ftl | 0 .../template/admin/common/error.ftl | 0 .../template/admin/common/lock.ftl | 0 .../template/admin/common/main.ftl | 0 .../template/admin/common/project_open.ftl | 0 .../template/admin/common/rest_pwd.ftl | 0 .../template/admin/date.ftl | 0 .../template/admin/email/email.ftl | 0 .../template/admin/email/email2.ftl | 0 .../template/admin/email/project_open.ftl | 0 .../template/admin/email/rest_pwd.ftl | 0 .../template/admin/head.ftl | 0 .../template/admin/index.ftl | 0 .../template/admin/left.ftl | 0 .../template/admin/log.ftl | 0 .../template/admin/login_name.ftl | 0 .../template/admin/main.ftl | 0 .../template/admin/project/add.ftl | 0 .../template/admin/project/add_dir.ftl | 0 .../template/admin/project/config.ftl | 0 .../template/admin/project/edit.ftl | 0 .../template/admin/project/frame/left.ftl | 0 .../template/admin/project/frame/main.ftl | 0 .../template/admin/project/frame/right.ftl | 0 .../template/admin/project/list.ftl | 0 .../template/admin/project/pjauth.ftl | 0 .../template/admin/project/rep.ftl | 0 .../template/admin/project_group/add.ftl | 0 .../template/admin/project_group/edit.ftl | 0 .../template/admin/project_group/list.ftl | 0 .../template/admin/project_group_usr/add.ftl | 0 .../template/admin/project_group_usr/edit.ftl | 0 .../template/admin/project_group_usr/list.ftl | 0 .../template/admin/right.ftl | 0 .../template/admin/svn_user/add.ftl | 0 .../template/admin/svn_user/edit.ftl | 0 .../template/admin/svn_user/frame/left.ftl | 0 .../template/admin/svn_user/frame/main.ftl | 0 .../template/admin/svn_user/frame/right.ftl | 0 .../template/admin/svn_user/list.ftl | 0 .../template/admin/top.ftl | 0 .../template/admin/user/add.ftl | 0 .../template/admin/user/add_user.ftl | 0 .../template/admin/user/edit.ftl | 0 .../template/admin/user/edit_user_role.ftl | 0 .../template/admin/user/frame/left.ftl | 0 .../template/admin/user/frame/main.ftl | 0 .../template/admin/user/frame/right.ftl | 0 .../template/admin/user/list.ftl | 0 .../template/admin/user/permission/add.ftl | 0 .../template/admin/user/permission/edit.ftl | 0 .../template/admin/user/permission/list.ftl | 0 .../admin/user/permission_category/add.ftl | 0 .../admin/user/permission_category/edit.ftl | 0 .../admin/user/permission_category/list.ftl | 0 .../template/admin/user/role/add.ftl | 0 .../template/admin/user/role/edit.ftl | 0 .../template/admin/user/role/list.ftl | 0 .../template/front/account/create_user.ftl | 0 .../template/front/zone/in.ftl | 0 .../template/login/login.ftl | 0 src/main/webapp/META-INF/MANIFEST.MF | 3 - src/main/webapp/WEB-INF/jsp/500.jsp | 59 ----- src/main/webapp/WEB-INF/web.xml | 76 ------ src/main/webapp/inex.html | 9 - 356 files changed, 187 insertions(+), 348 deletions(-) create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs rename src/main/resources/{conf.properties => application.properties} (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/index.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/operate_right.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/button.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/checkbox.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/checkboxlist-item.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/checkboxlist.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/common-attributes.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/control-close.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/control.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/editor.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/file.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/form.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/hidden.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/index.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/kindeditor.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/password.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/radio-item.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/radio.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/scripting-events.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/select.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/self_define_widget.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/span.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/table-batchoperate.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/table-column.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/table.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/table2.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/td.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/text.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/textarea.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/tr.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/pony/ui/tree.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/ftl/spring.ftl (100%) delete mode 100644 src/main/resources/quartz.properties delete mode 100644 src/main/resources/shiro.ini rename src/main/{webapp => resources/static}/res/cms/css/admin.css (100%) rename src/main/{webapp => resources/static}/res/cms/css/common.css (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/LMBg1.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/LMBg2.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/allBG.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/arrow.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/bg.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/bluemenu.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/circle.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/comm.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/content-type.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/dateBG.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/dqwzBG.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/h1_icon.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/h2_icon.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/h3_icon.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/h4_icon.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/house.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/ico1.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/ico2.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/ico3.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/icon.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/jeecms.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/lbg.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/left-line.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/loginout-icon.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/logo.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/logo.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/message-unread.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/model-icon.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/msg_bg.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/nav-left.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/nav_bg.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/nav_current.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/navcurrbg.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/newtopbg1.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/newtopbg2.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/operateMsg.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/phbBG1.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/phbBG2.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/refresh-icon.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/ruler.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/sep.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/set.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/shuxinBG.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/step.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/sxicon.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/time.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/time_bg.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/top-tbg.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/top_07.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/top_bg.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/top_menu_Divideline.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/top_menu_selected.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/top_useinfo_icon_01.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/top_useinfo_icon_02.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/top_useinfo_icon_03.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/topbg.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/topic.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/tuijian.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/vote_bar.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/welconlogin-icon.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/admin/ycz.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/common.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/dialog_overlay.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/bg.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/facebook.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/line.gif (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/line.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/llogo.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/llogo.png (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/login.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/ltitle.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/ltop.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/img/login/reset.jpg (100%) rename src/main/{webapp => resources/static}/res/cms/js/admin.js (100%) rename src/main/{webapp => resources/static}/res/cms/js/login.js (100%) rename src/main/{webapp => resources/static}/res/cms/js/pictures.js (100%) rename src/main/{webapp => resources/static}/res/common/css/base.css (100%) rename src/main/{webapp => resources/static}/res/common/css/bootstrap.min.css (100%) rename src/main/{webapp => resources/static}/res/common/css/common.css (100%) rename src/main/{webapp => resources/static}/res/common/css/error.css (100%) rename src/main/{webapp => resources/static}/res/common/css/jquery.treeview.css (100%) rename src/main/{webapp => resources/static}/res/common/css/jquery.ui.css (100%) rename src/main/{webapp => resources/static}/res/common/css/jquery.validate.css (100%) rename src/main/{webapp => resources/static}/res/common/css/style.css (100%) rename src/main/{webapp => resources/static}/res/common/css/theme.css (100%) rename src/main/{webapp => resources/static}/res/common/images/ajax-loader.gif (100%) rename src/main/{webapp => resources/static}/res/common/images/base_button.gif (100%) rename src/main/{webapp => resources/static}/res/common/images/base_icon.gif (100%) rename src/main/{webapp => resources/static}/res/common/images/base_loading_bar.gif (100%) rename src/main/{webapp => resources/static}/res/common/images/base_loading_icon.gif (100%) rename src/main/{webapp => resources/static}/res/common/images/base_overlay_bg.png (100%) rename src/main/{webapp => resources/static}/res/common/images/base_x_bg.gif (100%) rename src/main/{webapp => resources/static}/res/common/images/common.gif (100%) rename src/main/{webapp => resources/static}/res/common/images/error.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-bg_diagonals-thick_18_b81900_40x40.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-bg_diagonals-thick_20_666666_40x40.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-bg_flat_10_000000_40x100.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-bg_glass_100_f6f6f6_1x400.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-bg_glass_100_fdf5ce_1x400.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-bg_glass_65_ffffff_1x400.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-bg_gloss-wave_35_f6a828_500x100.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-bg_highlight-soft_100_eeeeee_1x100.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-bg_highlight-soft_75_ffe45c_1x100.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-icons_222222_256x240.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-icons_228ef1_256x240.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-icons_ef8c08_256x240.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-icons_ffd27a_256x240.png (100%) rename src/main/{webapp => resources/static}/res/common/img/jquery_ui/ui-icons_ffffff_256x240.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/FmenuBG.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/add-step.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/add_item.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/add_subTopic.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/background.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/baocunguding.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/bcplxx.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/bcxtmrzd.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/boxTitleBG.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/browse-button.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/button.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/bzyyfjyx.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/cjwj.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/content_move.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/cz.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/danye-button.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/del-button.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/depart.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/design.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/dlsz.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/down.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/down_disabled.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/eidtorbg.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/fhlb.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/finish.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/fjxgl.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/fsznx.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/fuzhi.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/fzbq.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/go.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/huanyuan.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/hysz.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/hyzcmx.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/jbsz.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/kscj.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/lanmu-positionbg.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/leftBg.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/ljxgl.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/menu_search.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-0.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-1.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-2.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-3.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-4.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-5.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-6.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-7.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-8.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/model-9.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/msg_bg.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/news-button.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/nopicture.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pagenumber_icon_001.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pagenumber_icon_003.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pagenumber_icon_004.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pagenumber_icon_01.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pagenumber_icon_02.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pagenumber_icon_022.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pagenumber_icon_03.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pagenumber_icon_04.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pagenumber_icon_05.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/parent-depart.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pbg.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pfzgl.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/pic-button.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/preview-button.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/qtpz.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/qtyl.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/quxiao.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/ruler.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/save-button.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/scgx.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/scsx.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/scsy.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/scsysxfj.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/shanchu.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/shangyi.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/shengchengjingtaiye.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/shenhe.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/sjxgl.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/sy.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/sysz.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/syy.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/tb-bg.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/theme-button.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/tianjia.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/tijiao.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/tijiao2.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/tit-tdbg.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/top_menu_butten.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/tuihui.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/tuisong.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/tuisongzhizhuanti.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/tv-button.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/up.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/up_disabled.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/wlfhqpz.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/wy.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/xiayi.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/xiazai-button.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/xiazai.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/xinjian.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/xiugai.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/xtsz.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/xyy.gif (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/xzwj.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/ycz.png (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/yidong.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/yingyong.jpg (100%) rename src/main/{webapp => resources/static}/res/common/img/theme/zjtctm.jpg (100%) rename src/main/{webapp => resources/static}/res/common/js/base.js (100%) rename src/main/{webapp => resources/static}/res/common/js/jquery-ui-1.10.4.min.js (100%) rename src/main/{webapp => resources/static}/res/common/js/jquery.ext.js (100%) rename src/main/{webapp => resources/static}/res/common/js/jquery.form.js (100%) rename src/main/{webapp => resources/static}/res/common/js/jquery.form.min.js (100%) rename src/main/{webapp => resources/static}/res/common/js/jquery.imgareaselect.js (100%) rename src/main/{webapp => resources/static}/res/common/js/jquery.js (100%) rename src/main/{webapp => resources/static}/res/common/js/message.js (100%) rename src/main/{webapp => resources/static}/res/common/js/pony.js (100%) rename src/main/{webapp => resources/static}/resources/bootstrap-responsive.min.css (100%) rename src/main/{webapp => resources/static}/resources/bootstrap.min.css (100%) rename src/main/{webapp => resources/static}/resources/incomplete.gif (100%) rename src/main/{webapp => resources/static}/resources/jquery-1.7.min.js (100%) rename src/main/{webapp => resources/static}/resources/sorttable.js (100%) rename src/main/{webapp => resources/static}/resources/svnadmin.css (100%) rename src/main/{webapp => resources/static}/resources/svnadmin.js (100%) rename src/main/{webapp => resources/static}/resources/treeview/images/ajax-loader.gif (100%) rename src/main/{webapp => resources/static}/resources/treeview/images/file.gif (100%) rename src/main/{webapp => resources/static}/resources/treeview/images/folder-closed.gif (100%) rename src/main/{webapp => resources/static}/resources/treeview/images/folder.gif (100%) rename src/main/{webapp => resources/static}/resources/treeview/images/treeview-default-line.gif (100%) rename src/main/{webapp => resources/static}/resources/treeview/images/treeview-default.gif (100%) rename src/main/{webapp => resources/static}/resources/treeview/treeview.css (100%) rename src/main/{webapp => resources/static}/resources/treeview/treeview.js (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/account/change_pwd.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/account/frame/left.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/account/frame/main.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/account/frame/right.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/common/error.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/common/lock.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/common/main.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/common/project_open.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/common/rest_pwd.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/date.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/email/email.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/email/email2.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/email/project_open.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/email/rest_pwd.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/head.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/index.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/left.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/log.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/login_name.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/main.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/add.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/add_dir.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/config.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/edit.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/frame/left.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/frame/main.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/frame/right.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/list.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/pjauth.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project/rep.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project_group/add.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project_group/edit.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project_group/list.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project_group_usr/add.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project_group_usr/edit.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/project_group_usr/list.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/right.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/svn_user/add.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/svn_user/edit.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/svn_user/frame/left.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/svn_user/frame/main.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/svn_user/frame/right.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/svn_user/list.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/top.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/add.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/add_user.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/edit.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/edit_user_role.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/frame/left.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/frame/main.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/frame/right.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/list.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/permission/add.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/permission/edit.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/permission/list.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/permission_category/add.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/permission_category/edit.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/permission_category/list.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/role/add.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/role/edit.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/admin/user/role/list.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/front/account/create_user.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/front/zone/in.ftl (100%) rename src/main/{webapp/WEB-INF => resources}/template/login/login.ftl (100%) delete mode 100644 src/main/webapp/META-INF/MANIFEST.MF delete mode 100644 src/main/webapp/WEB-INF/jsp/500.jsp delete mode 100644 src/main/webapp/WEB-INF/web.xml delete mode 100644 src/main/webapp/inex.html diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..abdea9a --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..71df522 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/pom.xml b/pom.xml index 26c8f72..ae20f0b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,66 +1,40 @@ - 4.0.0 com.rekoe rk_svnadmin - war 1.0 + jar rk_svnadmin http://www.rekoe.com UTF-8 - 1.r.63 - 2.3.26-incubating + 2.3.9-SNAPSHOT + 1.r.68-SNAPSHOT + 1.5 + UTF-8 - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - true - - - + + + + org.nutz + nutzboot-parent + ${nutzboot.version} + pom + import + + + - - javax.servlet - servlet-api - 2.5 - provided - - - mysql - mysql-connector-java - 5.1.44 - org.tmatesoft.svnkit svnkit 1.7.6 - - com.alibaba - druid - 1.1.4 - - - jconsole - com.alibaba - - - tools - com.alibaba - - - org.nutz - nutz-plugins-views - ${nutz.version} - - - org.nutz - nutz + nutz-plugins-slog ${nutz.version} @@ -68,41 +42,18 @@ restfb 1.6.14 - - org.freemarker - freemarker - ${freemarker.version} - - - net.sf.ehcache - ehcache - 2.9.1 - ch.ethz.ganymed ganymed-ssh2 build210 - - org.quartz-scheduler - quartz - 2.2.1 - - - c3p0 - c3p0 - - - org.nutz nutz-plugins-daocache - ${nutz.version} org.nutz - nutz-integration-quartz - ${nutz.version} + nutzboot-starter-redis org.json @@ -116,23 +67,23 @@ org.nutz - nutz-integration-shiro - ${nutz.version} - - - shiro-core - org.apache.shiro - - + nutzboot-starter-shiro - org.apache.shiro - shiro-all - 1.2.3 + org.nutz + nutzboot-starter-freemarker + + + org.nutz + nutzboot-starter-quartz - org.apache.shiro - shiro-guice + com.mchange + c3p0 + + + com.zaxxer + HikariCP-java6 @@ -152,19 +103,20 @@ 1.1.3 - log4j - log4j - 1.2.17 + org.nutz + nutzboot-starter-nutz-mvc - org.slf4j - slf4j-api - 1.7.5 + org.nutz + nutzboot-starter-nutz-dao - org.slf4j - slf4j-log4j12 - 1.7.5 + org.nutz + nutzboot-starter-jdbc + + + org.nutz + nutzboot-starter-jetty org.brickred @@ -181,78 +133,81 @@ + + mysql + mysql-connector-java + 8.0.18 + + + org.slf4j + slf4j-log4j12 + org.htmlparser htmlparser 2.1 + + + jitpack.io + https://jitpack.io + + + nutz + http://jfrog.nutz.cn/artifactory/libs-release + + + nutz-snapshots + http://jfrog.nutz.cn/artifactory/snapshots + + true + always + + + false + + + + + + nutz-snapshots + http://jfrog.nutz.cn/artifactory/snapshots + + true + always + + + false + + + - src/main/java - rk_svnadmin - - - src/main/resources - - **/*.js - **/msg/**/*.properties - oauth_consumer.properties - quartz.properties - log4j.properties - shiro.ini - ehcache.xml - - - - src/main/java - false - - - org.apache.maven.plugins maven-compiler-plugin - 2.5.1 + 3.7.0 1.8 1.8 - UTF-8 + + -parameters + + false org.apache.maven.plugins - maven-resources-plugin - 2.6 + maven-javadoc-plugin + 2.10.3 - UTF-8 + -Xdoclint:none - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - - jar - - prepare-package - - - src/main/resources/**/* - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - once - -Dfile.encoding=UTF-8 - + org.nutz.boot + nutzboot-maven-plugin + ${nutzboot.version} diff --git a/src/main/java/com/rekoe/MainModule.java b/src/main/java/com/rekoe/MainModule.java index ba9361d..18a6a7e 100644 --- a/src/main/java/com/rekoe/MainModule.java +++ b/src/main/java/com/rekoe/MainModule.java @@ -1,22 +1,80 @@ package com.rekoe; +import java.util.HashMap; +import java.util.List; + +import org.apache.shiro.crypto.RandomNumberGenerator; +import org.apache.shiro.crypto.SecureRandomNumberGenerator; +import org.apache.shiro.crypto.hash.Sha256Hash; +import org.nutz.dao.Dao; +import org.nutz.dao.impl.FileSqlManager; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.Daos; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.mvc.annotation.Encoding; import org.nutz.mvc.annotation.Fail; import org.nutz.mvc.annotation.IocBy; import org.nutz.mvc.annotation.Localization; -import org.nutz.mvc.annotation.Modules; -import org.nutz.mvc.annotation.SetupBy; -import org.nutz.mvc.annotation.Views; -import org.nutz.mvc.ioc.provider.ComboIocProvider; -import org.nutz.plugins.view.freemarker.FreemarkerViewMaker; -@Modules(scanPackage = true, packages = { "com.rekoe.module" }) -@IocBy(type = ComboIocProvider.class, args = { "*json", "/ioc", "*anno", "com.rekoe", "*tx", "*quartz", "*org.nutz.plugins.view.freemarker.FreemarkerIocLoader", "*async" }) -@SetupBy(MvcSetup.class) +import com.rekoe.domain.Pj; +import com.rekoe.domain.PjGrUsr; +import com.rekoe.domain.ProjectConfig; +import com.rekoe.domain.User; +import com.rekoe.domain.Usr; +import com.rekoe.service.AuthorityService; +import com.rekoe.service.ProjectConfigService; + +import freemarker.template.Configuration; + @Fail(">>:/admin/common/unauthorized.rk") @Encoding(input = "UTF-8", output = "UTF-8") -@Views({ FreemarkerViewMaker.class }) @Localization(value = "msg/", defaultLocalizationKey = "zh-CN") +@IocBean(create = "init") +@IocBy(args = { "*slog" }) public class MainModule { + @Inject + private Dao dao; + + @Inject + private AuthorityService authorityService; + + @Inject + private ProjectConfigService projectConfigService; + + @Inject + private Configuration configuration; + + public void init() { + configuration.setAutoImports(new HashMap(2) { + private static final long serialVersionUID = 7208484815721559298L; + { + put("p", "/ftl/pony/index.ftl"); + put("s", "/ftl/spring.ftl"); + } + }); + + dao.create(PjGrUsr.class, false); + Daos.createTablesInPackage(dao, User.class.getPackage().getName(), false); + Daos.migration(dao, Usr.class, true, true, false); + Daos.migration(dao, Pj.class, true, true, false); + Daos.migration(dao, ProjectConfig.class, true, true, false); + if (0 == dao.count(User.class)) { + FileSqlManager fm = new FileSqlManager("init_system_h2.sql"); + List sqlList = fm.createCombo(fm.keys()); + dao.execute(sqlList.toArray(new Sql[sqlList.size()])); + List userList = dao.query(User.class, null); + for (User user : userList) { + RandomNumberGenerator rng = new SecureRandomNumberGenerator(); + String salt = rng.nextBytes().toBase64(); + String hashedPasswordBase64 = new Sha256Hash("123", salt, 1024).toBase64(); + user.setSalt(salt); + user.setPassword(hashedPasswordBase64); + dao.update(user); + } + } + authorityService.initFormPackage("com.rekoe"); + projectConfigService.init(); + } } diff --git a/src/main/java/com/rekoe/MvcSetup.java b/src/main/java/com/rekoe/MvcSetup.java index 0268f18..6e83c76 100644 --- a/src/main/java/com/rekoe/MvcSetup.java +++ b/src/main/java/com/rekoe/MvcSetup.java @@ -6,6 +6,7 @@ import java.util.List; import org.apache.shiro.crypto.RandomNumberGenerator; import org.apache.shiro.crypto.SecureRandomNumberGenerator; import org.apache.shiro.crypto.hash.Sha256Hash; +import org.nutz.boot.starter.freemarker.FreeMarkerConfigurer; import org.nutz.dao.Dao; import org.nutz.dao.impl.FileSqlManager; import org.nutz.dao.sql.Sql; @@ -13,7 +14,6 @@ import org.nutz.dao.util.Daos; import org.nutz.ioc.Ioc; import org.nutz.mvc.NutConfig; import org.nutz.mvc.Setup; -import org.nutz.plugins.view.freemarker.FreeMarkerConfigurer; import org.tmatesoft.svn.core.SVNCommitInfo; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; diff --git a/src/main/java/com/rekoe/module/OauthLoginAct.java b/src/main/java/com/rekoe/module/OauthLoginAct.java index 86c2239..838daae 100644 --- a/src/main/java/com/rekoe/module/OauthLoginAct.java +++ b/src/main/java/com/rekoe/module/OauthLoginAct.java @@ -24,6 +24,8 @@ import org.brickred.socialauth.SocialAuthConfig; import org.brickred.socialauth.SocialAuthManager; import org.brickred.socialauth.exception.SocialAuthException; import org.brickred.socialauth.util.SocialAuthUtil; +import org.nutz.boot.starter.freemarker.FreeMarkerConfigurer; +import org.nutz.boot.starter.freemarker.FreemarkerView; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Encoding; @@ -36,8 +38,6 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.view.ForwardView; import org.nutz.mvc.view.ServerRedirectView; import org.nutz.mvc.view.ViewWrapper; -import org.nutz.plugins.view.freemarker.FreeMarkerConfigurer; -import org.nutz.plugins.view.freemarker.FreemarkerView; import com.rekoe.common.Message; import com.rekoe.shiro.realm.OAuthToken; diff --git a/src/main/java/com/rekoe/module/admin/AdminLoginAct.java b/src/main/java/com/rekoe/module/admin/AdminLoginAct.java index 5d3d3c8..9cbcb9d 100644 --- a/src/main/java/com/rekoe/module/admin/AdminLoginAct.java +++ b/src/main/java/com/rekoe/module/admin/AdminLoginAct.java @@ -10,6 +10,8 @@ import org.apache.shiro.authc.LockedAccountException; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.subject.Subject; import org.apache.shiro.util.ThreadContext; +import org.nutz.boot.starter.freemarker.FreeMarkerConfigurer; +import org.nutz.boot.starter.freemarker.FreemarkerView; import org.nutz.dao.Cnd; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -24,8 +26,6 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.view.ForwardView; import org.nutz.mvc.view.ServerRedirectView; import org.nutz.mvc.view.ViewWrapper; -import org.nutz.plugins.view.freemarker.FreeMarkerConfigurer; -import org.nutz.plugins.view.freemarker.FreemarkerView; import com.rekoe.domain.User; import com.rekoe.domain.Usr; diff --git a/src/main/java/com/rekoe/service/EmailServiceImpl.java b/src/main/java/com/rekoe/service/EmailServiceImpl.java index 20615b1..031ffa7 100644 --- a/src/main/java/com/rekoe/service/EmailServiceImpl.java +++ b/src/main/java/com/rekoe/service/EmailServiceImpl.java @@ -4,12 +4,12 @@ import java.io.File; import java.util.Map; import org.apache.commons.mail.HtmlEmail; +import org.nutz.boot.starter.freemarker.FreeMarkerConfigurer; import org.nutz.ioc.Ioc; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.log.Log; import org.nutz.log.Logs; -import org.nutz.plugins.view.freemarker.FreeMarkerConfigurer; import freemarker.template.Configuration; import freemarker.template.Template; diff --git a/src/main/resources/conf.properties b/src/main/resources/application.properties similarity index 100% rename from src/main/resources/conf.properties rename to src/main/resources/application.properties diff --git a/src/main/webapp/WEB-INF/ftl/pony/index.ftl b/src/main/resources/ftl/pony/index.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/index.ftl rename to src/main/resources/ftl/pony/index.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/operate_right.ftl b/src/main/resources/ftl/pony/operate_right.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/operate_right.ftl rename to src/main/resources/ftl/pony/operate_right.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/button.ftl b/src/main/resources/ftl/pony/ui/button.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/button.ftl rename to src/main/resources/ftl/pony/ui/button.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/checkbox.ftl b/src/main/resources/ftl/pony/ui/checkbox.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/checkbox.ftl rename to src/main/resources/ftl/pony/ui/checkbox.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/checkboxlist-item.ftl b/src/main/resources/ftl/pony/ui/checkboxlist-item.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/checkboxlist-item.ftl rename to src/main/resources/ftl/pony/ui/checkboxlist-item.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/checkboxlist.ftl b/src/main/resources/ftl/pony/ui/checkboxlist.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/checkboxlist.ftl rename to src/main/resources/ftl/pony/ui/checkboxlist.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/common-attributes.ftl b/src/main/resources/ftl/pony/ui/common-attributes.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/common-attributes.ftl rename to src/main/resources/ftl/pony/ui/common-attributes.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/control-close.ftl b/src/main/resources/ftl/pony/ui/control-close.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/control-close.ftl rename to src/main/resources/ftl/pony/ui/control-close.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/control.ftl b/src/main/resources/ftl/pony/ui/control.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/control.ftl rename to src/main/resources/ftl/pony/ui/control.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/editor.ftl b/src/main/resources/ftl/pony/ui/editor.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/editor.ftl rename to src/main/resources/ftl/pony/ui/editor.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/file.ftl b/src/main/resources/ftl/pony/ui/file.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/file.ftl rename to src/main/resources/ftl/pony/ui/file.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/form.ftl b/src/main/resources/ftl/pony/ui/form.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/form.ftl rename to src/main/resources/ftl/pony/ui/form.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/hidden.ftl b/src/main/resources/ftl/pony/ui/hidden.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/hidden.ftl rename to src/main/resources/ftl/pony/ui/hidden.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/index.ftl b/src/main/resources/ftl/pony/ui/index.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/index.ftl rename to src/main/resources/ftl/pony/ui/index.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/kindeditor.ftl b/src/main/resources/ftl/pony/ui/kindeditor.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/kindeditor.ftl rename to src/main/resources/ftl/pony/ui/kindeditor.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/password.ftl b/src/main/resources/ftl/pony/ui/password.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/password.ftl rename to src/main/resources/ftl/pony/ui/password.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/radio-item.ftl b/src/main/resources/ftl/pony/ui/radio-item.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/radio-item.ftl rename to src/main/resources/ftl/pony/ui/radio-item.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/radio.ftl b/src/main/resources/ftl/pony/ui/radio.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/radio.ftl rename to src/main/resources/ftl/pony/ui/radio.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/scripting-events.ftl b/src/main/resources/ftl/pony/ui/scripting-events.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/scripting-events.ftl rename to src/main/resources/ftl/pony/ui/scripting-events.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/select.ftl b/src/main/resources/ftl/pony/ui/select.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/select.ftl rename to src/main/resources/ftl/pony/ui/select.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/self_define_widget.ftl b/src/main/resources/ftl/pony/ui/self_define_widget.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/self_define_widget.ftl rename to src/main/resources/ftl/pony/ui/self_define_widget.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/span.ftl b/src/main/resources/ftl/pony/ui/span.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/span.ftl rename to src/main/resources/ftl/pony/ui/span.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/table-batchoperate.ftl b/src/main/resources/ftl/pony/ui/table-batchoperate.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/table-batchoperate.ftl rename to src/main/resources/ftl/pony/ui/table-batchoperate.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/table-column.ftl b/src/main/resources/ftl/pony/ui/table-column.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/table-column.ftl rename to src/main/resources/ftl/pony/ui/table-column.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/table.ftl b/src/main/resources/ftl/pony/ui/table.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/table.ftl rename to src/main/resources/ftl/pony/ui/table.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/table2.ftl b/src/main/resources/ftl/pony/ui/table2.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/table2.ftl rename to src/main/resources/ftl/pony/ui/table2.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/td.ftl b/src/main/resources/ftl/pony/ui/td.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/td.ftl rename to src/main/resources/ftl/pony/ui/td.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/text.ftl b/src/main/resources/ftl/pony/ui/text.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/text.ftl rename to src/main/resources/ftl/pony/ui/text.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/textarea.ftl b/src/main/resources/ftl/pony/ui/textarea.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/textarea.ftl rename to src/main/resources/ftl/pony/ui/textarea.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/tr.ftl b/src/main/resources/ftl/pony/ui/tr.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/tr.ftl rename to src/main/resources/ftl/pony/ui/tr.ftl diff --git a/src/main/webapp/WEB-INF/ftl/pony/ui/tree.ftl b/src/main/resources/ftl/pony/ui/tree.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/pony/ui/tree.ftl rename to src/main/resources/ftl/pony/ui/tree.ftl diff --git a/src/main/webapp/WEB-INF/ftl/spring.ftl b/src/main/resources/ftl/spring.ftl similarity index 100% rename from src/main/webapp/WEB-INF/ftl/spring.ftl rename to src/main/resources/ftl/spring.ftl diff --git a/src/main/resources/quartz.properties b/src/main/resources/quartz.properties deleted file mode 100644 index 489a5ba..0000000 --- a/src/main/resources/quartz.properties +++ /dev/null @@ -1,4 +0,0 @@ -org.quartz.scheduler.instanceName = NutzbookScheduler -org.quartz.threadPool.threadCount = 3 -org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore -org.quartz.scheduler.skipUpdateCheck=true \ No newline at end of file diff --git a/src/main/resources/shiro.ini b/src/main/resources/shiro.ini deleted file mode 100644 index 8237a80..0000000 --- a/src/main/resources/shiro.ini +++ /dev/null @@ -1,40 +0,0 @@ -[main] - -#Session -sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager - -# Session Cache -sessionDAO = org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO -sessionManager.sessionDAO = $sessionDAO -securityManager.sessionManager = $sessionManager - -authenticator=com.rekoe.shiro.ModularRealmAuthenticator2 -securityManager.authenticator=$authenticator - -# use R.UU32() -sessionIdGenerator = com.rekoe.shiro.RKSessionIdGenerator -securityManager.sessionManager.sessionDAO.sessionIdGenerator = $sessionIdGenerator - -cacheManager = org.apache.shiro.cache.ehcache.EhCacheManager -cacheManager.cacheManagerConfigFile=classpath:ehcache.xml -securityManager.cacheManager = $cacheManager - -# cookie -sessionIdCookie=com.rekoe.shiro.web.SimpleCookie -sessionIdCookie.name=rk_cms -sessionIdCookie.maxAge=946080000 -sessionIdCookie.httpOnly=true -sessionManager.sessionIdCookie=$sessionIdCookie -sessionManager.sessionIdCookieEnabled=true -sessionManager.globalSessionTimeout=946080000 - -sha256Matcher = org.apache.shiro.authc.credential.Sha256CredentialsMatcher -sha256Matcher.storedCredentialsHexEncoded = false -sha256Matcher.hashIterations = 1024 -sha256Matcher.hashSalted = true -nutzAuthoRealm = com.rekoe.shiro.realm.NutAuthoDaoRealm -shiroDbRealm = com.rekoe.shiro.realm.UsernamePasswordRealm -shiroDbRealm.credentialsMatcher = $sha256Matcher -securityManager.realms = $shiroDbRealm,$nutzAuthoRealm -authcStrategy = com.rekoe.shiro.authc.pam.AnySuccessfulStrategy -securityManager.authenticator.authenticationStrategy = $authcStrategy \ No newline at end of file diff --git a/src/main/webapp/res/cms/css/admin.css b/src/main/resources/static/res/cms/css/admin.css similarity index 100% rename from src/main/webapp/res/cms/css/admin.css rename to src/main/resources/static/res/cms/css/admin.css diff --git a/src/main/webapp/res/cms/css/common.css b/src/main/resources/static/res/cms/css/common.css similarity index 100% rename from src/main/webapp/res/cms/css/common.css rename to src/main/resources/static/res/cms/css/common.css diff --git a/src/main/webapp/res/cms/img/admin/LMBg1.jpg b/src/main/resources/static/res/cms/img/admin/LMBg1.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/LMBg1.jpg rename to src/main/resources/static/res/cms/img/admin/LMBg1.jpg diff --git a/src/main/webapp/res/cms/img/admin/LMBg2.jpg b/src/main/resources/static/res/cms/img/admin/LMBg2.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/LMBg2.jpg rename to src/main/resources/static/res/cms/img/admin/LMBg2.jpg diff --git a/src/main/webapp/res/cms/img/admin/allBG.jpg b/src/main/resources/static/res/cms/img/admin/allBG.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/allBG.jpg rename to src/main/resources/static/res/cms/img/admin/allBG.jpg diff --git a/src/main/webapp/res/cms/img/admin/arrow.gif b/src/main/resources/static/res/cms/img/admin/arrow.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/arrow.gif rename to src/main/resources/static/res/cms/img/admin/arrow.gif diff --git a/src/main/webapp/res/cms/img/admin/bg.png b/src/main/resources/static/res/cms/img/admin/bg.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/bg.png rename to src/main/resources/static/res/cms/img/admin/bg.png diff --git a/src/main/webapp/res/cms/img/admin/bluemenu.gif b/src/main/resources/static/res/cms/img/admin/bluemenu.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/bluemenu.gif rename to src/main/resources/static/res/cms/img/admin/bluemenu.gif diff --git a/src/main/webapp/res/cms/img/admin/circle.gif b/src/main/resources/static/res/cms/img/admin/circle.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/circle.gif rename to src/main/resources/static/res/cms/img/admin/circle.gif diff --git a/src/main/webapp/res/cms/img/admin/comm.gif b/src/main/resources/static/res/cms/img/admin/comm.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/comm.gif rename to src/main/resources/static/res/cms/img/admin/comm.gif diff --git a/src/main/webapp/res/cms/img/admin/content-type.png b/src/main/resources/static/res/cms/img/admin/content-type.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/content-type.png rename to src/main/resources/static/res/cms/img/admin/content-type.png diff --git a/src/main/webapp/res/cms/img/admin/dateBG.gif b/src/main/resources/static/res/cms/img/admin/dateBG.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/dateBG.gif rename to src/main/resources/static/res/cms/img/admin/dateBG.gif diff --git a/src/main/webapp/res/cms/img/admin/dqwzBG.jpg b/src/main/resources/static/res/cms/img/admin/dqwzBG.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/dqwzBG.jpg rename to src/main/resources/static/res/cms/img/admin/dqwzBG.jpg diff --git a/src/main/webapp/res/cms/img/admin/h1_icon.gif b/src/main/resources/static/res/cms/img/admin/h1_icon.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/h1_icon.gif rename to src/main/resources/static/res/cms/img/admin/h1_icon.gif diff --git a/src/main/webapp/res/cms/img/admin/h2_icon.gif b/src/main/resources/static/res/cms/img/admin/h2_icon.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/h2_icon.gif rename to src/main/resources/static/res/cms/img/admin/h2_icon.gif diff --git a/src/main/webapp/res/cms/img/admin/h3_icon.gif b/src/main/resources/static/res/cms/img/admin/h3_icon.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/h3_icon.gif rename to src/main/resources/static/res/cms/img/admin/h3_icon.gif diff --git a/src/main/webapp/res/cms/img/admin/h4_icon.gif b/src/main/resources/static/res/cms/img/admin/h4_icon.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/h4_icon.gif rename to src/main/resources/static/res/cms/img/admin/h4_icon.gif diff --git a/src/main/webapp/res/cms/img/admin/house.jpg b/src/main/resources/static/res/cms/img/admin/house.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/house.jpg rename to src/main/resources/static/res/cms/img/admin/house.jpg diff --git a/src/main/webapp/res/cms/img/admin/ico1.gif b/src/main/resources/static/res/cms/img/admin/ico1.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/ico1.gif rename to src/main/resources/static/res/cms/img/admin/ico1.gif diff --git a/src/main/webapp/res/cms/img/admin/ico2.jpg b/src/main/resources/static/res/cms/img/admin/ico2.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/ico2.jpg rename to src/main/resources/static/res/cms/img/admin/ico2.jpg diff --git a/src/main/webapp/res/cms/img/admin/ico3.jpg b/src/main/resources/static/res/cms/img/admin/ico3.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/ico3.jpg rename to src/main/resources/static/res/cms/img/admin/ico3.jpg diff --git a/src/main/webapp/res/cms/img/admin/icon.png b/src/main/resources/static/res/cms/img/admin/icon.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/icon.png rename to src/main/resources/static/res/cms/img/admin/icon.png diff --git a/src/main/webapp/res/cms/img/admin/jeecms.png b/src/main/resources/static/res/cms/img/admin/jeecms.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/jeecms.png rename to src/main/resources/static/res/cms/img/admin/jeecms.png diff --git a/src/main/webapp/res/cms/img/admin/lbg.jpg b/src/main/resources/static/res/cms/img/admin/lbg.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/lbg.jpg rename to src/main/resources/static/res/cms/img/admin/lbg.jpg diff --git a/src/main/webapp/res/cms/img/admin/left-line.png b/src/main/resources/static/res/cms/img/admin/left-line.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/left-line.png rename to src/main/resources/static/res/cms/img/admin/left-line.png diff --git a/src/main/webapp/res/cms/img/admin/loginout-icon.png b/src/main/resources/static/res/cms/img/admin/loginout-icon.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/loginout-icon.png rename to src/main/resources/static/res/cms/img/admin/loginout-icon.png diff --git a/src/main/webapp/res/cms/img/admin/logo.gif b/src/main/resources/static/res/cms/img/admin/logo.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/logo.gif rename to src/main/resources/static/res/cms/img/admin/logo.gif diff --git a/src/main/webapp/res/cms/img/admin/logo.png b/src/main/resources/static/res/cms/img/admin/logo.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/logo.png rename to src/main/resources/static/res/cms/img/admin/logo.png diff --git a/src/main/webapp/res/cms/img/admin/message-unread.png b/src/main/resources/static/res/cms/img/admin/message-unread.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/message-unread.png rename to src/main/resources/static/res/cms/img/admin/message-unread.png diff --git a/src/main/webapp/res/cms/img/admin/model-icon.png b/src/main/resources/static/res/cms/img/admin/model-icon.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/model-icon.png rename to src/main/resources/static/res/cms/img/admin/model-icon.png diff --git a/src/main/webapp/res/cms/img/admin/msg_bg.jpg b/src/main/resources/static/res/cms/img/admin/msg_bg.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/msg_bg.jpg rename to src/main/resources/static/res/cms/img/admin/msg_bg.jpg diff --git a/src/main/webapp/res/cms/img/admin/nav-left.png b/src/main/resources/static/res/cms/img/admin/nav-left.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/nav-left.png rename to src/main/resources/static/res/cms/img/admin/nav-left.png diff --git a/src/main/webapp/res/cms/img/admin/nav_bg.jpg b/src/main/resources/static/res/cms/img/admin/nav_bg.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/nav_bg.jpg rename to src/main/resources/static/res/cms/img/admin/nav_bg.jpg diff --git a/src/main/webapp/res/cms/img/admin/nav_current.jpg b/src/main/resources/static/res/cms/img/admin/nav_current.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/nav_current.jpg rename to src/main/resources/static/res/cms/img/admin/nav_current.jpg diff --git a/src/main/webapp/res/cms/img/admin/navcurrbg.gif b/src/main/resources/static/res/cms/img/admin/navcurrbg.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/navcurrbg.gif rename to src/main/resources/static/res/cms/img/admin/navcurrbg.gif diff --git a/src/main/webapp/res/cms/img/admin/newtopbg1.jpg b/src/main/resources/static/res/cms/img/admin/newtopbg1.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/newtopbg1.jpg rename to src/main/resources/static/res/cms/img/admin/newtopbg1.jpg diff --git a/src/main/webapp/res/cms/img/admin/newtopbg2.jpg b/src/main/resources/static/res/cms/img/admin/newtopbg2.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/newtopbg2.jpg rename to src/main/resources/static/res/cms/img/admin/newtopbg2.jpg diff --git a/src/main/webapp/res/cms/img/admin/operateMsg.jpg b/src/main/resources/static/res/cms/img/admin/operateMsg.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/operateMsg.jpg rename to src/main/resources/static/res/cms/img/admin/operateMsg.jpg diff --git a/src/main/webapp/res/cms/img/admin/phbBG1.gif b/src/main/resources/static/res/cms/img/admin/phbBG1.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/phbBG1.gif rename to src/main/resources/static/res/cms/img/admin/phbBG1.gif diff --git a/src/main/webapp/res/cms/img/admin/phbBG2.gif b/src/main/resources/static/res/cms/img/admin/phbBG2.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/phbBG2.gif rename to src/main/resources/static/res/cms/img/admin/phbBG2.gif diff --git a/src/main/webapp/res/cms/img/admin/refresh-icon.png b/src/main/resources/static/res/cms/img/admin/refresh-icon.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/refresh-icon.png rename to src/main/resources/static/res/cms/img/admin/refresh-icon.png diff --git a/src/main/webapp/res/cms/img/admin/ruler.gif b/src/main/resources/static/res/cms/img/admin/ruler.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/ruler.gif rename to src/main/resources/static/res/cms/img/admin/ruler.gif diff --git a/src/main/webapp/res/cms/img/admin/sep.jpg b/src/main/resources/static/res/cms/img/admin/sep.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/sep.jpg rename to src/main/resources/static/res/cms/img/admin/sep.jpg diff --git a/src/main/webapp/res/cms/img/admin/set.png b/src/main/resources/static/res/cms/img/admin/set.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/set.png rename to src/main/resources/static/res/cms/img/admin/set.png diff --git a/src/main/webapp/res/cms/img/admin/shuxinBG.gif b/src/main/resources/static/res/cms/img/admin/shuxinBG.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/shuxinBG.gif rename to src/main/resources/static/res/cms/img/admin/shuxinBG.gif diff --git a/src/main/webapp/res/cms/img/admin/step.png b/src/main/resources/static/res/cms/img/admin/step.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/step.png rename to src/main/resources/static/res/cms/img/admin/step.png diff --git a/src/main/webapp/res/cms/img/admin/sxicon.gif b/src/main/resources/static/res/cms/img/admin/sxicon.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/sxicon.gif rename to src/main/resources/static/res/cms/img/admin/sxicon.gif diff --git a/src/main/webapp/res/cms/img/admin/time.gif b/src/main/resources/static/res/cms/img/admin/time.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/time.gif rename to src/main/resources/static/res/cms/img/admin/time.gif diff --git a/src/main/webapp/res/cms/img/admin/time_bg.jpg b/src/main/resources/static/res/cms/img/admin/time_bg.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/time_bg.jpg rename to src/main/resources/static/res/cms/img/admin/time_bg.jpg diff --git a/src/main/webapp/res/cms/img/admin/top-tbg.png b/src/main/resources/static/res/cms/img/admin/top-tbg.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/top-tbg.png rename to src/main/resources/static/res/cms/img/admin/top-tbg.png diff --git a/src/main/webapp/res/cms/img/admin/top_07.jpg b/src/main/resources/static/res/cms/img/admin/top_07.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/top_07.jpg rename to src/main/resources/static/res/cms/img/admin/top_07.jpg diff --git a/src/main/webapp/res/cms/img/admin/top_bg.jpg b/src/main/resources/static/res/cms/img/admin/top_bg.jpg similarity index 100% rename from src/main/webapp/res/cms/img/admin/top_bg.jpg rename to src/main/resources/static/res/cms/img/admin/top_bg.jpg diff --git a/src/main/webapp/res/cms/img/admin/top_menu_Divideline.png b/src/main/resources/static/res/cms/img/admin/top_menu_Divideline.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/top_menu_Divideline.png rename to src/main/resources/static/res/cms/img/admin/top_menu_Divideline.png diff --git a/src/main/webapp/res/cms/img/admin/top_menu_selected.png b/src/main/resources/static/res/cms/img/admin/top_menu_selected.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/top_menu_selected.png rename to src/main/resources/static/res/cms/img/admin/top_menu_selected.png diff --git a/src/main/webapp/res/cms/img/admin/top_useinfo_icon_01.png b/src/main/resources/static/res/cms/img/admin/top_useinfo_icon_01.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/top_useinfo_icon_01.png rename to src/main/resources/static/res/cms/img/admin/top_useinfo_icon_01.png diff --git a/src/main/webapp/res/cms/img/admin/top_useinfo_icon_02.png b/src/main/resources/static/res/cms/img/admin/top_useinfo_icon_02.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/top_useinfo_icon_02.png rename to src/main/resources/static/res/cms/img/admin/top_useinfo_icon_02.png diff --git a/src/main/webapp/res/cms/img/admin/top_useinfo_icon_03.png b/src/main/resources/static/res/cms/img/admin/top_useinfo_icon_03.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/top_useinfo_icon_03.png rename to src/main/resources/static/res/cms/img/admin/top_useinfo_icon_03.png diff --git a/src/main/webapp/res/cms/img/admin/topbg.gif b/src/main/resources/static/res/cms/img/admin/topbg.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/topbg.gif rename to src/main/resources/static/res/cms/img/admin/topbg.gif diff --git a/src/main/webapp/res/cms/img/admin/topic.png b/src/main/resources/static/res/cms/img/admin/topic.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/topic.png rename to src/main/resources/static/res/cms/img/admin/topic.png diff --git a/src/main/webapp/res/cms/img/admin/tuijian.png b/src/main/resources/static/res/cms/img/admin/tuijian.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/tuijian.png rename to src/main/resources/static/res/cms/img/admin/tuijian.png diff --git a/src/main/webapp/res/cms/img/admin/vote_bar.gif b/src/main/resources/static/res/cms/img/admin/vote_bar.gif similarity index 100% rename from src/main/webapp/res/cms/img/admin/vote_bar.gif rename to src/main/resources/static/res/cms/img/admin/vote_bar.gif diff --git a/src/main/webapp/res/cms/img/admin/welconlogin-icon.png b/src/main/resources/static/res/cms/img/admin/welconlogin-icon.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/welconlogin-icon.png rename to src/main/resources/static/res/cms/img/admin/welconlogin-icon.png diff --git a/src/main/webapp/res/cms/img/admin/ycz.png b/src/main/resources/static/res/cms/img/admin/ycz.png similarity index 100% rename from src/main/webapp/res/cms/img/admin/ycz.png rename to src/main/resources/static/res/cms/img/admin/ycz.png diff --git a/src/main/webapp/res/cms/img/common.gif b/src/main/resources/static/res/cms/img/common.gif similarity index 100% rename from src/main/webapp/res/cms/img/common.gif rename to src/main/resources/static/res/cms/img/common.gif diff --git a/src/main/webapp/res/cms/img/dialog_overlay.png b/src/main/resources/static/res/cms/img/dialog_overlay.png similarity index 100% rename from src/main/webapp/res/cms/img/dialog_overlay.png rename to src/main/resources/static/res/cms/img/dialog_overlay.png diff --git a/src/main/webapp/res/cms/img/login/bg.jpg b/src/main/resources/static/res/cms/img/login/bg.jpg similarity index 100% rename from src/main/webapp/res/cms/img/login/bg.jpg rename to src/main/resources/static/res/cms/img/login/bg.jpg diff --git a/src/main/webapp/res/cms/img/login/facebook.jpg b/src/main/resources/static/res/cms/img/login/facebook.jpg similarity index 100% rename from src/main/webapp/res/cms/img/login/facebook.jpg rename to src/main/resources/static/res/cms/img/login/facebook.jpg diff --git a/src/main/webapp/res/cms/img/login/line.gif b/src/main/resources/static/res/cms/img/login/line.gif similarity index 100% rename from src/main/webapp/res/cms/img/login/line.gif rename to src/main/resources/static/res/cms/img/login/line.gif diff --git a/src/main/webapp/res/cms/img/login/line.jpg b/src/main/resources/static/res/cms/img/login/line.jpg similarity index 100% rename from src/main/webapp/res/cms/img/login/line.jpg rename to src/main/resources/static/res/cms/img/login/line.jpg diff --git a/src/main/webapp/res/cms/img/login/llogo.jpg b/src/main/resources/static/res/cms/img/login/llogo.jpg similarity index 100% rename from src/main/webapp/res/cms/img/login/llogo.jpg rename to src/main/resources/static/res/cms/img/login/llogo.jpg diff --git a/src/main/webapp/res/cms/img/login/llogo.png b/src/main/resources/static/res/cms/img/login/llogo.png similarity index 100% rename from src/main/webapp/res/cms/img/login/llogo.png rename to src/main/resources/static/res/cms/img/login/llogo.png diff --git a/src/main/webapp/res/cms/img/login/login.jpg b/src/main/resources/static/res/cms/img/login/login.jpg similarity index 100% rename from src/main/webapp/res/cms/img/login/login.jpg rename to src/main/resources/static/res/cms/img/login/login.jpg diff --git a/src/main/webapp/res/cms/img/login/ltitle.jpg b/src/main/resources/static/res/cms/img/login/ltitle.jpg similarity index 100% rename from src/main/webapp/res/cms/img/login/ltitle.jpg rename to src/main/resources/static/res/cms/img/login/ltitle.jpg diff --git a/src/main/webapp/res/cms/img/login/ltop.jpg b/src/main/resources/static/res/cms/img/login/ltop.jpg similarity index 100% rename from src/main/webapp/res/cms/img/login/ltop.jpg rename to src/main/resources/static/res/cms/img/login/ltop.jpg diff --git a/src/main/webapp/res/cms/img/login/reset.jpg b/src/main/resources/static/res/cms/img/login/reset.jpg similarity index 100% rename from src/main/webapp/res/cms/img/login/reset.jpg rename to src/main/resources/static/res/cms/img/login/reset.jpg diff --git a/src/main/webapp/res/cms/js/admin.js b/src/main/resources/static/res/cms/js/admin.js similarity index 100% rename from src/main/webapp/res/cms/js/admin.js rename to src/main/resources/static/res/cms/js/admin.js diff --git a/src/main/webapp/res/cms/js/login.js b/src/main/resources/static/res/cms/js/login.js similarity index 100% rename from src/main/webapp/res/cms/js/login.js rename to src/main/resources/static/res/cms/js/login.js diff --git a/src/main/webapp/res/cms/js/pictures.js b/src/main/resources/static/res/cms/js/pictures.js similarity index 100% rename from src/main/webapp/res/cms/js/pictures.js rename to src/main/resources/static/res/cms/js/pictures.js diff --git a/src/main/webapp/res/common/css/base.css b/src/main/resources/static/res/common/css/base.css similarity index 100% rename from src/main/webapp/res/common/css/base.css rename to src/main/resources/static/res/common/css/base.css diff --git a/src/main/webapp/res/common/css/bootstrap.min.css b/src/main/resources/static/res/common/css/bootstrap.min.css similarity index 100% rename from src/main/webapp/res/common/css/bootstrap.min.css rename to src/main/resources/static/res/common/css/bootstrap.min.css diff --git a/src/main/webapp/res/common/css/common.css b/src/main/resources/static/res/common/css/common.css similarity index 100% rename from src/main/webapp/res/common/css/common.css rename to src/main/resources/static/res/common/css/common.css diff --git a/src/main/webapp/res/common/css/error.css b/src/main/resources/static/res/common/css/error.css similarity index 100% rename from src/main/webapp/res/common/css/error.css rename to src/main/resources/static/res/common/css/error.css diff --git a/src/main/webapp/res/common/css/jquery.treeview.css b/src/main/resources/static/res/common/css/jquery.treeview.css similarity index 100% rename from src/main/webapp/res/common/css/jquery.treeview.css rename to src/main/resources/static/res/common/css/jquery.treeview.css diff --git a/src/main/webapp/res/common/css/jquery.ui.css b/src/main/resources/static/res/common/css/jquery.ui.css similarity index 100% rename from src/main/webapp/res/common/css/jquery.ui.css rename to src/main/resources/static/res/common/css/jquery.ui.css diff --git a/src/main/webapp/res/common/css/jquery.validate.css b/src/main/resources/static/res/common/css/jquery.validate.css similarity index 100% rename from src/main/webapp/res/common/css/jquery.validate.css rename to src/main/resources/static/res/common/css/jquery.validate.css diff --git a/src/main/webapp/res/common/css/style.css b/src/main/resources/static/res/common/css/style.css similarity index 100% rename from src/main/webapp/res/common/css/style.css rename to src/main/resources/static/res/common/css/style.css diff --git a/src/main/webapp/res/common/css/theme.css b/src/main/resources/static/res/common/css/theme.css similarity index 100% rename from src/main/webapp/res/common/css/theme.css rename to src/main/resources/static/res/common/css/theme.css diff --git a/src/main/webapp/res/common/images/ajax-loader.gif b/src/main/resources/static/res/common/images/ajax-loader.gif similarity index 100% rename from src/main/webapp/res/common/images/ajax-loader.gif rename to src/main/resources/static/res/common/images/ajax-loader.gif diff --git a/src/main/webapp/res/common/images/base_button.gif b/src/main/resources/static/res/common/images/base_button.gif similarity index 100% rename from src/main/webapp/res/common/images/base_button.gif rename to src/main/resources/static/res/common/images/base_button.gif diff --git a/src/main/webapp/res/common/images/base_icon.gif b/src/main/resources/static/res/common/images/base_icon.gif similarity index 100% rename from src/main/webapp/res/common/images/base_icon.gif rename to src/main/resources/static/res/common/images/base_icon.gif diff --git a/src/main/webapp/res/common/images/base_loading_bar.gif b/src/main/resources/static/res/common/images/base_loading_bar.gif similarity index 100% rename from src/main/webapp/res/common/images/base_loading_bar.gif rename to src/main/resources/static/res/common/images/base_loading_bar.gif diff --git a/src/main/webapp/res/common/images/base_loading_icon.gif b/src/main/resources/static/res/common/images/base_loading_icon.gif similarity index 100% rename from src/main/webapp/res/common/images/base_loading_icon.gif rename to src/main/resources/static/res/common/images/base_loading_icon.gif diff --git a/src/main/webapp/res/common/images/base_overlay_bg.png b/src/main/resources/static/res/common/images/base_overlay_bg.png similarity index 100% rename from src/main/webapp/res/common/images/base_overlay_bg.png rename to src/main/resources/static/res/common/images/base_overlay_bg.png diff --git a/src/main/webapp/res/common/images/base_x_bg.gif b/src/main/resources/static/res/common/images/base_x_bg.gif similarity index 100% rename from src/main/webapp/res/common/images/base_x_bg.gif rename to src/main/resources/static/res/common/images/base_x_bg.gif diff --git a/src/main/webapp/res/common/images/common.gif b/src/main/resources/static/res/common/images/common.gif similarity index 100% rename from src/main/webapp/res/common/images/common.gif rename to src/main/resources/static/res/common/images/common.gif diff --git a/src/main/webapp/res/common/images/error.gif b/src/main/resources/static/res/common/images/error.gif similarity index 100% rename from src/main/webapp/res/common/images/error.gif rename to src/main/resources/static/res/common/images/error.gif diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-bg_diagonals-thick_18_b81900_40x40.png b/src/main/resources/static/res/common/img/jquery_ui/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-bg_diagonals-thick_18_b81900_40x40.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-bg_diagonals-thick_20_666666_40x40.png b/src/main/resources/static/res/common/img/jquery_ui/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-bg_diagonals-thick_20_666666_40x40.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-bg_flat_10_000000_40x100.png b/src/main/resources/static/res/common/img/jquery_ui/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-bg_flat_10_000000_40x100.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-bg_flat_10_000000_40x100.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-bg_glass_100_f6f6f6_1x400.png b/src/main/resources/static/res/common/img/jquery_ui/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-bg_glass_100_f6f6f6_1x400.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-bg_glass_100_fdf5ce_1x400.png b/src/main/resources/static/res/common/img/jquery_ui/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-bg_glass_100_fdf5ce_1x400.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-bg_glass_65_ffffff_1x400.png b/src/main/resources/static/res/common/img/jquery_ui/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-bg_glass_65_ffffff_1x400.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-bg_glass_65_ffffff_1x400.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-bg_gloss-wave_35_f6a828_500x100.png b/src/main/resources/static/res/common/img/jquery_ui/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-bg_gloss-wave_35_f6a828_500x100.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-bg_highlight-soft_100_eeeeee_1x100.png b/src/main/resources/static/res/common/img/jquery_ui/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-bg_highlight-soft_75_ffe45c_1x100.png b/src/main/resources/static/res/common/img/jquery_ui/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-icons_222222_256x240.png b/src/main/resources/static/res/common/img/jquery_ui/ui-icons_222222_256x240.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-icons_222222_256x240.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-icons_222222_256x240.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-icons_228ef1_256x240.png b/src/main/resources/static/res/common/img/jquery_ui/ui-icons_228ef1_256x240.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-icons_228ef1_256x240.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-icons_228ef1_256x240.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-icons_ef8c08_256x240.png b/src/main/resources/static/res/common/img/jquery_ui/ui-icons_ef8c08_256x240.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-icons_ef8c08_256x240.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-icons_ef8c08_256x240.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-icons_ffd27a_256x240.png b/src/main/resources/static/res/common/img/jquery_ui/ui-icons_ffd27a_256x240.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-icons_ffd27a_256x240.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-icons_ffd27a_256x240.png diff --git a/src/main/webapp/res/common/img/jquery_ui/ui-icons_ffffff_256x240.png b/src/main/resources/static/res/common/img/jquery_ui/ui-icons_ffffff_256x240.png similarity index 100% rename from src/main/webapp/res/common/img/jquery_ui/ui-icons_ffffff_256x240.png rename to src/main/resources/static/res/common/img/jquery_ui/ui-icons_ffffff_256x240.png diff --git a/src/main/webapp/res/common/img/theme/FmenuBG.gif b/src/main/resources/static/res/common/img/theme/FmenuBG.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/FmenuBG.gif rename to src/main/resources/static/res/common/img/theme/FmenuBG.gif diff --git a/src/main/webapp/res/common/img/theme/add-step.png b/src/main/resources/static/res/common/img/theme/add-step.png similarity index 100% rename from src/main/webapp/res/common/img/theme/add-step.png rename to src/main/resources/static/res/common/img/theme/add-step.png diff --git a/src/main/webapp/res/common/img/theme/add_item.png b/src/main/resources/static/res/common/img/theme/add_item.png similarity index 100% rename from src/main/webapp/res/common/img/theme/add_item.png rename to src/main/resources/static/res/common/img/theme/add_item.png diff --git a/src/main/webapp/res/common/img/theme/add_subTopic.png b/src/main/resources/static/res/common/img/theme/add_subTopic.png similarity index 100% rename from src/main/webapp/res/common/img/theme/add_subTopic.png rename to src/main/resources/static/res/common/img/theme/add_subTopic.png diff --git a/src/main/webapp/res/common/img/theme/background.png b/src/main/resources/static/res/common/img/theme/background.png similarity index 100% rename from src/main/webapp/res/common/img/theme/background.png rename to src/main/resources/static/res/common/img/theme/background.png diff --git a/src/main/webapp/res/common/img/theme/baocunguding.jpg b/src/main/resources/static/res/common/img/theme/baocunguding.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/baocunguding.jpg rename to src/main/resources/static/res/common/img/theme/baocunguding.jpg diff --git a/src/main/webapp/res/common/img/theme/bcplxx.jpg b/src/main/resources/static/res/common/img/theme/bcplxx.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/bcplxx.jpg rename to src/main/resources/static/res/common/img/theme/bcplxx.jpg diff --git a/src/main/webapp/res/common/img/theme/bcxtmrzd.jpg b/src/main/resources/static/res/common/img/theme/bcxtmrzd.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/bcxtmrzd.jpg rename to src/main/resources/static/res/common/img/theme/bcxtmrzd.jpg diff --git a/src/main/webapp/res/common/img/theme/boxTitleBG.jpg b/src/main/resources/static/res/common/img/theme/boxTitleBG.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/boxTitleBG.jpg rename to src/main/resources/static/res/common/img/theme/boxTitleBG.jpg diff --git a/src/main/webapp/res/common/img/theme/browse-button.png b/src/main/resources/static/res/common/img/theme/browse-button.png similarity index 100% rename from src/main/webapp/res/common/img/theme/browse-button.png rename to src/main/resources/static/res/common/img/theme/browse-button.png diff --git a/src/main/webapp/res/common/img/theme/button.png b/src/main/resources/static/res/common/img/theme/button.png similarity index 100% rename from src/main/webapp/res/common/img/theme/button.png rename to src/main/resources/static/res/common/img/theme/button.png diff --git a/src/main/webapp/res/common/img/theme/bzyyfjyx.jpg b/src/main/resources/static/res/common/img/theme/bzyyfjyx.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/bzyyfjyx.jpg rename to src/main/resources/static/res/common/img/theme/bzyyfjyx.jpg diff --git a/src/main/webapp/res/common/img/theme/cjwj.jpg b/src/main/resources/static/res/common/img/theme/cjwj.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/cjwj.jpg rename to src/main/resources/static/res/common/img/theme/cjwj.jpg diff --git a/src/main/webapp/res/common/img/theme/content_move.png b/src/main/resources/static/res/common/img/theme/content_move.png similarity index 100% rename from src/main/webapp/res/common/img/theme/content_move.png rename to src/main/resources/static/res/common/img/theme/content_move.png diff --git a/src/main/webapp/res/common/img/theme/cz.jpg b/src/main/resources/static/res/common/img/theme/cz.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/cz.jpg rename to src/main/resources/static/res/common/img/theme/cz.jpg diff --git a/src/main/webapp/res/common/img/theme/danye-button.gif b/src/main/resources/static/res/common/img/theme/danye-button.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/danye-button.gif rename to src/main/resources/static/res/common/img/theme/danye-button.gif diff --git a/src/main/webapp/res/common/img/theme/del-button.png b/src/main/resources/static/res/common/img/theme/del-button.png similarity index 100% rename from src/main/webapp/res/common/img/theme/del-button.png rename to src/main/resources/static/res/common/img/theme/del-button.png diff --git a/src/main/webapp/res/common/img/theme/depart.png b/src/main/resources/static/res/common/img/theme/depart.png similarity index 100% rename from src/main/webapp/res/common/img/theme/depart.png rename to src/main/resources/static/res/common/img/theme/depart.png diff --git a/src/main/webapp/res/common/img/theme/design.png b/src/main/resources/static/res/common/img/theme/design.png similarity index 100% rename from src/main/webapp/res/common/img/theme/design.png rename to src/main/resources/static/res/common/img/theme/design.png diff --git a/src/main/webapp/res/common/img/theme/dlsz.jpg b/src/main/resources/static/res/common/img/theme/dlsz.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/dlsz.jpg rename to src/main/resources/static/res/common/img/theme/dlsz.jpg diff --git a/src/main/webapp/res/common/img/theme/down.png b/src/main/resources/static/res/common/img/theme/down.png similarity index 100% rename from src/main/webapp/res/common/img/theme/down.png rename to src/main/resources/static/res/common/img/theme/down.png diff --git a/src/main/webapp/res/common/img/theme/down_disabled.png b/src/main/resources/static/res/common/img/theme/down_disabled.png similarity index 100% rename from src/main/webapp/res/common/img/theme/down_disabled.png rename to src/main/resources/static/res/common/img/theme/down_disabled.png diff --git a/src/main/webapp/res/common/img/theme/eidtorbg.jpg b/src/main/resources/static/res/common/img/theme/eidtorbg.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/eidtorbg.jpg rename to src/main/resources/static/res/common/img/theme/eidtorbg.jpg diff --git a/src/main/webapp/res/common/img/theme/fhlb.jpg b/src/main/resources/static/res/common/img/theme/fhlb.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/fhlb.jpg rename to src/main/resources/static/res/common/img/theme/fhlb.jpg diff --git a/src/main/webapp/res/common/img/theme/finish.png b/src/main/resources/static/res/common/img/theme/finish.png similarity index 100% rename from src/main/webapp/res/common/img/theme/finish.png rename to src/main/resources/static/res/common/img/theme/finish.png diff --git a/src/main/webapp/res/common/img/theme/fjxgl.jpg b/src/main/resources/static/res/common/img/theme/fjxgl.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/fjxgl.jpg rename to src/main/resources/static/res/common/img/theme/fjxgl.jpg diff --git a/src/main/webapp/res/common/img/theme/fsznx.jpg b/src/main/resources/static/res/common/img/theme/fsznx.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/fsznx.jpg rename to src/main/resources/static/res/common/img/theme/fsznx.jpg diff --git a/src/main/webapp/res/common/img/theme/fuzhi.jpg b/src/main/resources/static/res/common/img/theme/fuzhi.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/fuzhi.jpg rename to src/main/resources/static/res/common/img/theme/fuzhi.jpg diff --git a/src/main/webapp/res/common/img/theme/fzbq.jpg b/src/main/resources/static/res/common/img/theme/fzbq.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/fzbq.jpg rename to src/main/resources/static/res/common/img/theme/fzbq.jpg diff --git a/src/main/webapp/res/common/img/theme/go.gif b/src/main/resources/static/res/common/img/theme/go.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/go.gif rename to src/main/resources/static/res/common/img/theme/go.gif diff --git a/src/main/webapp/res/common/img/theme/huanyuan.jpg b/src/main/resources/static/res/common/img/theme/huanyuan.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/huanyuan.jpg rename to src/main/resources/static/res/common/img/theme/huanyuan.jpg diff --git a/src/main/webapp/res/common/img/theme/hysz.jpg b/src/main/resources/static/res/common/img/theme/hysz.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/hysz.jpg rename to src/main/resources/static/res/common/img/theme/hysz.jpg diff --git a/src/main/webapp/res/common/img/theme/hyzcmx.jpg b/src/main/resources/static/res/common/img/theme/hyzcmx.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/hyzcmx.jpg rename to src/main/resources/static/res/common/img/theme/hyzcmx.jpg diff --git a/src/main/webapp/res/common/img/theme/jbsz.jpg b/src/main/resources/static/res/common/img/theme/jbsz.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/jbsz.jpg rename to src/main/resources/static/res/common/img/theme/jbsz.jpg diff --git a/src/main/webapp/res/common/img/theme/kscj.jpg b/src/main/resources/static/res/common/img/theme/kscj.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/kscj.jpg rename to src/main/resources/static/res/common/img/theme/kscj.jpg diff --git a/src/main/webapp/res/common/img/theme/lanmu-positionbg.png b/src/main/resources/static/res/common/img/theme/lanmu-positionbg.png similarity index 100% rename from src/main/webapp/res/common/img/theme/lanmu-positionbg.png rename to src/main/resources/static/res/common/img/theme/lanmu-positionbg.png diff --git a/src/main/webapp/res/common/img/theme/leftBg.jpg b/src/main/resources/static/res/common/img/theme/leftBg.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/leftBg.jpg rename to src/main/resources/static/res/common/img/theme/leftBg.jpg diff --git a/src/main/webapp/res/common/img/theme/ljxgl.jpg b/src/main/resources/static/res/common/img/theme/ljxgl.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/ljxgl.jpg rename to src/main/resources/static/res/common/img/theme/ljxgl.jpg diff --git a/src/main/webapp/res/common/img/theme/menu_search.jpg b/src/main/resources/static/res/common/img/theme/menu_search.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/menu_search.jpg rename to src/main/resources/static/res/common/img/theme/menu_search.jpg diff --git a/src/main/webapp/res/common/img/theme/model-0.gif b/src/main/resources/static/res/common/img/theme/model-0.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-0.gif rename to src/main/resources/static/res/common/img/theme/model-0.gif diff --git a/src/main/webapp/res/common/img/theme/model-1.gif b/src/main/resources/static/res/common/img/theme/model-1.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-1.gif rename to src/main/resources/static/res/common/img/theme/model-1.gif diff --git a/src/main/webapp/res/common/img/theme/model-2.gif b/src/main/resources/static/res/common/img/theme/model-2.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-2.gif rename to src/main/resources/static/res/common/img/theme/model-2.gif diff --git a/src/main/webapp/res/common/img/theme/model-3.gif b/src/main/resources/static/res/common/img/theme/model-3.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-3.gif rename to src/main/resources/static/res/common/img/theme/model-3.gif diff --git a/src/main/webapp/res/common/img/theme/model-4.gif b/src/main/resources/static/res/common/img/theme/model-4.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-4.gif rename to src/main/resources/static/res/common/img/theme/model-4.gif diff --git a/src/main/webapp/res/common/img/theme/model-5.gif b/src/main/resources/static/res/common/img/theme/model-5.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-5.gif rename to src/main/resources/static/res/common/img/theme/model-5.gif diff --git a/src/main/webapp/res/common/img/theme/model-6.gif b/src/main/resources/static/res/common/img/theme/model-6.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-6.gif rename to src/main/resources/static/res/common/img/theme/model-6.gif diff --git a/src/main/webapp/res/common/img/theme/model-7.gif b/src/main/resources/static/res/common/img/theme/model-7.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-7.gif rename to src/main/resources/static/res/common/img/theme/model-7.gif diff --git a/src/main/webapp/res/common/img/theme/model-8.gif b/src/main/resources/static/res/common/img/theme/model-8.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-8.gif rename to src/main/resources/static/res/common/img/theme/model-8.gif diff --git a/src/main/webapp/res/common/img/theme/model-9.gif b/src/main/resources/static/res/common/img/theme/model-9.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/model-9.gif rename to src/main/resources/static/res/common/img/theme/model-9.gif diff --git a/src/main/webapp/res/common/img/theme/msg_bg.jpg b/src/main/resources/static/res/common/img/theme/msg_bg.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/msg_bg.jpg rename to src/main/resources/static/res/common/img/theme/msg_bg.jpg diff --git a/src/main/webapp/res/common/img/theme/news-button.gif b/src/main/resources/static/res/common/img/theme/news-button.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/news-button.gif rename to src/main/resources/static/res/common/img/theme/news-button.gif diff --git a/src/main/webapp/res/common/img/theme/nopicture.png b/src/main/resources/static/res/common/img/theme/nopicture.png similarity index 100% rename from src/main/webapp/res/common/img/theme/nopicture.png rename to src/main/resources/static/res/common/img/theme/nopicture.png diff --git a/src/main/webapp/res/common/img/theme/pagenumber_icon_001.png b/src/main/resources/static/res/common/img/theme/pagenumber_icon_001.png similarity index 100% rename from src/main/webapp/res/common/img/theme/pagenumber_icon_001.png rename to src/main/resources/static/res/common/img/theme/pagenumber_icon_001.png diff --git a/src/main/webapp/res/common/img/theme/pagenumber_icon_003.png b/src/main/resources/static/res/common/img/theme/pagenumber_icon_003.png similarity index 100% rename from src/main/webapp/res/common/img/theme/pagenumber_icon_003.png rename to src/main/resources/static/res/common/img/theme/pagenumber_icon_003.png diff --git a/src/main/webapp/res/common/img/theme/pagenumber_icon_004.png b/src/main/resources/static/res/common/img/theme/pagenumber_icon_004.png similarity index 100% rename from src/main/webapp/res/common/img/theme/pagenumber_icon_004.png rename to src/main/resources/static/res/common/img/theme/pagenumber_icon_004.png diff --git a/src/main/webapp/res/common/img/theme/pagenumber_icon_01.png b/src/main/resources/static/res/common/img/theme/pagenumber_icon_01.png similarity index 100% rename from src/main/webapp/res/common/img/theme/pagenumber_icon_01.png rename to src/main/resources/static/res/common/img/theme/pagenumber_icon_01.png diff --git a/src/main/webapp/res/common/img/theme/pagenumber_icon_02.png b/src/main/resources/static/res/common/img/theme/pagenumber_icon_02.png similarity index 100% rename from src/main/webapp/res/common/img/theme/pagenumber_icon_02.png rename to src/main/resources/static/res/common/img/theme/pagenumber_icon_02.png diff --git a/src/main/webapp/res/common/img/theme/pagenumber_icon_022.png b/src/main/resources/static/res/common/img/theme/pagenumber_icon_022.png similarity index 100% rename from src/main/webapp/res/common/img/theme/pagenumber_icon_022.png rename to src/main/resources/static/res/common/img/theme/pagenumber_icon_022.png diff --git a/src/main/webapp/res/common/img/theme/pagenumber_icon_03.png b/src/main/resources/static/res/common/img/theme/pagenumber_icon_03.png similarity index 100% rename from src/main/webapp/res/common/img/theme/pagenumber_icon_03.png rename to src/main/resources/static/res/common/img/theme/pagenumber_icon_03.png diff --git a/src/main/webapp/res/common/img/theme/pagenumber_icon_04.png b/src/main/resources/static/res/common/img/theme/pagenumber_icon_04.png similarity index 100% rename from src/main/webapp/res/common/img/theme/pagenumber_icon_04.png rename to src/main/resources/static/res/common/img/theme/pagenumber_icon_04.png diff --git a/src/main/webapp/res/common/img/theme/pagenumber_icon_05.png b/src/main/resources/static/res/common/img/theme/pagenumber_icon_05.png similarity index 100% rename from src/main/webapp/res/common/img/theme/pagenumber_icon_05.png rename to src/main/resources/static/res/common/img/theme/pagenumber_icon_05.png diff --git a/src/main/webapp/res/common/img/theme/parent-depart.png b/src/main/resources/static/res/common/img/theme/parent-depart.png similarity index 100% rename from src/main/webapp/res/common/img/theme/parent-depart.png rename to src/main/resources/static/res/common/img/theme/parent-depart.png diff --git a/src/main/webapp/res/common/img/theme/pbg.jpg b/src/main/resources/static/res/common/img/theme/pbg.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/pbg.jpg rename to src/main/resources/static/res/common/img/theme/pbg.jpg diff --git a/src/main/webapp/res/common/img/theme/pfzgl.jpg b/src/main/resources/static/res/common/img/theme/pfzgl.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/pfzgl.jpg rename to src/main/resources/static/res/common/img/theme/pfzgl.jpg diff --git a/src/main/webapp/res/common/img/theme/pic-button.gif b/src/main/resources/static/res/common/img/theme/pic-button.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/pic-button.gif rename to src/main/resources/static/res/common/img/theme/pic-button.gif diff --git a/src/main/webapp/res/common/img/theme/preview-button.png b/src/main/resources/static/res/common/img/theme/preview-button.png similarity index 100% rename from src/main/webapp/res/common/img/theme/preview-button.png rename to src/main/resources/static/res/common/img/theme/preview-button.png diff --git a/src/main/webapp/res/common/img/theme/qtpz.jpg b/src/main/resources/static/res/common/img/theme/qtpz.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/qtpz.jpg rename to src/main/resources/static/res/common/img/theme/qtpz.jpg diff --git a/src/main/webapp/res/common/img/theme/qtyl.jpg b/src/main/resources/static/res/common/img/theme/qtyl.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/qtyl.jpg rename to src/main/resources/static/res/common/img/theme/qtyl.jpg diff --git a/src/main/webapp/res/common/img/theme/quxiao.jpg b/src/main/resources/static/res/common/img/theme/quxiao.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/quxiao.jpg rename to src/main/resources/static/res/common/img/theme/quxiao.jpg diff --git a/src/main/webapp/res/common/img/theme/ruler.gif b/src/main/resources/static/res/common/img/theme/ruler.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/ruler.gif rename to src/main/resources/static/res/common/img/theme/ruler.gif diff --git a/src/main/webapp/res/common/img/theme/save-button.png b/src/main/resources/static/res/common/img/theme/save-button.png similarity index 100% rename from src/main/webapp/res/common/img/theme/save-button.png rename to src/main/resources/static/res/common/img/theme/save-button.png diff --git a/src/main/webapp/res/common/img/theme/scgx.jpg b/src/main/resources/static/res/common/img/theme/scgx.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/scgx.jpg rename to src/main/resources/static/res/common/img/theme/scgx.jpg diff --git a/src/main/webapp/res/common/img/theme/scsx.jpg b/src/main/resources/static/res/common/img/theme/scsx.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/scsx.jpg rename to src/main/resources/static/res/common/img/theme/scsx.jpg diff --git a/src/main/webapp/res/common/img/theme/scsy.jpg b/src/main/resources/static/res/common/img/theme/scsy.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/scsy.jpg rename to src/main/resources/static/res/common/img/theme/scsy.jpg diff --git a/src/main/webapp/res/common/img/theme/scsysxfj.jpg b/src/main/resources/static/res/common/img/theme/scsysxfj.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/scsysxfj.jpg rename to src/main/resources/static/res/common/img/theme/scsysxfj.jpg diff --git a/src/main/webapp/res/common/img/theme/shanchu.jpg b/src/main/resources/static/res/common/img/theme/shanchu.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/shanchu.jpg rename to src/main/resources/static/res/common/img/theme/shanchu.jpg diff --git a/src/main/webapp/res/common/img/theme/shangyi.jpg b/src/main/resources/static/res/common/img/theme/shangyi.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/shangyi.jpg rename to src/main/resources/static/res/common/img/theme/shangyi.jpg diff --git a/src/main/webapp/res/common/img/theme/shengchengjingtaiye.jpg b/src/main/resources/static/res/common/img/theme/shengchengjingtaiye.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/shengchengjingtaiye.jpg rename to src/main/resources/static/res/common/img/theme/shengchengjingtaiye.jpg diff --git a/src/main/webapp/res/common/img/theme/shenhe.jpg b/src/main/resources/static/res/common/img/theme/shenhe.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/shenhe.jpg rename to src/main/resources/static/res/common/img/theme/shenhe.jpg diff --git a/src/main/webapp/res/common/img/theme/sjxgl.jpg b/src/main/resources/static/res/common/img/theme/sjxgl.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/sjxgl.jpg rename to src/main/resources/static/res/common/img/theme/sjxgl.jpg diff --git a/src/main/webapp/res/common/img/theme/sy.gif b/src/main/resources/static/res/common/img/theme/sy.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/sy.gif rename to src/main/resources/static/res/common/img/theme/sy.gif diff --git a/src/main/webapp/res/common/img/theme/sysz.jpg b/src/main/resources/static/res/common/img/theme/sysz.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/sysz.jpg rename to src/main/resources/static/res/common/img/theme/sysz.jpg diff --git a/src/main/webapp/res/common/img/theme/syy.gif b/src/main/resources/static/res/common/img/theme/syy.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/syy.gif rename to src/main/resources/static/res/common/img/theme/syy.gif diff --git a/src/main/webapp/res/common/img/theme/tb-bg.jpg b/src/main/resources/static/res/common/img/theme/tb-bg.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/tb-bg.jpg rename to src/main/resources/static/res/common/img/theme/tb-bg.jpg diff --git a/src/main/webapp/res/common/img/theme/theme-button.png b/src/main/resources/static/res/common/img/theme/theme-button.png similarity index 100% rename from src/main/webapp/res/common/img/theme/theme-button.png rename to src/main/resources/static/res/common/img/theme/theme-button.png diff --git a/src/main/webapp/res/common/img/theme/tianjia.jpg b/src/main/resources/static/res/common/img/theme/tianjia.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/tianjia.jpg rename to src/main/resources/static/res/common/img/theme/tianjia.jpg diff --git a/src/main/webapp/res/common/img/theme/tijiao.jpg b/src/main/resources/static/res/common/img/theme/tijiao.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/tijiao.jpg rename to src/main/resources/static/res/common/img/theme/tijiao.jpg diff --git a/src/main/webapp/res/common/img/theme/tijiao2.jpg b/src/main/resources/static/res/common/img/theme/tijiao2.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/tijiao2.jpg rename to src/main/resources/static/res/common/img/theme/tijiao2.jpg diff --git a/src/main/webapp/res/common/img/theme/tit-tdbg.png b/src/main/resources/static/res/common/img/theme/tit-tdbg.png similarity index 100% rename from src/main/webapp/res/common/img/theme/tit-tdbg.png rename to src/main/resources/static/res/common/img/theme/tit-tdbg.png diff --git a/src/main/webapp/res/common/img/theme/top_menu_butten.png b/src/main/resources/static/res/common/img/theme/top_menu_butten.png similarity index 100% rename from src/main/webapp/res/common/img/theme/top_menu_butten.png rename to src/main/resources/static/res/common/img/theme/top_menu_butten.png diff --git a/src/main/webapp/res/common/img/theme/tuihui.jpg b/src/main/resources/static/res/common/img/theme/tuihui.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/tuihui.jpg rename to src/main/resources/static/res/common/img/theme/tuihui.jpg diff --git a/src/main/webapp/res/common/img/theme/tuisong.jpg b/src/main/resources/static/res/common/img/theme/tuisong.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/tuisong.jpg rename to src/main/resources/static/res/common/img/theme/tuisong.jpg diff --git a/src/main/webapp/res/common/img/theme/tuisongzhizhuanti.gif b/src/main/resources/static/res/common/img/theme/tuisongzhizhuanti.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/tuisongzhizhuanti.gif rename to src/main/resources/static/res/common/img/theme/tuisongzhizhuanti.gif diff --git a/src/main/webapp/res/common/img/theme/tv-button.gif b/src/main/resources/static/res/common/img/theme/tv-button.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/tv-button.gif rename to src/main/resources/static/res/common/img/theme/tv-button.gif diff --git a/src/main/webapp/res/common/img/theme/up.png b/src/main/resources/static/res/common/img/theme/up.png similarity index 100% rename from src/main/webapp/res/common/img/theme/up.png rename to src/main/resources/static/res/common/img/theme/up.png diff --git a/src/main/webapp/res/common/img/theme/up_disabled.png b/src/main/resources/static/res/common/img/theme/up_disabled.png similarity index 100% rename from src/main/webapp/res/common/img/theme/up_disabled.png rename to src/main/resources/static/res/common/img/theme/up_disabled.png diff --git a/src/main/webapp/res/common/img/theme/wlfhqpz.jpg b/src/main/resources/static/res/common/img/theme/wlfhqpz.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/wlfhqpz.jpg rename to src/main/resources/static/res/common/img/theme/wlfhqpz.jpg diff --git a/src/main/webapp/res/common/img/theme/wy.gif b/src/main/resources/static/res/common/img/theme/wy.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/wy.gif rename to src/main/resources/static/res/common/img/theme/wy.gif diff --git a/src/main/webapp/res/common/img/theme/xiayi.jpg b/src/main/resources/static/res/common/img/theme/xiayi.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/xiayi.jpg rename to src/main/resources/static/res/common/img/theme/xiayi.jpg diff --git a/src/main/webapp/res/common/img/theme/xiazai-button.gif b/src/main/resources/static/res/common/img/theme/xiazai-button.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/xiazai-button.gif rename to src/main/resources/static/res/common/img/theme/xiazai-button.gif diff --git a/src/main/webapp/res/common/img/theme/xiazai.jpg b/src/main/resources/static/res/common/img/theme/xiazai.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/xiazai.jpg rename to src/main/resources/static/res/common/img/theme/xiazai.jpg diff --git a/src/main/webapp/res/common/img/theme/xinjian.jpg b/src/main/resources/static/res/common/img/theme/xinjian.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/xinjian.jpg rename to src/main/resources/static/res/common/img/theme/xinjian.jpg diff --git a/src/main/webapp/res/common/img/theme/xiugai.jpg b/src/main/resources/static/res/common/img/theme/xiugai.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/xiugai.jpg rename to src/main/resources/static/res/common/img/theme/xiugai.jpg diff --git a/src/main/webapp/res/common/img/theme/xtsz.jpg b/src/main/resources/static/res/common/img/theme/xtsz.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/xtsz.jpg rename to src/main/resources/static/res/common/img/theme/xtsz.jpg diff --git a/src/main/webapp/res/common/img/theme/xyy.gif b/src/main/resources/static/res/common/img/theme/xyy.gif similarity index 100% rename from src/main/webapp/res/common/img/theme/xyy.gif rename to src/main/resources/static/res/common/img/theme/xyy.gif diff --git a/src/main/webapp/res/common/img/theme/xzwj.jpg b/src/main/resources/static/res/common/img/theme/xzwj.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/xzwj.jpg rename to src/main/resources/static/res/common/img/theme/xzwj.jpg diff --git a/src/main/webapp/res/common/img/theme/ycz.png b/src/main/resources/static/res/common/img/theme/ycz.png similarity index 100% rename from src/main/webapp/res/common/img/theme/ycz.png rename to src/main/resources/static/res/common/img/theme/ycz.png diff --git a/src/main/webapp/res/common/img/theme/yidong.jpg b/src/main/resources/static/res/common/img/theme/yidong.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/yidong.jpg rename to src/main/resources/static/res/common/img/theme/yidong.jpg diff --git a/src/main/webapp/res/common/img/theme/yingyong.jpg b/src/main/resources/static/res/common/img/theme/yingyong.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/yingyong.jpg rename to src/main/resources/static/res/common/img/theme/yingyong.jpg diff --git a/src/main/webapp/res/common/img/theme/zjtctm.jpg b/src/main/resources/static/res/common/img/theme/zjtctm.jpg similarity index 100% rename from src/main/webapp/res/common/img/theme/zjtctm.jpg rename to src/main/resources/static/res/common/img/theme/zjtctm.jpg diff --git a/src/main/webapp/res/common/js/base.js b/src/main/resources/static/res/common/js/base.js similarity index 100% rename from src/main/webapp/res/common/js/base.js rename to src/main/resources/static/res/common/js/base.js diff --git a/src/main/webapp/res/common/js/jquery-ui-1.10.4.min.js b/src/main/resources/static/res/common/js/jquery-ui-1.10.4.min.js similarity index 100% rename from src/main/webapp/res/common/js/jquery-ui-1.10.4.min.js rename to src/main/resources/static/res/common/js/jquery-ui-1.10.4.min.js diff --git a/src/main/webapp/res/common/js/jquery.ext.js b/src/main/resources/static/res/common/js/jquery.ext.js similarity index 100% rename from src/main/webapp/res/common/js/jquery.ext.js rename to src/main/resources/static/res/common/js/jquery.ext.js diff --git a/src/main/webapp/res/common/js/jquery.form.js b/src/main/resources/static/res/common/js/jquery.form.js similarity index 100% rename from src/main/webapp/res/common/js/jquery.form.js rename to src/main/resources/static/res/common/js/jquery.form.js diff --git a/src/main/webapp/res/common/js/jquery.form.min.js b/src/main/resources/static/res/common/js/jquery.form.min.js similarity index 100% rename from src/main/webapp/res/common/js/jquery.form.min.js rename to src/main/resources/static/res/common/js/jquery.form.min.js diff --git a/src/main/webapp/res/common/js/jquery.imgareaselect.js b/src/main/resources/static/res/common/js/jquery.imgareaselect.js similarity index 100% rename from src/main/webapp/res/common/js/jquery.imgareaselect.js rename to src/main/resources/static/res/common/js/jquery.imgareaselect.js diff --git a/src/main/webapp/res/common/js/jquery.js b/src/main/resources/static/res/common/js/jquery.js similarity index 100% rename from src/main/webapp/res/common/js/jquery.js rename to src/main/resources/static/res/common/js/jquery.js diff --git a/src/main/webapp/res/common/js/message.js b/src/main/resources/static/res/common/js/message.js similarity index 100% rename from src/main/webapp/res/common/js/message.js rename to src/main/resources/static/res/common/js/message.js diff --git a/src/main/webapp/res/common/js/pony.js b/src/main/resources/static/res/common/js/pony.js similarity index 100% rename from src/main/webapp/res/common/js/pony.js rename to src/main/resources/static/res/common/js/pony.js diff --git a/src/main/webapp/resources/bootstrap-responsive.min.css b/src/main/resources/static/resources/bootstrap-responsive.min.css similarity index 100% rename from src/main/webapp/resources/bootstrap-responsive.min.css rename to src/main/resources/static/resources/bootstrap-responsive.min.css diff --git a/src/main/webapp/resources/bootstrap.min.css b/src/main/resources/static/resources/bootstrap.min.css similarity index 100% rename from src/main/webapp/resources/bootstrap.min.css rename to src/main/resources/static/resources/bootstrap.min.css diff --git a/src/main/webapp/resources/incomplete.gif b/src/main/resources/static/resources/incomplete.gif similarity index 100% rename from src/main/webapp/resources/incomplete.gif rename to src/main/resources/static/resources/incomplete.gif diff --git a/src/main/webapp/resources/jquery-1.7.min.js b/src/main/resources/static/resources/jquery-1.7.min.js similarity index 100% rename from src/main/webapp/resources/jquery-1.7.min.js rename to src/main/resources/static/resources/jquery-1.7.min.js diff --git a/src/main/webapp/resources/sorttable.js b/src/main/resources/static/resources/sorttable.js similarity index 100% rename from src/main/webapp/resources/sorttable.js rename to src/main/resources/static/resources/sorttable.js diff --git a/src/main/webapp/resources/svnadmin.css b/src/main/resources/static/resources/svnadmin.css similarity index 100% rename from src/main/webapp/resources/svnadmin.css rename to src/main/resources/static/resources/svnadmin.css diff --git a/src/main/webapp/resources/svnadmin.js b/src/main/resources/static/resources/svnadmin.js similarity index 100% rename from src/main/webapp/resources/svnadmin.js rename to src/main/resources/static/resources/svnadmin.js diff --git a/src/main/webapp/resources/treeview/images/ajax-loader.gif b/src/main/resources/static/resources/treeview/images/ajax-loader.gif similarity index 100% rename from src/main/webapp/resources/treeview/images/ajax-loader.gif rename to src/main/resources/static/resources/treeview/images/ajax-loader.gif diff --git a/src/main/webapp/resources/treeview/images/file.gif b/src/main/resources/static/resources/treeview/images/file.gif similarity index 100% rename from src/main/webapp/resources/treeview/images/file.gif rename to src/main/resources/static/resources/treeview/images/file.gif diff --git a/src/main/webapp/resources/treeview/images/folder-closed.gif b/src/main/resources/static/resources/treeview/images/folder-closed.gif similarity index 100% rename from src/main/webapp/resources/treeview/images/folder-closed.gif rename to src/main/resources/static/resources/treeview/images/folder-closed.gif diff --git a/src/main/webapp/resources/treeview/images/folder.gif b/src/main/resources/static/resources/treeview/images/folder.gif similarity index 100% rename from src/main/webapp/resources/treeview/images/folder.gif rename to src/main/resources/static/resources/treeview/images/folder.gif diff --git a/src/main/webapp/resources/treeview/images/treeview-default-line.gif b/src/main/resources/static/resources/treeview/images/treeview-default-line.gif similarity index 100% rename from src/main/webapp/resources/treeview/images/treeview-default-line.gif rename to src/main/resources/static/resources/treeview/images/treeview-default-line.gif diff --git a/src/main/webapp/resources/treeview/images/treeview-default.gif b/src/main/resources/static/resources/treeview/images/treeview-default.gif similarity index 100% rename from src/main/webapp/resources/treeview/images/treeview-default.gif rename to src/main/resources/static/resources/treeview/images/treeview-default.gif diff --git a/src/main/webapp/resources/treeview/treeview.css b/src/main/resources/static/resources/treeview/treeview.css similarity index 100% rename from src/main/webapp/resources/treeview/treeview.css rename to src/main/resources/static/resources/treeview/treeview.css diff --git a/src/main/webapp/resources/treeview/treeview.js b/src/main/resources/static/resources/treeview/treeview.js similarity index 100% rename from src/main/webapp/resources/treeview/treeview.js rename to src/main/resources/static/resources/treeview/treeview.js diff --git a/src/main/webapp/WEB-INF/template/admin/account/change_pwd.ftl b/src/main/resources/template/admin/account/change_pwd.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/account/change_pwd.ftl rename to src/main/resources/template/admin/account/change_pwd.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/account/frame/left.ftl b/src/main/resources/template/admin/account/frame/left.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/account/frame/left.ftl rename to src/main/resources/template/admin/account/frame/left.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/account/frame/main.ftl b/src/main/resources/template/admin/account/frame/main.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/account/frame/main.ftl rename to src/main/resources/template/admin/account/frame/main.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/account/frame/right.ftl b/src/main/resources/template/admin/account/frame/right.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/account/frame/right.ftl rename to src/main/resources/template/admin/account/frame/right.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/common/error.ftl b/src/main/resources/template/admin/common/error.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/common/error.ftl rename to src/main/resources/template/admin/common/error.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/common/lock.ftl b/src/main/resources/template/admin/common/lock.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/common/lock.ftl rename to src/main/resources/template/admin/common/lock.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/common/main.ftl b/src/main/resources/template/admin/common/main.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/common/main.ftl rename to src/main/resources/template/admin/common/main.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/common/project_open.ftl b/src/main/resources/template/admin/common/project_open.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/common/project_open.ftl rename to src/main/resources/template/admin/common/project_open.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/common/rest_pwd.ftl b/src/main/resources/template/admin/common/rest_pwd.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/common/rest_pwd.ftl rename to src/main/resources/template/admin/common/rest_pwd.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/date.ftl b/src/main/resources/template/admin/date.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/date.ftl rename to src/main/resources/template/admin/date.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/email/email.ftl b/src/main/resources/template/admin/email/email.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/email/email.ftl rename to src/main/resources/template/admin/email/email.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/email/email2.ftl b/src/main/resources/template/admin/email/email2.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/email/email2.ftl rename to src/main/resources/template/admin/email/email2.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/email/project_open.ftl b/src/main/resources/template/admin/email/project_open.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/email/project_open.ftl rename to src/main/resources/template/admin/email/project_open.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/email/rest_pwd.ftl b/src/main/resources/template/admin/email/rest_pwd.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/email/rest_pwd.ftl rename to src/main/resources/template/admin/email/rest_pwd.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/head.ftl b/src/main/resources/template/admin/head.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/head.ftl rename to src/main/resources/template/admin/head.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/index.ftl b/src/main/resources/template/admin/index.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/index.ftl rename to src/main/resources/template/admin/index.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/left.ftl b/src/main/resources/template/admin/left.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/left.ftl rename to src/main/resources/template/admin/left.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/log.ftl b/src/main/resources/template/admin/log.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/log.ftl rename to src/main/resources/template/admin/log.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/login_name.ftl b/src/main/resources/template/admin/login_name.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/login_name.ftl rename to src/main/resources/template/admin/login_name.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/main.ftl b/src/main/resources/template/admin/main.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/main.ftl rename to src/main/resources/template/admin/main.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/add.ftl b/src/main/resources/template/admin/project/add.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/add.ftl rename to src/main/resources/template/admin/project/add.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/add_dir.ftl b/src/main/resources/template/admin/project/add_dir.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/add_dir.ftl rename to src/main/resources/template/admin/project/add_dir.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/config.ftl b/src/main/resources/template/admin/project/config.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/config.ftl rename to src/main/resources/template/admin/project/config.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/edit.ftl b/src/main/resources/template/admin/project/edit.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/edit.ftl rename to src/main/resources/template/admin/project/edit.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/frame/left.ftl b/src/main/resources/template/admin/project/frame/left.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/frame/left.ftl rename to src/main/resources/template/admin/project/frame/left.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/frame/main.ftl b/src/main/resources/template/admin/project/frame/main.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/frame/main.ftl rename to src/main/resources/template/admin/project/frame/main.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/frame/right.ftl b/src/main/resources/template/admin/project/frame/right.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/frame/right.ftl rename to src/main/resources/template/admin/project/frame/right.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/list.ftl b/src/main/resources/template/admin/project/list.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/list.ftl rename to src/main/resources/template/admin/project/list.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/pjauth.ftl b/src/main/resources/template/admin/project/pjauth.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/pjauth.ftl rename to src/main/resources/template/admin/project/pjauth.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project/rep.ftl b/src/main/resources/template/admin/project/rep.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project/rep.ftl rename to src/main/resources/template/admin/project/rep.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project_group/add.ftl b/src/main/resources/template/admin/project_group/add.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project_group/add.ftl rename to src/main/resources/template/admin/project_group/add.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project_group/edit.ftl b/src/main/resources/template/admin/project_group/edit.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project_group/edit.ftl rename to src/main/resources/template/admin/project_group/edit.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project_group/list.ftl b/src/main/resources/template/admin/project_group/list.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project_group/list.ftl rename to src/main/resources/template/admin/project_group/list.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project_group_usr/add.ftl b/src/main/resources/template/admin/project_group_usr/add.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project_group_usr/add.ftl rename to src/main/resources/template/admin/project_group_usr/add.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project_group_usr/edit.ftl b/src/main/resources/template/admin/project_group_usr/edit.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project_group_usr/edit.ftl rename to src/main/resources/template/admin/project_group_usr/edit.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/project_group_usr/list.ftl b/src/main/resources/template/admin/project_group_usr/list.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/project_group_usr/list.ftl rename to src/main/resources/template/admin/project_group_usr/list.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/right.ftl b/src/main/resources/template/admin/right.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/right.ftl rename to src/main/resources/template/admin/right.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_user/add.ftl b/src/main/resources/template/admin/svn_user/add.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_user/add.ftl rename to src/main/resources/template/admin/svn_user/add.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_user/edit.ftl b/src/main/resources/template/admin/svn_user/edit.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_user/edit.ftl rename to src/main/resources/template/admin/svn_user/edit.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_user/frame/left.ftl b/src/main/resources/template/admin/svn_user/frame/left.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_user/frame/left.ftl rename to src/main/resources/template/admin/svn_user/frame/left.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_user/frame/main.ftl b/src/main/resources/template/admin/svn_user/frame/main.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_user/frame/main.ftl rename to src/main/resources/template/admin/svn_user/frame/main.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_user/frame/right.ftl b/src/main/resources/template/admin/svn_user/frame/right.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_user/frame/right.ftl rename to src/main/resources/template/admin/svn_user/frame/right.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/svn_user/list.ftl b/src/main/resources/template/admin/svn_user/list.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/svn_user/list.ftl rename to src/main/resources/template/admin/svn_user/list.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/top.ftl b/src/main/resources/template/admin/top.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/top.ftl rename to src/main/resources/template/admin/top.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/add.ftl b/src/main/resources/template/admin/user/add.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/add.ftl rename to src/main/resources/template/admin/user/add.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/add_user.ftl b/src/main/resources/template/admin/user/add_user.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/add_user.ftl rename to src/main/resources/template/admin/user/add_user.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/edit.ftl b/src/main/resources/template/admin/user/edit.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/edit.ftl rename to src/main/resources/template/admin/user/edit.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/edit_user_role.ftl b/src/main/resources/template/admin/user/edit_user_role.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/edit_user_role.ftl rename to src/main/resources/template/admin/user/edit_user_role.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/frame/left.ftl b/src/main/resources/template/admin/user/frame/left.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/frame/left.ftl rename to src/main/resources/template/admin/user/frame/left.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/frame/main.ftl b/src/main/resources/template/admin/user/frame/main.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/frame/main.ftl rename to src/main/resources/template/admin/user/frame/main.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/frame/right.ftl b/src/main/resources/template/admin/user/frame/right.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/frame/right.ftl rename to src/main/resources/template/admin/user/frame/right.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/list.ftl b/src/main/resources/template/admin/user/list.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/list.ftl rename to src/main/resources/template/admin/user/list.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/permission/add.ftl b/src/main/resources/template/admin/user/permission/add.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/permission/add.ftl rename to src/main/resources/template/admin/user/permission/add.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/permission/edit.ftl b/src/main/resources/template/admin/user/permission/edit.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/permission/edit.ftl rename to src/main/resources/template/admin/user/permission/edit.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/permission/list.ftl b/src/main/resources/template/admin/user/permission/list.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/permission/list.ftl rename to src/main/resources/template/admin/user/permission/list.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/permission_category/add.ftl b/src/main/resources/template/admin/user/permission_category/add.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/permission_category/add.ftl rename to src/main/resources/template/admin/user/permission_category/add.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/permission_category/edit.ftl b/src/main/resources/template/admin/user/permission_category/edit.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/permission_category/edit.ftl rename to src/main/resources/template/admin/user/permission_category/edit.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/permission_category/list.ftl b/src/main/resources/template/admin/user/permission_category/list.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/permission_category/list.ftl rename to src/main/resources/template/admin/user/permission_category/list.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/role/add.ftl b/src/main/resources/template/admin/user/role/add.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/role/add.ftl rename to src/main/resources/template/admin/user/role/add.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/role/edit.ftl b/src/main/resources/template/admin/user/role/edit.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/role/edit.ftl rename to src/main/resources/template/admin/user/role/edit.ftl diff --git a/src/main/webapp/WEB-INF/template/admin/user/role/list.ftl b/src/main/resources/template/admin/user/role/list.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/admin/user/role/list.ftl rename to src/main/resources/template/admin/user/role/list.ftl diff --git a/src/main/webapp/WEB-INF/template/front/account/create_user.ftl b/src/main/resources/template/front/account/create_user.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/front/account/create_user.ftl rename to src/main/resources/template/front/account/create_user.ftl diff --git a/src/main/webapp/WEB-INF/template/front/zone/in.ftl b/src/main/resources/template/front/zone/in.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/front/zone/in.ftl rename to src/main/resources/template/front/zone/in.ftl diff --git a/src/main/webapp/WEB-INF/template/login/login.ftl b/src/main/resources/template/login/login.ftl similarity index 100% rename from src/main/webapp/WEB-INF/template/login/login.ftl rename to src/main/resources/template/login/login.ftl diff --git a/src/main/webapp/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e..0000000 --- a/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/src/main/webapp/WEB-INF/jsp/500.jsp b/src/main/webapp/WEB-INF/jsp/500.jsp deleted file mode 100644 index cc48df0..0000000 --- a/src/main/webapp/WEB-INF/jsp/500.jsp +++ /dev/null @@ -1,59 +0,0 @@ -<%@page import="org.nutz.lang.Strings"%> -<%@page import="java.util.Enumeration"%> -<%@page import="java.io.ByteArrayOutputStream"%> -<%@page import="java.io.PrintWriter"%> -<%@page import="org.nutz.mvc.Mvcs"%> -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8" isErrorPage="true" trimDirectiveWhitespaces="true" - session="false"%> -<% response.setStatus(500); %> - - - - -出错啦 - - -
-<% - Throwable e = exception; - if (e == null) { - Object obj = request.getAttribute("obj"); - if (obj != null && obj instanceof Throwable) { - e = (Throwable)obj; - } else { - if (Mvcs.getActionContext() != null) { - e = Mvcs.getActionContext().getError(); - } - } - } -%> -

请求的路径: <%=(request.getAttribute("javax.servlet.forward.request_uri") + (request.getQueryString() == null ? "" : "?" + request.getQueryString())) %>

- <% - if (Mvcs.getActionContext() != null) { - %> -

请求的方法: <%=Mvcs.getActionContext().getMethod() %>

- <% - } - if (e != null) { - %> - -

异常堆栈如下:

- 

-		
-<%
-			ByteArrayOutputStream bao = new ByteArrayOutputStream();
-			PrintWriter pw = new PrintWriter(bao);
-			
-			e.printStackTrace(pw);
-			pw.flush();
-%>
-<%=Strings.escapeHtml(new String(bao.toByteArray())) %>
-		
-
-<% - } -%> -
- - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 55d9a3e..0000000 --- a/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - nutzbook - - org.apache.shiro.web.env.EnvironmentLoaderListener - - - ShiroFilter - org.apache.shiro.web.servlet.ShiroFilter - - - - ShiroFilter - /* - REQUEST - FORWARD - INCLUDE - ERROR - - - - DruidWebStatFilter - com.alibaba.druid.support.http.WebStatFilter - - exclusions - *.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*,/res/*,/thirdparty/*,/tinyeditor/* - - - - DruidWebStatFilter - /* - - - nutz - org.nutz.mvc.NutFilter - - modules - com.rekoe.MainModule - - - exclusions - /res/*,*.html,/static/* - - - - nutz - /* - - - DruidStatView - com.alibaba.druid.support.http.StatViewServlet - - - DruidStatView - /druid/* - - - index.html - index.htm - index.jsp - default.html - default.htm - default.jsp - - - 500 - /WEB-INF/jsp/500.jsp - - - - 946080000 - - \ No newline at end of file diff --git a/src/main/webapp/inex.html b/src/main/webapp/inex.html deleted file mode 100644 index eb14939..0000000 --- a/src/main/webapp/inex.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - ÎҵıêÌâ - - -ÍøÒ³ÄÚÈÝ - - \ No newline at end of file