diff --git a/html/1.txt b/html/1.txt
new file mode 100644
index 0000000..d800886
--- /dev/null
+++ b/html/1.txt
@@ -0,0 +1 @@
+123
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/magbox/Banner.html b/html/admin/magbox/Banner.html
similarity index 100%
rename from src/main/resources/templates/admin/magbox/Banner.html
rename to html/admin/magbox/Banner.html
diff --git a/src/main/resources/templates/admin/magbox/Countdown.html b/html/admin/magbox/Countdown.html
similarity index 100%
rename from src/main/resources/templates/admin/magbox/Countdown.html
rename to html/admin/magbox/Countdown.html
diff --git a/src/main/resources/templates/admin/magbox/magic.html b/html/admin/magbox/magic.html
similarity index 100%
rename from src/main/resources/templates/admin/magbox/magic.html
rename to html/admin/magbox/magic.html
diff --git a/src/main/resources/templates/admin/magbox/popularize.html b/html/admin/magbox/popularize.html
similarity index 100%
rename from src/main/resources/templates/admin/magbox/popularize.html
rename to html/admin/magbox/popularize.html
diff --git a/src/main/resources/templates/admin/magbox/tools.html b/html/admin/magbox/tools.html
similarity index 100%
rename from src/main/resources/templates/admin/magbox/tools.html
rename to html/admin/magbox/tools.html
diff --git a/src/main/resources/templates/admin/system/userlist.html b/html/admin/system/userlist.html
similarity index 100%
rename from src/main/resources/templates/admin/system/userlist.html
rename to html/admin/system/userlist.html
diff --git a/src/main/resources/templates/apphtml/user.html b/html/apphtml/user.html
similarity index 100%
rename from src/main/resources/templates/apphtml/user.html
rename to html/apphtml/user.html
diff --git a/src/main/resources/templates/home.html b/html/home.html
similarity index 100%
rename from src/main/resources/templates/home.html
rename to html/home.html
diff --git a/src/main/resources/templates/html/about.html b/html/html/about.html
similarity index 100%
rename from src/main/resources/templates/html/about.html
rename to html/html/about.html
diff --git a/src/main/resources/templates/html/head.html b/html/html/head.html
similarity index 100%
rename from src/main/resources/templates/html/head.html
rename to html/html/head.html
diff --git a/src/main/resources/templates/html/join.html b/html/html/join.html
similarity index 100%
rename from src/main/resources/templates/html/join.html
rename to html/html/join.html
diff --git a/src/main/resources/templates/html/main.html b/html/html/main.html
similarity index 100%
rename from src/main/resources/templates/html/main.html
rename to html/html/main.html
diff --git a/src/main/resources/templates/html/mymod.html b/html/html/mymod.html
similarity index 100%
rename from src/main/resources/templates/html/mymod.html
rename to html/html/mymod.html
diff --git a/src/main/resources/templates/html/permission.html b/html/html/permission.html
similarity index 100%
rename from src/main/resources/templates/html/permission.html
rename to html/html/permission.html
diff --git a/src/main/resources/templates/html/resetPassword.html b/html/html/resetPassword.html
similarity index 100%
rename from src/main/resources/templates/html/resetPassword.html
rename to html/html/resetPassword.html
diff --git a/src/main/resources/templates/html/test.html b/html/html/test.html
similarity index 100%
rename from src/main/resources/templates/html/test.html
rename to html/html/test.html
diff --git a/src/main/resources/templates/html/up.html b/html/html/up.html
similarity index 100%
rename from src/main/resources/templates/html/up.html
rename to html/html/up.html
diff --git a/src/main/resources/templates/html/upmod.html b/html/html/upmod.html
similarity index 100%
rename from src/main/resources/templates/html/upmod.html
rename to html/html/upmod.html
diff --git a/src/main/resources/templates/html/userData.html b/html/html/userData.html
similarity index 100%
rename from src/main/resources/templates/html/userData.html
rename to html/html/userData.html
diff --git a/src/main/resources/templates/index.html b/html/index.html
similarity index 100%
rename from src/main/resources/templates/index.html
rename to html/index.html
diff --git a/src/main/resources/static/css/ui.css b/html/static/css/ui.css
similarity index 100%
rename from src/main/resources/static/css/ui.css
rename to html/static/css/ui.css
diff --git a/src/main/resources/static/js/jquery-3.2.1.js b/html/static/js/jquery-3.2.1.js
similarity index 100%
rename from src/main/resources/static/js/jquery-3.2.1.js
rename to html/static/js/jquery-3.2.1.js
diff --git a/src/main/resources/static/js/user.js b/html/static/js/user.js
similarity index 100%
rename from src/main/resources/static/js/user.js
rename to html/static/js/user.js
diff --git a/src/main/resources/static/layui/css/layui.css b/html/static/layui/css/layui.css
similarity index 100%
rename from src/main/resources/static/layui/css/layui.css
rename to html/static/layui/css/layui.css
diff --git a/src/main/resources/static/layui/css/layui.mobile.css b/html/static/layui/css/layui.mobile.css
similarity index 100%
rename from src/main/resources/static/layui/css/layui.mobile.css
rename to html/static/layui/css/layui.mobile.css
diff --git a/src/main/resources/static/layui/css/modules/code.css b/html/static/layui/css/modules/code.css
similarity index 100%
rename from src/main/resources/static/layui/css/modules/code.css
rename to html/static/layui/css/modules/code.css
diff --git a/src/main/resources/static/layui/css/modules/laydate/default/laydate.css b/html/static/layui/css/modules/laydate/default/laydate.css
similarity index 100%
rename from src/main/resources/static/layui/css/modules/laydate/default/laydate.css
rename to html/static/layui/css/modules/laydate/default/laydate.css
diff --git a/src/main/resources/static/layui/css/modules/layer/default/icon-ext.png b/html/static/layui/css/modules/layer/default/icon-ext.png
similarity index 100%
rename from src/main/resources/static/layui/css/modules/layer/default/icon-ext.png
rename to html/static/layui/css/modules/layer/default/icon-ext.png
diff --git a/src/main/resources/static/layui/css/modules/layer/default/icon.png b/html/static/layui/css/modules/layer/default/icon.png
similarity index 100%
rename from src/main/resources/static/layui/css/modules/layer/default/icon.png
rename to html/static/layui/css/modules/layer/default/icon.png
diff --git a/src/main/resources/static/layui/css/modules/layer/default/layer.css b/html/static/layui/css/modules/layer/default/layer.css
similarity index 100%
rename from src/main/resources/static/layui/css/modules/layer/default/layer.css
rename to html/static/layui/css/modules/layer/default/layer.css
diff --git a/src/main/resources/static/layui/css/modules/layer/default/loading-0.gif b/html/static/layui/css/modules/layer/default/loading-0.gif
similarity index 100%
rename from src/main/resources/static/layui/css/modules/layer/default/loading-0.gif
rename to html/static/layui/css/modules/layer/default/loading-0.gif
diff --git a/src/main/resources/static/layui/css/modules/layer/default/loading-1.gif b/html/static/layui/css/modules/layer/default/loading-1.gif
similarity index 100%
rename from src/main/resources/static/layui/css/modules/layer/default/loading-1.gif
rename to html/static/layui/css/modules/layer/default/loading-1.gif
diff --git a/src/main/resources/static/layui/css/modules/layer/default/loading-2.gif b/html/static/layui/css/modules/layer/default/loading-2.gif
similarity index 100%
rename from src/main/resources/static/layui/css/modules/layer/default/loading-2.gif
rename to html/static/layui/css/modules/layer/default/loading-2.gif
diff --git a/src/main/resources/static/layui/font/iconfont.eot b/html/static/layui/font/iconfont.eot
similarity index 100%
rename from src/main/resources/static/layui/font/iconfont.eot
rename to html/static/layui/font/iconfont.eot
diff --git a/src/main/resources/static/layui/font/iconfont.svg b/html/static/layui/font/iconfont.svg
similarity index 100%
rename from src/main/resources/static/layui/font/iconfont.svg
rename to html/static/layui/font/iconfont.svg
diff --git a/src/main/resources/static/layui/font/iconfont.ttf b/html/static/layui/font/iconfont.ttf
similarity index 100%
rename from src/main/resources/static/layui/font/iconfont.ttf
rename to html/static/layui/font/iconfont.ttf
diff --git a/src/main/resources/static/layui/font/iconfont.woff b/html/static/layui/font/iconfont.woff
similarity index 100%
rename from src/main/resources/static/layui/font/iconfont.woff
rename to html/static/layui/font/iconfont.woff
diff --git a/src/main/resources/static/layui/images/face/0.gif b/html/static/layui/images/face/0.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/0.gif
rename to html/static/layui/images/face/0.gif
diff --git a/src/main/resources/static/layui/images/face/1.gif b/html/static/layui/images/face/1.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/1.gif
rename to html/static/layui/images/face/1.gif
diff --git a/src/main/resources/static/layui/images/face/10.gif b/html/static/layui/images/face/10.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/10.gif
rename to html/static/layui/images/face/10.gif
diff --git a/src/main/resources/static/layui/images/face/11.gif b/html/static/layui/images/face/11.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/11.gif
rename to html/static/layui/images/face/11.gif
diff --git a/src/main/resources/static/layui/images/face/12.gif b/html/static/layui/images/face/12.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/12.gif
rename to html/static/layui/images/face/12.gif
diff --git a/src/main/resources/static/layui/images/face/13.gif b/html/static/layui/images/face/13.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/13.gif
rename to html/static/layui/images/face/13.gif
diff --git a/src/main/resources/static/layui/images/face/14.gif b/html/static/layui/images/face/14.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/14.gif
rename to html/static/layui/images/face/14.gif
diff --git a/src/main/resources/static/layui/images/face/15.gif b/html/static/layui/images/face/15.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/15.gif
rename to html/static/layui/images/face/15.gif
diff --git a/src/main/resources/static/layui/images/face/16.gif b/html/static/layui/images/face/16.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/16.gif
rename to html/static/layui/images/face/16.gif
diff --git a/src/main/resources/static/layui/images/face/17.gif b/html/static/layui/images/face/17.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/17.gif
rename to html/static/layui/images/face/17.gif
diff --git a/src/main/resources/static/layui/images/face/18.gif b/html/static/layui/images/face/18.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/18.gif
rename to html/static/layui/images/face/18.gif
diff --git a/src/main/resources/static/layui/images/face/19.gif b/html/static/layui/images/face/19.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/19.gif
rename to html/static/layui/images/face/19.gif
diff --git a/src/main/resources/static/layui/images/face/2.gif b/html/static/layui/images/face/2.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/2.gif
rename to html/static/layui/images/face/2.gif
diff --git a/src/main/resources/static/layui/images/face/20.gif b/html/static/layui/images/face/20.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/20.gif
rename to html/static/layui/images/face/20.gif
diff --git a/src/main/resources/static/layui/images/face/21.gif b/html/static/layui/images/face/21.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/21.gif
rename to html/static/layui/images/face/21.gif
diff --git a/src/main/resources/static/layui/images/face/22.gif b/html/static/layui/images/face/22.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/22.gif
rename to html/static/layui/images/face/22.gif
diff --git a/src/main/resources/static/layui/images/face/23.gif b/html/static/layui/images/face/23.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/23.gif
rename to html/static/layui/images/face/23.gif
diff --git a/src/main/resources/static/layui/images/face/24.gif b/html/static/layui/images/face/24.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/24.gif
rename to html/static/layui/images/face/24.gif
diff --git a/src/main/resources/static/layui/images/face/25.gif b/html/static/layui/images/face/25.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/25.gif
rename to html/static/layui/images/face/25.gif
diff --git a/src/main/resources/static/layui/images/face/26.gif b/html/static/layui/images/face/26.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/26.gif
rename to html/static/layui/images/face/26.gif
diff --git a/src/main/resources/static/layui/images/face/27.gif b/html/static/layui/images/face/27.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/27.gif
rename to html/static/layui/images/face/27.gif
diff --git a/src/main/resources/static/layui/images/face/28.gif b/html/static/layui/images/face/28.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/28.gif
rename to html/static/layui/images/face/28.gif
diff --git a/src/main/resources/static/layui/images/face/29.gif b/html/static/layui/images/face/29.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/29.gif
rename to html/static/layui/images/face/29.gif
diff --git a/src/main/resources/static/layui/images/face/3.gif b/html/static/layui/images/face/3.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/3.gif
rename to html/static/layui/images/face/3.gif
diff --git a/src/main/resources/static/layui/images/face/30.gif b/html/static/layui/images/face/30.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/30.gif
rename to html/static/layui/images/face/30.gif
diff --git a/src/main/resources/static/layui/images/face/31.gif b/html/static/layui/images/face/31.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/31.gif
rename to html/static/layui/images/face/31.gif
diff --git a/src/main/resources/static/layui/images/face/32.gif b/html/static/layui/images/face/32.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/32.gif
rename to html/static/layui/images/face/32.gif
diff --git a/src/main/resources/static/layui/images/face/33.gif b/html/static/layui/images/face/33.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/33.gif
rename to html/static/layui/images/face/33.gif
diff --git a/src/main/resources/static/layui/images/face/34.gif b/html/static/layui/images/face/34.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/34.gif
rename to html/static/layui/images/face/34.gif
diff --git a/src/main/resources/static/layui/images/face/35.gif b/html/static/layui/images/face/35.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/35.gif
rename to html/static/layui/images/face/35.gif
diff --git a/src/main/resources/static/layui/images/face/36.gif b/html/static/layui/images/face/36.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/36.gif
rename to html/static/layui/images/face/36.gif
diff --git a/src/main/resources/static/layui/images/face/37.gif b/html/static/layui/images/face/37.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/37.gif
rename to html/static/layui/images/face/37.gif
diff --git a/src/main/resources/static/layui/images/face/38.gif b/html/static/layui/images/face/38.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/38.gif
rename to html/static/layui/images/face/38.gif
diff --git a/src/main/resources/static/layui/images/face/39.gif b/html/static/layui/images/face/39.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/39.gif
rename to html/static/layui/images/face/39.gif
diff --git a/src/main/resources/static/layui/images/face/4.gif b/html/static/layui/images/face/4.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/4.gif
rename to html/static/layui/images/face/4.gif
diff --git a/src/main/resources/static/layui/images/face/40.gif b/html/static/layui/images/face/40.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/40.gif
rename to html/static/layui/images/face/40.gif
diff --git a/src/main/resources/static/layui/images/face/41.gif b/html/static/layui/images/face/41.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/41.gif
rename to html/static/layui/images/face/41.gif
diff --git a/src/main/resources/static/layui/images/face/42.gif b/html/static/layui/images/face/42.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/42.gif
rename to html/static/layui/images/face/42.gif
diff --git a/src/main/resources/static/layui/images/face/43.gif b/html/static/layui/images/face/43.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/43.gif
rename to html/static/layui/images/face/43.gif
diff --git a/src/main/resources/static/layui/images/face/44.gif b/html/static/layui/images/face/44.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/44.gif
rename to html/static/layui/images/face/44.gif
diff --git a/src/main/resources/static/layui/images/face/45.gif b/html/static/layui/images/face/45.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/45.gif
rename to html/static/layui/images/face/45.gif
diff --git a/src/main/resources/static/layui/images/face/46.gif b/html/static/layui/images/face/46.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/46.gif
rename to html/static/layui/images/face/46.gif
diff --git a/src/main/resources/static/layui/images/face/47.gif b/html/static/layui/images/face/47.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/47.gif
rename to html/static/layui/images/face/47.gif
diff --git a/src/main/resources/static/layui/images/face/48.gif b/html/static/layui/images/face/48.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/48.gif
rename to html/static/layui/images/face/48.gif
diff --git a/src/main/resources/static/layui/images/face/49.gif b/html/static/layui/images/face/49.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/49.gif
rename to html/static/layui/images/face/49.gif
diff --git a/src/main/resources/static/layui/images/face/5.gif b/html/static/layui/images/face/5.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/5.gif
rename to html/static/layui/images/face/5.gif
diff --git a/src/main/resources/static/layui/images/face/50.gif b/html/static/layui/images/face/50.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/50.gif
rename to html/static/layui/images/face/50.gif
diff --git a/src/main/resources/static/layui/images/face/51.gif b/html/static/layui/images/face/51.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/51.gif
rename to html/static/layui/images/face/51.gif
diff --git a/src/main/resources/static/layui/images/face/52.gif b/html/static/layui/images/face/52.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/52.gif
rename to html/static/layui/images/face/52.gif
diff --git a/src/main/resources/static/layui/images/face/53.gif b/html/static/layui/images/face/53.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/53.gif
rename to html/static/layui/images/face/53.gif
diff --git a/src/main/resources/static/layui/images/face/54.gif b/html/static/layui/images/face/54.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/54.gif
rename to html/static/layui/images/face/54.gif
diff --git a/src/main/resources/static/layui/images/face/55.gif b/html/static/layui/images/face/55.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/55.gif
rename to html/static/layui/images/face/55.gif
diff --git a/src/main/resources/static/layui/images/face/56.gif b/html/static/layui/images/face/56.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/56.gif
rename to html/static/layui/images/face/56.gif
diff --git a/src/main/resources/static/layui/images/face/57.gif b/html/static/layui/images/face/57.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/57.gif
rename to html/static/layui/images/face/57.gif
diff --git a/src/main/resources/static/layui/images/face/58.gif b/html/static/layui/images/face/58.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/58.gif
rename to html/static/layui/images/face/58.gif
diff --git a/src/main/resources/static/layui/images/face/59.gif b/html/static/layui/images/face/59.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/59.gif
rename to html/static/layui/images/face/59.gif
diff --git a/src/main/resources/static/layui/images/face/6.gif b/html/static/layui/images/face/6.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/6.gif
rename to html/static/layui/images/face/6.gif
diff --git a/src/main/resources/static/layui/images/face/60.gif b/html/static/layui/images/face/60.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/60.gif
rename to html/static/layui/images/face/60.gif
diff --git a/src/main/resources/static/layui/images/face/61.gif b/html/static/layui/images/face/61.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/61.gif
rename to html/static/layui/images/face/61.gif
diff --git a/src/main/resources/static/layui/images/face/62.gif b/html/static/layui/images/face/62.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/62.gif
rename to html/static/layui/images/face/62.gif
diff --git a/src/main/resources/static/layui/images/face/63.gif b/html/static/layui/images/face/63.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/63.gif
rename to html/static/layui/images/face/63.gif
diff --git a/src/main/resources/static/layui/images/face/64.gif b/html/static/layui/images/face/64.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/64.gif
rename to html/static/layui/images/face/64.gif
diff --git a/src/main/resources/static/layui/images/face/65.gif b/html/static/layui/images/face/65.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/65.gif
rename to html/static/layui/images/face/65.gif
diff --git a/src/main/resources/static/layui/images/face/66.gif b/html/static/layui/images/face/66.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/66.gif
rename to html/static/layui/images/face/66.gif
diff --git a/src/main/resources/static/layui/images/face/67.gif b/html/static/layui/images/face/67.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/67.gif
rename to html/static/layui/images/face/67.gif
diff --git a/src/main/resources/static/layui/images/face/68.gif b/html/static/layui/images/face/68.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/68.gif
rename to html/static/layui/images/face/68.gif
diff --git a/src/main/resources/static/layui/images/face/69.gif b/html/static/layui/images/face/69.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/69.gif
rename to html/static/layui/images/face/69.gif
diff --git a/src/main/resources/static/layui/images/face/7.gif b/html/static/layui/images/face/7.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/7.gif
rename to html/static/layui/images/face/7.gif
diff --git a/src/main/resources/static/layui/images/face/70.gif b/html/static/layui/images/face/70.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/70.gif
rename to html/static/layui/images/face/70.gif
diff --git a/src/main/resources/static/layui/images/face/71.gif b/html/static/layui/images/face/71.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/71.gif
rename to html/static/layui/images/face/71.gif
diff --git a/src/main/resources/static/layui/images/face/8.gif b/html/static/layui/images/face/8.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/8.gif
rename to html/static/layui/images/face/8.gif
diff --git a/src/main/resources/static/layui/images/face/9.gif b/html/static/layui/images/face/9.gif
similarity index 100%
rename from src/main/resources/static/layui/images/face/9.gif
rename to html/static/layui/images/face/9.gif
diff --git a/src/main/resources/static/layui/lay/modules/carousel.js b/html/static/layui/lay/modules/carousel.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/carousel.js
rename to html/static/layui/lay/modules/carousel.js
diff --git a/src/main/resources/static/layui/lay/modules/code.js b/html/static/layui/lay/modules/code.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/code.js
rename to html/static/layui/lay/modules/code.js
diff --git a/src/main/resources/static/layui/lay/modules/colorpicker.js b/html/static/layui/lay/modules/colorpicker.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/colorpicker.js
rename to html/static/layui/lay/modules/colorpicker.js
diff --git a/src/main/resources/static/layui/lay/modules/element.js b/html/static/layui/lay/modules/element.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/element.js
rename to html/static/layui/lay/modules/element.js
diff --git a/src/main/resources/static/layui/lay/modules/flow.js b/html/static/layui/lay/modules/flow.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/flow.js
rename to html/static/layui/lay/modules/flow.js
diff --git a/src/main/resources/static/layui/lay/modules/form.js b/html/static/layui/lay/modules/form.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/form.js
rename to html/static/layui/lay/modules/form.js
diff --git a/src/main/resources/static/layui/lay/modules/jquery.js b/html/static/layui/lay/modules/jquery.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/jquery.js
rename to html/static/layui/lay/modules/jquery.js
diff --git a/src/main/resources/static/layui/lay/modules/laydate.js b/html/static/layui/lay/modules/laydate.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/laydate.js
rename to html/static/layui/lay/modules/laydate.js
diff --git a/src/main/resources/static/layui/lay/modules/layedit.js b/html/static/layui/lay/modules/layedit.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/layedit.js
rename to html/static/layui/lay/modules/layedit.js
diff --git a/src/main/resources/static/layui/lay/modules/layer.js b/html/static/layui/lay/modules/layer.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/layer.js
rename to html/static/layui/lay/modules/layer.js
diff --git a/src/main/resources/static/layui/lay/modules/laypage.js b/html/static/layui/lay/modules/laypage.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/laypage.js
rename to html/static/layui/lay/modules/laypage.js
diff --git a/src/main/resources/static/layui/lay/modules/laytpl.js b/html/static/layui/lay/modules/laytpl.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/laytpl.js
rename to html/static/layui/lay/modules/laytpl.js
diff --git a/src/main/resources/static/layui/lay/modules/mobile.js b/html/static/layui/lay/modules/mobile.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/mobile.js
rename to html/static/layui/lay/modules/mobile.js
diff --git a/src/main/resources/static/layui/lay/modules/rate.js b/html/static/layui/lay/modules/rate.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/rate.js
rename to html/static/layui/lay/modules/rate.js
diff --git a/src/main/resources/static/layui/lay/modules/slider.js b/html/static/layui/lay/modules/slider.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/slider.js
rename to html/static/layui/lay/modules/slider.js
diff --git a/src/main/resources/static/layui/lay/modules/table.js b/html/static/layui/lay/modules/table.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/table.js
rename to html/static/layui/lay/modules/table.js
diff --git a/src/main/resources/static/layui/lay/modules/tree.js b/html/static/layui/lay/modules/tree.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/tree.js
rename to html/static/layui/lay/modules/tree.js
diff --git a/src/main/resources/static/layui/lay/modules/upload.js b/html/static/layui/lay/modules/upload.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/upload.js
rename to html/static/layui/lay/modules/upload.js
diff --git a/src/main/resources/static/layui/lay/modules/util.js b/html/static/layui/lay/modules/util.js
similarity index 100%
rename from src/main/resources/static/layui/lay/modules/util.js
rename to html/static/layui/lay/modules/util.js
diff --git a/src/main/resources/static/layui/layui.all.js b/html/static/layui/layui.all.js
similarity index 100%
rename from src/main/resources/static/layui/layui.all.js
rename to html/static/layui/layui.all.js
diff --git a/src/main/resources/static/layui/layui.js b/html/static/layui/layui.js
similarity index 100%
rename from src/main/resources/static/layui/layui.js
rename to html/static/layui/layui.js
diff --git a/src/main/resources/templates/user/icon/1/image.png b/html/user/icon/1/image.png
similarity index 100%
rename from src/main/resources/templates/user/icon/1/image.png
rename to html/user/icon/1/image.png
diff --git a/src/main/java/com/yutou/controller/android/AppController.java b/src/main/java/com/yutou/controller/android/AppController.java
index 05d165f..73ea512 100644
--- a/src/main/java/com/yutou/controller/android/AppController.java
+++ b/src/main/java/com/yutou/controller/android/AppController.java
@@ -63,7 +63,8 @@ public class AppController {
@ResponseBody
public String getUtils(HttpServletRequest request,int min,int max) {
String uid=Tools.getUidOfToken(request)+"";
- List list=appConfig.getTools(uid);
+ String version=request.getParameter("clientVersion");
+ List list=appConfig.getTools(uid,version);
JSONObject json=new JSONObject();
json.put("code", ModEnum.SUCCESS.code);
json.put("msg", ModEnum.SUCCESS.msg);
diff --git a/src/main/java/com/yutou/mybatis/MAppTools.java b/src/main/java/com/yutou/mybatis/MAppTools.java
index 32d75b1..d790e92 100644
--- a/src/main/java/com/yutou/mybatis/MAppTools.java
+++ b/src/main/java/com/yutou/mybatis/MAppTools.java
@@ -43,6 +43,16 @@ public class MAppTools {
*/
private String parameter;
+ private String version;
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
/**
* This method was generated by MyBatis Generator. This method returns the value of the database column m_app_tools.id
* @return the value of m_app_tools.id
diff --git a/src/main/java/com/yutou/mybatis/MAppToolsExample.java b/src/main/java/com/yutou/mybatis/MAppToolsExample.java
index 66b8667..f85a20a 100644
--- a/src/main/java/com/yutou/mybatis/MAppToolsExample.java
+++ b/src/main/java/com/yutou/mybatis/MAppToolsExample.java
@@ -691,6 +691,10 @@ public class MAppToolsExample {
addCriterion("parameter not between", value1, value2, "parameter");
return (Criteria) this;
}
+ public Criteria andVersionLessThanOrEqualTo(String value){
+ addCriterion("version <= ", value, "version");
+ return (Criteria) this;
+ }
}
/**
diff --git a/src/main/java/com/yutou/services/AppConfig.java b/src/main/java/com/yutou/services/AppConfig.java
index dd6e964..54c5a63 100644
--- a/src/main/java/com/yutou/services/AppConfig.java
+++ b/src/main/java/com/yutou/services/AppConfig.java
@@ -15,7 +15,7 @@ public interface AppConfig {
List getAppHomeConfig();
List getHomeList(boolean all);
List getMgList(boolean all);
- List getTools(String uid);
+ List getTools(String uid,String version);
int setHome(MAppHome appHome);
int addHome(MAppHome appHome);
int setMgList(MAppMg appMg);
diff --git a/src/main/java/com/yutou/services/impl/AppConfigServiceImpi.java b/src/main/java/com/yutou/services/impl/AppConfigServiceImpi.java
index b77a036..8c4b41b 100644
--- a/src/main/java/com/yutou/services/impl/AppConfigServiceImpi.java
+++ b/src/main/java/com/yutou/services/impl/AppConfigServiceImpi.java
@@ -128,7 +128,7 @@ public class AppConfigServiceImpi implements AppConfig {
}
@Override
- public List getTools(String uid) {
+ public List getTools(String uid,String version) {
// TODO Auto-generated method stub
User user=userMapper.selectByPrimaryKey(Integer.valueOf(uid));
int power=0;
@@ -136,7 +136,7 @@ public class AppConfigServiceImpi implements AppConfig {
power=user.getPower();
}
MAppToolsExample example=new MAppToolsExample();
- example.createCriteria().andIsshowEqualTo(1).andPermissionLessThan(power);
+ example.createCriteria().andIsshowEqualTo(1).andPermissionLessThan(power).andVersionLessThanOrEqualTo(version);
return toolsMapper.selectByExample(example);
}
diff --git a/src/main/resources/mybatis/mapping/MAppToolsMapper.xml b/src/main/resources/mybatis/mapping/MAppToolsMapper.xml
index 346cf6b..66ce009 100644
--- a/src/main/resources/mybatis/mapping/MAppToolsMapper.xml
+++ b/src/main/resources/mybatis/mapping/MAppToolsMapper.xml
@@ -15,6 +15,7 @@
+