From 82278f1967beb26a1938f93cf7d9c0c916a9dd39 Mon Sep 17 00:00:00 2001 From: Yutousama <583819556@qq.com> Date: Fri, 10 Jan 2020 17:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E6=A4=8D=E4=B8=BASpringBoot=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .classpath | 32 -- .gitignore | 35 +- .project | 38 --- .tern-project | 24 -- README.md | 10 - pom.xml | 318 ++++++++---------- .../java/com/yutou/ServicerApplication.java | 13 + .../com/yutou/controller/Web/MainView.java | 116 +++++++ .../controller/Web/WebModController.java | 3 +- .../controller/Web/WebTestController.java | 4 - .../controller/Web/WebUserController.java | 4 +- src/main/java/com/yutou/enums/UserPower.java | 2 +- .../yutou/mybatis/dao/MAdConfigMapper.java | 4 +- .../com/yutou/mybatis/dao/MAdLogMapper.java | 4 +- .../mybatis/dao/MAppHomeConfigMapper.java | 6 +- .../com/yutou/mybatis/dao/MAppHomeMapper.java | 4 +- .../yutou/mybatis/dao/MAppLicenseMapper.java | 4 +- .../com/yutou/mybatis/dao/MAppMgMapper.java | 4 +- .../yutou/mybatis/dao/MAppPlugsMapper.java | 4 +- .../yutou/mybatis/dao/MAppToolsMapper.java | 4 +- .../com/yutou/mybatis/dao/MBannerMapper.java | 4 +- .../mybatis/dao/MGamePacknameMapper.java | 4 +- .../com/yutou/mybatis/dao/SConfigMapper.java | 4 +- .../yutou/mybatis/dao/TFeedbackMapper.java | 4 +- .../yutou/mybatis/dao/TGameVersionMapper.java | 4 +- .../com/yutou/mybatis/dao/TLinesMapper.java | 4 +- .../com/yutou/mybatis/dao/TModMapper.java | 4 +- .../yutou/mybatis/dao/TModcommentMapper.java | 4 +- .../yutou/mybatis/dao/TModdownloadMapper.java | 4 +- .../com/yutou/mybatis/dao/TModfileMapper.java | 4 +- .../yutou/mybatis/dao/TModfilePathMapper.java | 4 +- .../yutou/mybatis/dao/TModpowerMapper.java | 4 +- .../yutou/mybatis/dao/TModratingMapper.java | 4 +- .../com/yutou/mybatis/dao/TModtagMapper.java | 4 +- .../com/yutou/mybatis/dao/TModtypeMapper.java | 4 +- .../com/yutou/mybatis/dao/UDevUserMapper.java | 4 +- .../com/yutou/mybatis/dao/UGroupMapper.java | 4 +- .../mybatis/dao/UUserGameDataMapper.java | 4 +- .../mybatis/dao/UUsercollectionMapper.java | 6 +- .../yutou/mybatis/dao/UUserdataMapper.java | 4 +- .../com/yutou/mybatis/dao/UUserkeyMapper.java | 4 +- .../mybatis/dao/UUsermodscoreMapper.java | 4 +- .../com/yutou/mybatis/dao/UserMapper.java | 3 + .../yutou/mybatis/dao/ZsShipTypeMapper.java | 4 +- .../java/com/yutou/services/AdService.java | 2 +- .../com/yutou/services/MBannerService.java | 2 +- .../java/com/yutou/services/ModService.java | 18 +- .../com/yutou/services/PermissionService.java | 6 +- .../java/com/yutou/services/PlugsService.java | 4 +- .../com/yutou/services/SystemService.java | 2 +- .../java/com/yutou/services/UserService.java | 14 +- src/main/java/com/yutou/utlis/RedisUtlis.java | 8 +- src/main/resources/generatorConfig.xml | 118 ------- src/main/resources/jdbc.properties | 9 - src/main/resources/jedis.properties | 9 - src/main/resources/log4j.properties | 36 -- src/main/resources/logs.txt | 4 - .../{ => mybatis}/mapping/MAdConfigMapper.xml | 0 .../{ => mybatis}/mapping/MAdLogMapper.xml | 0 .../mapping/MAppHomeConfigMapper.xml | 0 .../{ => mybatis}/mapping/MAppHomeMapper.xml | 0 .../mapping/MAppLicenseMapper.xml | 0 .../{ => mybatis}/mapping/MAppMgMapper.xml | 0 .../{ => mybatis}/mapping/MAppPlugsMapper.xml | 0 .../{ => mybatis}/mapping/MAppToolsMapper.xml | 0 .../{ => mybatis}/mapping/MBannerMapper.xml | 0 .../mapping/MGamePacknameMapper.xml | 0 .../{ => mybatis}/mapping/SConfigMapper.xml | 0 .../{ => mybatis}/mapping/TFeedbackMapper.xml | 0 .../mapping/TGameVersionMapper.xml | 0 .../{ => mybatis}/mapping/TLinesMapper.xml | 0 .../{ => mybatis}/mapping/TModMapper.xml | 0 .../mapping/TModcommentMapper.xml | 0 .../mapping/TModdownloadMapper.xml | 0 .../{ => mybatis}/mapping/TModfileMapper.xml | 0 .../mapping/TModfilePathMapper.xml | 0 .../{ => mybatis}/mapping/TModpowerMapper.xml | 0 .../mapping/TModratingMapper.xml | 0 .../{ => mybatis}/mapping/TModtagMapper.xml | 0 .../{ => mybatis}/mapping/TModtypeMapper.xml | 0 .../{ => mybatis}/mapping/UDevUserMapper.xml | 0 .../{ => mybatis}/mapping/UGroupMapper.xml | 0 .../mapping/UUserGameDataMapper.xml | 0 .../mapping/UUsercollectionMapper.xml | 0 .../{ => mybatis}/mapping/UUserdataMapper.xml | 0 .../{ => mybatis}/mapping/UUserkeyMapper.xml | 0 .../mapping/UUsermodscoreMapper.xml | 0 .../{ => mybatis}/mapping/UserMapper.xml | 0 .../mapping/ZsShipTypeMapper.xml | 0 src/main/resources/mybatis/mybatis-config.xml | 10 + src/main/resources/spring-mvc.xml | 52 --- src/main/resources/spring-mybatis.xml | 56 --- .../{webapp => resources/static}/css/ui.css | 0 .../static}/js/jquery-3.2.1.js | 0 .../{webapp => resources/static}/js/user.js | 8 +- .../static}/layui/css/layui.css | 0 .../static}/layui/css/layui.mobile.css | 0 .../static}/layui/css/modules/code.css | 0 .../css/modules/laydate/default/laydate.css | 0 .../css/modules/layer/default/icon-ext.png | Bin .../layui/css/modules/layer/default/icon.png | Bin .../layui/css/modules/layer/default/layer.css | 0 .../css/modules/layer/default/loading-0.gif | Bin .../css/modules/layer/default/loading-1.gif | Bin .../css/modules/layer/default/loading-2.gif | Bin .../static}/layui/font/iconfont.eot | Bin .../static}/layui/font/iconfont.svg | 0 .../static}/layui/font/iconfont.ttf | Bin .../static}/layui/font/iconfont.woff | Bin .../static}/layui/images/face/0.gif | Bin .../static}/layui/images/face/1.gif | Bin .../static}/layui/images/face/10.gif | Bin .../static}/layui/images/face/11.gif | Bin .../static}/layui/images/face/12.gif | Bin .../static}/layui/images/face/13.gif | Bin .../static}/layui/images/face/14.gif | Bin .../static}/layui/images/face/15.gif | Bin .../static}/layui/images/face/16.gif | Bin .../static}/layui/images/face/17.gif | Bin .../static}/layui/images/face/18.gif | Bin .../static}/layui/images/face/19.gif | Bin .../static}/layui/images/face/2.gif | Bin .../static}/layui/images/face/20.gif | Bin .../static}/layui/images/face/21.gif | Bin .../static}/layui/images/face/22.gif | Bin .../static}/layui/images/face/23.gif | Bin .../static}/layui/images/face/24.gif | Bin .../static}/layui/images/face/25.gif | Bin .../static}/layui/images/face/26.gif | Bin .../static}/layui/images/face/27.gif | Bin .../static}/layui/images/face/28.gif | Bin .../static}/layui/images/face/29.gif | Bin .../static}/layui/images/face/3.gif | Bin .../static}/layui/images/face/30.gif | Bin .../static}/layui/images/face/31.gif | Bin .../static}/layui/images/face/32.gif | Bin .../static}/layui/images/face/33.gif | Bin .../static}/layui/images/face/34.gif | Bin .../static}/layui/images/face/35.gif | Bin .../static}/layui/images/face/36.gif | Bin .../static}/layui/images/face/37.gif | Bin .../static}/layui/images/face/38.gif | Bin .../static}/layui/images/face/39.gif | Bin .../static}/layui/images/face/4.gif | Bin .../static}/layui/images/face/40.gif | Bin .../static}/layui/images/face/41.gif | Bin .../static}/layui/images/face/42.gif | Bin .../static}/layui/images/face/43.gif | Bin .../static}/layui/images/face/44.gif | Bin .../static}/layui/images/face/45.gif | Bin .../static}/layui/images/face/46.gif | Bin .../static}/layui/images/face/47.gif | Bin .../static}/layui/images/face/48.gif | Bin .../static}/layui/images/face/49.gif | Bin .../static}/layui/images/face/5.gif | Bin .../static}/layui/images/face/50.gif | Bin .../static}/layui/images/face/51.gif | Bin .../static}/layui/images/face/52.gif | Bin .../static}/layui/images/face/53.gif | Bin .../static}/layui/images/face/54.gif | Bin .../static}/layui/images/face/55.gif | Bin .../static}/layui/images/face/56.gif | Bin .../static}/layui/images/face/57.gif | Bin .../static}/layui/images/face/58.gif | Bin .../static}/layui/images/face/59.gif | Bin .../static}/layui/images/face/6.gif | Bin .../static}/layui/images/face/60.gif | Bin .../static}/layui/images/face/61.gif | Bin .../static}/layui/images/face/62.gif | Bin .../static}/layui/images/face/63.gif | Bin .../static}/layui/images/face/64.gif | Bin .../static}/layui/images/face/65.gif | Bin .../static}/layui/images/face/66.gif | Bin .../static}/layui/images/face/67.gif | Bin .../static}/layui/images/face/68.gif | Bin .../static}/layui/images/face/69.gif | Bin .../static}/layui/images/face/7.gif | Bin .../static}/layui/images/face/70.gif | Bin .../static}/layui/images/face/71.gif | Bin .../static}/layui/images/face/8.gif | Bin .../static}/layui/images/face/9.gif | Bin .../static}/layui/lay/modules/carousel.js | 0 .../static}/layui/lay/modules/code.js | 0 .../static}/layui/lay/modules/colorpicker.js | 0 .../static}/layui/lay/modules/element.js | 0 .../static}/layui/lay/modules/flow.js | 0 .../static}/layui/lay/modules/form.js | 0 .../static}/layui/lay/modules/jquery.js | 0 .../static}/layui/lay/modules/laydate.js | 0 .../static}/layui/lay/modules/layedit.js | 0 .../static}/layui/lay/modules/layer.js | 0 .../static}/layui/lay/modules/laypage.js | 0 .../static}/layui/lay/modules/laytpl.js | 0 .../static}/layui/lay/modules/mobile.js | 0 .../static}/layui/lay/modules/rate.js | 0 .../static}/layui/lay/modules/slider.js | 0 .../static}/layui/lay/modules/table.js | 0 .../static}/layui/lay/modules/tree.js | 0 .../static}/layui/lay/modules/upload.js | 0 .../static}/layui/lay/modules/util.js | 0 .../static}/layui/layui.all.js | 0 .../static}/layui/layui.js | 0 .../templates/admin/magbox/Banner.html} | 15 +- .../templates/admin/magbox/Countdown.html} | 15 +- .../templates/admin/magbox/magic.html} | 15 +- .../templates/admin/magbox/popularize.html} | 15 +- .../templates/admin/magbox/tools.html} | 15 +- .../templates/admin/system/userlist.html} | 15 +- .../resources/templates/apphtml/user.html | 19 ++ .../templates/home.html} | 47 ++- src/main/resources/templates/html/about.html | 16 + .../templates/html/head.html} | 17 +- .../templates/html/join.html} | 11 +- .../templates/html/main.html} | 9 +- .../templates/html/mymod.html} | 19 +- .../templates/html/permission.html} | 15 +- .../templates/html/resetPassword.html} | 15 +- src/main/resources/templates/html/test.html | 22 ++ .../templates/html/up.html} | 15 +- .../templates/html/upmod.html} | 15 +- .../templates/html/userData.html} | 13 +- .../templates/index.html} | 13 +- .../templates}/user/icon/1/image.png | Bin src/main/webapp/WEB-INF/web.xml | 60 ---- src/main/webapp/apphtml/user.jsp | 20 -- src/main/webapp/cnm/data/jianrData.xlsx | Bin 4396019 -> 0 bytes src/main/webapp/cnm/data/jianrZbData.xlsx | Bin 120664 -> 0 bytes src/main/webapp/html/about.jsp | 17 - src/main/webapp/html/test.jsp | 23 -- src/main/webapp/tmp/QQ截图20190210002941.png | Bin 1260489 -> 0 bytes src/main/webapp/tmp/md5.jar | Bin 2036801 -> 0 bytes src/main/webapp/undefinedcss/modules/code.css | 2 - .../modules/laydate/default/laydate.css | 2 - .../modules/layer/default/icon-ext.png | Bin 5911 -> 0 bytes .../modules/layer/default/icon.png | Bin 11493 -> 0 bytes .../modules/layer/default/layer.css | 2 - .../modules/layer/default/loading-0.gif | Bin 5793 -> 0 bytes .../modules/layer/default/loading-1.gif | Bin 701 -> 0 bytes .../modules/layer/default/loading-2.gif | Bin 1787 -> 0 bytes 239 files changed, 640 insertions(+), 910 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .tern-project delete mode 100644 README.md create mode 100644 src/main/java/com/yutou/ServicerApplication.java create mode 100644 src/main/java/com/yutou/controller/Web/MainView.java delete mode 100644 src/main/resources/generatorConfig.xml delete mode 100644 src/main/resources/jdbc.properties delete mode 100644 src/main/resources/jedis.properties delete mode 100644 src/main/resources/log4j.properties delete mode 100644 src/main/resources/logs.txt rename src/main/resources/{ => mybatis}/mapping/MAdConfigMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/MAdLogMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/MAppHomeConfigMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/MAppHomeMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/MAppLicenseMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/MAppMgMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/MAppPlugsMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/MAppToolsMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/MBannerMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/MGamePacknameMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/SConfigMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TFeedbackMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TGameVersionMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TLinesMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TModMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TModcommentMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TModdownloadMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TModfileMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TModfilePathMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TModpowerMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TModratingMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TModtagMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/TModtypeMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/UDevUserMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/UGroupMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/UUserGameDataMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/UUsercollectionMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/UUserdataMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/UUserkeyMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/UUsermodscoreMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/UserMapper.xml (100%) rename src/main/resources/{ => mybatis}/mapping/ZsShipTypeMapper.xml (100%) create mode 100644 src/main/resources/mybatis/mybatis-config.xml delete mode 100644 src/main/resources/spring-mvc.xml delete mode 100644 src/main/resources/spring-mybatis.xml rename src/main/{webapp => resources/static}/css/ui.css (100%) rename src/main/{webapp => resources/static}/js/jquery-3.2.1.js (100%) rename src/main/{webapp => resources/static}/js/user.js (93%) rename src/main/{webapp => resources/static}/layui/css/layui.css (100%) rename src/main/{webapp => resources/static}/layui/css/layui.mobile.css (100%) rename src/main/{webapp => resources/static}/layui/css/modules/code.css (100%) rename src/main/{webapp => resources/static}/layui/css/modules/laydate/default/laydate.css (100%) rename src/main/{webapp => resources/static}/layui/css/modules/layer/default/icon-ext.png (100%) rename src/main/{webapp => resources/static}/layui/css/modules/layer/default/icon.png (100%) rename src/main/{webapp => resources/static}/layui/css/modules/layer/default/layer.css (100%) rename src/main/{webapp => resources/static}/layui/css/modules/layer/default/loading-0.gif (100%) rename src/main/{webapp => resources/static}/layui/css/modules/layer/default/loading-1.gif (100%) rename src/main/{webapp => resources/static}/layui/css/modules/layer/default/loading-2.gif (100%) rename src/main/{webapp => resources/static}/layui/font/iconfont.eot (100%) rename src/main/{webapp => resources/static}/layui/font/iconfont.svg (100%) rename src/main/{webapp => resources/static}/layui/font/iconfont.ttf (100%) rename src/main/{webapp => resources/static}/layui/font/iconfont.woff (100%) rename src/main/{webapp => resources/static}/layui/images/face/0.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/1.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/10.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/11.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/12.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/13.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/14.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/15.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/16.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/17.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/18.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/19.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/2.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/20.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/21.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/22.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/23.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/24.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/25.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/26.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/27.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/28.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/29.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/3.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/30.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/31.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/32.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/33.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/34.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/35.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/36.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/37.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/38.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/39.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/4.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/40.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/41.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/42.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/43.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/44.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/45.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/46.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/47.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/48.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/49.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/5.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/50.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/51.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/52.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/53.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/54.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/55.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/56.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/57.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/58.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/59.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/6.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/60.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/61.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/62.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/63.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/64.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/65.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/66.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/67.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/68.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/69.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/7.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/70.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/71.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/8.gif (100%) rename src/main/{webapp => resources/static}/layui/images/face/9.gif (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/carousel.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/code.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/colorpicker.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/element.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/flow.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/form.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/jquery.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/laydate.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/layedit.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/layer.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/laypage.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/laytpl.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/mobile.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/rate.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/slider.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/table.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/tree.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/upload.js (100%) rename src/main/{webapp => resources/static}/layui/lay/modules/util.js (100%) rename src/main/{webapp => resources/static}/layui/layui.all.js (100%) rename src/main/{webapp => resources/static}/layui/layui.js (100%) rename src/main/{webapp/admin/magbox/Banner.jsp => resources/templates/admin/magbox/Banner.html} (83%) rename src/main/{webapp/admin/magbox/Countdown.jsp => resources/templates/admin/magbox/Countdown.html} (78%) rename src/main/{webapp/admin/magbox/magic.jsp => resources/templates/admin/magbox/magic.html} (81%) rename src/main/{webapp/admin/magbox/popularize.jsp => resources/templates/admin/magbox/popularize.html} (85%) rename src/main/{webapp/admin/magbox/tools.jsp => resources/templates/admin/magbox/tools.html} (59%) rename src/main/{webapp/admin/system/userlist.jsp => resources/templates/admin/system/userlist.html} (90%) create mode 100644 src/main/resources/templates/apphtml/user.html rename src/main/{webapp/home.jsp => resources/templates/home.html} (81%) create mode 100644 src/main/resources/templates/html/about.html rename src/main/{webapp/html/head.jsp => resources/templates/html/head.html} (74%) rename src/main/{webapp/html/join.jsp => resources/templates/html/join.html} (74%) rename src/main/{webapp/html/main.jsp => resources/templates/html/main.html} (66%) rename src/main/{webapp/html/mymod.jsp => resources/templates/html/mymod.html} (79%) rename src/main/{webapp/html/permission.jsp => resources/templates/html/permission.html} (77%) rename src/main/{webapp/html/resetPassword.jsp => resources/templates/html/resetPassword.html} (82%) create mode 100644 src/main/resources/templates/html/test.html rename src/main/{webapp/html/up.jsp => resources/templates/html/up.html} (82%) rename src/main/{webapp/html/upmod.jsp => resources/templates/html/upmod.html} (96%) rename src/main/{webapp/html/userData.jsp => resources/templates/html/userData.html} (88%) rename src/main/{webapp/index.jsp => resources/templates/index.html} (90%) rename src/main/{webapp => resources/templates}/user/icon/1/image.png (100%) delete mode 100644 src/main/webapp/WEB-INF/web.xml delete mode 100644 src/main/webapp/apphtml/user.jsp delete mode 100644 src/main/webapp/cnm/data/jianrData.xlsx delete mode 100644 src/main/webapp/cnm/data/jianrZbData.xlsx delete mode 100644 src/main/webapp/html/about.jsp delete mode 100644 src/main/webapp/html/test.jsp delete mode 100644 src/main/webapp/tmp/QQ截图20190210002941.png delete mode 100644 src/main/webapp/tmp/md5.jar delete mode 100644 src/main/webapp/undefinedcss/modules/code.css delete mode 100644 src/main/webapp/undefinedcss/modules/laydate/default/laydate.css delete mode 100644 src/main/webapp/undefinedcss/modules/layer/default/icon-ext.png delete mode 100644 src/main/webapp/undefinedcss/modules/layer/default/icon.png delete mode 100644 src/main/webapp/undefinedcss/modules/layer/default/layer.css delete mode 100644 src/main/webapp/undefinedcss/modules/layer/default/loading-0.gif delete mode 100644 src/main/webapp/undefinedcss/modules/layer/default/loading-1.gif delete mode 100644 src/main/webapp/undefinedcss/modules/layer/default/loading-2.gif diff --git a/.classpath b/.classpath deleted file mode 100644 index 26981b6..0000000 --- a/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index d3d5430..a2a3040 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,31 @@ -logs/ +HELP.md target/ -.settings/ -src/main/webapp/plugin/ -src/main/webapp/mods/ -jianr_v2.sql +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/.project b/.project deleted file mode 100644 index 5634729..0000000 --- a/.project +++ /dev/null @@ -1,38 +0,0 @@ - - - jianRMG_Service_v2 - - - a - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/.tern-project b/.tern-project deleted file mode 100644 index 9df0459..0000000 --- a/.tern-project +++ /dev/null @@ -1,24 +0,0 @@ -{ - "ecmaVersion": 5, - "plugins": { - "guess-types": { - - }, - "outline": { - - }, - "angular1": { - - }, - "yui3": { - - }, - "aui1.5.x": { - - } - }, - "libs": [ - "browser", - "jquery" - ] -} \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 9b34562..0000000 --- a/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# ħıз - -#### Ŀ -ħıv2ķ - -#### ܹ -SSM+Redis -ݿMySQL - -#### \ No newline at end of file diff --git a/pom.xml b/pom.xml index 74790d7..3e68d52 100644 --- a/pom.xml +++ b/pom.xml @@ -1,178 +1,154 @@ - - 4.0.0 - com.yutou - jianRMG_Service_v2 - war - 0.0.1-SNAPSHOT - jianRMG_Service_v2 Maven Webapp - http://maven.apache.org - - - junit - junit - 3.8.1 - test - - - - javax - javaee-api - 7.0 - - - - org.springframework - spring-context - 4.3.10.RELEASE - - - org.springframework - spring-web - 4.3.0.RELEASE - - - org.springframework - spring-tx - 4.3.0.RELEASE - - - org.springframework - spring-jdbc - 4.3.0.RELEASE - - - org.springframework - spring-webmvc - 4.3.0.RELEASE - - - - org.mybatis - mybatis - 3.4.4 - + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.2.2.RELEASE + + + com.yutou.jianrmod + servicer + 2.0.0-SNAPSHOT + servicer + Demo project for Spring Boot - - org.mybatis - mybatis-spring - 1.3.1 - - - - log4j - log4j - 1.2.17 - - - org.apache.logging.log4j - log4j-core - 2.8.2 - - - - commons-dbcp - commons-dbcp - 1.4 - - - - mysql - mysql-connector-java - 5.1.38 - - - - commons-fileupload - commons-fileupload - 1.3.3 - + + 1.8 + - - - org.json - json - 20170516 - - - - com.alibaba - fastjson - 1.2.35 - - - - com.aliyun.oss - aliyun-sdk-oss - 2.8.1 - - - - redis.clients - jedis - 2.9.0 - - - com.sun.mail - javax.mail - 1.6.2 - - - - com.qiniu - qiniu-java-sdk - [7.2.0, 7.2.99] - - - com.squareup.okhttp3 - okhttp - 3.3.1 - compile - - - com.google.code.gson - gson - 2.6.2 - compile - - - com.qiniu - happy-dns-java - 0.1.4 - compile - - - - - jianrmod + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-websocket + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.1.1 + - - - org.eclipse.jetty - jetty-maven-plugin - 9.4.12.RC2 - - 10 - - 8088 - - + + org.springframework.boot + spring-boot-devtools + runtime + true + + + mysql + mysql-connector-java + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + - + + commons-fileupload + commons-fileupload + 1.3.3 + - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - UTF-8 - - - + + + org.json + json + 20170516 + + + + com.alibaba + fastjson + 1.2.35 + + + + com.aliyun.oss + aliyun-sdk-oss + 2.8.1 + + + + redis.clients + jedis + 2.9.0 + + + + com.qiniu + qiniu-java-sdk + [7.2.0, 7.2.99] + + + com.squareup.okhttp3 + okhttp + 3.3.1 + compile + + + com.google.code.gson + gson + 2.6.2 + compile + + + com.qiniu + happy-dns-java + 0.1.4 + compile + + + + com.sun.mail + javax.mail + 1.6.2 + + + + log4j + log4j + 1.2.17 + + + org.apache.logging.log4j + log4j-core + 2.8.2 + + - - \ No newline at end of file + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/yutou/ServicerApplication.java b/src/main/java/com/yutou/ServicerApplication.java new file mode 100644 index 0000000..4e7402c --- /dev/null +++ b/src/main/java/com/yutou/ServicerApplication.java @@ -0,0 +1,13 @@ +package com.yutou; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ServicerApplication { + + public static void main(String[] args) { + SpringApplication.run(ServicerApplication.class, args); + } + +} diff --git a/src/main/java/com/yutou/controller/Web/MainView.java b/src/main/java/com/yutou/controller/Web/MainView.java new file mode 100644 index 0000000..a5bec73 --- /dev/null +++ b/src/main/java/com/yutou/controller/Web/MainView.java @@ -0,0 +1,116 @@ +package com.yutou.controller.Web; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletRequest; + + +@Controller +public class MainView { + @RequestMapping("/home.html") + public String home(HttpServletRequest request) { + + return "/home.html"; + } + @RequestMapping("/html/permission.html") + public String permission(HttpServletRequest request) { + + return "/html/permission.html"; + } + @RequestMapping("/html/test.html") + public String test(HttpServletRequest request) { + + return "/html/test.html"; + } + @RequestMapping("/html/mymod.html") + public String mymod(HttpServletRequest request) { + + return "/html/mymod.html"; + } + @RequestMapping("/html/resetPassword.html") + public String resetPassword(HttpServletRequest request) { + + return "/html/resetPassword.html"; + } + @RequestMapping("/html/main.html") + public String main(HttpServletRequest request) { + + return "/html/main.html"; + } + @RequestMapping("/html/join.html") + public String join(HttpServletRequest request) { + + return "/html/join.html"; + } + @RequestMapping("/html/about.html") + public String about(HttpServletRequest request) { + + return "/html/about.html"; + } + @RequestMapping("/html/head.html") + public String head(HttpServletRequest request) { + + return "/html/head.html"; + } + @RequestMapping("/html/up.html") + public String up(HttpServletRequest request) { + + return "/html/up.html"; + } + @RequestMapping("/html/userData.html") + public String userData(HttpServletRequest request) { + + return "/html/userData.html"; + } + @RequestMapping("/html/upmod.html") + public String upmod(HttpServletRequest request) { + + return "/html/upmod.html"; + } + @RequestMapping("/user/icon/1/image.png") + public String image(HttpServletRequest request) { + + return "/user/icon/1/image.png"; + } + @RequestMapping("/apphtml/user.html") + public String user(HttpServletRequest request) { + + return "/apphtml/user.html"; + } + @RequestMapping("/admin/magbox/popularize.html") + public String popularize(HttpServletRequest request) { + + return "/admin/magbox/popularize.html"; + } + @RequestMapping("/admin/magbox/tools.html") + public String tools(HttpServletRequest request) { + + return "/admin/magbox/tools.html"; + } + @RequestMapping("/admin/magbox/Countdown.html") + public String Countdown(HttpServletRequest request) { + + return "/admin/magbox/Countdown.html"; + } + @RequestMapping("/admin/magbox/magic.html") + public String magic(HttpServletRequest request) { + + return "/admin/magbox/magic.html"; + } + @RequestMapping("/admin/magbox/Banner.html") + public String Banner(HttpServletRequest request) { + + return "/admin/magbox/Banner.html"; + } + @RequestMapping("/admin/system/userlist.html") + public String userlist(HttpServletRequest request) { + + return "/admin/system/userlist.html"; + } + @RequestMapping("/index.html") + public String index(HttpServletRequest request) { + + return "/index.html"; + } +} diff --git a/src/main/java/com/yutou/controller/Web/WebModController.java b/src/main/java/com/yutou/controller/Web/WebModController.java index 9a135bf..7d0be64 100644 --- a/src/main/java/com/yutou/controller/Web/WebModController.java +++ b/src/main/java/com/yutou/controller/Web/WebModController.java @@ -38,7 +38,8 @@ public class WebModController { JSONObject json = new JSONObject(); List list=new ArrayList<>(); try { - list = modService.getUserOfId(Integer.valueOf(RedisUtlis.get(request.getSession().getId()))); + JSONObject user=new JSONObject(RedisUtlis.get(request.getSession().getId())); + list = modService.getUserOfId(user.getInt("id")); } catch (Exception e) { // TODO: handle exception e.printStackTrace(); diff --git a/src/main/java/com/yutou/controller/Web/WebTestController.java b/src/main/java/com/yutou/controller/Web/WebTestController.java index cc2527b..d179ee1 100644 --- a/src/main/java/com/yutou/controller/Web/WebTestController.java +++ b/src/main/java/com/yutou/controller/Web/WebTestController.java @@ -6,17 +6,13 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.yutou.mybatis.dao.TModMapper; @Controller public class WebTestController { - @Resource - TModMapper modMapper; @RequestMapping("/test.do") @ResponseBody public String Test(String type) { return type; } - } diff --git a/src/main/java/com/yutou/controller/Web/WebUserController.java b/src/main/java/com/yutou/controller/Web/WebUserController.java index 32224ea..4e2b86e 100644 --- a/src/main/java/com/yutou/controller/Web/WebUserController.java +++ b/src/main/java/com/yutou/controller/Web/WebUserController.java @@ -193,11 +193,11 @@ public class WebUserController { public String reset(String sign,HttpServletRequest request,HttpServletResponse response) { try { Tools.saveSession(request, "uuid", sign); - response.sendRedirect("/html/resetPassword.jsp"); + response.sendRedirect("/html/resetPassword.html"); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); - return "自动跳转失败，请点击这里手动跳转"; + return "自动跳转失败，请点击这里手动跳转"; } return "跳转中"; } diff --git a/src/main/java/com/yutou/enums/UserPower.java b/src/main/java/com/yutou/enums/UserPower.java index 1a3af00..93586ee 100644 --- a/src/main/java/com/yutou/enums/UserPower.java +++ b/src/main/java/com/yutou/enums/UserPower.java @@ -3,7 +3,7 @@ package com.yutou.enums; public class UserPower { public enum Power{ USER (0,"#"), //普通用户 - UPLOAD(100,"upmod.jsp"), //上传者 + UPLOAD(100,"upmod.html"), //上传者 U_Auditor(500,"#"), // 审核员 ADMIN (999,"#"); //管理员 diff --git a/src/main/java/com/yutou/mybatis/dao/MAdConfigMapper.java b/src/main/java/com/yutou/mybatis/dao/MAdConfigMapper.java index 012b1fb..541c358 100644 --- a/src/main/java/com/yutou/mybatis/dao/MAdConfigMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MAdConfigMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MAdConfig; import com.yutou.mybatis.MAdConfigExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MAdConfigMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/MAdLogMapper.java b/src/main/java/com/yutou/mybatis/dao/MAdLogMapper.java index a39d6c6..38cde0a 100644 --- a/src/main/java/com/yutou/mybatis/dao/MAdLogMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MAdLogMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MAdLog; import com.yutou.mybatis.MAdLogExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MAdLogMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/MAppHomeConfigMapper.java b/src/main/java/com/yutou/mybatis/dao/MAppHomeConfigMapper.java index 9b3b333..f3a00d0 100644 --- a/src/main/java/com/yutou/mybatis/dao/MAppHomeConfigMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MAppHomeConfigMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MAppHomeConfig; import com.yutou.mybatis.MAppHomeConfigExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MAppHomeConfigMapper { /** @@ -54,7 +56,7 @@ public interface MAppHomeConfigMapper { * @mbg.generated Mon May 13 14:48:33 CST 2019 */ int updateByExampleSelective(@Param("record") MAppHomeConfig record, - @Param("example") MAppHomeConfigExample example); + @Param("example") MAppHomeConfigExample example); /** * This method was generated by MyBatis Generator. This method corresponds to the database table m_app_home_config diff --git a/src/main/java/com/yutou/mybatis/dao/MAppHomeMapper.java b/src/main/java/com/yutou/mybatis/dao/MAppHomeMapper.java index a7881f4..a99ef7c 100644 --- a/src/main/java/com/yutou/mybatis/dao/MAppHomeMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MAppHomeMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MAppHome; import com.yutou.mybatis.MAppHomeExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MAppHomeMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/MAppLicenseMapper.java b/src/main/java/com/yutou/mybatis/dao/MAppLicenseMapper.java index 84d9cde..889c323 100644 --- a/src/main/java/com/yutou/mybatis/dao/MAppLicenseMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MAppLicenseMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MAppLicense; import com.yutou.mybatis.MAppLicenseExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MAppLicenseMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/MAppMgMapper.java b/src/main/java/com/yutou/mybatis/dao/MAppMgMapper.java index ed50fce..f5d3133 100644 --- a/src/main/java/com/yutou/mybatis/dao/MAppMgMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MAppMgMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MAppMg; import com.yutou.mybatis.MAppMgExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MAppMgMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/MAppPlugsMapper.java b/src/main/java/com/yutou/mybatis/dao/MAppPlugsMapper.java index cc94d1f..3143a10 100644 --- a/src/main/java/com/yutou/mybatis/dao/MAppPlugsMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MAppPlugsMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MAppPlugs; import com.yutou.mybatis.MAppPlugsExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MAppPlugsMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/MAppToolsMapper.java b/src/main/java/com/yutou/mybatis/dao/MAppToolsMapper.java index b783877..8cfdc9a 100644 --- a/src/main/java/com/yutou/mybatis/dao/MAppToolsMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MAppToolsMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MAppTools; import com.yutou.mybatis.MAppToolsExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MAppToolsMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/MBannerMapper.java b/src/main/java/com/yutou/mybatis/dao/MBannerMapper.java index d0e7078..61ecc05 100644 --- a/src/main/java/com/yutou/mybatis/dao/MBannerMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MBannerMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MBanner; import com.yutou.mybatis.MBannerExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MBannerMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/MGamePacknameMapper.java b/src/main/java/com/yutou/mybatis/dao/MGamePacknameMapper.java index 26a48c8..73f41f8 100644 --- a/src/main/java/com/yutou/mybatis/dao/MGamePacknameMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/MGamePacknameMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.MGamePackname; import com.yutou.mybatis.MGamePacknameExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface MGamePacknameMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/SConfigMapper.java b/src/main/java/com/yutou/mybatis/dao/SConfigMapper.java index b646f72..03a99df 100644 --- a/src/main/java/com/yutou/mybatis/dao/SConfigMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/SConfigMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.SConfig; import com.yutou.mybatis.SConfigExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface SConfigMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TFeedbackMapper.java b/src/main/java/com/yutou/mybatis/dao/TFeedbackMapper.java index 5b13d8d..9bc2ce8 100644 --- a/src/main/java/com/yutou/mybatis/dao/TFeedbackMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TFeedbackMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TFeedback; import com.yutou.mybatis.TFeedbackExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TFeedbackMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TGameVersionMapper.java b/src/main/java/com/yutou/mybatis/dao/TGameVersionMapper.java index 4d9d868..90734ca 100644 --- a/src/main/java/com/yutou/mybatis/dao/TGameVersionMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TGameVersionMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TGameVersion; import com.yutou.mybatis.TGameVersionExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TGameVersionMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TLinesMapper.java b/src/main/java/com/yutou/mybatis/dao/TLinesMapper.java index 829c59f..1c90b17 100644 --- a/src/main/java/com/yutou/mybatis/dao/TLinesMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TLinesMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TLines; import com.yutou.mybatis.TLinesExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TLinesMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TModMapper.java b/src/main/java/com/yutou/mybatis/dao/TModMapper.java index 44995fd..f16dad2 100644 --- a/src/main/java/com/yutou/mybatis/dao/TModMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TModMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TMod; import com.yutou.mybatis.TModExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TModMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TModcommentMapper.java b/src/main/java/com/yutou/mybatis/dao/TModcommentMapper.java index d9ca79b..7a51065 100644 --- a/src/main/java/com/yutou/mybatis/dao/TModcommentMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TModcommentMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TModcomment; import com.yutou.mybatis.TModcommentExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TModcommentMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TModdownloadMapper.java b/src/main/java/com/yutou/mybatis/dao/TModdownloadMapper.java index 740e831..7c1fd97 100644 --- a/src/main/java/com/yutou/mybatis/dao/TModdownloadMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TModdownloadMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TModdownload; import com.yutou.mybatis.TModdownloadExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TModdownloadMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TModfileMapper.java b/src/main/java/com/yutou/mybatis/dao/TModfileMapper.java index a552ccf..fa991d8 100644 --- a/src/main/java/com/yutou/mybatis/dao/TModfileMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TModfileMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TModfile; import com.yutou.mybatis.TModfileExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TModfileMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TModfilePathMapper.java b/src/main/java/com/yutou/mybatis/dao/TModfilePathMapper.java index af35ddb..f2581e6 100644 --- a/src/main/java/com/yutou/mybatis/dao/TModfilePathMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TModfilePathMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TModfilePath; import com.yutou.mybatis.TModfilePathExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TModfilePathMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TModpowerMapper.java b/src/main/java/com/yutou/mybatis/dao/TModpowerMapper.java index 2e73e70..37c804f 100644 --- a/src/main/java/com/yutou/mybatis/dao/TModpowerMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TModpowerMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TModpower; import com.yutou.mybatis.TModpowerExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TModpowerMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TModratingMapper.java b/src/main/java/com/yutou/mybatis/dao/TModratingMapper.java index af6bbe2..8006667 100644 --- a/src/main/java/com/yutou/mybatis/dao/TModratingMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TModratingMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TModrating; import com.yutou.mybatis.TModratingExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TModratingMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TModtagMapper.java b/src/main/java/com/yutou/mybatis/dao/TModtagMapper.java index c71975a..1532616 100644 --- a/src/main/java/com/yutou/mybatis/dao/TModtagMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TModtagMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TModtag; import com.yutou.mybatis.TModtagExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TModtagMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/TModtypeMapper.java b/src/main/java/com/yutou/mybatis/dao/TModtypeMapper.java index 4e065cc..af69b2e 100644 --- a/src/main/java/com/yutou/mybatis/dao/TModtypeMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/TModtypeMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.TModtype; import com.yutou.mybatis.TModtypeExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface TModtypeMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/UDevUserMapper.java b/src/main/java/com/yutou/mybatis/dao/UDevUserMapper.java index 4f5adb2..0a537ed 100644 --- a/src/main/java/com/yutou/mybatis/dao/UDevUserMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/UDevUserMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.UDevUser; import com.yutou.mybatis.UDevUserExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface UDevUserMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/UGroupMapper.java b/src/main/java/com/yutou/mybatis/dao/UGroupMapper.java index 8dff3c3..acb4ac3 100644 --- a/src/main/java/com/yutou/mybatis/dao/UGroupMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/UGroupMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.UGroup; import com.yutou.mybatis.UGroupExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface UGroupMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/UUserGameDataMapper.java b/src/main/java/com/yutou/mybatis/dao/UUserGameDataMapper.java index 1b6b618..37b1997 100644 --- a/src/main/java/com/yutou/mybatis/dao/UUserGameDataMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/UUserGameDataMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.UUserGameData; import com.yutou.mybatis.UUserGameDataExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface UUserGameDataMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/UUsercollectionMapper.java b/src/main/java/com/yutou/mybatis/dao/UUsercollectionMapper.java index d68ea8e..736ce42 100644 --- a/src/main/java/com/yutou/mybatis/dao/UUsercollectionMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/UUsercollectionMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.UUsercollection; import com.yutou.mybatis.UUsercollectionExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface UUsercollectionMapper { /** @@ -54,7 +56,7 @@ public interface UUsercollectionMapper { * @mbg.generated Mon May 13 14:48:33 CST 2019 */ int updateByExampleSelective(@Param("record") UUsercollection record, - @Param("example") UUsercollectionExample example); + @Param("example") UUsercollectionExample example); /** * This method was generated by MyBatis Generator. This method corresponds to the database table u_usercollection diff --git a/src/main/java/com/yutou/mybatis/dao/UUserdataMapper.java b/src/main/java/com/yutou/mybatis/dao/UUserdataMapper.java index 66c21ee..d88eabd 100644 --- a/src/main/java/com/yutou/mybatis/dao/UUserdataMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/UUserdataMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.UUserdata; import com.yutou.mybatis.UUserdataExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface UUserdataMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/UUserkeyMapper.java b/src/main/java/com/yutou/mybatis/dao/UUserkeyMapper.java index 96c950c..6703eb3 100644 --- a/src/main/java/com/yutou/mybatis/dao/UUserkeyMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/UUserkeyMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.UUserkey; import com.yutou.mybatis.UUserkeyExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface UUserkeyMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/UUsermodscoreMapper.java b/src/main/java/com/yutou/mybatis/dao/UUsermodscoreMapper.java index 34647dd..9dbafcf 100644 --- a/src/main/java/com/yutou/mybatis/dao/UUsermodscoreMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/UUsermodscoreMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.UUsermodscore; import com.yutou.mybatis.UUsermodscoreExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface UUsermodscoreMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/UserMapper.java b/src/main/java/com/yutou/mybatis/dao/UserMapper.java index dff8fbc..63add7b 100644 --- a/src/main/java/com/yutou/mybatis/dao/UserMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/UserMapper.java @@ -3,8 +3,11 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.User; import com.yutou.mybatis.UserExample; import java.util.List; + +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +@Mapper public interface UserMapper { /** diff --git a/src/main/java/com/yutou/mybatis/dao/ZsShipTypeMapper.java b/src/main/java/com/yutou/mybatis/dao/ZsShipTypeMapper.java index 5c238c0..369e200 100644 --- a/src/main/java/com/yutou/mybatis/dao/ZsShipTypeMapper.java +++ b/src/main/java/com/yutou/mybatis/dao/ZsShipTypeMapper.java @@ -3,8 +3,10 @@ package com.yutou.mybatis.dao; import com.yutou.mybatis.ZsShipType; import com.yutou.mybatis.ZsShipTypeExample; import java.util.List; -import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface ZsShipTypeMapper { /** diff --git a/src/main/java/com/yutou/services/AdService.java b/src/main/java/com/yutou/services/AdService.java index c96fcff..9ee09df 100644 --- a/src/main/java/com/yutou/services/AdService.java +++ b/src/main/java/com/yutou/services/AdService.java @@ -6,5 +6,5 @@ import com.yutou.mybatis.MAdLog; public interface AdService { MAdConfig getAd(int type); void addAdLog(MAdLog log); - int getUserAd(int type,int uid); + int getUserAd(int type, int uid); } diff --git a/src/main/java/com/yutou/services/MBannerService.java b/src/main/java/com/yutou/services/MBannerService.java index fcdecf5..56733b4 100644 --- a/src/main/java/com/yutou/services/MBannerService.java +++ b/src/main/java/com/yutou/services/MBannerService.java @@ -6,7 +6,7 @@ import com.yutou.mybatis.MBanner; public interface MBannerService { int addBanner(MBanner banner); - int showBanner(int id,boolean show); + int showBanner(int id, boolean show); int setBanner(MBanner banner); List getBanner(boolean all); } diff --git a/src/main/java/com/yutou/services/ModService.java b/src/main/java/com/yutou/services/ModService.java index c269b8d..d9b2899 100644 --- a/src/main/java/com/yutou/services/ModService.java +++ b/src/main/java/com/yutou/services/ModService.java @@ -23,13 +23,13 @@ public interface ModService { * @param mid mod的id * @return */ - TMod getMod(int mid,int upower); + TMod getMod(int mid, int upower); /** * 搜索mod * @param search 搜索关键词 * @return mod列表 */ - List getMod(String search,int upower); + List getMod(String search, int upower); /** * 获取mod的评论 * @param mid mod的id @@ -47,7 +47,7 @@ public interface ModService { * @param mid mod的id #注意,下载地址是没有包含主URL的 * @return */ - List getModFile(int mid,int uid); + List getModFile(int mid, int uid); /** * 获取mod应该安装到的路径 * @param mid mod的id @@ -65,7 +65,7 @@ public interface ModService { * @param max 最大数 * @return */ - List getMods(int min,int max,int upower); + List getMods(int min, int max, int upower); /** * 获取mod的权限 * @param mid mod的id @@ -77,7 +77,7 @@ public interface ModService { * @param tid * @return */ - List getTypeOfMod( int tid); + List getTypeOfMod(int tid); /** * 获取所有舰娘类型的MOD * @param tid @@ -96,7 +96,7 @@ public interface ModService { * @param rmid * @return */ - List getReMod(int mid,int rmid); + List getReMod(int mid, int rmid); List getModTag(int mid); /** @@ -105,14 +105,14 @@ public interface ModService { * @param mid mod id * @return 0 error, 1 success, -1 user already Conllection */ - int setConllection(String uid,String mid); + int setConllection(String uid, String mid); /** * 设置mod权限 * @param mid * @param power * @return */ - int setModPower(int mid,int power); + int setModPower(int mid, int power); /** * 移动mod * @param mid @@ -120,7 +120,7 @@ public interface ModService { * @param mType * @return */ - int moveMod(int mid,String jType,String mType); + int moveMod(int mid, String jType, String mType); /** * 获取MOD类型和舰娘类型的信息 * @return diff --git a/src/main/java/com/yutou/services/PermissionService.java b/src/main/java/com/yutou/services/PermissionService.java index 191e90d..7e73a44 100644 --- a/src/main/java/com/yutou/services/PermissionService.java +++ b/src/main/java/com/yutou/services/PermissionService.java @@ -9,7 +9,7 @@ import com.yutou.mybatis.UGroup; public interface PermissionService { List getGroup(); UGroup getGroup(String title); - UGroup getGroup(int power,UGroup userGroup); - int benUser(int muid,int uid,Date time); - int unBenUser(int muid,int uid); + UGroup getGroup(int power, UGroup userGroup); + int benUser(int muid, int uid, Date time); + int unBenUser(int muid, int uid); } diff --git a/src/main/java/com/yutou/services/PlugsService.java b/src/main/java/com/yutou/services/PlugsService.java index 564726f..ed36a74 100644 --- a/src/main/java/com/yutou/services/PlugsService.java +++ b/src/main/java/com/yutou/services/PlugsService.java @@ -7,8 +7,8 @@ import com.yutou.mybatis.UDevUser; public interface PlugsService { List getPlugs(int power); - MAppPlugs getPlug(int power,int id); + MAppPlugs getPlug(int power, int id); boolean addPlug(MAppPlugs plug); boolean removePlug(int id); - UDevUser checkPlugs(String appid,String md5,String fileName); + UDevUser checkPlugs(String appid, String md5, String fileName); } diff --git a/src/main/java/com/yutou/services/SystemService.java b/src/main/java/com/yutou/services/SystemService.java index 6570277..f890032 100644 --- a/src/main/java/com/yutou/services/SystemService.java +++ b/src/main/java/com/yutou/services/SystemService.java @@ -5,7 +5,7 @@ import java.util.List; import com.yutou.mybatis.TFeedback; public interface SystemService { - int addFeedBack(int uid,String context,String sysinfo); + int addFeedBack(int uid, String context, String sysinfo); TFeedback getFeedback(int id); List getFeedback(); } diff --git a/src/main/java/com/yutou/services/UserService.java b/src/main/java/com/yutou/services/UserService.java index 4c1f95d..e757654 100644 --- a/src/main/java/com/yutou/services/UserService.java +++ b/src/main/java/com/yutou/services/UserService.java @@ -10,24 +10,24 @@ import com.yutou.mybatis.UUserdata; import com.yutou.mybatis.User; public interface UserService { - int login(String uname,String pass); - int reg(String uname,String name,String pass); + int login(String uname, String pass); + int reg(String uname, String name, String pass); int userPower(int id); int getUserId(String uname); User getUser(int id); - List searchUser(String type,String key); + List searchUser(String type, String key); UUserdata getUUserData(int id); JSONObject getUserData(int id); int updateUserData(UUserdata udata); int updateUser(User user); - List getUserList(int min,int max); + List getUserList(int min, int max); - int addModCollect(int uid,int mid); - List userCollectMod(int min,int max,int uid); + int addModCollect(int uid, int mid); + List userCollectMod(int min, int max, int uid); int removeCollectMod(int mid); void addGameData(UUserGameData gameData); void updateGameData(UUserGameData gameData); List getGameData(int uid); - UUserGameData findGameData(int uid,String fileName); + UUserGameData findGameData(int uid, String fileName); } diff --git a/src/main/java/com/yutou/utlis/RedisUtlis.java b/src/main/java/com/yutou/utlis/RedisUtlis.java index ebb24b9..c35fae3 100644 --- a/src/main/java/com/yutou/utlis/RedisUtlis.java +++ b/src/main/java/com/yutou/utlis/RedisUtlis.java @@ -17,9 +17,11 @@ public class RedisUtlis { // 写成静态代码块形式，只加载一次，节省资源 static { - Properties properties = PropertyUtil.loadProperties("jedis.properties"); - host = properties.getProperty("redis.host"); - port = Integer.valueOf(properties.getProperty("redis.port")); + //Properties properties = PropertyUtil.loadProperties("jedis.properties"); + //host = properties.getProperty("redis.host"); + //port = Integer.valueOf(properties.getProperty("redis.port")); + host="127.0.0.1"; + port=6379; } public static boolean set(String key, String value) { diff --git a/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml deleted file mode 100644 index 584ca57..0000000 --- a/src/main/resources/generatorConfig.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - -
- - - - - -
- - -
- - - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - - -
- - -
- - - -
- - -
- - -
- - -
- - -
- - -
- - \ No newline at end of file diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties deleted file mode 100644 index 979cad4..0000000 --- a/src/main/resources/jdbc.properties +++ /dev/null @@ -1,9 +0,0 @@ -driver=com.mysql.jdbc.Driver -url=jdbc:mysql://127.0.0.1:3306/jianr_v2?useSSL=false&useUnicode=true&autoReconnect=true&characterEncoding=UTF-8 -username=jianrmod -password=dashuyuxiaodidi233 -initialSize=0 -maxActive=20 -maxIdle=20 -minIdle=1 -maxWait=60000 \ No newline at end of file diff --git a/src/main/resources/jedis.properties b/src/main/resources/jedis.properties deleted file mode 100644 index 6eb0a8c..0000000 --- a/src/main/resources/jedis.properties +++ /dev/null @@ -1,9 +0,0 @@ -# Redis settings -redis.host=127.0.0.1 -redis.port=6379 -redis.pass= -redis.timeout=10000 -redis.maxIdle=300 -redis.maxTotal=600 -redis.maxWaitMillis=1000 -redis.testOnBorrow=false \ No newline at end of file diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties deleted file mode 100644 index b9fc9c4..0000000 --- a/src/main/resources/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -### \u8BBE\u7F6E### -log4j.rootLogger = DEBUG,D,E,I - - - -log4j.appender.I = org.apache.log4j.DailyRollingFileAppender -log4j.appender.I.File =logs/info.log -log4j.appender.file.DatePattern=yyyy-MM-dd.log -log4j.appender.I.Append = true -log4j.appender.I.Threshold = INFO -log4j.appender.I.layout = org.apache.log4j.PatternLayout -log4j.appender.I.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n - -### \u8F93\u51FAERROR \u7EA7\u522B\u4EE5\u4E0A\u7684\u65E5\u5FD7\u5230=E://logs/error.log ### -log4j.appender.E = org.apache.log4j.DailyRollingFileAppender -log4j.appender.E.File =logs/error.log -log4j.appender.E.Append = true -log4j.appender.E.Threshold = ERROR -log4j.appender.E.layout = org.apache.log4j.PatternLayout -log4j.appender.E.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n - -log4j.appender.D = org.apache.log4j.DailyRollingFileAppender -log4j.appender.D.File = logs/debug.log -log4j.appender.D.Append = true -log4j.appender.D.Threshold = DEBUG -log4j.appender.D.layout = org.apache.log4j.PatternLayout -log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n - - -log4j.logger.com.ibatis=DEBUG -log4j.logger.com.ibatis.common.jdbc.SimpleDataSource=DEBUG -log4j.logger.com.ibatis.common.jdbc.ScriptRunner=DEBUG -log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=DEBUG -log4j.logger.java.sql.Connection=DEBUG -log4j.logger.java.sql.Statement=DEBUG -log4j.logger.java.sql.PreparedStatement=DEBUG \ No newline at end of file diff --git a/src/main/resources/logs.txt b/src/main/resources/logs.txt deleted file mode 100644 index 419c9d9..0000000 --- a/src/main/resources/logs.txt +++ /dev/null @@ -1,4 +0,0 @@ -该做的事情： - 上回做好了根据mid（当前MODid）和remid（被关联id）来查询mod关联 -所以： - 应用到APP上 \ No newline at end of file diff --git a/src/main/resources/mapping/MAdConfigMapper.xml b/src/main/resources/mybatis/mapping/MAdConfigMapper.xml similarity index 100% rename from src/main/resources/mapping/MAdConfigMapper.xml rename to src/main/resources/mybatis/mapping/MAdConfigMapper.xml diff --git a/src/main/resources/mapping/MAdLogMapper.xml b/src/main/resources/mybatis/mapping/MAdLogMapper.xml similarity index 100% rename from src/main/resources/mapping/MAdLogMapper.xml rename to src/main/resources/mybatis/mapping/MAdLogMapper.xml diff --git a/src/main/resources/mapping/MAppHomeConfigMapper.xml b/src/main/resources/mybatis/mapping/MAppHomeConfigMapper.xml similarity index 100% rename from src/main/resources/mapping/MAppHomeConfigMapper.xml rename to src/main/resources/mybatis/mapping/MAppHomeConfigMapper.xml diff --git a/src/main/resources/mapping/MAppHomeMapper.xml b/src/main/resources/mybatis/mapping/MAppHomeMapper.xml similarity index 100% rename from src/main/resources/mapping/MAppHomeMapper.xml rename to src/main/resources/mybatis/mapping/MAppHomeMapper.xml diff --git a/src/main/resources/mapping/MAppLicenseMapper.xml b/src/main/resources/mybatis/mapping/MAppLicenseMapper.xml similarity index 100% rename from src/main/resources/mapping/MAppLicenseMapper.xml rename to src/main/resources/mybatis/mapping/MAppLicenseMapper.xml diff --git a/src/main/resources/mapping/MAppMgMapper.xml b/src/main/resources/mybatis/mapping/MAppMgMapper.xml similarity index 100% rename from src/main/resources/mapping/MAppMgMapper.xml rename to src/main/resources/mybatis/mapping/MAppMgMapper.xml diff --git a/src/main/resources/mapping/MAppPlugsMapper.xml b/src/main/resources/mybatis/mapping/MAppPlugsMapper.xml similarity index 100% rename from src/main/resources/mapping/MAppPlugsMapper.xml rename to src/main/resources/mybatis/mapping/MAppPlugsMapper.xml diff --git a/src/main/resources/mapping/MAppToolsMapper.xml b/src/main/resources/mybatis/mapping/MAppToolsMapper.xml similarity index 100% rename from src/main/resources/mapping/MAppToolsMapper.xml rename to src/main/resources/mybatis/mapping/MAppToolsMapper.xml diff --git a/src/main/resources/mapping/MBannerMapper.xml b/src/main/resources/mybatis/mapping/MBannerMapper.xml similarity index 100% rename from src/main/resources/mapping/MBannerMapper.xml rename to src/main/resources/mybatis/mapping/MBannerMapper.xml diff --git a/src/main/resources/mapping/MGamePacknameMapper.xml b/src/main/resources/mybatis/mapping/MGamePacknameMapper.xml similarity index 100% rename from src/main/resources/mapping/MGamePacknameMapper.xml rename to src/main/resources/mybatis/mapping/MGamePacknameMapper.xml diff --git a/src/main/resources/mapping/SConfigMapper.xml b/src/main/resources/mybatis/mapping/SConfigMapper.xml similarity index 100% rename from src/main/resources/mapping/SConfigMapper.xml rename to src/main/resources/mybatis/mapping/SConfigMapper.xml diff --git a/src/main/resources/mapping/TFeedbackMapper.xml b/src/main/resources/mybatis/mapping/TFeedbackMapper.xml similarity index 100% rename from src/main/resources/mapping/TFeedbackMapper.xml rename to src/main/resources/mybatis/mapping/TFeedbackMapper.xml diff --git a/src/main/resources/mapping/TGameVersionMapper.xml b/src/main/resources/mybatis/mapping/TGameVersionMapper.xml similarity index 100% rename from src/main/resources/mapping/TGameVersionMapper.xml rename to src/main/resources/mybatis/mapping/TGameVersionMapper.xml diff --git a/src/main/resources/mapping/TLinesMapper.xml b/src/main/resources/mybatis/mapping/TLinesMapper.xml similarity index 100% rename from src/main/resources/mapping/TLinesMapper.xml rename to src/main/resources/mybatis/mapping/TLinesMapper.xml diff --git a/src/main/resources/mapping/TModMapper.xml b/src/main/resources/mybatis/mapping/TModMapper.xml similarity index 100% rename from src/main/resources/mapping/TModMapper.xml rename to src/main/resources/mybatis/mapping/TModMapper.xml diff --git a/src/main/resources/mapping/TModcommentMapper.xml b/src/main/resources/mybatis/mapping/TModcommentMapper.xml similarity index 100% rename from src/main/resources/mapping/TModcommentMapper.xml rename to src/main/resources/mybatis/mapping/TModcommentMapper.xml diff --git a/src/main/resources/mapping/TModdownloadMapper.xml b/src/main/resources/mybatis/mapping/TModdownloadMapper.xml similarity index 100% rename from src/main/resources/mapping/TModdownloadMapper.xml rename to src/main/resources/mybatis/mapping/TModdownloadMapper.xml diff --git a/src/main/resources/mapping/TModfileMapper.xml b/src/main/resources/mybatis/mapping/TModfileMapper.xml similarity index 100% rename from src/main/resources/mapping/TModfileMapper.xml rename to src/main/resources/mybatis/mapping/TModfileMapper.xml diff --git a/src/main/resources/mapping/TModfilePathMapper.xml b/src/main/resources/mybatis/mapping/TModfilePathMapper.xml similarity index 100% rename from src/main/resources/mapping/TModfilePathMapper.xml rename to src/main/resources/mybatis/mapping/TModfilePathMapper.xml diff --git a/src/main/resources/mapping/TModpowerMapper.xml b/src/main/resources/mybatis/mapping/TModpowerMapper.xml similarity index 100% rename from src/main/resources/mapping/TModpowerMapper.xml rename to src/main/resources/mybatis/mapping/TModpowerMapper.xml diff --git a/src/main/resources/mapping/TModratingMapper.xml b/src/main/resources/mybatis/mapping/TModratingMapper.xml similarity index 100% rename from src/main/resources/mapping/TModratingMapper.xml rename to src/main/resources/mybatis/mapping/TModratingMapper.xml diff --git a/src/main/resources/mapping/TModtagMapper.xml b/src/main/resources/mybatis/mapping/TModtagMapper.xml similarity index 100% rename from src/main/resources/mapping/TModtagMapper.xml rename to src/main/resources/mybatis/mapping/TModtagMapper.xml diff --git a/src/main/resources/mapping/TModtypeMapper.xml b/src/main/resources/mybatis/mapping/TModtypeMapper.xml similarity index 100% rename from src/main/resources/mapping/TModtypeMapper.xml rename to src/main/resources/mybatis/mapping/TModtypeMapper.xml diff --git a/src/main/resources/mapping/UDevUserMapper.xml b/src/main/resources/mybatis/mapping/UDevUserMapper.xml similarity index 100% rename from src/main/resources/mapping/UDevUserMapper.xml rename to src/main/resources/mybatis/mapping/UDevUserMapper.xml diff --git a/src/main/resources/mapping/UGroupMapper.xml b/src/main/resources/mybatis/mapping/UGroupMapper.xml similarity index 100% rename from src/main/resources/mapping/UGroupMapper.xml rename to src/main/resources/mybatis/mapping/UGroupMapper.xml diff --git a/src/main/resources/mapping/UUserGameDataMapper.xml b/src/main/resources/mybatis/mapping/UUserGameDataMapper.xml similarity index 100% rename from src/main/resources/mapping/UUserGameDataMapper.xml rename to src/main/resources/mybatis/mapping/UUserGameDataMapper.xml diff --git a/src/main/resources/mapping/UUsercollectionMapper.xml b/src/main/resources/mybatis/mapping/UUsercollectionMapper.xml similarity index 100% rename from src/main/resources/mapping/UUsercollectionMapper.xml rename to src/main/resources/mybatis/mapping/UUsercollectionMapper.xml diff --git a/src/main/resources/mapping/UUserdataMapper.xml b/src/main/resources/mybatis/mapping/UUserdataMapper.xml similarity index 100% rename from src/main/resources/mapping/UUserdataMapper.xml rename to src/main/resources/mybatis/mapping/UUserdataMapper.xml diff --git a/src/main/resources/mapping/UUserkeyMapper.xml b/src/main/resources/mybatis/mapping/UUserkeyMapper.xml similarity index 100% rename from src/main/resources/mapping/UUserkeyMapper.xml rename to src/main/resources/mybatis/mapping/UUserkeyMapper.xml diff --git a/src/main/resources/mapping/UUsermodscoreMapper.xml b/src/main/resources/mybatis/mapping/UUsermodscoreMapper.xml similarity index 100% rename from src/main/resources/mapping/UUsermodscoreMapper.xml rename to src/main/resources/mybatis/mapping/UUsermodscoreMapper.xml diff --git a/src/main/resources/mapping/UserMapper.xml b/src/main/resources/mybatis/mapping/UserMapper.xml similarity index 100% rename from src/main/resources/mapping/UserMapper.xml rename to src/main/resources/mybatis/mapping/UserMapper.xml diff --git a/src/main/resources/mapping/ZsShipTypeMapper.xml b/src/main/resources/mybatis/mapping/ZsShipTypeMapper.xml similarity index 100% rename from src/main/resources/mapping/ZsShipTypeMapper.xml rename to src/main/resources/mybatis/mapping/ZsShipTypeMapper.xml diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml new file mode 100644 index 0000000..7dd9e50 --- /dev/null +++ b/src/main/resources/mybatis/mybatis-config.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml deleted file mode 100644 index a8d3eab..0000000 --- a/src/main/resources/spring-mvc.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/html;charset=UTF-8 - - - - - - \ No newline at end of file diff --git a/src/main/resources/spring-mybatis.xml b/src/main/resources/spring-mybatis.xml deleted file mode 100644 index 68dc80d..0000000 --- a/src/main/resources/spring-mybatis.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/css/ui.css b/src/main/resources/static/css/ui.css similarity index 100% rename from src/main/webapp/css/ui.css rename to src/main/resources/static/css/ui.css diff --git a/src/main/webapp/js/jquery-3.2.1.js b/src/main/resources/static/js/jquery-3.2.1.js similarity index 100% rename from src/main/webapp/js/jquery-3.2.1.js rename to src/main/resources/static/js/jquery-3.2.1.js diff --git a/src/main/webapp/js/user.js b/src/main/resources/static/js/user.js similarity index 93% rename from src/main/webapp/js/user.js rename to src/main/resources/static/js/user.js index 71c96e8..3ec8e42 100644 --- a/src/main/webapp/js/user.js +++ b/src/main/resources/static/js/user.js @@ -17,18 +17,18 @@ window.onload=function(){ case 104: title="请登录"; content="还没登陆哦~"; - url="/index.jsp" + url="/index.html" break; case 105: title="没有访问权限"; content="您无法访问当前页面"; - url="home.jsp" + url="home.html" reload=true; break; default: title="异常错误"; content="未知错误，请尝试重新登录"; - url="/index.jsp" + url="/index.html" break; } var layer = layui.layer; @@ -66,7 +66,7 @@ function logout(){ }, btn:['了解'], btn1:function(){ - window.location.replace("/index.jsp"); + window.location.replace("/index.html"); } }) }); diff --git a/src/main/webapp/layui/css/layui.css b/src/main/resources/static/layui/css/layui.css similarity index 100% rename from src/main/webapp/layui/css/layui.css rename to src/main/resources/static/layui/css/layui.css diff --git a/src/main/webapp/layui/css/layui.mobile.css b/src/main/resources/static/layui/css/layui.mobile.css similarity index 100% rename from src/main/webapp/layui/css/layui.mobile.css rename to src/main/resources/static/layui/css/layui.mobile.css diff --git a/src/main/webapp/layui/css/modules/code.css b/src/main/resources/static/layui/css/modules/code.css similarity index 100% rename from src/main/webapp/layui/css/modules/code.css rename to src/main/resources/static/layui/css/modules/code.css diff --git a/src/main/webapp/layui/css/modules/laydate/default/laydate.css b/src/main/resources/static/layui/css/modules/laydate/default/laydate.css similarity index 100% rename from src/main/webapp/layui/css/modules/laydate/default/laydate.css rename to src/main/resources/static/layui/css/modules/laydate/default/laydate.css diff --git a/src/main/webapp/layui/css/modules/layer/default/icon-ext.png b/src/main/resources/static/layui/css/modules/layer/default/icon-ext.png similarity index 100% rename from src/main/webapp/layui/css/modules/layer/default/icon-ext.png rename to src/main/resources/static/layui/css/modules/layer/default/icon-ext.png diff --git a/src/main/webapp/layui/css/modules/layer/default/icon.png b/src/main/resources/static/layui/css/modules/layer/default/icon.png similarity index 100% rename from src/main/webapp/layui/css/modules/layer/default/icon.png rename to src/main/resources/static/layui/css/modules/layer/default/icon.png diff --git a/src/main/webapp/layui/css/modules/layer/default/layer.css b/src/main/resources/static/layui/css/modules/layer/default/layer.css similarity index 100% rename from src/main/webapp/layui/css/modules/layer/default/layer.css rename to src/main/resources/static/layui/css/modules/layer/default/layer.css diff --git a/src/main/webapp/layui/css/modules/layer/default/loading-0.gif b/src/main/resources/static/layui/css/modules/layer/default/loading-0.gif similarity index 100% rename from src/main/webapp/layui/css/modules/layer/default/loading-0.gif rename to src/main/resources/static/layui/css/modules/layer/default/loading-0.gif diff --git a/src/main/webapp/layui/css/modules/layer/default/loading-1.gif b/src/main/resources/static/layui/css/modules/layer/default/loading-1.gif similarity index 100% rename from src/main/webapp/layui/css/modules/layer/default/loading-1.gif rename to src/main/resources/static/layui/css/modules/layer/default/loading-1.gif diff --git a/src/main/webapp/layui/css/modules/layer/default/loading-2.gif b/src/main/resources/static/layui/css/modules/layer/default/loading-2.gif similarity index 100% rename from src/main/webapp/layui/css/modules/layer/default/loading-2.gif rename to src/main/resources/static/layui/css/modules/layer/default/loading-2.gif diff --git a/src/main/webapp/layui/font/iconfont.eot b/src/main/resources/static/layui/font/iconfont.eot similarity index 100% rename from src/main/webapp/layui/font/iconfont.eot rename to src/main/resources/static/layui/font/iconfont.eot diff --git a/src/main/webapp/layui/font/iconfont.svg b/src/main/resources/static/layui/font/iconfont.svg similarity index 100% rename from src/main/webapp/layui/font/iconfont.svg rename to src/main/resources/static/layui/font/iconfont.svg diff --git a/src/main/webapp/layui/font/iconfont.ttf b/src/main/resources/static/layui/font/iconfont.ttf similarity index 100% rename from src/main/webapp/layui/font/iconfont.ttf rename to src/main/resources/static/layui/font/iconfont.ttf diff --git a/src/main/webapp/layui/font/iconfont.woff b/src/main/resources/static/layui/font/iconfont.woff similarity index 100% rename from src/main/webapp/layui/font/iconfont.woff rename to src/main/resources/static/layui/font/iconfont.woff diff --git a/src/main/webapp/layui/images/face/0.gif b/src/main/resources/static/layui/images/face/0.gif similarity index 100% rename from src/main/webapp/layui/images/face/0.gif rename to src/main/resources/static/layui/images/face/0.gif diff --git a/src/main/webapp/layui/images/face/1.gif b/src/main/resources/static/layui/images/face/1.gif similarity index 100% rename from src/main/webapp/layui/images/face/1.gif rename to src/main/resources/static/layui/images/face/1.gif diff --git a/src/main/webapp/layui/images/face/10.gif b/src/main/resources/static/layui/images/face/10.gif similarity index 100% rename from src/main/webapp/layui/images/face/10.gif rename to src/main/resources/static/layui/images/face/10.gif diff --git a/src/main/webapp/layui/images/face/11.gif b/src/main/resources/static/layui/images/face/11.gif similarity index 100% rename from src/main/webapp/layui/images/face/11.gif rename to src/main/resources/static/layui/images/face/11.gif diff --git a/src/main/webapp/layui/images/face/12.gif b/src/main/resources/static/layui/images/face/12.gif similarity index 100% rename from src/main/webapp/layui/images/face/12.gif rename to src/main/resources/static/layui/images/face/12.gif diff --git a/src/main/webapp/layui/images/face/13.gif b/src/main/resources/static/layui/images/face/13.gif similarity index 100% rename from src/main/webapp/layui/images/face/13.gif rename to src/main/resources/static/layui/images/face/13.gif diff --git a/src/main/webapp/layui/images/face/14.gif b/src/main/resources/static/layui/images/face/14.gif similarity index 100% rename from src/main/webapp/layui/images/face/14.gif rename to src/main/resources/static/layui/images/face/14.gif diff --git a/src/main/webapp/layui/images/face/15.gif b/src/main/resources/static/layui/images/face/15.gif similarity index 100% rename from src/main/webapp/layui/images/face/15.gif rename to src/main/resources/static/layui/images/face/15.gif diff --git a/src/main/webapp/layui/images/face/16.gif b/src/main/resources/static/layui/images/face/16.gif similarity index 100% rename from src/main/webapp/layui/images/face/16.gif rename to src/main/resources/static/layui/images/face/16.gif diff --git a/src/main/webapp/layui/images/face/17.gif b/src/main/resources/static/layui/images/face/17.gif similarity index 100% rename from src/main/webapp/layui/images/face/17.gif rename to src/main/resources/static/layui/images/face/17.gif diff --git a/src/main/webapp/layui/images/face/18.gif b/src/main/resources/static/layui/images/face/18.gif similarity index 100% rename from src/main/webapp/layui/images/face/18.gif rename to src/main/resources/static/layui/images/face/18.gif diff --git a/src/main/webapp/layui/images/face/19.gif b/src/main/resources/static/layui/images/face/19.gif similarity index 100% rename from src/main/webapp/layui/images/face/19.gif rename to src/main/resources/static/layui/images/face/19.gif diff --git a/src/main/webapp/layui/images/face/2.gif b/src/main/resources/static/layui/images/face/2.gif similarity index 100% rename from src/main/webapp/layui/images/face/2.gif rename to src/main/resources/static/layui/images/face/2.gif diff --git a/src/main/webapp/layui/images/face/20.gif b/src/main/resources/static/layui/images/face/20.gif similarity index 100% rename from src/main/webapp/layui/images/face/20.gif rename to src/main/resources/static/layui/images/face/20.gif diff --git a/src/main/webapp/layui/images/face/21.gif b/src/main/resources/static/layui/images/face/21.gif similarity index 100% rename from src/main/webapp/layui/images/face/21.gif rename to src/main/resources/static/layui/images/face/21.gif diff --git a/src/main/webapp/layui/images/face/22.gif b/src/main/resources/static/layui/images/face/22.gif similarity index 100% rename from src/main/webapp/layui/images/face/22.gif rename to src/main/resources/static/layui/images/face/22.gif diff --git a/src/main/webapp/layui/images/face/23.gif b/src/main/resources/static/layui/images/face/23.gif similarity index 100% rename from src/main/webapp/layui/images/face/23.gif rename to src/main/resources/static/layui/images/face/23.gif diff --git a/src/main/webapp/layui/images/face/24.gif b/src/main/resources/static/layui/images/face/24.gif similarity index 100% rename from src/main/webapp/layui/images/face/24.gif rename to src/main/resources/static/layui/images/face/24.gif diff --git a/src/main/webapp/layui/images/face/25.gif b/src/main/resources/static/layui/images/face/25.gif similarity index 100% rename from src/main/webapp/layui/images/face/25.gif rename to src/main/resources/static/layui/images/face/25.gif diff --git a/src/main/webapp/layui/images/face/26.gif b/src/main/resources/static/layui/images/face/26.gif similarity index 100% rename from src/main/webapp/layui/images/face/26.gif rename to src/main/resources/static/layui/images/face/26.gif diff --git a/src/main/webapp/layui/images/face/27.gif b/src/main/resources/static/layui/images/face/27.gif similarity index 100% rename from src/main/webapp/layui/images/face/27.gif rename to src/main/resources/static/layui/images/face/27.gif diff --git a/src/main/webapp/layui/images/face/28.gif b/src/main/resources/static/layui/images/face/28.gif similarity index 100% rename from src/main/webapp/layui/images/face/28.gif rename to src/main/resources/static/layui/images/face/28.gif diff --git a/src/main/webapp/layui/images/face/29.gif b/src/main/resources/static/layui/images/face/29.gif similarity index 100% rename from src/main/webapp/layui/images/face/29.gif rename to src/main/resources/static/layui/images/face/29.gif diff --git a/src/main/webapp/layui/images/face/3.gif b/src/main/resources/static/layui/images/face/3.gif similarity index 100% rename from src/main/webapp/layui/images/face/3.gif rename to src/main/resources/static/layui/images/face/3.gif diff --git a/src/main/webapp/layui/images/face/30.gif b/src/main/resources/static/layui/images/face/30.gif similarity index 100% rename from src/main/webapp/layui/images/face/30.gif rename to src/main/resources/static/layui/images/face/30.gif diff --git a/src/main/webapp/layui/images/face/31.gif b/src/main/resources/static/layui/images/face/31.gif similarity index 100% rename from src/main/webapp/layui/images/face/31.gif rename to src/main/resources/static/layui/images/face/31.gif diff --git a/src/main/webapp/layui/images/face/32.gif b/src/main/resources/static/layui/images/face/32.gif similarity index 100% rename from src/main/webapp/layui/images/face/32.gif rename to src/main/resources/static/layui/images/face/32.gif diff --git a/src/main/webapp/layui/images/face/33.gif b/src/main/resources/static/layui/images/face/33.gif similarity index 100% rename from src/main/webapp/layui/images/face/33.gif rename to src/main/resources/static/layui/images/face/33.gif diff --git a/src/main/webapp/layui/images/face/34.gif b/src/main/resources/static/layui/images/face/34.gif similarity index 100% rename from src/main/webapp/layui/images/face/34.gif rename to src/main/resources/static/layui/images/face/34.gif diff --git a/src/main/webapp/layui/images/face/35.gif b/src/main/resources/static/layui/images/face/35.gif similarity index 100% rename from src/main/webapp/layui/images/face/35.gif rename to src/main/resources/static/layui/images/face/35.gif diff --git a/src/main/webapp/layui/images/face/36.gif b/src/main/resources/static/layui/images/face/36.gif similarity index 100% rename from src/main/webapp/layui/images/face/36.gif rename to src/main/resources/static/layui/images/face/36.gif diff --git a/src/main/webapp/layui/images/face/37.gif b/src/main/resources/static/layui/images/face/37.gif similarity index 100% rename from src/main/webapp/layui/images/face/37.gif rename to src/main/resources/static/layui/images/face/37.gif diff --git a/src/main/webapp/layui/images/face/38.gif b/src/main/resources/static/layui/images/face/38.gif similarity index 100% rename from src/main/webapp/layui/images/face/38.gif rename to src/main/resources/static/layui/images/face/38.gif diff --git a/src/main/webapp/layui/images/face/39.gif b/src/main/resources/static/layui/images/face/39.gif similarity index 100% rename from src/main/webapp/layui/images/face/39.gif rename to src/main/resources/static/layui/images/face/39.gif diff --git a/src/main/webapp/layui/images/face/4.gif b/src/main/resources/static/layui/images/face/4.gif similarity index 100% rename from src/main/webapp/layui/images/face/4.gif rename to src/main/resources/static/layui/images/face/4.gif diff --git a/src/main/webapp/layui/images/face/40.gif b/src/main/resources/static/layui/images/face/40.gif similarity index 100% rename from src/main/webapp/layui/images/face/40.gif rename to src/main/resources/static/layui/images/face/40.gif diff --git a/src/main/webapp/layui/images/face/41.gif b/src/main/resources/static/layui/images/face/41.gif similarity index 100% rename from src/main/webapp/layui/images/face/41.gif rename to src/main/resources/static/layui/images/face/41.gif diff --git a/src/main/webapp/layui/images/face/42.gif b/src/main/resources/static/layui/images/face/42.gif similarity index 100% rename from src/main/webapp/layui/images/face/42.gif rename to src/main/resources/static/layui/images/face/42.gif diff --git a/src/main/webapp/layui/images/face/43.gif b/src/main/resources/static/layui/images/face/43.gif similarity index 100% rename from src/main/webapp/layui/images/face/43.gif rename to src/main/resources/static/layui/images/face/43.gif diff --git a/src/main/webapp/layui/images/face/44.gif b/src/main/resources/static/layui/images/face/44.gif similarity index 100% rename from src/main/webapp/layui/images/face/44.gif rename to src/main/resources/static/layui/images/face/44.gif diff --git a/src/main/webapp/layui/images/face/45.gif b/src/main/resources/static/layui/images/face/45.gif similarity index 100% rename from src/main/webapp/layui/images/face/45.gif rename to src/main/resources/static/layui/images/face/45.gif diff --git a/src/main/webapp/layui/images/face/46.gif b/src/main/resources/static/layui/images/face/46.gif similarity index 100% rename from src/main/webapp/layui/images/face/46.gif rename to src/main/resources/static/layui/images/face/46.gif diff --git a/src/main/webapp/layui/images/face/47.gif b/src/main/resources/static/layui/images/face/47.gif similarity index 100% rename from src/main/webapp/layui/images/face/47.gif rename to src/main/resources/static/layui/images/face/47.gif diff --git a/src/main/webapp/layui/images/face/48.gif b/src/main/resources/static/layui/images/face/48.gif similarity index 100% rename from src/main/webapp/layui/images/face/48.gif rename to src/main/resources/static/layui/images/face/48.gif diff --git a/src/main/webapp/layui/images/face/49.gif b/src/main/resources/static/layui/images/face/49.gif similarity index 100% rename from src/main/webapp/layui/images/face/49.gif rename to src/main/resources/static/layui/images/face/49.gif diff --git a/src/main/webapp/layui/images/face/5.gif b/src/main/resources/static/layui/images/face/5.gif similarity index 100% rename from src/main/webapp/layui/images/face/5.gif rename to src/main/resources/static/layui/images/face/5.gif diff --git a/src/main/webapp/layui/images/face/50.gif b/src/main/resources/static/layui/images/face/50.gif similarity index 100% rename from src/main/webapp/layui/images/face/50.gif rename to src/main/resources/static/layui/images/face/50.gif diff --git a/src/main/webapp/layui/images/face/51.gif b/src/main/resources/static/layui/images/face/51.gif similarity index 100% rename from src/main/webapp/layui/images/face/51.gif rename to src/main/resources/static/layui/images/face/51.gif diff --git a/src/main/webapp/layui/images/face/52.gif b/src/main/resources/static/layui/images/face/52.gif similarity index 100% rename from src/main/webapp/layui/images/face/52.gif rename to src/main/resources/static/layui/images/face/52.gif diff --git a/src/main/webapp/layui/images/face/53.gif b/src/main/resources/static/layui/images/face/53.gif similarity index 100% rename from src/main/webapp/layui/images/face/53.gif rename to src/main/resources/static/layui/images/face/53.gif diff --git a/src/main/webapp/layui/images/face/54.gif b/src/main/resources/static/layui/images/face/54.gif similarity index 100% rename from src/main/webapp/layui/images/face/54.gif rename to src/main/resources/static/layui/images/face/54.gif diff --git a/src/main/webapp/layui/images/face/55.gif b/src/main/resources/static/layui/images/face/55.gif similarity index 100% rename from src/main/webapp/layui/images/face/55.gif rename to src/main/resources/static/layui/images/face/55.gif diff --git a/src/main/webapp/layui/images/face/56.gif b/src/main/resources/static/layui/images/face/56.gif similarity index 100% rename from src/main/webapp/layui/images/face/56.gif rename to src/main/resources/static/layui/images/face/56.gif diff --git a/src/main/webapp/layui/images/face/57.gif b/src/main/resources/static/layui/images/face/57.gif similarity index 100% rename from src/main/webapp/layui/images/face/57.gif rename to src/main/resources/static/layui/images/face/57.gif diff --git a/src/main/webapp/layui/images/face/58.gif b/src/main/resources/static/layui/images/face/58.gif similarity index 100% rename from src/main/webapp/layui/images/face/58.gif rename to src/main/resources/static/layui/images/face/58.gif diff --git a/src/main/webapp/layui/images/face/59.gif b/src/main/resources/static/layui/images/face/59.gif similarity index 100% rename from src/main/webapp/layui/images/face/59.gif rename to src/main/resources/static/layui/images/face/59.gif diff --git a/src/main/webapp/layui/images/face/6.gif b/src/main/resources/static/layui/images/face/6.gif similarity index 100% rename from src/main/webapp/layui/images/face/6.gif rename to src/main/resources/static/layui/images/face/6.gif diff --git a/src/main/webapp/layui/images/face/60.gif b/src/main/resources/static/layui/images/face/60.gif similarity index 100% rename from src/main/webapp/layui/images/face/60.gif rename to src/main/resources/static/layui/images/face/60.gif diff --git a/src/main/webapp/layui/images/face/61.gif b/src/main/resources/static/layui/images/face/61.gif similarity index 100% rename from src/main/webapp/layui/images/face/61.gif rename to src/main/resources/static/layui/images/face/61.gif diff --git a/src/main/webapp/layui/images/face/62.gif b/src/main/resources/static/layui/images/face/62.gif similarity index 100% rename from src/main/webapp/layui/images/face/62.gif rename to src/main/resources/static/layui/images/face/62.gif diff --git a/src/main/webapp/layui/images/face/63.gif b/src/main/resources/static/layui/images/face/63.gif similarity index 100% rename from src/main/webapp/layui/images/face/63.gif rename to src/main/resources/static/layui/images/face/63.gif diff --git a/src/main/webapp/layui/images/face/64.gif b/src/main/resources/static/layui/images/face/64.gif similarity index 100% rename from src/main/webapp/layui/images/face/64.gif rename to src/main/resources/static/layui/images/face/64.gif diff --git a/src/main/webapp/layui/images/face/65.gif b/src/main/resources/static/layui/images/face/65.gif similarity index 100% rename from src/main/webapp/layui/images/face/65.gif rename to src/main/resources/static/layui/images/face/65.gif diff --git a/src/main/webapp/layui/images/face/66.gif b/src/main/resources/static/layui/images/face/66.gif similarity index 100% rename from src/main/webapp/layui/images/face/66.gif rename to src/main/resources/static/layui/images/face/66.gif diff --git a/src/main/webapp/layui/images/face/67.gif b/src/main/resources/static/layui/images/face/67.gif similarity index 100% rename from src/main/webapp/layui/images/face/67.gif rename to src/main/resources/static/layui/images/face/67.gif diff --git a/src/main/webapp/layui/images/face/68.gif b/src/main/resources/static/layui/images/face/68.gif similarity index 100% rename from src/main/webapp/layui/images/face/68.gif rename to src/main/resources/static/layui/images/face/68.gif diff --git a/src/main/webapp/layui/images/face/69.gif b/src/main/resources/static/layui/images/face/69.gif similarity index 100% rename from src/main/webapp/layui/images/face/69.gif rename to src/main/resources/static/layui/images/face/69.gif diff --git a/src/main/webapp/layui/images/face/7.gif b/src/main/resources/static/layui/images/face/7.gif similarity index 100% rename from src/main/webapp/layui/images/face/7.gif rename to src/main/resources/static/layui/images/face/7.gif diff --git a/src/main/webapp/layui/images/face/70.gif b/src/main/resources/static/layui/images/face/70.gif similarity index 100% rename from src/main/webapp/layui/images/face/70.gif rename to src/main/resources/static/layui/images/face/70.gif diff --git a/src/main/webapp/layui/images/face/71.gif b/src/main/resources/static/layui/images/face/71.gif similarity index 100% rename from src/main/webapp/layui/images/face/71.gif rename to src/main/resources/static/layui/images/face/71.gif diff --git a/src/main/webapp/layui/images/face/8.gif b/src/main/resources/static/layui/images/face/8.gif similarity index 100% rename from src/main/webapp/layui/images/face/8.gif rename to src/main/resources/static/layui/images/face/8.gif diff --git a/src/main/webapp/layui/images/face/9.gif b/src/main/resources/static/layui/images/face/9.gif similarity index 100% rename from src/main/webapp/layui/images/face/9.gif rename to src/main/resources/static/layui/images/face/9.gif diff --git a/src/main/webapp/layui/lay/modules/carousel.js b/src/main/resources/static/layui/lay/modules/carousel.js similarity index 100% rename from src/main/webapp/layui/lay/modules/carousel.js rename to src/main/resources/static/layui/lay/modules/carousel.js diff --git a/src/main/webapp/layui/lay/modules/code.js b/src/main/resources/static/layui/lay/modules/code.js similarity index 100% rename from src/main/webapp/layui/lay/modules/code.js rename to src/main/resources/static/layui/lay/modules/code.js diff --git a/src/main/webapp/layui/lay/modules/colorpicker.js b/src/main/resources/static/layui/lay/modules/colorpicker.js similarity index 100% rename from src/main/webapp/layui/lay/modules/colorpicker.js rename to src/main/resources/static/layui/lay/modules/colorpicker.js diff --git a/src/main/webapp/layui/lay/modules/element.js b/src/main/resources/static/layui/lay/modules/element.js similarity index 100% rename from src/main/webapp/layui/lay/modules/element.js rename to src/main/resources/static/layui/lay/modules/element.js diff --git a/src/main/webapp/layui/lay/modules/flow.js b/src/main/resources/static/layui/lay/modules/flow.js similarity index 100% rename from src/main/webapp/layui/lay/modules/flow.js rename to src/main/resources/static/layui/lay/modules/flow.js diff --git a/src/main/webapp/layui/lay/modules/form.js b/src/main/resources/static/layui/lay/modules/form.js similarity index 100% rename from src/main/webapp/layui/lay/modules/form.js rename to src/main/resources/static/layui/lay/modules/form.js diff --git a/src/main/webapp/layui/lay/modules/jquery.js b/src/main/resources/static/layui/lay/modules/jquery.js similarity index 100% rename from src/main/webapp/layui/lay/modules/jquery.js rename to src/main/resources/static/layui/lay/modules/jquery.js diff --git a/src/main/webapp/layui/lay/modules/laydate.js b/src/main/resources/static/layui/lay/modules/laydate.js similarity index 100% rename from src/main/webapp/layui/lay/modules/laydate.js rename to src/main/resources/static/layui/lay/modules/laydate.js diff --git a/src/main/webapp/layui/lay/modules/layedit.js b/src/main/resources/static/layui/lay/modules/layedit.js similarity index 100% rename from src/main/webapp/layui/lay/modules/layedit.js rename to src/main/resources/static/layui/lay/modules/layedit.js diff --git a/src/main/webapp/layui/lay/modules/layer.js b/src/main/resources/static/layui/lay/modules/layer.js similarity index 100% rename from src/main/webapp/layui/lay/modules/layer.js rename to src/main/resources/static/layui/lay/modules/layer.js diff --git a/src/main/webapp/layui/lay/modules/laypage.js b/src/main/resources/static/layui/lay/modules/laypage.js similarity index 100% rename from src/main/webapp/layui/lay/modules/laypage.js rename to src/main/resources/static/layui/lay/modules/laypage.js diff --git a/src/main/webapp/layui/lay/modules/laytpl.js b/src/main/resources/static/layui/lay/modules/laytpl.js similarity index 100% rename from src/main/webapp/layui/lay/modules/laytpl.js rename to src/main/resources/static/layui/lay/modules/laytpl.js diff --git a/src/main/webapp/layui/lay/modules/mobile.js b/src/main/resources/static/layui/lay/modules/mobile.js similarity index 100% rename from src/main/webapp/layui/lay/modules/mobile.js rename to src/main/resources/static/layui/lay/modules/mobile.js diff --git a/src/main/webapp/layui/lay/modules/rate.js b/src/main/resources/static/layui/lay/modules/rate.js similarity index 100% rename from src/main/webapp/layui/lay/modules/rate.js rename to src/main/resources/static/layui/lay/modules/rate.js diff --git a/src/main/webapp/layui/lay/modules/slider.js b/src/main/resources/static/layui/lay/modules/slider.js similarity index 100% rename from src/main/webapp/layui/lay/modules/slider.js rename to src/main/resources/static/layui/lay/modules/slider.js diff --git a/src/main/webapp/layui/lay/modules/table.js b/src/main/resources/static/layui/lay/modules/table.js similarity index 100% rename from src/main/webapp/layui/lay/modules/table.js rename to src/main/resources/static/layui/lay/modules/table.js diff --git a/src/main/webapp/layui/lay/modules/tree.js b/src/main/resources/static/layui/lay/modules/tree.js similarity index 100% rename from src/main/webapp/layui/lay/modules/tree.js rename to src/main/resources/static/layui/lay/modules/tree.js diff --git a/src/main/webapp/layui/lay/modules/upload.js b/src/main/resources/static/layui/lay/modules/upload.js similarity index 100% rename from src/main/webapp/layui/lay/modules/upload.js rename to src/main/resources/static/layui/lay/modules/upload.js diff --git a/src/main/webapp/layui/lay/modules/util.js b/src/main/resources/static/layui/lay/modules/util.js similarity index 100% rename from src/main/webapp/layui/lay/modules/util.js rename to src/main/resources/static/layui/lay/modules/util.js diff --git a/src/main/webapp/layui/layui.all.js b/src/main/resources/static/layui/layui.all.js similarity index 100% rename from src/main/webapp/layui/layui.all.js rename to src/main/resources/static/layui/layui.all.js diff --git a/src/main/webapp/layui/layui.js b/src/main/resources/static/layui/layui.js similarity index 100% rename from src/main/webapp/layui/layui.js rename to src/main/resources/static/layui/layui.js diff --git a/src/main/webapp/admin/magbox/Banner.jsp b/src/main/resources/templates/admin/magbox/Banner.html similarity index 83% rename from src/main/webapp/admin/magbox/Banner.jsp rename to src/main/resources/templates/admin/magbox/Banner.html index 7f1b300..bf33691 100644 --- a/src/main/webapp/admin/magbox/Banner.jsp +++ b/src/main/resources/templates/admin/magbox/Banner.html @@ -1,16 +1,15 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + Banner设置 - - - - - + + + + + diff --git a/src/main/webapp/admin/magbox/Countdown.jsp b/src/main/resources/templates/admin/magbox/Countdown.html similarity index 78% rename from src/main/webapp/admin/magbox/Countdown.jsp rename to src/main/resources/templates/admin/magbox/Countdown.html index 76f5b84..3b0c183 100644 --- a/src/main/webapp/admin/magbox/Countdown.jsp +++ b/src/main/resources/templates/admin/magbox/Countdown.html @@ -1,16 +1,15 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + 盒子倒计时设置 - - - - - + + + + +
diff --git a/src/main/webapp/admin/magbox/magic.jsp b/src/main/resources/templates/admin/magbox/magic.html similarity index 81% rename from src/main/webapp/admin/magbox/magic.jsp rename to src/main/resources/templates/admin/magbox/magic.html index 16a7548..765aead 100644 --- a/src/main/webapp/admin/magbox/magic.jsp +++ b/src/main/resources/templates/admin/magbox/magic.html @@ -1,16 +1,15 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + 魔改列表设置 - - - - - + + + + + diff --git a/src/main/webapp/admin/magbox/popularize.jsp b/src/main/resources/templates/admin/magbox/popularize.html similarity index 85% rename from src/main/webapp/admin/magbox/popularize.jsp rename to src/main/resources/templates/admin/magbox/popularize.html index e1a64b9..2720d5d 100644 --- a/src/main/webapp/admin/magbox/popularize.jsp +++ b/src/main/resources/templates/admin/magbox/popularize.html @@ -1,16 +1,15 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + 推广设置 - - - - - + + + + + diff --git a/src/main/webapp/admin/magbox/tools.jsp b/src/main/resources/templates/admin/magbox/tools.html similarity index 59% rename from src/main/webapp/admin/magbox/tools.jsp rename to src/main/resources/templates/admin/magbox/tools.html index 54cfebe..20e03d4 100644 --- a/src/main/webapp/admin/magbox/tools.jsp +++ b/src/main/resources/templates/admin/magbox/tools.html @@ -1,16 +1,15 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + Insert title here - - - - - + + + + + diff --git a/src/main/webapp/admin/system/userlist.jsp b/src/main/resources/templates/admin/system/userlist.html similarity index 90% rename from src/main/webapp/admin/system/userlist.jsp rename to src/main/resources/templates/admin/system/userlist.html index 5c867bf..32e3eb3 100644 --- a/src/main/webapp/admin/system/userlist.jsp +++ b/src/main/resources/templates/admin/system/userlist.html @@ -1,16 +1,15 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + 用户列表 - - - - - + + + + +
用户列表
diff --git a/src/main/resources/templates/apphtml/user.html b/src/main/resources/templates/apphtml/user.html new file mode 100644 index 0000000..fa1705b --- /dev/null +++ b/src/main/resources/templates/apphtml/user.html @@ -0,0 +1,19 @@ + + + + + + + + +倒计时设置 + + + + + + \ No newline at end of file diff --git a/src/main/webapp/home.jsp b/src/main/resources/templates/home.html similarity index 81% rename from src/main/webapp/home.jsp rename to src/main/resources/templates/home.html index 1d52118..edaa8ca 100644 --- a/src/main/webapp/home.jsp +++ b/src/main/resources/templates/home.html @@ -1,16 +1,15 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + 个人中心 - - - - - - + + + + + +
@@ -82,7 +81,7 @@
- +
@@ -112,56 +111,56 @@ }) $('#banner').click(function(event) { $(document).attr('title', "Banner管理"); - $('#context').attr('src', '/admin/magbox/Banner.jsp'); + $('#context').attr('src', '/admin/magbox/Banner.html'); }) $('#countdown').click(function(event) { $(document).attr('title', "倒计时管理"); - $('#context').attr('src', '/admin/magbox/Countdown.jsp'); + $('#context').attr('src', '/admin/magbox/Countdown.html'); }) $('#users').click(function(event) { $(document).attr('title', '用户列表'); - $('#context').attr('src', "admin/system/userlist.jsp"); + $('#context').attr('src', "admin/system/userlist.html"); }) $('#title').click(function(event) { $(document).attr('title', '个人中心'); - window.location.href = "home.jsp" + window.location.href = "home.html" }) $('#main').click(function(event) { $(document).attr('title', '个人中心'); - $('#context').attr('src', '/html/main.jsp'); + $('#context').attr('src', '/html/main.html'); }) $('#join').click(function(event) { $(document).attr('title', '加入我们'); - $('#context').attr('src', '/html/join.jsp'); + $('#context').attr('src', '/html/join.html'); }) $('#about').click(function(event) { $(document).attr('title', '关于我们'); - $('#context').attr('src', '/html/about.jsp'); + $('#context').attr('src', '/html/about.html'); }) $('#upmod').click(function(event) { $(document).attr('title', '魔改上传器'); - $('#context').attr('src', '/html/upmod.jsp'); + $('#context').attr('src', '/html/upmod.html'); }) $('#mymod').click(function(event) { $(document).attr('title', '我的魔改'); - $('#context').attr('src', '/html/mymod.jsp'); + $('#context').attr('src', '/html/mymod.html'); }) $('#userData').click(function(event) { $(document).attr('title', '基本资料'); - $('#context').attr('src', '/html/userData.jsp'); + $('#context').attr('src', '/html/userData.html'); }) $('#permission').click(function(event) { $(document).attr('title', '申请权限'); - $('#context').attr('src', '/html/permission.jsp'); + $('#context').attr('src', '/html/permission.html'); }) $.post("/user/udata.do", function(data, textStatus, req) { var json = JSON.parse(data); + console.log(data) $('#uname').text(json.data.user.uname); $('#ic_user').attr("src", json.data.userdata.image) try { - var pw = ${ - adminPower - }; + + var pw =json.data.user.power; if (pw == '') { location.reload(); return; diff --git a/src/main/resources/templates/html/about.html b/src/main/resources/templates/html/about.html new file mode 100644 index 0000000..a970d5d --- /dev/null +++ b/src/main/resources/templates/html/about.html @@ -0,0 +1,16 @@ + + + + + +Insert title here + + + + + + + +咕咕咕？ + + \ No newline at end of file diff --git a/src/main/webapp/html/head.jsp b/src/main/resources/templates/html/head.html similarity index 74% rename from src/main/webapp/html/head.jsp rename to src/main/resources/templates/html/head.html index 4fa0317..3aa2fc3 100644 --- a/src/main/webapp/html/head.jsp +++ b/src/main/resources/templates/html/head.html @@ -1,13 +1,12 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + - - - + + + - + + + 听说这里面有福利 diff --git a/src/main/webapp/html/main.jsp b/src/main/resources/templates/html/main.html similarity index 66% rename from src/main/webapp/html/main.jsp rename to src/main/resources/templates/html/main.html index bbd4b3a..56b34ab 100644 --- a/src/main/webapp/html/main.jsp +++ b/src/main/resources/templates/html/main.html @@ -1,6 +1,5 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + @@ -20,6 +19,6 @@ - - + + \ No newline at end of file diff --git a/src/main/webapp/html/mymod.jsp b/src/main/resources/templates/html/mymod.html similarity index 79% rename from src/main/webapp/html/mymod.jsp rename to src/main/resources/templates/html/mymod.html index 6fd0d24..bb84456 100644 --- a/src/main/webapp/html/mymod.jsp +++ b/src/main/resources/templates/html/mymod.html @@ -1,17 +1,16 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - + + Insert title here - - - - - - + + + + + +