diff --git a/.gitignore b/.gitignore index 82eca336..d0af6227 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,8 @@ .settings .springBeans .sts4-cache - +logs +src/target ### IntelliJ IDEA ### .idea *.iws diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 09827eb1..00000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,76 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, sex characteristics, gender identity and expression, -level of experience, education, socio-economic status, nationality, personal -appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at . All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq diff --git a/README.md b/README.md index 1d3d46a9..fe818041 100644 --- a/README.md +++ b/README.md @@ -1,67 +1,8 @@ -# Hellohao图床 - 强大的图像托管服务程序 - -![Visual Studio Marketplace Rating (Stars)](https://img.shields.io/visual-studio-marketplace/stars/ritwickdey.LiveServer?style=flat-square) -![https://img.shields.io/badge/license-AGPL-blue.svg?style=flat-square](https://img.shields.io/badge/license-AGPL-blue.svg?longCache=true&style=flat-square) -![https://img.shields.io/badge/language-java-orange.svg?style=flat-square](https://img.shields.io/badge/language-java-yellow.svg?longCache=true&style=popout-square) - -> 这是一个基于多家对象存储源的SpringBoot开源图片托管程序。 -> 本项目使用 Spring Boot 搭建, 针对用户更方便的管理自己的图片管理拓展功能, 支持对接`本地`、`网易`，`阿里`，`又拍`，`七牛`、`腾讯`、`FTP`、`u-file`,`B2`等多家对象存储. -> 后台对用户管理。 -> 支持配置多家存储源。 -> 用户注册邮箱验证，以及后台配置邮箱服务器。 -> 以及图片鉴黄配置等操作。 - -## 主要功能支持： - -- 多主题支持：炫酷壁纸、简约蓝白 -- 支持 图片拖拽、截图软件直接(Ctrl+V)和图片URL地址上传。 -- 支持对接本地、网易、阿里、又拍、七牛、腾讯、FTP、u-file、B2等各大对象存储平台。 -- 支持图片定期暂存（到期自动删除） -- 支持画廊分享模式(用户可把自己当前上传的图片以图片集的形式批量分享给好友) -- 支持上传者IP记录，并可配置IP黑名单操作 -- 支持链接生成二维码。 -- 支持开启/关闭API接口。 -- URL列表、缩略图。查看原图等功能。 -- 图片鉴黄配置（开启后，每天固定时间进行非法图片监测） -- 游客、用户的上传管理 -- 邮箱注册激活。 -- 站点样式设置和上传规则配置等。 - -主站地址: [http://tbed.hellohao.cn/](http://tbed.hellohao.cn/) - -站点Demo：[http://tc.hellohao.cn/](http://tc.hellohao.cn/) - -文档地址: [http://tbed.hellohao.cn/doc](http://tbed.hellohao.cn/doc) - -开源版编译包下载(内部版请前往主站获取): [https://github.com/Hello-hao/Tbed/releases/](https://github.com/Hello-hao/Tbed/releases/) - -全套部署视频教程：[https://www.bilibili.com/video/av79137056/](https://www.bilibili.com/video/av79137056/) - -## 系统预览 - -![Hellohao/dec2d0616104505.png](http://cdn.wwery.com/Hellohao/dec2d0616104505.png) - -![图床后台管理.png](http://cdn.wwery.com/Hellohao/c208e0825054822.png) -![图床后台管理2.png](http://cdn.wwery.com/Hellohao/6c7690825054822.png) -![图床后台管理3.png](http://cdn.wwery.com/Hellohao/2a79b0825054822.png) -![图床后台管理4.png](http://cdn.wwery.com/Hellohao/5c1800825054824.png) - - ## 运行环境 - JDK 1.8 - MySQL5.5+ -## 一：项目编译 - -(如果你的目的是为了部署自己的图床项目，可以下滑直接用编译包按照部署教程，直接可以部署。) - -### 下载项目 - -```git -git clone https://github.com/Hello-hao/Tbed.git -``` - ### 导入项目 使用自己的 Intellij IDEA 或者 Eclipse 均可. @@ -100,7 +41,7 @@ spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.thymeleaf.cache=false multipart.maxFileSize=10240KB multipart.maxRequestSize=10240KB -spring.thymeleaf.mode = LEGACYHTML5 +spring.thymeleaf.mode = HTML spring.http.multipart.location=/data/upload_tmp ``` @@ -113,60 +54,4 @@ spring.http.multipart.location=/data/upload_tmp 初始邮箱：admin 初始密码`admin` -启动后访问地址为：http://localhost:8088 , `8088`就是你配置`server.port=8088`的端口. - - - -## 二：编译包直接部署 - -> **项目搭建部署教程：** [**http://www.hellohao.cn/?p=201**](http://www.hellohao.cn/?p=201 "点击查看搭建文档") - -### 部署 - -前提是你的服务器必须要有`JDK1.8`环境，和`mysql`数据库。 - -```shell - #JDK安装命令 - yum install java-1.8* -``` - -如果你是宝塔环境，也可以在应用商店安装一个`Tomcat8`因该是自带JDK1.8环境。 - -把`Tbed.jar`和`application.properties`放到服务器你想存放的目录比如`/home`，注意这两个文件必须要在同一目录下不能分开。 -依次运行如下命令： - -```shell -cd /home - -java -jar Tbed.jar -``` - -然后访问`http://服务器IP:8088/`即可。 -注意：上边的`/home`是你的jar包和application.properties文件放的目录。 -项目运行起来不要关闭xshell窗口，否则项目将不能访问。可以使用一些后台命令把项目锁定后台。如`nohup`或`screen`，推荐使用`screen` - -### PC客户端 - -![khd.gif](http://cdn.wwery.com/Hellohao/b1bb70927045346.gif) - -如果你想让自己的图床拥有自己的客户端，可以加下方群，联系群主帮你对接（前提是你使用的是Hellohao图床程序搭建的网站。） - -### 声明 - -本程序免费提供给个人用户使用，未经允许不得作为盈利商业使用，如果你想商用或程序定制，请先与我们联系，分享你的利益。 -源码仅供感兴趣的开发者做开发逻辑参考，不得在未经开发者同意的情况下以他人名义修改并发布使用编译包。 -如果你想个人修改并使用我的源码，请保留原作者的版权，并开源你修改过的源码。 - -### 反馈交流 - - **如果你遇到BUG可以去我的博客反馈** -Hellohao博客: [http://www.hellohao.cn/](http://www.hellohao.cn/) - -欢迎加入Hellohao开发者交流群，群聊号码：**864800972** - -### 捐赠开发者 - -**如果你也支持Hellohao图床，可以请我喝杯咖啡。我会持续更新Hellohao图床** - -**捐赠地址:** [**http://tbed.hellohao.cn/pay**](http://tbed.hellohao.cn/pay) - +启动后访问地址为：http://localhost:8088 , `8088`就是你配置`server.port=8088`的端口. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4ed90f4b..1d1313bb 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ druid-spring-boot-starter 1.1.10 - + com.aliyun.oss aliyun-sdk-oss @@ -62,37 +62,37 @@ java-sdk 4.11.0 - + com.upyun java-sdk 4.1.2 - + com.qiniu qiniu-java-sdk 7.2.22 - + com.qcloud cos_api 5.5.7 - - - - - + + + + + commons-net commons-net 3.3 - + cn.hutool @@ -187,6 +187,12 @@ compile + + commons-httpclient + commons-httpclient + 3.0 + + @@ -197,6 +203,7 @@ spring-boot-maven-plugin true + cn.mq.tbed.TbedApplication diff --git a/sql/picturebed.sql b/sql/picturebed.sql index a1ed495e..5fbabd42 100644 --- a/sql/picturebed.sql +++ b/sql/picturebed.sql @@ -2,16 +2,16 @@ Navicat Premium Data Transfer Source Server : localhost - Source Server Type : MySQL - Source Server Version : 50720 + Source Server Type : MariaDB + Source Server Version : 100504 Source Host : localhost:3306 Source Schema : picturebed - Target Server Type : MySQL - Target Server Version : 50720 + Target Server Type : MariaDB + Target Server Version : 100504 File Encoding : 65001 - Date: 18/03/2020 22:31:29 + Date: 28/12/2020 17:44:56 */ SET NAMES utf8mb4; @@ -29,6 +29,11 @@ CREATE TABLE `album` ( `userid` int(10) NULL DEFAULT NULL ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +-- ---------------------------- +-- Records of album +-- ---------------------------- +INSERT INTO `album` VALUES ('TOALBUM9ee19N', '第一个画廊', '2020-12-28', '951021', 1); + -- ---------------------------- -- Table structure for code -- ---------------------------- @@ -38,7 +43,20 @@ CREATE TABLE `code` ( `value` int(20) NOT NULL, `code` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of code +-- ---------------------------- +INSERT INTO `code` VALUES (2, 1024, 'f70b3ec2473a658a7c922237645e00f73f1996a0095767cfa19ecd29dab26e04'); +INSERT INTO `code` VALUES (3, 1024, '9799a265d89fc026f3b2c22a6bde53ebf859ed707543a6a8bd3e13e6b83131aa'); +INSERT INTO `code` VALUES (4, 1024, 'c301b863e12bff3f7cdba2af0d7ca134c819419ff6eb3e21260a5199456efb43'); +INSERT INTO `code` VALUES (5, 1024, '7279a5421d022f7e6c234d94d90a4d02d54a9053e35054276fdfc532b2433aff'); +INSERT INTO `code` VALUES (6, 1024, 'ce8d66dca8f72c1b7a7aced177e2df6c4c9fa0b39d04e97280124323befae9c6'); +INSERT INTO `code` VALUES (7, 1024, 'df046eef348c873acb7340565f82381255b6e4869c1e25122b3e7af28316904a'); +INSERT INTO `code` VALUES (8, 1024, '78833240197a06d3fb793cd6747e84cd3c6c2323633d6bc49bb7518e98f7245f'); +INSERT INTO `code` VALUES (9, 1024, '2ec0ba794ba60d7d7adcfe3cea4dd6949921d319333d890b226ebd4f463cf7e9'); +INSERT INTO `code` VALUES (10, 1024, '5cb3ffd64a3ba4fdfb1716b172fa44723f698bb397471eeebcb30f27f524d70b'); -- ---------------------------- -- Table structure for config @@ -64,12 +82,12 @@ CREATE TABLE `config` ( `webfavicons` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `theme` int(4) NULL DEFAULT 1 COMMENT '主题', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of config -- ---------------------------- -INSERT INTO `config` VALUES (1, 8, 1, 'Hellohao', '网站由JAVA语言编写应用SpringBoot框架开发，前端全部组件由BootStrap/Layui框架编写。由作者个人更新维护，后期会加入更全面的功能供大家使用，如有BUG请与我反馈。', 'https://hellohao-cloud.oss-cn-beijing.aliyuncs.com/Pexels.mp4', '1', 'Hellohao开发制作', '也许...|这将是最好用的图床', 'console.log(\'百度统计JS代码\');', 'http://127.0.0.1:8088', 'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1565769264&di=74d809d6cfae81bbab83bf9d573d8f9a&src=http://pic17.nipic.com/20110917/7420038_160826355111_2.jpg', 'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1565769264&di=74d809d6cfae81bbab83bf9d573d8f9a&src=http://pic17.nipic.com/20110917/7420038_160826355111_2.jpg', 1, NULL, NULL, NULL, 1); +INSERT INTO `config` VALUES (1, 8, 1, '师哥', '网站由JAVA语言编写应用SpringBoot框架开发，前端全部组件由BootStrap/Layui框架编写。由作者个人更新维护，后期会加入更全面的功能供大家使用，如有BUG请与我反馈。', 'https://hellohao-cloud.oss-cn-beijing.aliyuncs.com/Pexels.mp4', '1', '请叫我师哥', '也许...|这将是最好用的图床', 'console.log(\'\\n\' + \' %c 师哥出品，必属精品！ \' + \'\\n\', \'color: #fadfa3; background: #030307; padding:5px 0;\');', 'http://127.0.0.1:8088', 'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1565769264&di=74d809d6cfae81bbab83bf9d573d8f9a&src=http://pic17.nipic.com/20110917/7420038_160826355111_2.jpg', 'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1565769264&di=74d809d6cfae81bbab83bf9d573d8f9a&src=http://pic17.nipic.com/20110917/7420038_160826355111_2.jpg', 1, NULL, NULL, NULL, 1); -- ---------------------------- -- Table structure for emailconfig @@ -84,12 +102,12 @@ CREATE TABLE `emailconfig` ( `emailname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名', `using` int(4) NULL DEFAULT NULL COMMENT '1为可用，其他为不使用', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of emailconfig -- ---------------------------- -INSERT INTO `emailconfig` VALUES (1, '', '', '', '', '', 0); +INSERT INTO `emailconfig` VALUES (1, 'luyuna1121@163.com', '123', '123', '0', NULL, NULL); -- ---------------------------- -- Table structure for group @@ -116,6 +134,15 @@ CREATE TABLE `imgandalbum` ( `albumkey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; +-- ---------------------------- +-- Records of imgandalbum +-- ---------------------------- +INSERT INTO `imgandalbum` VALUES ('2020/12/28/TOIMG55c9c1228034019N.png', 'TOALBUM9ee19N'); +INSERT INTO `imgandalbum` VALUES ('2020/12/28/TOIMG74d771228034019N.png', 'TOALBUM9ee19N'); +INSERT INTO `imgandalbum` VALUES ('2020/12/28/TOIMGcb1b61228044637N.png', 'TOALBUM9ee19N'); +INSERT INTO `imgandalbum` VALUES ('2020/12/28/TOIMG1888f1228044638N.png', 'TOALBUM9ee19N'); +INSERT INTO `imgandalbum` VALUES ('2020/12/28/TOIMGfbee11228044638N.png', 'TOALBUM9ee19N'); + -- ---------------------------- -- Table structure for imgdata -- ---------------------------- @@ -134,7 +161,21 @@ CREATE TABLE `imgdata` ( `md5key` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, INDEX `index_md5key_url`(`md5key`, `imgurl`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compressed; +) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compressed; + +-- ---------------------------- +-- Records of imgdata +-- ---------------------------- +INSERT INTO `imgdata` VALUES (3, '2020/12/28/TOIMG8feef1228034019N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMG8feef1228034019N.png', 1, '2020-12-28', 33, '0:0:0:0:0:0:0:1', 5, 0, NULL, 'c3c6b8b02135ff705099e31896a40ba3'); +INSERT INTO `imgdata` VALUES (4, '2020/12/28/TOIMG27a471228034019N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMG27a471228034019N.png', 1, '2020-12-28', 31, '0:0:0:0:0:0:0:1', 5, 0, NULL, '5aabd5ae7f506d9a14b995c1aebd8032'); +INSERT INTO `imgdata` VALUES (5, '2020/12/28/TOIMG3f94b1228034019N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMG3f94b1228034019N.png', 1, '2020-12-28', 701, '0:0:0:0:0:0:0:1', 5, 0, NULL, 'bb0e745f1bd70301067bcd643c8210c2'); +INSERT INTO `imgdata` VALUES (6, '2020/12/28/TOIMG55c9c1228034019N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMG55c9c1228034019N.png', 1, '2020-12-28', 340, '0:0:0:0:0:0:0:1', 5, 0, '', '0dcf051e419b3c1330cdb50c25ba74ba'); +INSERT INTO `imgdata` VALUES (7, '2020/12/28/TOIMG74d771228034019N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMG74d771228034019N.png', 1, '2020-12-28', 155, '0:0:0:0:0:0:0:1', 5, 0, '', 'a93f5402b3572dcd797aa51ad0bed814'); +INSERT INTO `imgdata` VALUES (8, '2020/12/28/TOIMG094361228041534N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMG094361228041534N.png', 1, '2020-12-28', 14, '0:0:0:0:0:0:0:1', 5, 0, NULL, '15eb54fcb5a69e527f03287c106fbf52'); +INSERT INTO `imgdata` VALUES (9, '2020/12/28/TOIMGcb1b61228044637N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMGcb1b61228044637N.png', 1, '2020-12-28', 49, '0:0:0:0:0:0:0:1', 5, 0, '', '4812f2386d32385ae43ee4bd6a717838'); +INSERT INTO `imgdata` VALUES (10, '2020/12/28/TOIMG1888f1228044638N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMG1888f1228044638N.png', 1, '2020-12-28', 64, '0:0:0:0:0:0:0:1', 5, 0, '', '7350b217e7fde0d6152d8a01660d425a'); +INSERT INTO `imgdata` VALUES (11, '2020/12/28/TOIMGfbee11228044638N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMGfbee11228044638N.png', 1, '2020-12-28', 46, '0:0:0:0:0:0:0:1', 5, 0, '', '50c2d2b67cb94dfeb09c18746eb28f29'); +INSERT INTO `imgdata` VALUES (12, '2020/12/28/TOIMGe5d641228045647N.png', 'http://127.0.0.1:8088/2020/12/28/TOIMGe5d641228045647N.png', 0, '2020-12-28', 1396, '0:0:0:0:0:0:0:1', 5, 0, NULL, 'a894878a9b97664ef2eee16619befc5d'); -- ---------------------------- -- Table structure for imgreview @@ -231,7 +272,7 @@ CREATE TABLE `uploadconfig` ( -- ---------------------------- -- Records of uploadconfig -- ---------------------------- -INSERT INTO `uploadconfig` VALUES (1, 3, 5, 1, 5, 'gif,jpg,jpeg,bmp,png', 2, 1, 1, 500, 1024, ''); +INSERT INTO `uploadconfig` VALUES (1, 3, 15, 1, 5, 'gif,jpg,jpeg,bmp,png', 2, 1, 1, 500, 10240, ''); -- ---------------------------- -- Table structure for user @@ -254,7 +295,7 @@ CREATE TABLE `user` ( -- ---------------------------- -- Records of user -- ---------------------------- -INSERT INTO `user` VALUES (1, 'admin', 'YWRtaW4=', 'admin', '2019-06-12', 2, '828812cff63b4e52b7be7911a9a410b2', 1, 1024, 1); +INSERT INTO `user` VALUES (1, 'admin', 'YWRtaW4=', 'admin', '2019-06-12', 2, 'bf4e20c586284ae3bc31c7554d345fed', 1, 2048, 1); -- ---------------------------- -- Table structure for usergroup diff --git a/src/main/java/cn/hellohao/controller/UpdateImgController.java b/src/main/java/cn/hellohao/controller/UpdateImgController.java deleted file mode 100644 index 96c7ae61..00000000 --- a/src/main/java/cn/hellohao/controller/UpdateImgController.java +++ /dev/null @@ -1,446 +0,0 @@ -package cn.hellohao.controller; - -import cn.hellohao.pojo.*; -import cn.hellohao.service.*; -import cn.hellohao.service.impl.*; -import cn.hellohao.utils.*; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.imageio.ImageIO; -import javax.imageio.ImageWriteParam; -import javax.imageio.ImageWriter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.awt.image.BufferedImage; -import java.io.*; -import java.text.SimpleDateFormat; -import java.util.*; - -@Controller -public class UpdateImgController { - @Autowired - private NOSImageupload nOSImageupload; - @Autowired - private UserService userService; - @Autowired - private KeysService keysService; - @Autowired - private ConfigService configService; - @Autowired - private UploadConfigService uploadConfigService; - @Autowired - private USSImageupload ussImageupload; - @Autowired - private KODOImageupload kodoImageupload; - @Autowired - private COSImageupload cosImageupload; - @Autowired - private FTPImageupload ftpImageupload; - @Autowired - private ImgService imgService; - @Autowired - private UploadServicel uploadServicel; - - private String[] iparr; - - @RequestMapping({"/", "/index"}) - public String indexImg(Model model, HttpSession httpSession, HttpServletRequest request, HttpServletResponse response) { - Print.Normal("当前项目路径："+System.getProperty("user.dir")); - Config config = configService.getSourceype(); - UploadConfig uploadConfig = uploadConfigService.getUpdateConfig(); - User u = (User) httpSession.getAttribute("user"); - String email = (String) httpSession.getAttribute("email"); - Integer filesizetourists = 0; - Integer filesizeuser = 0; - Integer imgcounttourists = 0; - Integer imgcountuser = 0; - if(uploadConfig.getFilesizetourists()!=null){filesizetourists = uploadConfig.getFilesizetourists();} - if(uploadConfig.getFilesizeuser()!=null){filesizeuser = uploadConfig.getFilesizeuser();} - if(uploadConfig.getImgcounttourists()!=null){imgcounttourists = uploadConfig.getImgcounttourists();} - if(uploadConfig.getImgcountuser()!=null){imgcountuser = uploadConfig.getImgcountuser();} - if (email != null) { - Integer ret = userService.login(u.getEmail(), u.getPassword(),null); - if (ret > 0) { - User user = userService.getUsers(u.getEmail()); - model.addAttribute("username", user.getUsername()); - model.addAttribute("level", user.getLevel()); - model.addAttribute("loginid", 100); - model.addAttribute("imgcount", imgcountuser); - model.addAttribute("filesize", filesizeuser*1024*1024); - } else { - model.addAttribute("loginid", -1); - model.addAttribute("imgcount", imgcounttourists); - } - } else { - model.addAttribute("loginid", -2); - model.addAttribute("imgcount", imgcounttourists); - model.addAttribute("filesize", filesizetourists*1024*1024); - } - model.addAttribute("suffix", uploadConfig.getSuffix()); - model.addAttribute("config", config); - model.addAttribute("uploadConfig", uploadConfig); - Integer isupdate = 1; - if(uploadConfig.getIsupdate()!=1){ - isupdate = (u == null) ? 0: 1; - } - model.addAttribute("VisitorUpload", isupdate); - - if(config.getTheme()==1){ - return "index"; - }else{ - return "index-Minimalism"; - } - } - - @RequestMapping(value = "/upimg") - @ResponseBody - public Msg upimg( HttpSession session,HttpServletRequest request - , @RequestParam(value = "file", required = false) MultipartFile multipartFile,Integer setday,String upurlk) throws Exception { - Msg msg = new Msg(); - msg = uploadServicel.uploadForLoc(session,request,multipartFile,setday,upurlk,iparr); - return msg; - } - -//根据网络图片url上传 - @PostMapping(value = "/upurlimg") - @ResponseBody - public String upurlimg(HttpSession session, String imgurl, HttpServletRequest request,Integer setday,String upurlk) throws Exception { - JSONArray jsonArray = new JSONArray(); - Config config = configService.getSourceype(); - UploadConfig uploadConfig = uploadConfigService.getUpdateConfig(); - User u = (User) session.getAttribute("user"); - Integer usermemory =0; - Integer memory =0; - Integer Sourcekey=0; - String userpath = "tourist"; - String userip = GetIPS.getIpAddr(request); - Print.Normal("上传者ip:"+userip); - iparr = uploadConfig.getBlacklist().split(";"); - for (String s : iparr) { - if(s.equals(userip)){ - jsonArray.add(911); - return jsonArray.toString(); - } - } - if(u==null){ - Sourcekey = GetCurrentSource.GetSource(null); - memory = uploadConfig.getVisitormemory(); - usermemory= imgService.getusermemory(0); - if(usermemory==null){usermemory = 0;} - }else{ - userpath = u.getUsername(); - Sourcekey = GetCurrentSource.GetSource(u.getId()); - memory = userService.getUsers(u.getEmail()).getMemory(); - usermemory= imgService.getusermemory(u.getId()); - if(usermemory==null){usermemory = 0;} - } - if(uploadConfig.getUrltype()==2){ - java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("yyyy/MM/dd"); - userpath = dateFormat.format(new Date()); - } - if(Integer.parseInt(Base64Encryption.decryptBASE64(upurlk))!=yzupdate()){ - jsonArray.add(-403); - return jsonArray.toString(); - } - Keys key = keysService.selectKeys(Sourcekey); - long imgsize = ImgUrlUtil.getFileLength(imgurl); - Integer youke = uploadConfig.getFilesizetourists(); - Integer yonghu = uploadConfig.getFilesizeuser(); - String uuid= UUID.randomUUID().toString().replace("-", ""); - Boolean bo =false; - bo = Sourcekey==5?true:StringUtils.doNull(Sourcekey,key); - if(!bo){ - jsonArray.add(-1); - return jsonArray.toString(); - } - Print.warning("上传地址是："+request.getSession().getServletContext().getRealPath("/")+"/hellohaotmp/"); - - if(usermemory/1024>=memory) { - jsonArray.add(-5); - return jsonArray.toString(); - } - long stime = System.currentTimeMillis(); - if(u!=null){ - if(imgsize>0 && imgsize>=(yonghu*1024*1024)) { - jsonArray.add(-2); - return jsonArray.toString(); - } - try{ - boolean bl =ImgUrlUtil.downLoadFromUrl(imgurl, - uuid, request.getSession().getServletContext().getRealPath("/")+File.separator+"hellohaotmp"+File.separator); - if(bl==true){ - FileInputStream is = new FileInputStream(request.getSession().getServletContext().getRealPath("/")+File.separator+"hellohaotmp"+File.separator+uuid); - byte[] b = new byte[3]; - is.read(b, 0, b.length); - String xxx = ImgUrlUtil.bytesToHexString(b); - xxx = xxx.toUpperCase(); - if(is!=null){is.close();} - if(TypeDict.checkType(xxx).equals("0000")) { - jsonArray.add(-3);//不是图片格式 - return jsonArray.toString(); - } - Map map = new HashMap<>(); - map.put(TypeDict.checkType(xxx), request.getSession().getServletContext().getRealPath("/")+"hellohaotmp"+ File.separator+uuid); - Map m = null; - m = GetSource.storageSource(key.getStorageType(), null, userpath,map,setday); - Images img = new Images(); - SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd"); - String times = df.format(new Date()); - System.out.println("上传图片的时间是："+times); - for (Map.Entry entry : m.entrySet()) { - if(key.getStorageType()==5){ - if(config.getDomain()!=null){ - jsonArray.add(config.getDomain()+"/"+entry.getKey().getImgurl()); - img.setImgurl(config.getDomain()+"/"+entry.getKey().getImgurl());//图片链接 - }else{ - jsonArray.add(config.getDomain()+"/"+entry.getKey().getImgurl()); - img.setImgurl("http://"+IPPortUtil.getLocalIP()+":"+IPPortUtil.getLocalPort()+"/"+entry.getKey().getImgurl());//图片链接 - } - }else{ - jsonArray.add(entry.getKey().getImgurl()); - img.setImgurl(entry.getKey().getImgurl()); - } - img.setUpdatetime(times); - img.setSource(key.getStorageType()); - img.setUserid(u == null?0:u.getId()); - img.setSizes((entry.getValue())); - //img.setImgname(SetText.getSubString(entry.getKey().getImgurl(), key.getRequestAddress() + "/", "")); - img.setImgname(entry.getKey().getImgurl()); - img.setAbnormal(userip); - if(setday>0){img.setImgtype(1);} - else{img.setImgtype(0);} - userService.insertimg(img); - long etime = System.currentTimeMillis(); - System.out.println("上传图片所用时长：" + String.valueOf(etime - stime) + "ms"); - } - } - }catch (Exception e) { - Print.warning(e.toString()); - jsonArray.add(-4); - } - }else{ - if(imgsize>0 && imgsize>=(youke*1024*1024)){ - //文件过大 - jsonArray.add(-2); - return jsonArray.toString(); - } - try{ - boolean bl = ImgUrlUtil.downLoadFromUrl(imgurl, - uuid, request.getSession().getServletContext().getRealPath("/")+"hellohaotmp"+File.separator); - if(bl==true){ - FileInputStream is = new FileInputStream(request.getSession().getServletContext().getRealPath("/")+"hellohaotmp"+File.separator+uuid); - byte[] b = new byte[3]; - is.read(b, 0, b.length); - String xxx = ImgUrlUtil.bytesToHexString(b); - xxx = xxx.toUpperCase(); - if(is!=null){is.close(); } - if(xxx.equals("0000")) { - jsonArray.add(-3); - return jsonArray.toString(); - } - Map map = new HashMap<>(); - map.put(TypeDict.checkType(xxx), request.getSession().getServletContext().getRealPath("/")+File.separator+"hellohaotmp"+File.separator+uuid); - Map m = null; - m = GetSource.storageSource(key.getStorageType(), null, userpath,map,setday); - Images img = new Images(); - SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd"); - String times = df.format(new Date()); - System.out.println("上传图片的时间是："+times); - for (Map.Entry entry : m.entrySet()) { - if(key.getStorageType()==5){ - if(config.getDomain()!=null){ - jsonArray.add(config.getDomain()+"/"+entry.getKey().getImgurl()); - img.setImgurl(config.getDomain()+"/"+entry.getKey().getImgurl()); - }else{ - jsonArray.add(config.getDomain()+"/"+entry.getKey().getImgurl()); - img.setImgurl("http://"+IPPortUtil.getLocalIP()+":"+IPPortUtil.getLocalPort()+"/"+entry.getKey().getImgurl());//图片链接 - } - }else{ - jsonArray.add(entry.getKey().getImgurl()); - img.setImgurl(entry.getKey().getImgurl()); - } - img.setUpdatetime(times); - img.setSource(key.getStorageType()); - img.setUserid(u == null?0:u.getId()); - img.setSizes((entry.getValue())); - img.setImgname(SetText.getSubString(entry.getKey().getImgurl(), key.getRequestAddress() + "/", "")); - img.setImgtype(setday>0?1:0); - img.setAbnormal(userip); - userService.insertimg(img); - long etime = System.currentTimeMillis(); - System.out.println("上传图片所用时长：" + String.valueOf(etime - stime) + "ms"); - } - } - }catch (Exception e) { - Print.warning(e.toString()); - jsonArray.add(-4); - } - } - return jsonArray.toString(); -/** - * 错误返回值含义： - * -1 存储源key未配置 - * -2 目标图片太大或者不存在 - * -3 文件类型不符合要求 - * */ - } - - @RequestMapping("/sentence") - @ResponseBody - public String sentence(HttpSession session, Integer id) { - JSONArray jsonArray = new JSONArray(); - String text = Sentence.getURLContent(); - jsonArray.add(text); - return jsonArray.toString(); - } - - //ajax查询用户是否已经登录 - @RequestMapping(value = "/islogin") - @ResponseBody - public String islogin(HttpSession session) { - JSONObject jsonObject = new JSONObject(); - User user = (User) session.getAttribute("user"); - if(user!=null){ - if (user.getEmail() != null && user.getPassword() != null) { - jsonObject.put("username",user.getUsername()); - jsonObject.put("level",user.getLevel()); - jsonObject.put("lgoinret",1); - }else{ - jsonObject.put("lgoinret",0); - } - } - return jsonObject.toString(); - } - - @GetMapping(value = "/images/{id}") - @ResponseBody - public Images selectByFy(@PathVariable("id") Integer id) { - return imgService.selectByPrimaryKey(id); - } - - - @RequestMapping("/{key1}/TOIMG{key2}N.{key3}") - public void selectByFy(HttpServletRequest request, HttpServletResponse response, - @PathVariable("key1") String key1, @PathVariable("key2") String key2, - @PathVariable("key3") String key3, Model model){ - String head = "jpg"; - if(key3.equals("jpg")||key3.equals("jpeg")){ - head = "jpeg"; - }else if(key3.equals("png")){ - head = "png"; - }else if(key3.equals("bmp")){ - head = "bmp"; - }else if(key3.equals("gif")){ - head = "gif"; - }else{ - head = key3; - } - response.setHeader("Pragma", "no-cache"); - response.setHeader("Cache-Control", "no-cache"); - response.setDateHeader("Expires", 0); - response.setContentType("image/"+head); - InputStream is= null; - BufferedImage bi=null; - try { - is = new FileInputStream(new File(File.separator+"HellohaoData"+File.separator+key1+"/TOIMG"+key2+"N."+key3)); - bi= ImageIO.read(is); - is.close(); - //将图片输出给浏览器 - BufferedImage image = (bi) ; - OutputStream os = response.getOutputStream(); - ImageIO.write(image, head, os); - } catch (Exception e) { - Print.warning("寻找本地文件出错："+e.getMessage()); - e.printStackTrace(); - try { - response.sendRedirect("/404"); - } catch (IOException ex) { - ex.printStackTrace(); - } - } - //return "forward:/links/"+key1+"/TOIMG"+key2+"N."+key3; - } - - @RequestMapping("/{key1:\\d+}/{key2}/{key3}/TOIMG{key4}N.{key5}") - public void selectByFy2(HttpServletRequest request, HttpServletResponse response, - @PathVariable("key1") String key1,@PathVariable("key2") String key2, - @PathVariable("key3") String key3,@PathVariable("key4") String key4, - @PathVariable("key5") String key5,Model model) { - String head = "jpg"; - if(key5.equals("jpg")||key5.equals("jpeg")){ - head = "jpeg"; - }else if(key5.equals("png")){ - head = "png"; - }else if(key5.equals("bmp")){ - head = "bmp"; - }else if(key5.equals("gif")){ - head = "gif"; - }else{ - head = key5; - } - response.setHeader("Pragma", "no-cache"); - response.setHeader("Cache-Control", "no-cache"); - response.setDateHeader("Expires", 0); - response.setContentType("image/"+head); - InputStream is= null; - BufferedImage bi=null; - try { - is = new FileInputStream(new File(File.separator+"HellohaoData"+File.separator+key1+"/"+key2+"/"+key3+"/TOIMG"+key4+"N."+key5)); - bi= ImageIO.read(is); - is.close(); - //将图片输出给浏览器 - BufferedImage image = (bi) ; - OutputStream os = response.getOutputStream(); - ImageIO.write(image, head, os); - } catch (Exception e) { - Print.warning("寻找本地文件出错："+e.getMessage()); - e.printStackTrace(); - try { - response.sendRedirect("/404"); - } catch (IOException ex) { - ex.printStackTrace(); - } - } - - - -/* InputStream is= null; - BufferedImage bi=null; - is = new FileInputStream(new File(File.separator+"HellohaoData"+File.separator+key1+"/"+key2+"/"+key3+"/TOIMG"+key4+"N."+key5)); - bi= ImageIO.read(is); - is.close(); - - //将验证码存入Session - //将图片输出给浏览器 - BufferedImage image = (bi) ; - response.setContentType("image/JPEG"); - OutputStream os = response.getOutputStream(); - ImageIO.write(image, "JPEG", os);*/ - - - } - - private Integer yzupdate(){ - Calendar cal = Calendar.getInstance(); - int y=cal.get(Calendar.YEAR); - int m=cal.get(Calendar.MONTH); - int d=cal.get(Calendar.DATE); - //int h=cal.get(Calendar.HOUR_OF_DAY); - //int mm=cal.get(Calendar.MINUTE); - return y+m+d+999; - } - - @RequestMapping("/err") - public String err() { - return "err"; - } - - -} diff --git a/src/main/java/cn/mq/tbed/SendPic.java b/src/main/java/cn/mq/tbed/SendPic.java new file mode 100644 index 00000000..66c4136a --- /dev/null +++ b/src/main/java/cn/mq/tbed/SendPic.java @@ -0,0 +1,92 @@ +package cn.mq.tbed; + + +import java.io.*; + + +import cn.hutool.http.HttpRequest; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.multipart.FilePart; +import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity; +import org.apache.commons.httpclient.methods.multipart.Part; + + +/** + * @author mq + * @description: TODO + * @title: SendPic + * @projectName Tbed + * @date 2021/1/1416:13 + */ +public class SendPic { + public static void main(String[] args) throws IOException { + String path = "2021/03/09/TOIMG4fd080309102352N.jpg"; + String url = "http://localhost:8081/delimg?fileName="+path; + String body = HttpRequest.get(url).execute().body(); + System.out.println(body); + +// String url = "http://localhost:8081/upimgss"; +// File file = new File("78-1609827215767.jpg"); +// String fileload = SendPic.fileload(url, file); +// System.out.println(fileload); +// String body = HttpRequest.get(url).timeout(20000).form("file", baos.toByteArray(), "aaa.png").execute().body(); +// System.out.println(body); + + } + + public static String fileload(String url, File file) { + String body = "{}"; + + if (url == null || url.equals("")) { + return "illegal"; + } + if (!file.exists()) { + return "file not exist"; + } + + PostMethod postMethod = new PostMethod(url); + BufferedReader br = null; + try { + // FilePart：用来上传文件的类,file即要上传的文件 + FilePart fp = new FilePart("file", file); + Part[] parts = new Part[]{fp}; + + // 对于MIME类型的请求，httpclient建议全用MulitPartRequestEntity进行包装 + MultipartRequestEntity mre = new MultipartRequestEntity(parts, postMethod.getParams()); + postMethod.setRequestEntity(mre); + + HttpClient client = new HttpClient(); + // 由于要上传的文件可能比较大 , 因此在此设置最大的连接超时时间 + client.getHttpConnectionManager().getParams().setConnectionTimeout(5000); + int status = client.executeMethod(postMethod); + if (status == HttpStatus.SC_OK) { + InputStream inputStream = postMethod.getResponseBodyAsStream(); + br = new BufferedReader(new InputStreamReader(inputStream)); + StringBuilder stringBuffer = new StringBuilder(); + String str = ""; + while ((str = br.readLine()) != null) { + stringBuffer.append(str); + } + body = stringBuffer.toString(); + } else { + body = "fail"; + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (br != null) { + try { + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + // 释放连接 + postMethod.releaseConnection(); + } + return body; + } +} + diff --git a/src/main/java/cn/hellohao/TbedApplication.java b/src/main/java/cn/mq/tbed/TbedApplication.java similarity index 75% rename from src/main/java/cn/hellohao/TbedApplication.java rename to src/main/java/cn/mq/tbed/TbedApplication.java index 7907dbb3..871620ec 100644 --- a/src/main/java/cn/hellohao/TbedApplication.java +++ b/src/main/java/cn/mq/tbed/TbedApplication.java @@ -1,21 +1,13 @@ -package cn.hellohao; +package cn.mq.tbed; import javax.servlet.MultipartConfigElement; -import javax.servlet.http.HttpServletRequest; -import cn.hellohao.utils.Print; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import java.net.InetAddress; -import java.util.Scanner; @SpringBootApplication @Configuration diff --git a/src/main/java/cn/hellohao/config/WebMvcConfigurer.java b/src/main/java/cn/mq/tbed/config/WebMvcConfigurer.java similarity index 87% rename from src/main/java/cn/hellohao/config/WebMvcConfigurer.java rename to src/main/java/cn/mq/tbed/config/WebMvcConfigurer.java index f6fa29ed..ab0940a6 100644 --- a/src/main/java/cn/hellohao/config/WebMvcConfigurer.java +++ b/src/main/java/cn/mq/tbed/config/WebMvcConfigurer.java @@ -1,5 +1,6 @@ -package cn.hellohao.config; +package cn.mq.tbed.config; +import cn.mq.tbed.utils.Resources; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @@ -11,7 +12,7 @@ public class WebMvcConfigurer extends WebMvcConfigurerAdapter { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - String filePath =File.separator + "HellohaoData" + File.separator; + String filePath =File.separator + Resources.basePath + File.separator; //和页面有关的静态目录都放在项目的static目录下 //registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/"); //上传的图片在D盘下的OTA目录下，访问路径如：http://localhost:8081/OTA/d3cf0281-bb7f-40e0-ab77-406db95ccf2c.jpg diff --git a/src/main/java/cn/hellohao/controller/AdminController.java b/src/main/java/cn/mq/tbed/controller/AdminController.java similarity index 97% rename from src/main/java/cn/hellohao/controller/AdminController.java rename to src/main/java/cn/mq/tbed/controller/AdminController.java index 1ced80d0..676e45f3 100644 --- a/src/main/java/cn/hellohao/controller/AdminController.java +++ b/src/main/java/cn/mq/tbed/controller/AdminController.java @@ -1,12 +1,12 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; -import cn.hellohao.pojo.*; -import cn.hellohao.pojo.vo.PageResultBean; -import cn.hellohao.service.*; -import cn.hellohao.service.impl.AlbumServiceI; -import cn.hellohao.service.impl.ImgServiceImpl; -import cn.hellohao.service.impl.UserServiceImpl; -import cn.hellohao.utils.*; +import cn.mq.tbed.pojo.*; +import cn.mq.tbed.pojo.vo.PageResultBean; +import cn.mq.tbed.service.impl.AlbumServiceI; +import cn.mq.tbed.service.impl.ImgServiceImpl; +import cn.mq.tbed.service.impl.UserServiceImpl; +import cn.mq.tbed.service.*; +import cn.mq.tbed.utils.*; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; @@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -165,7 +164,7 @@ public String getwebconfig(HttpSession session) { @RequestMapping(value = "/selecttable") @ResponseBody public PageResultBean selectByFy(HttpSession session, Integer pageNum, Integer pageSize, Integer selecttype, - Integer storageType,String starttime,String stoptime) { + Integer storageType, String starttime, String stoptime) { User u = (User) session.getAttribute("user"); Images img = new Images(); if(storageType!=null){ @@ -425,8 +424,8 @@ public String albumlist(HttpSession session, Model model) { @PostMapping("/getAlbumURLList") @ResponseBody - public Map getAlbumURLList (HttpSession session,@RequestParam(required = false, defaultValue = "1") int page, - @RequestParam(required = false) int limit,Album album){ + public Map getAlbumURLList (HttpSession session, @RequestParam(required = false, defaultValue = "1") int page, + @RequestParam(required = false) int limit, Album album){ User u = (User) session.getAttribute("user"); PageHelper.startPage(page, limit); List list = null; diff --git a/src/main/java/cn/hellohao/controller/AdminRootController.java b/src/main/java/cn/mq/tbed/controller/AdminRootController.java similarity index 96% rename from src/main/java/cn/hellohao/controller/AdminRootController.java rename to src/main/java/cn/mq/tbed/controller/AdminRootController.java index 83ad98c3..02e8aa71 100644 --- a/src/main/java/cn/hellohao/controller/AdminRootController.java +++ b/src/main/java/cn/mq/tbed/controller/AdminRootController.java @@ -1,12 +1,12 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; -import cn.hellohao.pojo.*; -import cn.hellohao.service.*; -import cn.hellohao.service.impl.*; -import cn.hellohao.utils.GetCurrentSource; -import cn.hellohao.utils.Print; -import cn.hellohao.utils.StringUtils; +import cn.mq.tbed.pojo.*; +import cn.mq.tbed.utils.GetCurrentSource; +import cn.mq.tbed.utils.Print; +import cn.mq.tbed.utils.StringUtils; import cn.hutool.http.HttpUtil; +import cn.mq.tbed.service.*; +import cn.mq.tbed.service.impl.*; import com.alibaba.fastjson.JSONArray; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -54,7 +54,7 @@ public String touser() { public String tostorage(HttpSession session, Model model, HttpServletRequest request) { User u = (User) session.getAttribute("user"); Integer Sourcekey = GetCurrentSource.GetSource(u.getId()); - Keys key= keysService.selectKeys(Sourcekey); + Keys key= keysService.selectKeys(Sourcekey); Boolean b = StringUtils.doNull(Sourcekey,key); Integer StorageType = 0; if(Sourcekey!=5){ diff --git a/src/main/java/cn/hellohao/controller/AlbumController.java b/src/main/java/cn/mq/tbed/controller/AlbumController.java similarity index 91% rename from src/main/java/cn/hellohao/controller/AlbumController.java rename to src/main/java/cn/mq/tbed/controller/AlbumController.java index 2fbb3d24..1030e520 100644 --- a/src/main/java/cn/hellohao/controller/AlbumController.java +++ b/src/main/java/cn/mq/tbed/controller/AlbumController.java @@ -1,14 +1,13 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; -import cn.hellohao.pojo.*; -import cn.hellohao.service.*; -import cn.hellohao.service.impl.AlbumServiceI; -import cn.hellohao.service.impl.ImgAndAlbumServiceImpl; -import cn.hellohao.utils.GetCurrentSource; -import cn.hellohao.utils.Print; +import cn.mq.tbed.pojo.*; +import cn.mq.tbed.service.impl.AlbumServiceI; +import cn.mq.tbed.utils.GetCurrentSource; +import cn.mq.tbed.service.ConfigService; +import cn.mq.tbed.service.ImgAndAlbumService; +import cn.mq.tbed.service.ImgService; +import cn.mq.tbed.service.UploadConfigService; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -53,8 +52,8 @@ public String addalbum(HttpSession session,Model model) { @PostMapping("/SaveForAlbum") @ResponseBody - public Msg SaveForAlbum(HttpSession session,@RequestParam("imgarr[]") String[] imgarr, @RequestParam("aboutarr[]") String[] aboutarr, - String albumtitle, String password){ + public Msg SaveForAlbum(HttpSession session, @RequestParam("imgarr[]") String[] imgarr, @RequestParam("aboutarr[]") String[] aboutarr, + String albumtitle, String password){ Msg msg = new Msg(); User u = (User) session.getAttribute("user"); String uuid = "TOALBUM"+ UUID.randomUUID().toString().replace("-", "").toLowerCase().substring(0,5)+"N"; diff --git a/src/main/java/cn/hellohao/controller/ClientController.java b/src/main/java/cn/mq/tbed/controller/ClientController.java similarity index 99% rename from src/main/java/cn/hellohao/controller/ClientController.java rename to src/main/java/cn/mq/tbed/controller/ClientController.java index 344745bf..19748552 100644 --- a/src/main/java/cn/hellohao/controller/ClientController.java +++ b/src/main/java/cn/mq/tbed/controller/ClientController.java @@ -1,10 +1,10 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; -import cn.hellohao.pojo.*; -import cn.hellohao.service.*; -import cn.hellohao.service.impl.*; -import cn.hellohao.utils.*; import cn.hutool.http.HttpUtil; +import cn.mq.tbed.pojo.*; +import cn.mq.tbed.service.*; +import cn.mq.tbed.service.impl.*; +import cn.mq.tbed.utils.*; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; @@ -57,7 +57,7 @@ public class ClientController { @PostMapping(value = "/clientupimg") @ResponseBody - public ResultBean clientupimg(HttpServletRequest request,@RequestParam("file") List file, String email, String pass) throws Exception { + public ResultBean clientupimg(HttpServletRequest request, @RequestParam("file") List file, String email, String pass) throws Exception { String userip = GetIPS.getIpAddr(request); Print.Normal("上传者ip:"+userip); ResultBean resultBean = null; diff --git a/src/main/java/cn/hellohao/controller/CodeController.java b/src/main/java/cn/mq/tbed/controller/CodeController.java similarity index 89% rename from src/main/java/cn/hellohao/controller/CodeController.java rename to src/main/java/cn/mq/tbed/controller/CodeController.java index 161c97a3..f940b674 100644 --- a/src/main/java/cn/hellohao/controller/CodeController.java +++ b/src/main/java/cn/mq/tbed/controller/CodeController.java @@ -1,14 +1,9 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; -import cn.hellohao.pojo.Code; -import cn.hellohao.pojo.Config; -import cn.hellohao.pojo.User; -import cn.hellohao.service.CodeService; -import cn.hellohao.service.KeysService; -import cn.hellohao.service.UserService; -import cn.hellohao.service.impl.ImgServiceImpl; +import cn.mq.tbed.pojo.Code; +import cn.mq.tbed.pojo.User; +import cn.mq.tbed.service.CodeService; import cn.hutool.crypto.SecureUtil; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/hellohao/controller/ErrorController.java b/src/main/java/cn/mq/tbed/controller/ErrorController.java similarity index 96% rename from src/main/java/cn/hellohao/controller/ErrorController.java rename to src/main/java/cn/mq/tbed/controller/ErrorController.java index f2f4f5da..a1fbb1e5 100644 --- a/src/main/java/cn/hellohao/controller/ErrorController.java +++ b/src/main/java/cn/mq/tbed/controller/ErrorController.java @@ -1,4 +1,4 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.stereotype.Controller; diff --git a/src/main/java/cn/hellohao/controller/ExceptionHandling.java b/src/main/java/cn/mq/tbed/controller/ExceptionHandling.java similarity index 91% rename from src/main/java/cn/hellohao/controller/ExceptionHandling.java rename to src/main/java/cn/mq/tbed/controller/ExceptionHandling.java index 8e0188b5..dc38ea9b 100644 --- a/src/main/java/cn/hellohao/controller/ExceptionHandling.java +++ b/src/main/java/cn/mq/tbed/controller/ExceptionHandling.java @@ -1,18 +1,14 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; -import cn.hellohao.exception.StorageSourceInitException; -import cn.hellohao.utils.Print; +import cn.mq.tbed.exception.StorageSourceInitException; +import cn.mq.tbed.utils.Print; import org.springframework.ui.Model; -import org.springframework.validation.BindException; -import org.springframework.validation.ObjectError; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.servlet.ModelAndView; import java.net.SocketException; -import java.util.Date; -import java.util.List; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/controller/GroupController.java b/src/main/java/cn/mq/tbed/controller/GroupController.java similarity index 92% rename from src/main/java/cn/hellohao/controller/GroupController.java rename to src/main/java/cn/mq/tbed/controller/GroupController.java index 512607dc..b76aec95 100644 --- a/src/main/java/cn/hellohao/controller/GroupController.java +++ b/src/main/java/cn/mq/tbed/controller/GroupController.java @@ -1,12 +1,12 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; -import cn.hellohao.pojo.Group; -import cn.hellohao.pojo.Keys; -import cn.hellohao.pojo.User; -import cn.hellohao.service.GroupService; -import cn.hellohao.service.KeysService; -import cn.hellohao.service.UserService; -import cn.hellohao.utils.StringUtils; +import cn.mq.tbed.pojo.Group; +import cn.mq.tbed.pojo.Keys; +import cn.mq.tbed.pojo.User; +import cn.mq.tbed.service.GroupService; +import cn.mq.tbed.service.KeysService; +import cn.mq.tbed.service.UserService; +import cn.mq.tbed.utils.StringUtils; import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/cn/hellohao/controller/ImageReviewController.java b/src/main/java/cn/mq/tbed/controller/ImageReviewController.java similarity index 92% rename from src/main/java/cn/hellohao/controller/ImageReviewController.java rename to src/main/java/cn/mq/tbed/controller/ImageReviewController.java index dc6b5e96..dc53a76f 100644 --- a/src/main/java/cn/hellohao/controller/ImageReviewController.java +++ b/src/main/java/cn/mq/tbed/controller/ImageReviewController.java @@ -1,7 +1,7 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; -import cn.hellohao.pojo.Imgreview; -import cn.hellohao.service.ImgreviewService; +import cn.mq.tbed.pojo.Imgreview; +import cn.mq.tbed.service.ImgreviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/cn/mq/tbed/controller/UpdateImgController.java b/src/main/java/cn/mq/tbed/controller/UpdateImgController.java new file mode 100644 index 00000000..75190684 --- /dev/null +++ b/src/main/java/cn/mq/tbed/controller/UpdateImgController.java @@ -0,0 +1,571 @@ +package cn.mq.tbed.controller; + +import cn.mq.tbed.pojo.*; +import cn.mq.tbed.service.*; +import cn.mq.tbed.service.impl.*; +import cn.mq.tbed.utils.*; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.awt.image.BufferedImage; +import java.io.*; +import java.text.SimpleDateFormat; +import java.util.*; + +@Controller +public class UpdateImgController { + @Autowired + private NOSImageupload nOSImageupload; + @Autowired + private UserService userService; + @Autowired + private KeysService keysService; + @Autowired + private ConfigService configService; + @Autowired + private UploadConfigService uploadConfigService; + @Autowired + private USSImageupload ussImageupload; + @Autowired + private KODOImageupload kodoImageupload; + @Autowired + private COSImageupload cosImageupload; + @Autowired + private FTPImageupload ftpImageupload; + @Autowired + private ImgService imgService; + @Autowired + private UploadServicel uploadServicel; + + private String[] iparr; + + @RequestMapping({"/", "/index"}) + public String indexImg(Model model, HttpSession httpSession, HttpServletRequest request, HttpServletResponse response) { + Print.Normal("当前项目路径：" + System.getProperty("user.dir")); + Config config = configService.getSourceype(); + UploadConfig uploadConfig = uploadConfigService.getUpdateConfig(); + User u = (User) httpSession.getAttribute("user"); + String email = (String) httpSession.getAttribute("email"); + Integer filesizetourists = 0; + Integer filesizeuser = 0; + Integer imgcounttourists = 0; + Integer imgcountuser = 0; + if (uploadConfig.getFilesizetourists() != null) { + filesizetourists = uploadConfig.getFilesizetourists(); + } + if (uploadConfig.getFilesizeuser() != null) { + filesizeuser = uploadConfig.getFilesizeuser(); + } + if (uploadConfig.getImgcounttourists() != null) { + imgcounttourists = uploadConfig.getImgcounttourists(); + } + if (uploadConfig.getImgcountuser() != null) { + imgcountuser = uploadConfig.getImgcountuser(); + } + if (email != null) { + Integer ret = userService.login(u.getEmail(), u.getPassword(), null); + if (ret > 0) { + User user = userService.getUsers(u.getEmail()); + model.addAttribute("username", user.getUsername()); + model.addAttribute("level", user.getLevel()); + model.addAttribute("loginid", 100); + model.addAttribute("imgcount", imgcountuser); + model.addAttribute("filesize", filesizeuser * 1024 * 1024); + } else { + model.addAttribute("loginid", -1); + model.addAttribute("imgcount", imgcounttourists); + } + } else { + model.addAttribute("loginid", -2); + model.addAttribute("imgcount", imgcounttourists); + model.addAttribute("filesize", filesizetourists * 1024 * 1024); + } + model.addAttribute("suffix", uploadConfig.getSuffix()); + model.addAttribute("config", config); + model.addAttribute("uploadConfig", uploadConfig); + Integer isupdate = 1; + if (uploadConfig.getIsupdate() != 1) { + isupdate = (u == null) ? 0 : 1; + } + model.addAttribute("VisitorUpload", isupdate); + + if (config.getTheme() == 1) { + return "index"; + } else { + return "index-Minimalism"; + } + } + + @RequestMapping(value = "/upimg") + @ResponseBody + public Msg upimg(HttpSession session, HttpServletRequest request + , @RequestParam(value = "file", required = false) MultipartFile multipartFile, Integer setday, String upurlk) throws Exception { + Msg msg = new Msg(); + msg = uploadServicel.uploadForLoc(session, request, multipartFile, setday, upurlk, iparr); + return msg; + } + + @RequestMapping(value = "/upimgs") + @ResponseBody + public Msg upimgs(@RequestParam(value = "file", required = false) MultipartFile[] multipartFile, HttpSession session, HttpServletRequest request + , Integer setday, String upurlk) throws Exception { + Msg msg = new Msg(); + JSONObject jsonObject = new JSONObject(); + for (int i = 0; i < multipartFile.length; i++) { + Msg msg1 = uploadServicel.uploadForLoc(session, request, multipartFile[i], setday, upurlk, iparr); + jsonObject.put(i + "", msg1.getData()); + } + + msg.setData(jsonObject); + return msg; + } + + @RequestMapping(value = "/upimgss") + @ResponseBody + public String upimgss(@RequestParam(value = "file", required = false) MultipartFile multipartFile, HttpSession session, HttpServletRequest request + , Integer setday, String upurlk) throws Exception { + + + InputStream ins = multipartFile.getInputStream(); + File files = new File("upimgs"); + if (!files.exists()) { + boolean mkdirs = files.mkdirs();//创建目录 + } + File file = new File("upimgs/" + multipartFile.getOriginalFilename()); + inputStreamToFile(ins, file); + ins.close(); + + Msg msg; + msg = uploadServicel.uploadForLoc(session, request, multipartFile, 0, upurlk, iparr); + return JSONObject.toJSONString(msg.getData()); + } + + + @RequestMapping(value = "/delimg") + @ResponseBody + public Boolean delimg(String fileName){ + boolean delete = false; + String sPath = "upimgs"; + Integer deleimgname = imgService.deleimgname(fileName); + File file = new File(File.separator + Resources.basePath + File.separator + fileName); + if (file.isFile() && file.exists()) { + delete = file.delete(); + } + if(delete){ + return deletedirFile(sPath); + }else { + return false; + } + } + + + private boolean deletedirFile(String sPath) { + boolean flag = false; + if (!sPath.endsWith(File.separator)) { + sPath = sPath + File.separator; + } + File dirFile = new File(sPath); + File[] files = dirFile.listFiles(); + for (int i = 0; i < files.length; i++) { + //删除子文件 + if (files[i].isFile()) { + flag = deleteFile(files[i].getAbsolutePath()); + if (!flag) { + break; + } + } //删除子目录 + else { + flag = deletedirFile(files[i].getAbsolutePath()); + if (!flag) { + break; + } + } + } + return flag; + } + + public boolean deleteFile(String sPath) { + boolean flag = false; + File file = new File(sPath); + // 路径为文件且不为空则进行删除 + if (file.isFile() && file.exists()) { + file.delete(); + flag = true; + } + return flag; + } + + + private static void inputStreamToFile(InputStream ins, File file) { + try { + OutputStream os = new FileOutputStream(file); + int bytesRead = 0; + byte[] buffer = new byte[8192]; + while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) { + os.write(buffer, 0, bytesRead); + } + os.close(); + ins.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + //根据网络图片url上传 + @PostMapping(value = "/upurlimg") + @ResponseBody + public String upurlimg(HttpSession session, String imgurl, HttpServletRequest request, Integer setday, String upurlk) throws Exception { + JSONArray jsonArray = new JSONArray(); + Config config = configService.getSourceype(); + UploadConfig uploadConfig = uploadConfigService.getUpdateConfig(); + User u = (User) session.getAttribute("user"); + Integer usermemory = 0; + Integer memory = 0; + Integer Sourcekey = 0; + String userpath = "tourist"; + String userip = GetIPS.getIpAddr(request); + Print.Normal("上传者ip:" + userip); + iparr = uploadConfig.getBlacklist().split(";"); + for (String s : iparr) { + if (s.equals(userip)) { + jsonArray.add(911); + return jsonArray.toString(); + } + } + if (u == null) { + Sourcekey = GetCurrentSource.GetSource(null); + memory = uploadConfig.getVisitormemory(); + usermemory = imgService.getusermemory(0); + if (usermemory == null) { + usermemory = 0; + } + } else { + userpath = u.getUsername(); + Sourcekey = GetCurrentSource.GetSource(u.getId()); + memory = userService.getUsers(u.getEmail()).getMemory(); + usermemory = imgService.getusermemory(u.getId()); + if (usermemory == null) { + usermemory = 0; + } + } + if (uploadConfig.getUrltype() == 2) { + java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("yyyy/MM/dd"); + userpath = dateFormat.format(new Date()); + } + if (Integer.parseInt(Base64Encryption.decryptBASE64(upurlk)) != yzupdate()) { + jsonArray.add(-403); + return jsonArray.toString(); + } + Keys key = keysService.selectKeys(Sourcekey); + long imgsize = ImgUrlUtil.getFileLength(imgurl); + Integer youke = uploadConfig.getFilesizetourists(); + Integer yonghu = uploadConfig.getFilesizeuser(); + String uuid = UUID.randomUUID().toString().replace("-", ""); + Boolean bo = false; + bo = Sourcekey == 5 ? true : StringUtils.doNull(Sourcekey, key); + if (!bo) { + jsonArray.add(-1); + return jsonArray.toString(); + } + Print.warning("上传地址是：" + request.getSession().getServletContext().getRealPath("/") + "/hellohaotmp/"); + + if (usermemory / 1024 >= memory) { + jsonArray.add(-5); + return jsonArray.toString(); + } + long stime = System.currentTimeMillis(); + if (u != null) { + if (imgsize > 0 && imgsize >= (yonghu * 1024 * 1024)) { + jsonArray.add(-2); + return jsonArray.toString(); + } + try { + boolean bl = ImgUrlUtil.downLoadFromUrl(imgurl, + uuid, request.getSession().getServletContext().getRealPath("/") + File.separator + "hellohaotmp" + File.separator); + if (bl == true) { + FileInputStream is = new FileInputStream(request.getSession().getServletContext().getRealPath("/") + File.separator + "hellohaotmp" + File.separator + uuid); + byte[] b = new byte[3]; + is.read(b, 0, b.length); + String xxx = ImgUrlUtil.bytesToHexString(b); + xxx = xxx.toUpperCase(); + if (is != null) { + is.close(); + } + if (TypeDict.checkType(xxx).equals("0000")) { + jsonArray.add(-3);//不是图片格式 + return jsonArray.toString(); + } + Map map = new HashMap<>(); + map.put(TypeDict.checkType(xxx), request.getSession().getServletContext().getRealPath("/") + "hellohaotmp" + File.separator + uuid); + Map m = null; + m = GetSource.storageSource(key.getStorageType(), null, userpath, map, setday); + Images img = new Images(); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + String times = df.format(new Date()); + System.out.println("上传图片的时间是：" + times); + for (Map.Entry entry : m.entrySet()) { + if (key.getStorageType() == 5) { + if (config.getDomain() != null) { + jsonArray.add(config.getDomain() + "/" + entry.getKey().getImgurl()); + img.setImgurl(config.getDomain() + "/" + entry.getKey().getImgurl());//图片链接 + } else { + jsonArray.add(config.getDomain() + "/" + entry.getKey().getImgurl()); + img.setImgurl("http://" + IPPortUtil.getLocalIP() + ":" + IPPortUtil.getLocalPort() + "/" + entry.getKey().getImgurl());//图片链接 + } + } else { + jsonArray.add(entry.getKey().getImgurl()); + img.setImgurl(entry.getKey().getImgurl()); + } + img.setUpdatetime(times); + img.setSource(key.getStorageType()); + img.setUserid(u == null ? 0 : u.getId()); + img.setSizes((entry.getValue())); + //img.setImgname(SetText.getSubString(entry.getKey().getImgurl(), key.getRequestAddress() + "/", "")); + img.setImgname(entry.getKey().getImgurl()); + img.setAbnormal(userip); + if (setday > 0) { + img.setImgtype(1); + } else { + img.setImgtype(0); + } + userService.insertimg(img); + long etime = System.currentTimeMillis(); + System.out.println("上传图片所用时长：" + String.valueOf(etime - stime) + "ms"); + } + } + } catch (Exception e) { + Print.warning(e.toString()); + jsonArray.add(-4); + } + } else { + if (imgsize > 0 && imgsize >= (youke * 1024 * 1024)) { + //文件过大 + jsonArray.add(-2); + return jsonArray.toString(); + } + try { + boolean bl = ImgUrlUtil.downLoadFromUrl(imgurl, + uuid, request.getSession().getServletContext().getRealPath("/") + "hellohaotmp" + File.separator); + if (bl == true) { + FileInputStream is = new FileInputStream(request.getSession().getServletContext().getRealPath("/") + "hellohaotmp" + File.separator + uuid); + byte[] b = new byte[3]; + is.read(b, 0, b.length); + String xxx = ImgUrlUtil.bytesToHexString(b); + xxx = xxx.toUpperCase(); + if (is != null) { + is.close(); + } + if (xxx.equals("0000")) { + jsonArray.add(-3); + return jsonArray.toString(); + } + Map map = new HashMap<>(); + map.put(TypeDict.checkType(xxx), request.getSession().getServletContext().getRealPath("/") + File.separator + "hellohaotmp" + File.separator + uuid); + Map m = null; + m = GetSource.storageSource(key.getStorageType(), null, userpath, map, setday); + Images img = new Images(); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + String times = df.format(new Date()); + System.out.println("上传图片的时间是：" + times); + for (Map.Entry entry : m.entrySet()) { + if (key.getStorageType() == 5) { + if (config.getDomain() != null) { + jsonArray.add(config.getDomain() + "/" + entry.getKey().getImgurl()); + img.setImgurl(config.getDomain() + "/" + entry.getKey().getImgurl()); + } else { + jsonArray.add(config.getDomain() + "/" + entry.getKey().getImgurl()); + img.setImgurl("http://" + IPPortUtil.getLocalIP() + ":" + IPPortUtil.getLocalPort() + "/" + entry.getKey().getImgurl());//图片链接 + } + } else { + jsonArray.add(entry.getKey().getImgurl()); + img.setImgurl(entry.getKey().getImgurl()); + } + img.setUpdatetime(times); + img.setSource(key.getStorageType()); + img.setUserid(u == null ? 0 : u.getId()); + img.setSizes((entry.getValue())); + img.setImgname(SetText.getSubString(entry.getKey().getImgurl(), key.getRequestAddress() + "/", "")); + img.setImgtype(setday > 0 ? 1 : 0); + img.setAbnormal(userip); + userService.insertimg(img); + long etime = System.currentTimeMillis(); + System.out.println("上传图片所用时长：" + String.valueOf(etime - stime) + "ms"); + } + } + } catch (Exception e) { + Print.warning(e.toString()); + jsonArray.add(-4); + } + } + return jsonArray.toString(); +/** + * 错误返回值含义： + * -1 存储源key未配置 + * -2 目标图片太大或者不存在 + * -3 文件类型不符合要求 + * */ + } + + @RequestMapping("/sentence") + @ResponseBody + public String sentence(HttpSession session, Integer id) { + JSONArray jsonArray = new JSONArray(); + String text = Sentence.getURLContent(); + jsonArray.add(text); + return jsonArray.toString(); + } + + //ajax查询用户是否已经登录 + @RequestMapping(value = "/islogin") + @ResponseBody + public String islogin(HttpSession session) { + JSONObject jsonObject = new JSONObject(); + User user = (User) session.getAttribute("user"); + if (user != null) { + if (user.getEmail() != null && user.getPassword() != null) { + jsonObject.put("username", user.getUsername()); + jsonObject.put("level", user.getLevel()); + jsonObject.put("lgoinret", 1); + } else { + jsonObject.put("lgoinret", 0); + } + } + return jsonObject.toString(); + } + + @GetMapping(value = "/images/{id}") + @ResponseBody + public Images selectByFy(@PathVariable("id") Integer id) { + return imgService.selectByPrimaryKey(id); + } + + + @RequestMapping("/{key1}/TOIMG{key2}N.{key3}") + public void selectByFy(HttpServletRequest request, HttpServletResponse response, + @PathVariable("key1") String key1, @PathVariable("key2") String key2, + @PathVariable("key3") String key3, Model model) { + String head = "jpg"; + if (key3.equals("jpg") || key3.equals("jpeg")) { + head = "jpeg"; + } else if (key3.equals("png")) { + head = "png"; + } else if (key3.equals("bmp")) { + head = "bmp"; + } else if (key3.equals("gif")) { + head = "gif"; + } else { + head = key3; + } + response.setHeader("Pragma", "no-cache"); + response.setHeader("Cache-Control", "no-cache"); + response.setDateHeader("Expires", 0); + response.setContentType("image/" + head); + InputStream is = null; + BufferedImage bi = null; + try { + is = new FileInputStream(new File(File.separator + Resources.basePath + File.separator + key1 + "/TOIMG" + key2 + "N." + key3)); + bi = ImageIO.read(is); + is.close(); + //将图片输出给浏览器 + BufferedImage image = (bi); + OutputStream os = response.getOutputStream(); + ImageIO.write(image, head, os); + } catch (Exception e) { + Print.warning("寻找本地文件出错：" + e.getMessage()); + e.printStackTrace(); + try { + response.sendRedirect("/404"); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + //return "forward:/links/"+key1+"/TOIMG"+key2+"N."+key3; + } + + @RequestMapping("/{key1:\\d+}/{key2}/{key3}/TOIMG{key4}N.{key5}") + public void selectByFy2(HttpServletRequest request, HttpServletResponse response, + @PathVariable("key1") String key1, @PathVariable("key2") String key2, + @PathVariable("key3") String key3, @PathVariable("key4") String key4, + @PathVariable("key5") String key5, Model model) { + String head = "jpg"; + if (key5.equals("jpg") || key5.equals("jpeg")) { + head = "jpeg"; + } else if (key5.equals("png")) { + head = "png"; + } else if (key5.equals("bmp")) { + head = "bmp"; + } else if (key5.equals("gif")) { + head = "gif"; + } else { + head = key5; + } + response.setHeader("Pragma", "no-cache"); + response.setHeader("Cache-Control", "no-cache"); + response.setDateHeader("Expires", 0); + response.setContentType("image/" + head); + InputStream is = null; + BufferedImage bi = null; + try { + File file = new File(File.separator + Resources.basePath + File.separator + key1 + "/" + key2 + "/" + key3 + "/TOIMG" + key4 + "N." + key5); + is = new FileInputStream(file); + bi = ImageIO.read(is); + is.close(); + //将图片输出给浏览器 + BufferedImage image = (bi); + OutputStream os = response.getOutputStream(); + ImageIO.write(image, head, os); + } catch (Exception e) { + Print.warning("寻找本地文件出错：" + e.getMessage()); + e.printStackTrace(); + try { + response.sendRedirect("/404"); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + + + +/* InputStream is= null; + BufferedImage bi=null; + is = new FileInputStream(new File(File.separator+"HellohaoData"+File.separator+key1+"/"+key2+"/"+key3+"/TOIMG"+key4+"N."+key5)); + bi= ImageIO.read(is); + is.close(); + + //将验证码存入Session + //将图片输出给浏览器 + BufferedImage image = (bi) ; + response.setContentType("image/JPEG"); + OutputStream os = response.getOutputStream(); + ImageIO.write(image, "JPEG", os);*/ + + + } + + private Integer yzupdate() { + Calendar cal = Calendar.getInstance(); + int y = cal.get(Calendar.YEAR); + int m = cal.get(Calendar.MONTH); + int d = cal.get(Calendar.DATE); + //int h=cal.get(Calendar.HOUR_OF_DAY); + //int mm=cal.get(Calendar.MINUTE); + return y + m + d + 999; + } + + @RequestMapping("/err") + public String err() { + return "err"; + } + + +} diff --git a/src/main/java/cn/hellohao/controller/UserController.java b/src/main/java/cn/mq/tbed/controller/UserController.java similarity index 96% rename from src/main/java/cn/hellohao/controller/UserController.java rename to src/main/java/cn/mq/tbed/controller/UserController.java index 57d5a23a..966554e9 100644 --- a/src/main/java/cn/hellohao/controller/UserController.java +++ b/src/main/java/cn/mq/tbed/controller/UserController.java @@ -1,9 +1,7 @@ -package cn.hellohao.controller; +package cn.mq.tbed.controller; -import java.net.URLDecoder; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; import java.util.Random; import java.util.UUID; @@ -14,11 +12,11 @@ import javax.servlet.http.HttpSession; import javax.validation.Valid; -import cn.hellohao.pojo.*; -import cn.hellohao.service.*; -import cn.hellohao.utils.Base64Encryption; -import cn.hellohao.utils.Print; -import cn.hellohao.utils.SendEmail; +import cn.mq.tbed.pojo.*; +import cn.mq.tbed.utils.Base64Encryption; +import cn.mq.tbed.utils.Print; +import cn.mq.tbed.utils.SendEmail; +import cn.mq.tbed.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -30,8 +28,6 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.springframework.web.servlet.ModelAndView; - @Controller @RequestMapping("/user") public class UserController { @@ -50,7 +46,7 @@ public class UserController { @RequestMapping("/register") @ResponseBody - public String Register(@Valid User u,Integer zctmp) { + public String Register(@Valid User u, Integer zctmp) { JSONObject jsonObject = new JSONObject(); if((zctmp-number2)==(istmp2-number2)){ User user = new User(); diff --git a/src/main/java/cn/hellohao/dao/AlbumMapper.java b/src/main/java/cn/mq/tbed/dao/AlbumMapper.java similarity index 80% rename from src/main/java/cn/hellohao/dao/AlbumMapper.java rename to src/main/java/cn/mq/tbed/dao/AlbumMapper.java index 2cd8b51f..9fa7e525 100644 --- a/src/main/java/cn/hellohao/dao/AlbumMapper.java +++ b/src/main/java/cn/mq/tbed/dao/AlbumMapper.java @@ -1,10 +1,9 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.Album; +import cn.mq.tbed.pojo.Album; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import javax.validation.constraints.Max; import java.util.List; /** diff --git a/src/main/java/cn/hellohao/dao/CodeMapper.java b/src/main/java/cn/mq/tbed/dao/CodeMapper.java similarity index 84% rename from src/main/java/cn/hellohao/dao/CodeMapper.java rename to src/main/java/cn/mq/tbed/dao/CodeMapper.java index 38773ff9..6de91d70 100644 --- a/src/main/java/cn/hellohao/dao/CodeMapper.java +++ b/src/main/java/cn/mq/tbed/dao/CodeMapper.java @@ -1,7 +1,6 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.Code; -import cn.hellohao.pojo.Keys; +import cn.mq.tbed.pojo.Code; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/cn/hellohao/dao/ConfigMapper.java b/src/main/java/cn/mq/tbed/dao/ConfigMapper.java similarity index 60% rename from src/main/java/cn/hellohao/dao/ConfigMapper.java rename to src/main/java/cn/mq/tbed/dao/ConfigMapper.java index 3f266d93..2a62e856 100644 --- a/src/main/java/cn/hellohao/dao/ConfigMapper.java +++ b/src/main/java/cn/mq/tbed/dao/ConfigMapper.java @@ -1,8 +1,7 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.Config; +import cn.mq.tbed.pojo.Config; import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Service; @Mapper public interface ConfigMapper { diff --git a/src/main/java/cn/hellohao/dao/DomainMapper.java b/src/main/java/cn/mq/tbed/dao/DomainMapper.java similarity index 81% rename from src/main/java/cn/hellohao/dao/DomainMapper.java rename to src/main/java/cn/mq/tbed/dao/DomainMapper.java index d86b2bb7..64adb3fc 100644 --- a/src/main/java/cn/hellohao/dao/DomainMapper.java +++ b/src/main/java/cn/mq/tbed/dao/DomainMapper.java @@ -1,6 +1,5 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.Domain; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/cn/hellohao/dao/EmailConfigMapper.java b/src/main/java/cn/mq/tbed/dao/EmailConfigMapper.java similarity index 73% rename from src/main/java/cn/hellohao/dao/EmailConfigMapper.java rename to src/main/java/cn/mq/tbed/dao/EmailConfigMapper.java index 6fd80ced..f18f0b67 100644 --- a/src/main/java/cn/hellohao/dao/EmailConfigMapper.java +++ b/src/main/java/cn/mq/tbed/dao/EmailConfigMapper.java @@ -1,6 +1,6 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.EmailConfig; +import cn.mq.tbed.pojo.EmailConfig; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/cn/hellohao/dao/GroupMapper.java b/src/main/java/cn/mq/tbed/dao/GroupMapper.java similarity index 88% rename from src/main/java/cn/hellohao/dao/GroupMapper.java rename to src/main/java/cn/mq/tbed/dao/GroupMapper.java index be373bd4..d9c9438b 100644 --- a/src/main/java/cn/hellohao/dao/GroupMapper.java +++ b/src/main/java/cn/mq/tbed/dao/GroupMapper.java @@ -1,6 +1,6 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.Group; +import cn.mq.tbed.pojo.Group; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/cn/hellohao/dao/ImgAndAlbumMapper.java b/src/main/java/cn/mq/tbed/dao/ImgAndAlbumMapper.java similarity index 86% rename from src/main/java/cn/hellohao/dao/ImgAndAlbumMapper.java rename to src/main/java/cn/mq/tbed/dao/ImgAndAlbumMapper.java index 79c77a81..2aa1431c 100644 --- a/src/main/java/cn/hellohao/dao/ImgAndAlbumMapper.java +++ b/src/main/java/cn/mq/tbed/dao/ImgAndAlbumMapper.java @@ -1,7 +1,7 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.Images; -import cn.hellohao.pojo.ImgAndAlbum; +import cn.mq.tbed.pojo.Images; +import cn.mq.tbed.pojo.ImgAndAlbum; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/cn/hellohao/dao/ImgMapper.java b/src/main/java/cn/mq/tbed/dao/ImgMapper.java similarity index 93% rename from src/main/java/cn/hellohao/dao/ImgMapper.java rename to src/main/java/cn/mq/tbed/dao/ImgMapper.java index cf66f101..0e2e4922 100644 --- a/src/main/java/cn/hellohao/dao/ImgMapper.java +++ b/src/main/java/cn/mq/tbed/dao/ImgMapper.java @@ -1,11 +1,11 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import cn.hellohao.pojo.Images; +import cn.mq.tbed.pojo.Images; @Mapper public interface ImgMapper { diff --git a/src/main/java/cn/hellohao/dao/ImgreviewMapper.java b/src/main/java/cn/mq/tbed/dao/ImgreviewMapper.java similarity index 85% rename from src/main/java/cn/hellohao/dao/ImgreviewMapper.java rename to src/main/java/cn/mq/tbed/dao/ImgreviewMapper.java index 30d22fcf..9da8d5b3 100644 --- a/src/main/java/cn/hellohao/dao/ImgreviewMapper.java +++ b/src/main/java/cn/mq/tbed/dao/ImgreviewMapper.java @@ -1,6 +1,6 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.Imgreview; +import cn.mq.tbed.pojo.Imgreview; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/cn/hellohao/dao/KeysMapper.java b/src/main/java/cn/mq/tbed/dao/KeysMapper.java similarity index 85% rename from src/main/java/cn/hellohao/dao/KeysMapper.java rename to src/main/java/cn/mq/tbed/dao/KeysMapper.java index d1509d14..50c0f800 100644 --- a/src/main/java/cn/hellohao/dao/KeysMapper.java +++ b/src/main/java/cn/mq/tbed/dao/KeysMapper.java @@ -1,9 +1,9 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import cn.hellohao.pojo.Keys; +import cn.mq.tbed.pojo.Keys; import java.util.List; diff --git a/src/main/java/cn/hellohao/dao/NoticeMapper.java b/src/main/java/cn/mq/tbed/dao/NoticeMapper.java similarity index 82% rename from src/main/java/cn/hellohao/dao/NoticeMapper.java rename to src/main/java/cn/mq/tbed/dao/NoticeMapper.java index 33a99e36..f07ba749 100644 --- a/src/main/java/cn/hellohao/dao/NoticeMapper.java +++ b/src/main/java/cn/mq/tbed/dao/NoticeMapper.java @@ -1,4 +1,4 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/hellohao/dao/SysConfigMapper.java b/src/main/java/cn/mq/tbed/dao/SysConfigMapper.java similarity index 79% rename from src/main/java/cn/hellohao/dao/SysConfigMapper.java rename to src/main/java/cn/mq/tbed/dao/SysConfigMapper.java index f5129e14..32a55479 100644 --- a/src/main/java/cn/hellohao/dao/SysConfigMapper.java +++ b/src/main/java/cn/mq/tbed/dao/SysConfigMapper.java @@ -1,6 +1,6 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.SysConfig; +import cn.mq.tbed.pojo.SysConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/cn/hellohao/dao/UploadConfigMapper.java b/src/main/java/cn/mq/tbed/dao/UploadConfigMapper.java similarity index 74% rename from src/main/java/cn/hellohao/dao/UploadConfigMapper.java rename to src/main/java/cn/mq/tbed/dao/UploadConfigMapper.java index aac88448..96ee48d4 100644 --- a/src/main/java/cn/hellohao/dao/UploadConfigMapper.java +++ b/src/main/java/cn/mq/tbed/dao/UploadConfigMapper.java @@ -1,6 +1,6 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.UploadConfig; +import cn.mq.tbed.pojo.UploadConfig; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/cn/hellohao/dao/UserGroupMapper.java b/src/main/java/cn/mq/tbed/dao/UserGroupMapper.java similarity index 90% rename from src/main/java/cn/hellohao/dao/UserGroupMapper.java rename to src/main/java/cn/mq/tbed/dao/UserGroupMapper.java index d80dc2f8..1a4bdd67 100644 --- a/src/main/java/cn/hellohao/dao/UserGroupMapper.java +++ b/src/main/java/cn/mq/tbed/dao/UserGroupMapper.java @@ -1,6 +1,6 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; -import cn.hellohao.pojo.UserGroup; +import cn.mq.tbed.pojo.UserGroup; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/cn/hellohao/dao/UserMapper.java b/src/main/java/cn/mq/tbed/dao/UserMapper.java similarity index 93% rename from src/main/java/cn/hellohao/dao/UserMapper.java rename to src/main/java/cn/mq/tbed/dao/UserMapper.java index 6a4f8319..10850303 100644 --- a/src/main/java/cn/hellohao/dao/UserMapper.java +++ b/src/main/java/cn/mq/tbed/dao/UserMapper.java @@ -1,10 +1,10 @@ -package cn.hellohao.dao; +package cn.mq.tbed.dao; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import cn.hellohao.pojo.Images; -import cn.hellohao.pojo.User; +import cn.mq.tbed.pojo.Images; +import cn.mq.tbed.pojo.User; import java.util.List; diff --git a/src/main/java/cn/hellohao/exception/CodeException.java b/src/main/java/cn/mq/tbed/exception/CodeException.java similarity index 95% rename from src/main/java/cn/hellohao/exception/CodeException.java rename to src/main/java/cn/mq/tbed/exception/CodeException.java index e8f49dfe..dfd202b8 100644 --- a/src/main/java/cn/hellohao/exception/CodeException.java +++ b/src/main/java/cn/mq/tbed/exception/CodeException.java @@ -1,4 +1,4 @@ -package cn.hellohao.exception; +package cn.mq.tbed.exception; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/exception/LoginException.java b/src/main/java/cn/mq/tbed/exception/LoginException.java similarity index 95% rename from src/main/java/cn/hellohao/exception/LoginException.java rename to src/main/java/cn/mq/tbed/exception/LoginException.java index ecfe1473..b8d6b9e5 100644 --- a/src/main/java/cn/hellohao/exception/LoginException.java +++ b/src/main/java/cn/mq/tbed/exception/LoginException.java @@ -1,4 +1,4 @@ -package cn.hellohao.exception; +package cn.mq.tbed.exception; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/exception/StorageSourceInitException.java b/src/main/java/cn/mq/tbed/exception/StorageSourceInitException.java similarity index 95% rename from src/main/java/cn/hellohao/exception/StorageSourceInitException.java rename to src/main/java/cn/mq/tbed/exception/StorageSourceInitException.java index f5dcd6d7..32aa13c5 100644 --- a/src/main/java/cn/hellohao/exception/StorageSourceInitException.java +++ b/src/main/java/cn/mq/tbed/exception/StorageSourceInitException.java @@ -1,4 +1,4 @@ -package cn.hellohao.exception; +package cn.mq.tbed.exception; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/interceptor/InterceptorConfig.java b/src/main/java/cn/mq/tbed/interceptor/InterceptorConfig.java similarity index 86% rename from src/main/java/cn/hellohao/interceptor/InterceptorConfig.java rename to src/main/java/cn/mq/tbed/interceptor/InterceptorConfig.java index 04453f1b..2acce6c1 100644 --- a/src/main/java/cn/hellohao/interceptor/InterceptorConfig.java +++ b/src/main/java/cn/mq/tbed/interceptor/InterceptorConfig.java @@ -1,24 +1,14 @@ -package cn.hellohao.interceptor; +package cn.mq.tbed.interceptor; -import java.io.PrintWriter; -import java.net.URLDecoder; -import java.net.URLEncoder; - -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import cn.hellohao.pojo.User; -import cn.hellohao.service.impl.NOSImageupload; -import cn.hellohao.service.impl.UserServiceImpl; -import cn.hellohao.utils.Base64Encryption; -import cn.hellohao.utils.Print; -import cn.hellohao.utils.SpringContextHolder; +import cn.mq.tbed.pojo.User; +import cn.mq.tbed.service.impl.UserServiceImpl; +import cn.mq.tbed.utils.SpringContextHolder; import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/cn/hellohao/interceptor/InterceptorConfigTwo.java b/src/main/java/cn/mq/tbed/interceptor/InterceptorConfigTwo.java similarity index 97% rename from src/main/java/cn/hellohao/interceptor/InterceptorConfigTwo.java rename to src/main/java/cn/mq/tbed/interceptor/InterceptorConfigTwo.java index b9c0504c..713d7b39 100644 --- a/src/main/java/cn/hellohao/interceptor/InterceptorConfigTwo.java +++ b/src/main/java/cn/mq/tbed/interceptor/InterceptorConfigTwo.java @@ -1,6 +1,6 @@ -package cn.hellohao.interceptor; +package cn.mq.tbed.interceptor; -import cn.hellohao.pojo.User; +import cn.mq.tbed.pojo.User; import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/src/main/java/cn/hellohao/interceptor/InterceptorConfigWeb.java b/src/main/java/cn/mq/tbed/interceptor/InterceptorConfigWeb.java similarity index 58% rename from src/main/java/cn/hellohao/interceptor/InterceptorConfigWeb.java rename to src/main/java/cn/mq/tbed/interceptor/InterceptorConfigWeb.java index 0391150b..c02c65dd 100644 --- a/src/main/java/cn/hellohao/interceptor/InterceptorConfigWeb.java +++ b/src/main/java/cn/mq/tbed/interceptor/InterceptorConfigWeb.java @@ -1,8 +1,8 @@ -package cn.hellohao.interceptor; +package cn.mq.tbed.interceptor; -import cn.hellohao.pojo.User; -import cn.hellohao.service.impl.UserServiceImpl; -import cn.hellohao.utils.SpringContextHolder; +import cn.mq.tbed.pojo.User; +import cn.mq.tbed.service.impl.UserServiceImpl; +import cn.mq.tbed.utils.SpringContextHolder; import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; @@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import java.net.URLDecoder; @Component @@ -31,24 +30,24 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons if(user==null){ Cookie[] cookies = request.getCookies(); String Hellohao_UniqueUserKey = ""; - for (Cookie cookie : cookies) { - if(cookie.getName().equals("Hellohao_UniqueUserKey") && Hellohao_UniqueUserKey.equals("")){ - Hellohao_UniqueUserKey = URLDecoder.decode(cookie.getValue(), "GBK"); - } - } - - if(Hellohao_UniqueUserKey!=null && !Hellohao_UniqueUserKey.equals("")){ - //String basepass = Base64Encryption.encryptBASE64(pass.getBytes()); - Integer ret = userService.login(null, null,Hellohao_UniqueUserKey); - if (ret > 0) { - User u = userService.getUsersMail(Hellohao_UniqueUserKey); - if (u.getIsok() == 1) { - session.setAttribute("user", u); - session.setAttribute("email", u.getEmail()); - //request.getRequestDispatcher("/admin/goadmin").forward(request, response); - } - } - } +// for (Cookie cookie : cookies) { +// if(cookie.getName().equals("Hellohao_UniqueUserKey") && Hellohao_UniqueUserKey.equals("")){ +// Hellohao_UniqueUserKey = URLDecoder.decode(cookie.getValue(), "GBK"); +// } +// } +// +// if(Hellohao_UniqueUserKey!=null && !Hellohao_UniqueUserKey.equals("")){ +// //String basepass = Base64Encryption.encryptBASE64(pass.getBytes()); +// Integer ret = userService.login(null, null,Hellohao_UniqueUserKey); +// if (ret > 0) { +// User u = userService.getUsersMail(Hellohao_UniqueUserKey); +// if (u.getIsok() == 1) { +// session.setAttribute("user", u); +// session.setAttribute("email", u.getEmail()); +// //request.getRequestDispatcher("/admin/goadmin").forward(request, response); +// } +// } +// } } return true; diff --git a/src/main/java/cn/hellohao/interceptor/WebAppConfig.java b/src/main/java/cn/mq/tbed/interceptor/WebAppConfig.java similarity index 93% rename from src/main/java/cn/hellohao/interceptor/WebAppConfig.java rename to src/main/java/cn/mq/tbed/interceptor/WebAppConfig.java index 9c1cf5e0..e2a94be2 100644 --- a/src/main/java/cn/hellohao/interceptor/WebAppConfig.java +++ b/src/main/java/cn/mq/tbed/interceptor/WebAppConfig.java @@ -1,4 +1,4 @@ -package cn.hellohao.interceptor; +package cn.mq.tbed.interceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -6,9 +6,6 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - @Configuration public class WebAppConfig implements WebMvcConfigurer { @@ -37,7 +34,7 @@ public void addInterceptors(InterceptorRegistry registry) { .excludePathPatterns("/static/**","/**/*.css", "/**/*.js", "/**/*.png", "/**/*.jpg", "/**/*.jpeg", "/**/*.gif", "/**/fonts/*", "/**/*.svg", "/clientupimg/**","/clientupurlimg/**","/clientlogin/**","/notices/**","/systemupdate/**","/getdomain/**", - "/getNoticeText/**","/getNotice/**","/addalbum/**","/addalbum/**","/SaveForAlbum/**","/TOALBUM*N/**","/TOALBUM*N/**"); + "/getNoticeText/**","/getNotice/**","/addalbum/**","/addalbum/**","/SaveForAlbum/**","/TOALBUM*N/**","/TOALBUM*N/**","/upimgs/**"); registry.addInterceptor(interceptorConfig).addPathPatterns("/admin/**"); registry.addInterceptor(interceptorConfigTwo).addPathPatterns("/admin/root/**"); diff --git a/src/main/java/cn/hellohao/pojo/Album.java b/src/main/java/cn/mq/tbed/pojo/Album.java similarity index 98% rename from src/main/java/cn/hellohao/pojo/Album.java rename to src/main/java/cn/mq/tbed/pojo/Album.java index 899147af..e5bd50d0 100644 --- a/src/main/java/cn/hellohao/pojo/Album.java +++ b/src/main/java/cn/mq/tbed/pojo/Album.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/pojo/Code.java b/src/main/java/cn/mq/tbed/pojo/Code.java similarity index 96% rename from src/main/java/cn/hellohao/pojo/Code.java rename to src/main/java/cn/mq/tbed/pojo/Code.java index 9b7af713..95bf25d0 100644 --- a/src/main/java/cn/hellohao/pojo/Code.java +++ b/src/main/java/cn/mq/tbed/pojo/Code.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/pojo/Config.java b/src/main/java/cn/mq/tbed/pojo/Config.java similarity index 99% rename from src/main/java/cn/hellohao/pojo/Config.java rename to src/main/java/cn/mq/tbed/pojo/Config.java index 0d5ebec4..8938cd45 100644 --- a/src/main/java/cn/hellohao/pojo/Config.java +++ b/src/main/java/cn/mq/tbed/pojo/Config.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; public class Config { private Integer id; diff --git a/src/main/java/cn/hellohao/pojo/Domain.java b/src/main/java/cn/mq/tbed/pojo/Domain.java similarity index 96% rename from src/main/java/cn/hellohao/pojo/Domain.java rename to src/main/java/cn/mq/tbed/pojo/Domain.java index a60f153f..50250dad 100644 --- a/src/main/java/cn/hellohao/pojo/Domain.java +++ b/src/main/java/cn/mq/tbed/pojo/Domain.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/pojo/EmailConfig.java b/src/main/java/cn/mq/tbed/pojo/EmailConfig.java similarity index 98% rename from src/main/java/cn/hellohao/pojo/EmailConfig.java rename to src/main/java/cn/mq/tbed/pojo/EmailConfig.java index 813624ea..0c10b9ca 100644 --- a/src/main/java/cn/hellohao/pojo/EmailConfig.java +++ b/src/main/java/cn/mq/tbed/pojo/EmailConfig.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; public class EmailConfig { private Integer id ; diff --git a/src/main/java/cn/hellohao/pojo/Group.java b/src/main/java/cn/mq/tbed/pojo/Group.java similarity index 96% rename from src/main/java/cn/hellohao/pojo/Group.java rename to src/main/java/cn/mq/tbed/pojo/Group.java index 7b7de7f7..73d87de4 100644 --- a/src/main/java/cn/hellohao/pojo/Group.java +++ b/src/main/java/cn/mq/tbed/pojo/Group.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/pojo/Images.java b/src/main/java/cn/mq/tbed/pojo/Images.java similarity index 99% rename from src/main/java/cn/hellohao/pojo/Images.java rename to src/main/java/cn/mq/tbed/pojo/Images.java index b2cee441..d5e3e77e 100644 --- a/src/main/java/cn/hellohao/pojo/Images.java +++ b/src/main/java/cn/mq/tbed/pojo/Images.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/cn/hellohao/pojo/ImgAndAlbum.java b/src/main/java/cn/mq/tbed/pojo/ImgAndAlbum.java similarity index 96% rename from src/main/java/cn/hellohao/pojo/ImgAndAlbum.java rename to src/main/java/cn/mq/tbed/pojo/ImgAndAlbum.java index 48f9152c..806501ec 100644 --- a/src/main/java/cn/hellohao/pojo/ImgAndAlbum.java +++ b/src/main/java/cn/mq/tbed/pojo/ImgAndAlbum.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/pojo/Imgreview.java b/src/main/java/cn/mq/tbed/pojo/Imgreview.java similarity index 98% rename from src/main/java/cn/hellohao/pojo/Imgreview.java rename to src/main/java/cn/mq/tbed/pojo/Imgreview.java index 6b1581ca..62b7c88a 100644 --- a/src/main/java/cn/hellohao/pojo/Imgreview.java +++ b/src/main/java/cn/mq/tbed/pojo/Imgreview.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; public class Imgreview { private Integer id; diff --git a/src/main/java/cn/hellohao/pojo/Keys.java b/src/main/java/cn/mq/tbed/pojo/Keys.java similarity index 98% rename from src/main/java/cn/hellohao/pojo/Keys.java rename to src/main/java/cn/mq/tbed/pojo/Keys.java index 67ba9176..338885b1 100644 --- a/src/main/java/cn/hellohao/pojo/Keys.java +++ b/src/main/java/cn/mq/tbed/pojo/Keys.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; public class Keys { private Integer id; diff --git a/src/main/java/cn/hellohao/pojo/Msg.java b/src/main/java/cn/mq/tbed/pojo/Msg.java similarity index 98% rename from src/main/java/cn/hellohao/pojo/Msg.java rename to src/main/java/cn/mq/tbed/pojo/Msg.java index 57a2804f..da5ef889 100644 --- a/src/main/java/cn/hellohao/pojo/Msg.java +++ b/src/main/java/cn/mq/tbed/pojo/Msg.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; import java.io.Serializable; diff --git a/src/main/java/cn/hellohao/pojo/Notice.java b/src/main/java/cn/mq/tbed/pojo/Notice.java similarity index 95% rename from src/main/java/cn/hellohao/pojo/Notice.java rename to src/main/java/cn/mq/tbed/pojo/Notice.java index 0b754ebe..8e059e4a 100644 --- a/src/main/java/cn/hellohao/pojo/Notice.java +++ b/src/main/java/cn/mq/tbed/pojo/Notice.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; public class Notice { private Integer id; diff --git a/src/main/java/cn/hellohao/pojo/ResultBean.java b/src/main/java/cn/mq/tbed/pojo/ResultBean.java similarity index 97% rename from src/main/java/cn/hellohao/pojo/ResultBean.java rename to src/main/java/cn/mq/tbed/pojo/ResultBean.java index 75293fc0..2ead0f9b 100644 --- a/src/main/java/cn/hellohao/pojo/ResultBean.java +++ b/src/main/java/cn/mq/tbed/pojo/ResultBean.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; public class ResultBean { private int code; diff --git a/src/main/java/cn/hellohao/pojo/ReturnImage.java b/src/main/java/cn/mq/tbed/pojo/ReturnImage.java similarity index 95% rename from src/main/java/cn/hellohao/pojo/ReturnImage.java rename to src/main/java/cn/mq/tbed/pojo/ReturnImage.java index bf55dffb..44a34569 100644 --- a/src/main/java/cn/hellohao/pojo/ReturnImage.java +++ b/src/main/java/cn/mq/tbed/pojo/ReturnImage.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/pojo/SysConfig.java b/src/main/java/cn/mq/tbed/pojo/SysConfig.java similarity index 95% rename from src/main/java/cn/hellohao/pojo/SysConfig.java rename to src/main/java/cn/mq/tbed/pojo/SysConfig.java index 454aaa24..356f1c9a 100644 --- a/src/main/java/cn/hellohao/pojo/SysConfig.java +++ b/src/main/java/cn/mq/tbed/pojo/SysConfig.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/pojo/UploadConfig.java b/src/main/java/cn/mq/tbed/pojo/UploadConfig.java similarity index 99% rename from src/main/java/cn/hellohao/pojo/UploadConfig.java rename to src/main/java/cn/mq/tbed/pojo/UploadConfig.java index 0aaffa37..f3d6f61e 100644 --- a/src/main/java/cn/hellohao/pojo/UploadConfig.java +++ b/src/main/java/cn/mq/tbed/pojo/UploadConfig.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; public class UploadConfig { private String suffix; diff --git a/src/main/java/cn/hellohao/pojo/User.java b/src/main/java/cn/mq/tbed/pojo/User.java similarity index 99% rename from src/main/java/cn/hellohao/pojo/User.java rename to src/main/java/cn/mq/tbed/pojo/User.java index afa502ad..34f60139 100644 --- a/src/main/java/cn/hellohao/pojo/User.java +++ b/src/main/java/cn/mq/tbed/pojo/User.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; import org.hibernate.validator.constraints.Length; diff --git a/src/main/java/cn/hellohao/pojo/UserGroup.java b/src/main/java/cn/mq/tbed/pojo/UserGroup.java similarity index 96% rename from src/main/java/cn/hellohao/pojo/UserGroup.java rename to src/main/java/cn/mq/tbed/pojo/UserGroup.java index ff6807cd..f4bed047 100644 --- a/src/main/java/cn/hellohao/pojo/UserGroup.java +++ b/src/main/java/cn/mq/tbed/pojo/UserGroup.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo; +package cn.mq.tbed.pojo; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/pojo/vo/PageResultBean.java b/src/main/java/cn/mq/tbed/pojo/vo/PageResultBean.java similarity index 94% rename from src/main/java/cn/hellohao/pojo/vo/PageResultBean.java rename to src/main/java/cn/mq/tbed/pojo/vo/PageResultBean.java index 3f3b039b..ce83f404 100644 --- a/src/main/java/cn/hellohao/pojo/vo/PageResultBean.java +++ b/src/main/java/cn/mq/tbed/pojo/vo/PageResultBean.java @@ -1,4 +1,4 @@ -package cn.hellohao.pojo.vo; +package cn.mq.tbed.pojo.vo; import java.util.List; diff --git a/src/main/java/cn/hellohao/quartz/FirstJob.java b/src/main/java/cn/mq/tbed/quartz/FirstJob.java similarity index 93% rename from src/main/java/cn/hellohao/quartz/FirstJob.java rename to src/main/java/cn/mq/tbed/quartz/FirstJob.java index cccd063a..4eb4afaa 100644 --- a/src/main/java/cn/hellohao/quartz/FirstJob.java +++ b/src/main/java/cn/mq/tbed/quartz/FirstJob.java @@ -1,4 +1,4 @@ -package cn.hellohao.quartz; +package cn.mq.tbed.quartz; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Component; diff --git a/src/main/java/cn/hellohao/quartz/QuartzConfigration.java b/src/main/java/cn/mq/tbed/quartz/QuartzConfigration.java similarity index 95% rename from src/main/java/cn/hellohao/quartz/QuartzConfigration.java rename to src/main/java/cn/mq/tbed/quartz/QuartzConfigration.java index 6c609bbe..13722ba1 100644 --- a/src/main/java/cn/hellohao/quartz/QuartzConfigration.java +++ b/src/main/java/cn/mq/tbed/quartz/QuartzConfigration.java @@ -1,8 +1,5 @@ -package cn.hellohao.quartz; +package cn.mq.tbed.quartz; -import cn.hellohao.quartz.FirstJob; -import cn.hellohao.quartz.SecondJob; -import cn.hellohao.quartz.SpringUtil; import org.quartz.JobDetail; import org.quartz.Trigger; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/cn/hellohao/quartz/SchedulerTask.java b/src/main/java/cn/mq/tbed/quartz/SchedulerTask.java similarity index 94% rename from src/main/java/cn/hellohao/quartz/SchedulerTask.java rename to src/main/java/cn/mq/tbed/quartz/SchedulerTask.java index 03d94a03..8044f1bd 100644 --- a/src/main/java/cn/hellohao/quartz/SchedulerTask.java +++ b/src/main/java/cn/mq/tbed/quartz/SchedulerTask.java @@ -1,12 +1,12 @@ -package cn.hellohao.quartz; +package cn.mq.tbed.quartz; -import cn.hellohao.pojo.Images; -import cn.hellohao.pojo.Imgreview; -import cn.hellohao.pojo.Keys; -import cn.hellohao.service.impl.ImgServiceImpl; -import cn.hellohao.service.impl.ImgreviewServiceImpl; -import cn.hellohao.service.impl.KeysServiceImpl; -import cn.hellohao.utils.LocUpdateImg; +import cn.mq.tbed.pojo.Images; +import cn.mq.tbed.pojo.Imgreview; +import cn.mq.tbed.pojo.Keys; +import cn.mq.tbed.service.impl.ImgServiceImpl; +import cn.mq.tbed.service.impl.ImgreviewServiceImpl; +import cn.mq.tbed.service.impl.KeysServiceImpl; +import cn.mq.tbed.utils.LocUpdateImg; import com.alibaba.fastjson.JSON; import com.baidu.aip.contentcensor.AipContentCensor; import com.baidu.aip.contentcensor.EImgType; diff --git a/src/main/java/cn/hellohao/quartz/SecondJob.java b/src/main/java/cn/mq/tbed/quartz/SecondJob.java similarity index 92% rename from src/main/java/cn/hellohao/quartz/SecondJob.java rename to src/main/java/cn/mq/tbed/quartz/SecondJob.java index 99990427..d0a504e5 100644 --- a/src/main/java/cn/hellohao/quartz/SecondJob.java +++ b/src/main/java/cn/mq/tbed/quartz/SecondJob.java @@ -1,4 +1,4 @@ -package cn.hellohao.quartz; +package cn.mq.tbed.quartz; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Component; diff --git a/src/main/java/cn/hellohao/quartz/SpringUtil.java b/src/main/java/cn/mq/tbed/quartz/SpringUtil.java similarity index 97% rename from src/main/java/cn/hellohao/quartz/SpringUtil.java rename to src/main/java/cn/mq/tbed/quartz/SpringUtil.java index a2b07979..3f2cfa53 100644 --- a/src/main/java/cn/hellohao/quartz/SpringUtil.java +++ b/src/main/java/cn/mq/tbed/quartz/SpringUtil.java @@ -1,4 +1,4 @@ -package cn.hellohao.quartz; +package cn.mq.tbed.quartz; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cn/hellohao/quartz/TempImgTask.java b/src/main/java/cn/mq/tbed/quartz/TempImgTask.java similarity index 91% rename from src/main/java/cn/hellohao/quartz/TempImgTask.java rename to src/main/java/cn/mq/tbed/quartz/TempImgTask.java index b91d679c..cb9860d2 100644 --- a/src/main/java/cn/hellohao/quartz/TempImgTask.java +++ b/src/main/java/cn/mq/tbed/quartz/TempImgTask.java @@ -1,11 +1,11 @@ -package cn.hellohao.quartz; - -import cn.hellohao.pojo.Keys; -import cn.hellohao.service.impl.ImgServiceImpl; -import cn.hellohao.service.impl.KeysServiceImpl; -import cn.hellohao.utils.DeleImg; -import cn.hellohao.utils.LocUpdateImg; -import cn.hellohao.utils.Print; +package cn.mq.tbed.quartz; + +import cn.mq.tbed.pojo.Keys; +import cn.mq.tbed.service.impl.ImgServiceImpl; +import cn.mq.tbed.service.impl.KeysServiceImpl; +import cn.mq.tbed.utils.DeleImg; +import cn.mq.tbed.utils.LocUpdateImg; +import cn.mq.tbed.utils.Resources; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -43,7 +43,7 @@ public void init() { public void start() throws InterruptedException { List list = new ArrayList<>(); - File file = new File(File.separator + "HellohaoData"+File.separator+"img.ini"); + File file = new File(File.separator + Resources.basePath+File.separator+"img.ini"); //判断文件是否存在 if (file.exists()) { StringBuilder result = new StringBuilder(); @@ -108,7 +108,7 @@ public void start() throws InterruptedException { } public static void main(String[] args) throws Exception { - clearInfoForFile(File.separator + "HellohaoData"+File.separator+"img.ini"); + clearInfoForFile(File.separator + Resources.basePath+File.separator+"img.ini"); } @@ -136,7 +136,7 @@ public static void clearInfoForFile(String fileName) { //遍历没有过期的list文本，依次插入 public static void textcr(List list){ - clearInfoForFile(File.separator + "HellohaoData"+File.separator+"img.ini"); + clearInfoForFile(File.separator + Resources.basePath+File.separator+"img.ini"); //Print.Normal("开始重新插入没有过期的文本"); for (String s : list) { DeleImg.charu(s); diff --git a/src/main/java/cn/hellohao/service/AlbumService.java b/src/main/java/cn/mq/tbed/service/AlbumService.java similarity index 77% rename from src/main/java/cn/hellohao/service/AlbumService.java rename to src/main/java/cn/mq/tbed/service/AlbumService.java index fd9a7d60..94fcebe4 100644 --- a/src/main/java/cn/hellohao/service/AlbumService.java +++ b/src/main/java/cn/mq/tbed/service/AlbumService.java @@ -1,7 +1,6 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.Album; -import org.apache.ibatis.annotations.Mapper; +import cn.mq.tbed.pojo.Album; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/cn/hellohao/service/CodeService.java b/src/main/java/cn/mq/tbed/service/CodeService.java similarity index 79% rename from src/main/java/cn/hellohao/service/CodeService.java rename to src/main/java/cn/mq/tbed/service/CodeService.java index 8bdb83a1..e5e6e73d 100644 --- a/src/main/java/cn/hellohao/service/CodeService.java +++ b/src/main/java/cn/mq/tbed/service/CodeService.java @@ -1,7 +1,6 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.Code; -import org.apache.ibatis.annotations.Param; +import cn.mq.tbed.pojo.Code; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/cn/hellohao/service/ConfigService.java b/src/main/java/cn/mq/tbed/service/ConfigService.java similarity index 72% rename from src/main/java/cn/hellohao/service/ConfigService.java rename to src/main/java/cn/mq/tbed/service/ConfigService.java index ded4c1f1..48559fcd 100644 --- a/src/main/java/cn/hellohao/service/ConfigService.java +++ b/src/main/java/cn/mq/tbed/service/ConfigService.java @@ -1,6 +1,6 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.Config; +import cn.mq.tbed.pojo.Config; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/cn/hellohao/service/DomainService.java b/src/main/java/cn/mq/tbed/service/DomainService.java similarity index 76% rename from src/main/java/cn/hellohao/service/DomainService.java rename to src/main/java/cn/mq/tbed/service/DomainService.java index 0decf773..23b0493f 100644 --- a/src/main/java/cn/hellohao/service/DomainService.java +++ b/src/main/java/cn/mq/tbed/service/DomainService.java @@ -1,6 +1,5 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.Domain; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/cn/hellohao/service/EmailConfigService.java b/src/main/java/cn/mq/tbed/service/EmailConfigService.java similarity index 72% rename from src/main/java/cn/hellohao/service/EmailConfigService.java rename to src/main/java/cn/mq/tbed/service/EmailConfigService.java index 2112a742..df5ceffc 100644 --- a/src/main/java/cn/hellohao/service/EmailConfigService.java +++ b/src/main/java/cn/mq/tbed/service/EmailConfigService.java @@ -1,6 +1,6 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.EmailConfig; +import cn.mq.tbed.pojo.EmailConfig; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/cn/hellohao/service/GroupService.java b/src/main/java/cn/mq/tbed/service/GroupService.java similarity index 85% rename from src/main/java/cn/hellohao/service/GroupService.java rename to src/main/java/cn/mq/tbed/service/GroupService.java index 3f48c67c..19a140b3 100644 --- a/src/main/java/cn/hellohao/service/GroupService.java +++ b/src/main/java/cn/mq/tbed/service/GroupService.java @@ -1,6 +1,6 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.Group; +import cn.mq.tbed.pojo.Group; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/cn/hellohao/service/ImgAndAlbumService.java b/src/main/java/cn/mq/tbed/service/ImgAndAlbumService.java similarity index 82% rename from src/main/java/cn/hellohao/service/ImgAndAlbumService.java rename to src/main/java/cn/mq/tbed/service/ImgAndAlbumService.java index 80b95a9d..fa293ecd 100644 --- a/src/main/java/cn/hellohao/service/ImgAndAlbumService.java +++ b/src/main/java/cn/mq/tbed/service/ImgAndAlbumService.java @@ -1,7 +1,7 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.Images; -import cn.hellohao.pojo.ImgAndAlbum; +import cn.mq.tbed.pojo.Images; +import cn.mq.tbed.pojo.ImgAndAlbum; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/cn/hellohao/service/ImgService.java b/src/main/java/cn/mq/tbed/service/ImgService.java similarity index 83% rename from src/main/java/cn/hellohao/service/ImgService.java rename to src/main/java/cn/mq/tbed/service/ImgService.java index 6b93706b..07a68346 100644 --- a/src/main/java/cn/hellohao/service/ImgService.java +++ b/src/main/java/cn/mq/tbed/service/ImgService.java @@ -1,11 +1,9 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; import java.util.List; -import org.apache.ibatis.annotations.Param; - -import cn.hellohao.pojo.Images; +import cn.mq.tbed.pojo.Images; public interface ImgService { List selectimg(Images images); diff --git a/src/main/java/cn/hellohao/service/ImgreviewService.java b/src/main/java/cn/mq/tbed/service/ImgreviewService.java similarity index 82% rename from src/main/java/cn/hellohao/service/ImgreviewService.java rename to src/main/java/cn/mq/tbed/service/ImgreviewService.java index 8214532d..1e63043f 100644 --- a/src/main/java/cn/hellohao/service/ImgreviewService.java +++ b/src/main/java/cn/mq/tbed/service/ImgreviewService.java @@ -1,6 +1,6 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.Imgreview; +import cn.mq.tbed.pojo.Imgreview; public interface ImgreviewService { int deleteByPrimaryKey(Integer id); diff --git a/src/main/java/cn/hellohao/service/KeysService.java b/src/main/java/cn/mq/tbed/service/KeysService.java similarity index 76% rename from src/main/java/cn/hellohao/service/KeysService.java rename to src/main/java/cn/mq/tbed/service/KeysService.java index 540e3903..d36d8142 100644 --- a/src/main/java/cn/hellohao/service/KeysService.java +++ b/src/main/java/cn/mq/tbed/service/KeysService.java @@ -1,7 +1,7 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.Keys; +import cn.mq.tbed.pojo.Keys; import java.util.List; diff --git a/src/main/java/cn/hellohao/service/NoticeService.java b/src/main/java/cn/mq/tbed/service/NoticeService.java similarity index 67% rename from src/main/java/cn/hellohao/service/NoticeService.java rename to src/main/java/cn/mq/tbed/service/NoticeService.java index 498356e1..b0876345 100644 --- a/src/main/java/cn/hellohao/service/NoticeService.java +++ b/src/main/java/cn/mq/tbed/service/NoticeService.java @@ -1,4 +1,4 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; public interface NoticeService { diff --git a/src/main/java/cn/hellohao/service/SysConfigService.java b/src/main/java/cn/mq/tbed/service/SysConfigService.java similarity index 78% rename from src/main/java/cn/hellohao/service/SysConfigService.java rename to src/main/java/cn/mq/tbed/service/SysConfigService.java index 6966b0e1..a3c37b70 100644 --- a/src/main/java/cn/hellohao/service/SysConfigService.java +++ b/src/main/java/cn/mq/tbed/service/SysConfigService.java @@ -1,6 +1,6 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.SysConfig; +import cn.mq.tbed.pojo.SysConfig; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/cn/hellohao/service/UploadConfigService.java b/src/main/java/cn/mq/tbed/service/UploadConfigService.java similarity index 74% rename from src/main/java/cn/hellohao/service/UploadConfigService.java rename to src/main/java/cn/mq/tbed/service/UploadConfigService.java index c727e263..c8318bfe 100644 --- a/src/main/java/cn/hellohao/service/UploadConfigService.java +++ b/src/main/java/cn/mq/tbed/service/UploadConfigService.java @@ -1,6 +1,6 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.UploadConfig; +import cn.mq.tbed.pojo.UploadConfig; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/cn/hellohao/service/UserGroupService.java b/src/main/java/cn/mq/tbed/service/UserGroupService.java similarity index 87% rename from src/main/java/cn/hellohao/service/UserGroupService.java rename to src/main/java/cn/mq/tbed/service/UserGroupService.java index 7b479629..c1de4be1 100644 --- a/src/main/java/cn/hellohao/service/UserGroupService.java +++ b/src/main/java/cn/mq/tbed/service/UserGroupService.java @@ -1,6 +1,6 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.UserGroup; +import cn.mq.tbed.pojo.UserGroup; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/cn/hellohao/service/UserService.java b/src/main/java/cn/mq/tbed/service/UserService.java similarity index 86% rename from src/main/java/cn/hellohao/service/UserService.java rename to src/main/java/cn/mq/tbed/service/UserService.java index 63faa1b4..80e9e573 100644 --- a/src/main/java/cn/hellohao/service/UserService.java +++ b/src/main/java/cn/mq/tbed/service/UserService.java @@ -1,8 +1,7 @@ -package cn.hellohao.service; +package cn.mq.tbed.service; -import cn.hellohao.pojo.Images; -import cn.hellohao.pojo.User; -import org.apache.ibatis.annotations.Param; +import cn.mq.tbed.pojo.Images; +import cn.mq.tbed.pojo.User; import java.util.List; diff --git a/src/main/java/cn/hellohao/service/impl/AlbumServiceI.java b/src/main/java/cn/mq/tbed/service/impl/AlbumServiceI.java similarity index 83% rename from src/main/java/cn/hellohao/service/impl/AlbumServiceI.java rename to src/main/java/cn/mq/tbed/service/impl/AlbumServiceI.java index 71049af6..504a66ed 100644 --- a/src/main/java/cn/hellohao/service/impl/AlbumServiceI.java +++ b/src/main/java/cn/mq/tbed/service/impl/AlbumServiceI.java @@ -1,20 +1,17 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.AlbumMapper; -import cn.hellohao.dao.ConfigMapper; -import cn.hellohao.dao.ImgAndAlbumMapper; -import cn.hellohao.exception.CodeException; -import cn.hellohao.pojo.Album; -import cn.hellohao.pojo.ImgAndAlbum; -import cn.hellohao.pojo.Msg; -import cn.hellohao.service.AlbumService; -import com.alibaba.fastjson.JSONObject; +import cn.mq.tbed.dao.AlbumMapper; +import cn.mq.tbed.dao.ConfigMapper; +import cn.mq.tbed.dao.ImgAndAlbumMapper; +import cn.mq.tbed.exception.CodeException; +import cn.mq.tbed.pojo.Album; +import cn.mq.tbed.pojo.ImgAndAlbum; +import cn.mq.tbed.service.AlbumService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.UUID; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/service/impl/COSImageupload.java b/src/main/java/cn/mq/tbed/service/impl/COSImageupload.java similarity index 95% rename from src/main/java/cn/hellohao/service/impl/COSImageupload.java rename to src/main/java/cn/mq/tbed/service/impl/COSImageupload.java index 914e27e1..fea00cce 100644 --- a/src/main/java/cn/hellohao/service/impl/COSImageupload.java +++ b/src/main/java/cn/mq/tbed/service/impl/COSImageupload.java @@ -1,21 +1,16 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.pojo.Keys; -import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; -import cn.hellohao.utils.*; -import com.netease.cloud.auth.BasicCredentials; -import com.netease.cloud.auth.Credentials; -import com.netease.cloud.services.nos.NosClient; +import cn.mq.tbed.pojo.Keys; +import cn.mq.tbed.pojo.ReturnImage; +import cn.mq.tbed.pojo.UploadConfig; +import cn.mq.tbed.utils.*; import com.netease.cloud.services.nos.model.ObjectMetadata; -import com.netease.cloud.services.nos.transfer.TransferManager; import com.qcloud.cos.COSClient; import com.qcloud.cos.ClientConfig; import com.qcloud.cos.auth.BasicCOSCredentials; import com.qcloud.cos.auth.COSCredentials; import com.qcloud.cos.exception.CosClientException; import com.qcloud.cos.exception.CosServiceException; -import com.qcloud.cos.model.Bucket; import com.qcloud.cos.model.PutObjectRequest; import com.qcloud.cos.model.PutObjectResult; import com.qcloud.cos.region.Region; diff --git a/src/main/java/cn/hellohao/service/impl/CodeServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/CodeServiceImpl.java similarity index 84% rename from src/main/java/cn/hellohao/service/impl/CodeServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/CodeServiceImpl.java index 10c455e3..60ebb0b2 100644 --- a/src/main/java/cn/hellohao/service/impl/CodeServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/CodeServiceImpl.java @@ -1,8 +1,8 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.CodeMapper; -import cn.hellohao.pojo.Code; -import cn.hellohao.service.CodeService; +import cn.mq.tbed.dao.CodeMapper; +import cn.mq.tbed.pojo.Code; +import cn.mq.tbed.service.CodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/ConfigServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/ConfigServiceImpl.java similarity index 71% rename from src/main/java/cn/hellohao/service/impl/ConfigServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/ConfigServiceImpl.java index 94d99f1b..25a0cecf 100644 --- a/src/main/java/cn/hellohao/service/impl/ConfigServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/ConfigServiceImpl.java @@ -1,9 +1,8 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.ConfigMapper; -import cn.hellohao.pojo.Config; -import cn.hellohao.pojo.Images; -import cn.hellohao.service.ConfigService; +import cn.mq.tbed.dao.ConfigMapper; +import cn.mq.tbed.pojo.Config; +import cn.mq.tbed.service.ConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/DomainServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/DomainServiceImpl.java similarity index 74% rename from src/main/java/cn/hellohao/service/impl/DomainServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/DomainServiceImpl.java index 02be1cd1..4679684a 100644 --- a/src/main/java/cn/hellohao/service/impl/DomainServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/DomainServiceImpl.java @@ -1,8 +1,7 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.DomainMapper; -import cn.hellohao.pojo.Domain; -import cn.hellohao.service.DomainService; +import cn.mq.tbed.dao.DomainMapper; +import cn.mq.tbed.service.DomainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/EmailServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/EmailServiceImpl.java similarity index 75% rename from src/main/java/cn/hellohao/service/impl/EmailServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/EmailServiceImpl.java index d1c4d524..2244d528 100644 --- a/src/main/java/cn/hellohao/service/impl/EmailServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/EmailServiceImpl.java @@ -1,8 +1,8 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.EmailConfigMapper; -import cn.hellohao.pojo.EmailConfig; -import cn.hellohao.service.EmailConfigService; +import cn.mq.tbed.dao.EmailConfigMapper; +import cn.mq.tbed.pojo.EmailConfig; +import cn.mq.tbed.service.EmailConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/FTPImageupload.java b/src/main/java/cn/mq/tbed/service/impl/FTPImageupload.java similarity index 96% rename from src/main/java/cn/hellohao/service/impl/FTPImageupload.java rename to src/main/java/cn/mq/tbed/service/impl/FTPImageupload.java index ce0253fa..3632578b 100644 --- a/src/main/java/cn/hellohao/service/impl/FTPImageupload.java +++ b/src/main/java/cn/mq/tbed/service/impl/FTPImageupload.java @@ -1,9 +1,9 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.pojo.Keys; -import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; -import cn.hellohao.utils.*; +import cn.mq.tbed.pojo.Keys; +import cn.mq.tbed.pojo.ReturnImage; +import cn.mq.tbed.pojo.UploadConfig; +import cn.mq.tbed.utils.*; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPReply; import org.springframework.stereotype.Service; @@ -107,10 +107,10 @@ public static Integer Initialize(Keys k) { Integer p = Integer.parseInt(host[1]); try { if(!ftp.isConnected()){ - ftp.connect(h,p); +// ftp.connect(h,p); } - ftp.login(k.getAccessKey(), k.getAccessSecret()); - } catch (IOException e) { +// ftp.login(k.getAccessKey(), k.getAccessSecret()); + } catch (Exception e) { e.printStackTrace(); return -1; } diff --git a/src/main/java/cn/hellohao/service/impl/GroupServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/GroupServiceImpl.java similarity index 85% rename from src/main/java/cn/hellohao/service/impl/GroupServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/GroupServiceImpl.java index e1b9b988..41250565 100644 --- a/src/main/java/cn/hellohao/service/impl/GroupServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/GroupServiceImpl.java @@ -1,11 +1,11 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.GroupMapper; -import cn.hellohao.dao.UserMapper; -import cn.hellohao.exception.CodeException; -import cn.hellohao.pojo.Group; -import cn.hellohao.pojo.User; -import cn.hellohao.service.GroupService; +import cn.mq.tbed.dao.GroupMapper; +import cn.mq.tbed.dao.UserMapper; +import cn.mq.tbed.exception.CodeException; +import cn.mq.tbed.pojo.Group; +import cn.mq.tbed.pojo.User; +import cn.mq.tbed.service.GroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cn/hellohao/service/impl/IPblacklist.java b/src/main/java/cn/mq/tbed/service/impl/IPblacklist.java similarity index 74% rename from src/main/java/cn/hellohao/service/impl/IPblacklist.java rename to src/main/java/cn/mq/tbed/service/impl/IPblacklist.java index 7a716815..3226698b 100644 --- a/src/main/java/cn/hellohao/service/impl/IPblacklist.java +++ b/src/main/java/cn/mq/tbed/service/impl/IPblacklist.java @@ -1,4 +1,4 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; /** * @author Hellohao diff --git a/src/main/java/cn/hellohao/service/impl/ImgAndAlbumServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/ImgAndAlbumServiceImpl.java similarity index 84% rename from src/main/java/cn/hellohao/service/impl/ImgAndAlbumServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/ImgAndAlbumServiceImpl.java index 58da05b4..a648db31 100644 --- a/src/main/java/cn/hellohao/service/impl/ImgAndAlbumServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/ImgAndAlbumServiceImpl.java @@ -1,9 +1,9 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.ImgAndAlbumMapper; -import cn.hellohao.pojo.Images; -import cn.hellohao.pojo.ImgAndAlbum; -import cn.hellohao.service.ImgAndAlbumService; +import cn.mq.tbed.dao.ImgAndAlbumMapper; +import cn.mq.tbed.pojo.Images; +import cn.mq.tbed.pojo.ImgAndAlbum; +import cn.mq.tbed.service.ImgAndAlbumService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/ImgServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/ImgServiceImpl.java similarity index 96% rename from src/main/java/cn/hellohao/service/impl/ImgServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/ImgServiceImpl.java index f5d04f72..bc3f15ce 100644 --- a/src/main/java/cn/hellohao/service/impl/ImgServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/ImgServiceImpl.java @@ -1,10 +1,11 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import cn.hellohao.utils.Print; +import cn.mq.tbed.utils.Print; +import cn.mq.tbed.service.ImgService; import com.UpYun; import com.aliyun.oss.OSSClient; import com.qcloud.cos.COSClient; @@ -31,12 +32,9 @@ import com.netease.cloud.services.nos.model.CannedAccessControlList; import com.netease.cloud.services.nos.transfer.TransferManager; -import cn.hellohao.dao.ImgMapper; -import cn.hellohao.pojo.Images; -import cn.hellohao.pojo.Keys; -import cn.hellohao.service.ImgService; - -import javax.annotation.Resource; +import cn.mq.tbed.dao.ImgMapper; +import cn.mq.tbed.pojo.Images; +import cn.mq.tbed.pojo.Keys; @Service public class ImgServiceImpl implements ImgService { diff --git a/src/main/java/cn/hellohao/service/impl/ImgreviewServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/ImgreviewServiceImpl.java similarity index 85% rename from src/main/java/cn/hellohao/service/impl/ImgreviewServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/ImgreviewServiceImpl.java index 159bf2fb..13873e61 100644 --- a/src/main/java/cn/hellohao/service/impl/ImgreviewServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/ImgreviewServiceImpl.java @@ -1,8 +1,8 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.ImgreviewMapper; -import cn.hellohao.pojo.Imgreview; -import cn.hellohao.service.ImgreviewService; +import cn.mq.tbed.dao.ImgreviewMapper; +import cn.mq.tbed.pojo.Imgreview; +import cn.mq.tbed.service.ImgreviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/InitializationStorage.java b/src/main/java/cn/mq/tbed/service/impl/InitializationStorage.java similarity index 88% rename from src/main/java/cn/hellohao/service/impl/InitializationStorage.java rename to src/main/java/cn/mq/tbed/service/impl/InitializationStorage.java index 4fe637b8..f45d2468 100644 --- a/src/main/java/cn/hellohao/service/impl/InitializationStorage.java +++ b/src/main/java/cn/mq/tbed/service/impl/InitializationStorage.java @@ -1,8 +1,8 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.KeysMapper; -import cn.hellohao.pojo.Keys; -import cn.hellohao.utils.Print; +import cn.mq.tbed.dao.KeysMapper; +import cn.mq.tbed.pojo.Keys; +import cn.mq.tbed.utils.Print; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; @@ -25,7 +25,7 @@ public class InitializationStorage implements CommandLineRunner { @Override public void run(String... args) throws Exception { intiStorage(); - sout(); +// sout(); } public void intiStorage(){ List keylist = keysMapper.getKeys(); @@ -33,7 +33,8 @@ public void intiStorage(){ if(key.getStorageType()!=0 && key.getStorageType()!=null){ int ret =0; if(key.getStorageType()==1){ - ret =NOSImageupload.Initialize(key);//实例化网易 + //实例化网易 + ret =NOSImageupload.Initialize(key); }else if (key.getStorageType()==2){ ret =OSSImageupload.Initialize(key); }else if(key.getStorageType()==3){ diff --git a/src/main/java/cn/hellohao/service/impl/KODOImageupload.java b/src/main/java/cn/mq/tbed/service/impl/KODOImageupload.java similarity index 95% rename from src/main/java/cn/hellohao/service/impl/KODOImageupload.java rename to src/main/java/cn/mq/tbed/service/impl/KODOImageupload.java index a7227d71..802bc267 100644 --- a/src/main/java/cn/hellohao/service/impl/KODOImageupload.java +++ b/src/main/java/cn/mq/tbed/service/impl/KODOImageupload.java @@ -1,19 +1,16 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.pojo.Keys; -import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; -import cn.hellohao.utils.DateUtils; -import cn.hellohao.utils.DeleImg; -import cn.hellohao.utils.ImgUrlUtil; -import cn.hellohao.utils.SetFiles; -import com.aliyun.oss.OSSClient; -import com.aliyun.oss.model.ObjectMetadata; +import cn.mq.tbed.pojo.Keys; +import cn.mq.tbed.pojo.ReturnImage; +import cn.mq.tbed.pojo.UploadConfig; +import cn.mq.tbed.utils.DateUtils; +import cn.mq.tbed.utils.DeleImg; +import cn.mq.tbed.utils.ImgUrlUtil; +import cn.mq.tbed.utils.SetFiles; import com.google.gson.Gson; import com.qiniu.common.QiniuException; import com.qiniu.common.Zone; import com.qiniu.http.Response; -import com.qiniu.storage.BucketManager; import com.qiniu.storage.Configuration; import com.qiniu.storage.UploadManager; import com.qiniu.storage.model.DefaultPutRet; diff --git a/src/main/java/cn/hellohao/service/impl/KeysServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/KeysServiceImpl.java similarity index 82% rename from src/main/java/cn/hellohao/service/impl/KeysServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/KeysServiceImpl.java index ccfffd6f..86860fa0 100644 --- a/src/main/java/cn/hellohao/service/impl/KeysServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/KeysServiceImpl.java @@ -1,11 +1,11 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; +import cn.mq.tbed.service.KeysService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import cn.hellohao.dao.KeysMapper; -import cn.hellohao.pojo.Keys; -import cn.hellohao.service.KeysService; +import cn.mq.tbed.dao.KeysMapper; +import cn.mq.tbed.pojo.Keys; import java.util.List; diff --git a/src/main/java/cn/hellohao/service/impl/NOSImageupload.java b/src/main/java/cn/mq/tbed/service/impl/NOSImageupload.java similarity index 96% rename from src/main/java/cn/hellohao/service/impl/NOSImageupload.java rename to src/main/java/cn/mq/tbed/service/impl/NOSImageupload.java index 7d25cc3e..3e321087 100644 --- a/src/main/java/cn/hellohao/service/impl/NOSImageupload.java +++ b/src/main/java/cn/mq/tbed/service/impl/NOSImageupload.java @@ -1,4 +1,4 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; import java.io.File; import java.io.FileInputStream; @@ -8,10 +8,9 @@ import java.util.Map; import java.util.UUID; -import cn.hellohao.exception.StorageSourceInitException; -import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; -import cn.hellohao.utils.*; +import cn.mq.tbed.pojo.ReturnImage; +import cn.mq.tbed.pojo.UploadConfig; +import cn.mq.tbed.utils.*; import com.netease.cloud.services.nos.model.ObjectMetadata; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -19,10 +18,8 @@ import com.netease.cloud.auth.BasicCredentials; import com.netease.cloud.auth.Credentials; import com.netease.cloud.services.nos.NosClient; -import com.netease.cloud.services.nos.model.Bucket; -import com.netease.cloud.services.nos.transfer.TransferManager; -import cn.hellohao.pojo.Keys; +import cn.mq.tbed.pojo.Keys; @Service public class NOSImageupload { diff --git a/src/main/java/cn/hellohao/service/impl/NoticeServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/NoticeServiceImpl.java similarity index 74% rename from src/main/java/cn/hellohao/service/impl/NoticeServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/NoticeServiceImpl.java index 86e48419..7186bc45 100644 --- a/src/main/java/cn/hellohao/service/impl/NoticeServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/NoticeServiceImpl.java @@ -1,7 +1,7 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.NoticeMapper; -import cn.hellohao.service.NoticeService; +import cn.mq.tbed.dao.NoticeMapper; +import cn.mq.tbed.service.NoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/OSSImageupload.java b/src/main/java/cn/mq/tbed/service/impl/OSSImageupload.java similarity index 96% rename from src/main/java/cn/hellohao/service/impl/OSSImageupload.java rename to src/main/java/cn/mq/tbed/service/impl/OSSImageupload.java index 4be8b77b..6143f470 100644 --- a/src/main/java/cn/hellohao/service/impl/OSSImageupload.java +++ b/src/main/java/cn/mq/tbed/service/impl/OSSImageupload.java @@ -1,9 +1,12 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.pojo.Keys; -import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; -import cn.hellohao.utils.*; +import cn.mq.tbed.pojo.Keys; +import cn.mq.tbed.pojo.ReturnImage; +import cn.mq.tbed.pojo.UploadConfig; +import cn.mq.tbed.utils.DateUtils; +import cn.mq.tbed.utils.DeleImg; +import cn.mq.tbed.utils.ImgUrlUtil; +import cn.mq.tbed.utils.SetFiles; import com.aliyun.oss.OSSClient; import com.aliyun.oss.model.ObjectMetadata; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/SysConfigServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/SysConfigServiceImpl.java similarity index 77% rename from src/main/java/cn/hellohao/service/impl/SysConfigServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/SysConfigServiceImpl.java index ab11f052..87fb853e 100644 --- a/src/main/java/cn/hellohao/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/SysConfigServiceImpl.java @@ -1,8 +1,8 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.SysConfigMapper; -import cn.hellohao.pojo.SysConfig; -import cn.hellohao.service.SysConfigService; +import cn.mq.tbed.dao.SysConfigMapper; +import cn.mq.tbed.pojo.SysConfig; +import cn.mq.tbed.service.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/USSImageupload.java b/src/main/java/cn/mq/tbed/service/impl/USSImageupload.java similarity index 97% rename from src/main/java/cn/hellohao/service/impl/USSImageupload.java rename to src/main/java/cn/mq/tbed/service/impl/USSImageupload.java index a0056578..2d5b068f 100644 --- a/src/main/java/cn/hellohao/service/impl/USSImageupload.java +++ b/src/main/java/cn/mq/tbed/service/impl/USSImageupload.java @@ -1,11 +1,10 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.pojo.Keys; -import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; -import cn.hellohao.utils.*; +import cn.mq.tbed.pojo.Keys; +import cn.mq.tbed.pojo.ReturnImage; +import cn.mq.tbed.pojo.UploadConfig; +import cn.mq.tbed.utils.*; import com.UpYun; -import com.aliyun.oss.OSSClient; import com.aliyun.oss.model.ObjectMetadata; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/cn/hellohao/service/impl/UploadConfigServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/UploadConfigServiceImpl.java similarity index 76% rename from src/main/java/cn/hellohao/service/impl/UploadConfigServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/UploadConfigServiceImpl.java index c01a1e69..6a5c7536 100644 --- a/src/main/java/cn/hellohao/service/impl/UploadConfigServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/UploadConfigServiceImpl.java @@ -1,8 +1,8 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.UploadConfigMapper; -import cn.hellohao.pojo.UploadConfig; -import cn.hellohao.service.UploadConfigService; +import cn.mq.tbed.dao.UploadConfigMapper; +import cn.mq.tbed.pojo.UploadConfig; +import cn.mq.tbed.service.UploadConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/UploadServicel.java b/src/main/java/cn/mq/tbed/service/impl/UploadServicel.java similarity index 94% rename from src/main/java/cn/hellohao/service/impl/UploadServicel.java rename to src/main/java/cn/mq/tbed/service/impl/UploadServicel.java index 5e654635..6868561b 100644 --- a/src/main/java/cn/hellohao/service/impl/UploadServicel.java +++ b/src/main/java/cn/mq/tbed/service/impl/UploadServicel.java @@ -1,15 +1,14 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.*; -import cn.hellohao.pojo.*; -import cn.hellohao.utils.*; +import cn.mq.tbed.dao.*; +import cn.mq.tbed.pojo.*; +import cn.mq.tbed.utils.*; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -38,8 +37,8 @@ public class UploadServicel { UserMapper userMapper; - public Msg uploadForLoc(HttpSession session, HttpServletRequest request, - MultipartFile multipartFile, Integer setday, String upurlk, String[] iparr) { + public synchronized Msg uploadForLoc(HttpSession session, HttpServletRequest request, + MultipartFile multipartFile, Integer setday, String upurlk, String[] iparr) { Msg msg = new Msg(); JSONArray jsonArray = new JSONArray(); JSONObject jsonObject = new JSONObject(); @@ -106,10 +105,11 @@ public Msg uploadForLoc(HttpSession session, HttpServletRequest request, } } } - if (Integer.parseInt(Base64Encryption.decryptBASE64(upurlk)) != yzupdate()) { - msg.setCode("4003"); - return msg; - } + Integer yzupdate = yzupdate(); +// if (Integer.parseInt(Base64Encryption.decryptBASE64(upurlk)) != yzupdate) { +// msg.setCode("4003"); +// return msg; +// } //验证文件是否是图片 if (u == null) { sourcekey = GetCurrentSource.GetSource(null); diff --git a/src/main/java/cn/hellohao/service/impl/UserGroupServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/UserGroupServiceImpl.java similarity index 87% rename from src/main/java/cn/hellohao/service/impl/UserGroupServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/UserGroupServiceImpl.java index bfca4a69..a2b24fb7 100644 --- a/src/main/java/cn/hellohao/service/impl/UserGroupServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/UserGroupServiceImpl.java @@ -1,8 +1,8 @@ -package cn.hellohao.service.impl; +package cn.mq.tbed.service.impl; -import cn.hellohao.dao.UserGroupMapper; -import cn.hellohao.pojo.UserGroup; -import cn.hellohao.service.UserGroupService; +import cn.mq.tbed.dao.UserGroupMapper; +import cn.mq.tbed.pojo.UserGroup; +import cn.mq.tbed.service.UserGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/cn/hellohao/service/impl/UserServiceImpl.java b/src/main/java/cn/mq/tbed/service/impl/UserServiceImpl.java similarity index 88% rename from src/main/java/cn/hellohao/service/impl/UserServiceImpl.java rename to src/main/java/cn/mq/tbed/service/impl/UserServiceImpl.java index c54a9bc3..7de8d702 100644 --- a/src/main/java/cn/hellohao/service/impl/UserServiceImpl.java +++ b/src/main/java/cn/mq/tbed/service/impl/UserServiceImpl.java @@ -1,12 +1,12 @@ -package cn.hellohao.service.impl; - -import cn.hellohao.dao.CodeMapper; -import cn.hellohao.dao.UserMapper; -import cn.hellohao.exception.CodeException; -import cn.hellohao.pojo.Images; -import cn.hellohao.pojo.User; -import cn.hellohao.service.UserService; -import cn.hellohao.utils.Print; +package cn.mq.tbed.service.impl; + +import cn.mq.tbed.dao.CodeMapper; +import cn.mq.tbed.dao.UserMapper; +import cn.mq.tbed.exception.CodeException; +import cn.mq.tbed.pojo.Images; +import cn.mq.tbed.pojo.User; +import cn.mq.tbed.service.UserService; +import cn.mq.tbed.utils.Print; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,7 +21,10 @@ public class UserServiceImpl implements UserService { private CodeMapper codeMapper; @Override public Integer register(User user) { - // TODO Auto-generated method stub + Integer integer = checkUsername(user.getEmail()); + if(integer > 0){ + return 0; + } return userMapper.register(user); } diff --git a/src/main/java/cn/hellohao/utils/AfterServiceStarted.java b/src/main/java/cn/mq/tbed/utils/AfterServiceStarted.java similarity index 77% rename from src/main/java/cn/hellohao/utils/AfterServiceStarted.java rename to src/main/java/cn/mq/tbed/utils/AfterServiceStarted.java index 732e86f2..7fac9c6b 100644 --- a/src/main/java/cn/hellohao/utils/AfterServiceStarted.java +++ b/src/main/java/cn/mq/tbed/utils/AfterServiceStarted.java @@ -1,12 +1,9 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; -import java.util.Scanner; - @Component public class AfterServiceStarted implements ApplicationRunner { diff --git a/src/main/java/cn/hellohao/utils/Base64Encryption.java b/src/main/java/cn/mq/tbed/utils/Base64Encryption.java similarity index 60% rename from src/main/java/cn/hellohao/utils/Base64Encryption.java rename to src/main/java/cn/mq/tbed/utils/Base64Encryption.java index 9b5114c9..a0acc8f9 100644 --- a/src/main/java/cn/hellohao/utils/Base64Encryption.java +++ b/src/main/java/cn/mq/tbed/utils/Base64Encryption.java @@ -1,7 +1,7 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; +import java.util.Base64.Encoder; +import java.util.Base64.Decoder; import java.io.IOException; import java.util.Base64; @@ -16,14 +16,18 @@ public static void toBaseCode(String str) { public static String decryptBASE64(String key) { byte[] b =null; try { - b = (new BASE64Decoder()).decodeBuffer(key); - } catch (IOException e) { + + Decoder decoder = Base64.getDecoder(); + b = decoder.decode(key); + } catch (Exception e) { e.printStackTrace(); } return new String(b); } public static String encryptBASE64(byte[] key) { String string = "SGVsbG9oYW8K"; - return (new BASE64Encoder()).encodeBuffer(key).replaceAll("\r|\n", ""); + Encoder encoder = Base64.getEncoder(); + byte[] encode = encoder.encode(key); + return new String(encode); } } \ No newline at end of file diff --git a/src/main/java/cn/hellohao/utils/DateUtils.java b/src/main/java/cn/mq/tbed/utils/DateUtils.java similarity index 95% rename from src/main/java/cn/hellohao/utils/DateUtils.java rename to src/main/java/cn/mq/tbed/utils/DateUtils.java index eac9a76f..1d1fa736 100644 --- a/src/main/java/cn/hellohao/utils/DateUtils.java +++ b/src/main/java/cn/mq/tbed/utils/DateUtils.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/src/main/java/cn/hellohao/utils/DeleImg.java b/src/main/java/cn/mq/tbed/utils/DeleImg.java similarity index 94% rename from src/main/java/cn/hellohao/utils/DeleImg.java rename to src/main/java/cn/mq/tbed/utils/DeleImg.java index a7c779b0..b865581a 100644 --- a/src/main/java/cn/hellohao/utils/DeleImg.java +++ b/src/main/java/cn/mq/tbed/utils/DeleImg.java @@ -1,11 +1,11 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; import java.io.*; public class DeleImg { public static void charu(String imgUrlText) { - String filePath =File.separator + "HellohaoData" ; + String filePath =File.separator + Resources.basePath ; File file = new File(filePath); File file1 = new File(filePath+File.separator+"img.ini"); if(!file.exists()){ diff --git a/src/main/java/cn/hellohao/utils/FTPUtils.java b/src/main/java/cn/mq/tbed/utils/FTPUtils.java similarity index 99% rename from src/main/java/cn/hellohao/utils/FTPUtils.java rename to src/main/java/cn/mq/tbed/utils/FTPUtils.java index 3db4215b..f3635be7 100644 --- a/src/main/java/cn/hellohao/utils/FTPUtils.java +++ b/src/main/java/cn/mq/tbed/utils/FTPUtils.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; diff --git a/src/main/java/cn/hellohao/utils/FirstRun.java b/src/main/java/cn/mq/tbed/utils/FirstRun.java similarity index 97% rename from src/main/java/cn/hellohao/utils/FirstRun.java rename to src/main/java/cn/mq/tbed/utils/FirstRun.java index 83b1af68..dddd8bb6 100644 --- a/src/main/java/cn/hellohao/utils/FirstRun.java +++ b/src/main/java/cn/mq/tbed/utils/FirstRun.java @@ -1,8 +1,6 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import org.omg.CORBA.Environment; import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/cn/hellohao/utils/GetCurrentSource.java b/src/main/java/cn/mq/tbed/utils/GetCurrentSource.java similarity index 75% rename from src/main/java/cn/hellohao/utils/GetCurrentSource.java rename to src/main/java/cn/mq/tbed/utils/GetCurrentSource.java index 1ff7663c..fd0dc278 100644 --- a/src/main/java/cn/hellohao/utils/GetCurrentSource.java +++ b/src/main/java/cn/mq/tbed/utils/GetCurrentSource.java @@ -1,14 +1,10 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import cn.hellohao.dao.UserMapper; -import cn.hellohao.pojo.Group; -import cn.hellohao.pojo.User; -import cn.hellohao.pojo.UserGroup; -import cn.hellohao.service.GroupService; -import cn.hellohao.service.UserGroupService; -import cn.hellohao.service.impl.GroupServiceImpl; -import cn.hellohao.service.impl.UserGroupServiceImpl; -import cn.hellohao.service.impl.UserServiceImpl; +import cn.mq.tbed.pojo.Group; +import cn.mq.tbed.pojo.User; +import cn.mq.tbed.service.impl.GroupServiceImpl; +import cn.mq.tbed.service.impl.UserGroupServiceImpl; +import cn.mq.tbed.service.impl.UserServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/cn/hellohao/utils/GetIPS.java b/src/main/java/cn/mq/tbed/utils/GetIPS.java similarity index 91% rename from src/main/java/cn/hellohao/utils/GetIPS.java rename to src/main/java/cn/mq/tbed/utils/GetIPS.java index a84eac74..b9c7c55b 100644 --- a/src/main/java/cn/hellohao/utils/GetIPS.java +++ b/src/main/java/cn/mq/tbed/utils/GetIPS.java @@ -1,7 +1,6 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import cn.hellohao.service.impl.ImgServiceImpl; -import cn.hellohao.service.impl.ImgreviewServiceImpl; +import cn.mq.tbed.service.impl.ImgServiceImpl; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/cn/hellohao/utils/GetSource.java b/src/main/java/cn/mq/tbed/utils/GetSource.java similarity index 93% rename from src/main/java/cn/hellohao/utils/GetSource.java rename to src/main/java/cn/mq/tbed/utils/GetSource.java index d4f2c491..a7f0d485 100644 --- a/src/main/java/cn/hellohao/utils/GetSource.java +++ b/src/main/java/cn/mq/tbed/utils/GetSource.java @@ -1,8 +1,8 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import cn.hellohao.exception.StorageSourceInitException; -import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.service.impl.*; +import cn.mq.tbed.exception.StorageSourceInitException; +import cn.mq.tbed.pojo.ReturnImage; +import cn.mq.tbed.service.impl.*; import org.springframework.web.multipart.MultipartFile; import java.util.Map; diff --git a/src/main/java/cn/hellohao/utils/IPPortUtil.java b/src/main/java/cn/mq/tbed/utils/IPPortUtil.java similarity index 98% rename from src/main/java/cn/hellohao/utils/IPPortUtil.java rename to src/main/java/cn/mq/tbed/utils/IPPortUtil.java index 85dc726a..1b775983 100644 --- a/src/main/java/cn/hellohao/utils/IPPortUtil.java +++ b/src/main/java/cn/mq/tbed/utils/IPPortUtil.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; diff --git a/src/main/java/cn/hellohao/utils/ImgUrlUtil.java b/src/main/java/cn/mq/tbed/utils/ImgUrlUtil.java similarity index 98% rename from src/main/java/cn/hellohao/utils/ImgUrlUtil.java rename to src/main/java/cn/mq/tbed/utils/ImgUrlUtil.java index eda06127..15e1f073 100644 --- a/src/main/java/cn/hellohao/utils/ImgUrlUtil.java +++ b/src/main/java/cn/mq/tbed/utils/ImgUrlUtil.java @@ -1,6 +1,4 @@ -package cn.hellohao.utils; - -import cn.hellohao.TbedApplication; +package cn.mq.tbed.utils; import java.io.*; import java.net.HttpURLConnection; diff --git a/src/main/java/cn/hellohao/utils/LocUpdateImg.java b/src/main/java/cn/mq/tbed/utils/LocUpdateImg.java similarity index 91% rename from src/main/java/cn/hellohao/utils/LocUpdateImg.java rename to src/main/java/cn/mq/tbed/utils/LocUpdateImg.java index b086fb2e..abd5b0fb 100644 --- a/src/main/java/cn/hellohao/utils/LocUpdateImg.java +++ b/src/main/java/cn/mq/tbed/utils/LocUpdateImg.java @@ -1,7 +1,7 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; +import cn.mq.tbed.pojo.ReturnImage; +import cn.mq.tbed.pojo.UploadConfig; import org.springframework.web.multipart.MultipartFile; import java.io.*; @@ -12,14 +12,14 @@ public class LocUpdateImg { public static void deleteLOCImg(String imagename){ - String filePath =File.separator + "HellohaoData" + File.separator+imagename; + String filePath =File.separator + Resources.basePath + File.separator+imagename; File file = new File(filePath); file.delete(); } public static Map ImageuploadLOC(Map fileMap, String username, Map fileMap2,Integer setday) throws Exception { - String filePath =File.separator + "HellohaoData" + File.separator; + String filePath =File.separator + Resources.basePath + File.separator; if(fileMap2==null){ File file = null; Map ImgUrl = new HashMap<>(); @@ -67,8 +67,8 @@ public static Map ImageuploadLOC(Map ImageuploadLOC(Map clientLocUpdateImg(Map fileMap, String username, UploadConfig uploadConfig) { - String filePath =File.separator + "HellohaoData" + File.separator; + String filePath =File.separator + Resources.basePath + File.separator; File file = null; Map ImgUrl = new HashMap<>(); for (Map.Entry entry : fileMap.entrySet()) { diff --git a/src/main/java/cn/hellohao/utils/Print.java b/src/main/java/cn/mq/tbed/utils/Print.java similarity index 96% rename from src/main/java/cn/hellohao/utils/Print.java rename to src/main/java/cn/mq/tbed/utils/Print.java index 689c5f3e..b292cb14 100644 --- a/src/main/java/cn/hellohao/utils/Print.java +++ b/src/main/java/cn/mq/tbed/utils/Print.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; public class Print { // 正常normal diff --git a/src/main/java/cn/mq/tbed/utils/Resources.java b/src/main/java/cn/mq/tbed/utils/Resources.java new file mode 100644 index 00000000..c4c3093d --- /dev/null +++ b/src/main/java/cn/mq/tbed/utils/Resources.java @@ -0,0 +1,13 @@ +package cn.mq.tbed.utils; + +/** + * @author mq + * @description: TODO + * @title: Resources + * @projectName Tbed + * @date 2021/1/1317:47 + */ +public class Resources { + + public final static String basePath = "sdzy"; +} diff --git a/src/main/java/cn/hellohao/utils/SendEmail.java b/src/main/java/cn/mq/tbed/utils/SendEmail.java similarity index 98% rename from src/main/java/cn/hellohao/utils/SendEmail.java rename to src/main/java/cn/mq/tbed/utils/SendEmail.java index f9a40fcd..3da204fa 100644 --- a/src/main/java/cn/hellohao/utils/SendEmail.java +++ b/src/main/java/cn/mq/tbed/utils/SendEmail.java @@ -1,7 +1,7 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import cn.hellohao.pojo.Config; -import cn.hellohao.pojo.EmailConfig; +import cn.mq.tbed.pojo.Config; +import cn.mq.tbed.pojo.EmailConfig; import javax.mail.*; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; diff --git a/src/main/java/cn/hellohao/utils/Sentence.java b/src/main/java/cn/mq/tbed/utils/Sentence.java similarity index 98% rename from src/main/java/cn/hellohao/utils/Sentence.java rename to src/main/java/cn/mq/tbed/utils/Sentence.java index f0ae3063..8c816e17 100644 --- a/src/main/java/cn/hellohao/utils/Sentence.java +++ b/src/main/java/cn/mq/tbed/utils/Sentence.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/cn/hellohao/utils/SetFiles.java b/src/main/java/cn/mq/tbed/utils/SetFiles.java similarity index 98% rename from src/main/java/cn/hellohao/utils/SetFiles.java rename to src/main/java/cn/mq/tbed/utils/SetFiles.java index 0517f9fe..1c9bad9b 100644 --- a/src/main/java/cn/hellohao/utils/SetFiles.java +++ b/src/main/java/cn/mq/tbed/utils/SetFiles.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/cn/hellohao/utils/SetText.java b/src/main/java/cn/mq/tbed/utils/SetText.java similarity index 95% rename from src/main/java/cn/hellohao/utils/SetText.java rename to src/main/java/cn/mq/tbed/utils/SetText.java index fbef67dc..752c2d95 100644 --- a/src/main/java/cn/hellohao/utils/SetText.java +++ b/src/main/java/cn/mq/tbed/utils/SetText.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; public class SetText { public static String getSubString(String text, String left, String right) { diff --git a/src/main/java/cn/hellohao/utils/SpringContextHolder.java b/src/main/java/cn/mq/tbed/utils/SpringContextHolder.java similarity index 98% rename from src/main/java/cn/hellohao/utils/SpringContextHolder.java rename to src/main/java/cn/mq/tbed/utils/SpringContextHolder.java index 0787b1c2..f526bcb0 100644 --- a/src/main/java/cn/hellohao/utils/SpringContextHolder.java +++ b/src/main/java/cn/mq/tbed/utils/SpringContextHolder.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cn/hellohao/utils/SqlHelper.java b/src/main/java/cn/mq/tbed/utils/SqlHelper.java similarity index 94% rename from src/main/java/cn/hellohao/utils/SqlHelper.java rename to src/main/java/cn/mq/tbed/utils/SqlHelper.java index d307d12b..75034dc9 100644 --- a/src/main/java/cn/hellohao/utils/SqlHelper.java +++ b/src/main/java/cn/mq/tbed/utils/SqlHelper.java @@ -1,11 +1,6 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import org.apache.ibatis.io.Resources; -import org.apache.ibatis.jdbc.ScriptRunner; - -import java.io.IOException; import java.sql.*; -import java.util.Properties; final class RunSqlScript { diff --git a/src/main/java/cn/hellohao/utils/StringUtils.java b/src/main/java/cn/mq/tbed/utils/StringUtils.java similarity index 96% rename from src/main/java/cn/hellohao/utils/StringUtils.java rename to src/main/java/cn/mq/tbed/utils/StringUtils.java index 328c511a..9b84c9e5 100644 --- a/src/main/java/cn/hellohao/utils/StringUtils.java +++ b/src/main/java/cn/mq/tbed/utils/StringUtils.java @@ -1,10 +1,6 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import cn.hellohao.pojo.Keys; - -import java.lang.reflect.Field; -import java.util.Collection; -import java.util.Map; +import cn.mq.tbed.pojo.Keys; public class StringUtils { public static Boolean doNull(Integer sourcekey,Keys k) { diff --git a/src/main/java/cn/hellohao/utils/TestUrl.java b/src/main/java/cn/mq/tbed/utils/TestUrl.java similarity index 98% rename from src/main/java/cn/hellohao/utils/TestUrl.java rename to src/main/java/cn/mq/tbed/utils/TestUrl.java index 2049e127..0dc1d3af 100644 --- a/src/main/java/cn/hellohao/utils/TestUrl.java +++ b/src/main/java/cn/mq/tbed/utils/TestUrl.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; import java.io.InputStream; import java.net.URL; diff --git a/src/main/java/cn/hellohao/utils/TypeDict.java b/src/main/java/cn/mq/tbed/utils/TypeDict.java similarity index 98% rename from src/main/java/cn/hellohao/utils/TypeDict.java rename to src/main/java/cn/mq/tbed/utils/TypeDict.java index 8ee3e675..2c57bda8 100644 --- a/src/main/java/cn/hellohao/utils/TypeDict.java +++ b/src/main/java/cn/mq/tbed/utils/TypeDict.java @@ -1,4 +1,4 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; public class TypeDict { /** diff --git a/src/main/java/cn/hellohao/utils/WebConfigConfigurer.java b/src/main/java/cn/mq/tbed/utils/WebConfigConfigurer.java similarity index 90% rename from src/main/java/cn/hellohao/utils/WebConfigConfigurer.java rename to src/main/java/cn/mq/tbed/utils/WebConfigConfigurer.java index 03b0ae15..a4896f93 100644 --- a/src/main/java/cn/hellohao/utils/WebConfigConfigurer.java +++ b/src/main/java/cn/mq/tbed/utils/WebConfigConfigurer.java @@ -1,6 +1,5 @@ -package cn.hellohao.utils; +package cn.mq.tbed.utils; -import org.springframework.context.annotation.Configuration; import org.springframework.http.CacheControl; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ddd6034f..e99d30bc 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,11 +1,13 @@ #数据库账号 spring.datasource.username=root #数据库密码test -spring.datasource.password=root +spring.datasource.password=sdzy@123 +#spring.datasource.password=root #数据库链接地址 -spring.datasource.url=jdbc:mysql://localhost:3306/picturebed?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 +spring.datasource.url=jdbc:mysql://132.232.89.144:33067/picturebed?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 +#spring.datasource.url=jdbc:mysql://localhost:3306/picturebed?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 #端口 -server.port=8088 +server.port=9100 #鉴黄周期表达式 下方表达式为每天七点半执行 #不懂请勿乱修改。具体可以参考官方文档http://doc.wwery.com Expression=0 30 04 * * ? @@ -15,14 +17,14 @@ Expression=0 30 04 * * ? spring.thymeleaf.suffix=.html mybatis.configuration.map-underscore-to-camel-case=true mybatis.mapper-locations=classpath:mapper/*.xml -logging.level.cn.hellohao.dao=debug +logging.level.cn.hellohao.dao=info spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=GMT+8 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.thymeleaf.cache=false -multipart.maxFileSize=10240KB -multipart.maxRequestSize=10240KB -spring.thymeleaf.mode = LEGACYHTML5 +multipart.maxFileSize=1024KB +multipart.maxRequestSize=1024KB +spring.thymeleaf.mode = HTML spring.http.multipart.location=/data/upload_tmp systemupdate=2019-11-29 diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt index 7657e70a..ccca073d 100644 --- a/src/main/resources/banner.txt +++ b/src/main/resources/banner.txt @@ -1,11 +1,21 @@ - _ _ _ - /\ /\___| | | ___ | |__ __ _ ___ - / /_/ / _ \ | |/ _ \| '_ \ / _` |/ _ \ -/ __ / __/ | | (_) | | | | (_| | (_) | -\/ /_/ \___|_|_|\___/|_| |_|\__,_|\___/ +${AnsiColor.BRIGHT_BLUE} -__________________________________________ - HellohaoBlog：http://www.hellohao.cn -__________________________________________ -// \ No newline at end of file + ,---, + ,--.' | ,---, ,--, + | | : ,---, ,---.'| ,---. ,---, ,----,,--.'| ,--, ,---, + .--.--. : : : ,-+-. / | | | : ' ,'\ ,-+-. / | ,----._,. .' .`|| |, ,'_ /| ,-+-. / | + / / ' : | |,--. ,--.--. ,--.'|' | | | | / / | ,--.'|' | / / ' / .' .' .'`--'_ .--, .--. | | : ,--.'|' | +| : /`./ | : ' | / \ | | ,"' | ,--.__| |. ; ,. :| | ,"' || : |,---, ' ./ ,' ,'| /_ ./|,'_ /| : . || | ,"' | +| : ;_ | | /' :.--. .-. | | | / | | / ,' |' | |: :| | / | || | .\ .; | .' / ' | | , ' , ' :| ' | | . .| | / | | + \ \ `.' : | | | \__\/: . . | | | | |. ' / |' | .; :| | | | |. ; '; |`---' / ;--,| | : /___/ \: || | ' | | || | | | | + `----. \ | ' | : ," .--.; | | | | |/ ' ; |: || : || | | |/ ' . . | / / / .`|' : |__. \ ' |: | : ; ; || | | |/ + / /`--' / : :_:,'/ / ,. | | | |--' | | '/ ' \ \ / | | |--' `---`-'| |./__; .' | | '.'|\ ; :' : `--' \ | |--' +'--'. /| | ,' ; : .' \| |/ | : :| `----' | |/ .'__/\_: |; | .' ; : ; \ \ ;: , .-./ |/ + `--'---' `--'' | , .-./'---' \ \ / '---' | : :`---' | , / : \ \`--`----' '---' + `--`---' `----' \ \ / ---`-' \ ' ; + `--`-' `--` +${AnsiColor.BRIGHT_GREEN} + +Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} +${AnsiColor.BLACK} \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 00000000..50b71f6d --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + %red(%date{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %cyan(%thread) %blue(%file:%line) %green(%logger) %cyan(%msg%n) + + + + + + + + + ERROR + DENY + ACCEPT + + + logs/info.%d.log + + + %d -->%p %c[%L] --> %msg%n + + + + + + + + + ERROR + + + + %d -->%p %c[%L] --> %msg%n + + + logs/error.%d.log + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/AlbumMapper.xml b/src/main/resources/mapper/AlbumMapper.xml index 0a4e5cdd..27db1c96 100644 --- a/src/main/resources/mapper/AlbumMapper.xml +++ b/src/main/resources/mapper/AlbumMapper.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM @@ -19,7 +19,7 @@ - + insert into `album` (albumkey,albumtitle,createdate,`password`,userid) values (#{albumkey},#{albumtitle},#{createdate},#{password},#{userid}) @@ -28,7 +28,7 @@ delete from album where albumkey=#{albumkey} - SELECT a.albumkey, diff --git a/src/main/resources/mapper/CodeMapper.xml b/src/main/resources/mapper/CodeMapper.xml index 52680483..2d0e0fd8 100644 --- a/src/main/resources/mapper/CodeMapper.xml +++ b/src/main/resources/mapper/CodeMapper.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM @@ -14,7 +14,7 @@ - SELECT * FROM @@ -23,7 +23,7 @@ - + insert into `code` (id,value,code) values (null,#{value},#{code}) diff --git a/src/main/resources/mapper/ConfigMapper.xml b/src/main/resources/mapper/ConfigMapper.xml index 2bb8cad6..fde59a3b 100644 --- a/src/main/resources/mapper/ConfigMapper.xml +++ b/src/main/resources/mapper/ConfigMapper.xml @@ -1,12 +1,12 @@ - + - select * from config where id = 1 - + UPDATE config diff --git a/src/main/resources/mapper/DomainMapper.xml b/src/main/resources/mapper/DomainMapper.xml index ae1dc6cc..e9f41978 100644 --- a/src/main/resources/mapper/DomainMapper.xml +++ b/src/main/resources/mapper/DomainMapper.xml @@ -1,6 +1,6 @@ - + + - + UPDATE emailconfig diff --git a/src/main/resources/mapper/GroupMapper.xml b/src/main/resources/mapper/GroupMapper.xml index dbfe8572..2884b4b4 100644 --- a/src/main/resources/mapper/GroupMapper.xml +++ b/src/main/resources/mapper/GroupMapper.xml @@ -1,16 +1,16 @@ - + - SELECT * FROM `group` - SELECT * FROM @@ -18,7 +18,7 @@ where id = #{id} - + insert into `group` (id,groupname,keyid) values (null,#{groupname},#{keyid}) @@ -26,7 +26,7 @@ delete from `group` where id=#{id} - + UPDATE `group` SET groupname=#{groupname},keyid=#{keyid} where id = #{id}; diff --git a/src/main/resources/mapper/ImgAndAlbumMapper.xml b/src/main/resources/mapper/ImgAndAlbumMapper.xml index 2fa0236a..bbe2e422 100644 --- a/src/main/resources/mapper/ImgAndAlbumMapper.xml +++ b/src/main/resources/mapper/ImgAndAlbumMapper.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM @@ -15,7 +15,7 @@ - SELECT * FROM @@ -27,7 +27,7 @@ - + insert into `imgandalbum` (imgname,albumkey) values (#{imgname},#{albumkey}) @@ -39,7 +39,7 @@ delete from imgandalbum where albumkey=#{albumkey} - select * from imgdata a LEFT JOIN imgandalbum b on a.imgname = b.imgname LEFT JOIN album c on b.albumkey = c.albumkey diff --git a/src/main/resources/mapper/ImgMapper.xml b/src/main/resources/mapper/ImgMapper.xml index 9a90eafe..c72f9ca9 100644 --- a/src/main/resources/mapper/ImgMapper.xml +++ b/src/main/resources/mapper/ImgMapper.xml @@ -1,9 +1,9 @@ - + - SELECT a.id, a.imgname, @@ -60,7 +60,7 @@ - select * from imgdata where id = #{id} @@ -73,7 +73,7 @@ - + UPDATE imgdata @@ -95,7 +95,7 @@ DELETE FROM imgdata WHERE id = #{id} - SELECT * from imgdata WHERE updatetime>=#{time} @@ -115,7 +115,7 @@ - select imgname,imgurl from imgdata where md5key = #{md5key} diff --git a/src/main/resources/mapper/ImgreviewMapper.xml b/src/main/resources/mapper/ImgreviewMapper.xml index 19205a83..ad4107b9 100644 --- a/src/main/resources/mapper/ImgreviewMapper.xml +++ b/src/main/resources/mapper/ImgreviewMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -26,7 +26,7 @@ delete from imgreview where id = #{id,jdbcType=INTEGER} - insert into imgreview (app_id, api_key, secret_key, @@ -34,7 +34,7 @@ values (#{appId,jdbcType=VARCHAR}, #{apiKey,jdbcType=VARCHAR}, #{secretKey,jdbcType=VARCHAR}, #{using,jdbcType=INTEGER},#{count,jdbcType=INTEGER}) - insert into imgreview @@ -73,7 +73,7 @@ - + update imgreview @@ -95,7 +95,7 @@ where id = #{id,jdbcType=INTEGER} - + update imgreview set app_id = #{appId,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper/KeysMapper.xml b/src/main/resources/mapper/KeysMapper.xml index 5419708f..9aef343b 100644 --- a/src/main/resources/mapper/KeysMapper.xml +++ b/src/main/resources/mapper/KeysMapper.xml @@ -1,10 +1,10 @@ - + - SELECT * FROM @@ -14,14 +14,14 @@ - SELECT * FROM `keys` - + UPDATE `keys` SET AccessKey = #{AccessKey}, AccessSecret = #{AccessSecret}, diff --git a/src/main/resources/mapper/NoticeMapper.xml b/src/main/resources/mapper/NoticeMapper.xml index c8793ae9..18b400e4 100644 --- a/src/main/resources/mapper/NoticeMapper.xml +++ b/src/main/resources/mapper/NoticeMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mapper/SysConfigMapper.xml b/src/main/resources/mapper/SysConfigMapper.xml index c5abccde..a267e1e7 100644 --- a/src/main/resources/mapper/SysConfigMapper.xml +++ b/src/main/resources/mapper/SysConfigMapper.xml @@ -1,12 +1,12 @@ - + - select * from sysconfig where id = 1 - + UPDATE sysconfig diff --git a/src/main/resources/mapper/UploadConfigMapper.xml b/src/main/resources/mapper/UploadConfigMapper.xml index d0ee8380..52a9f2fa 100644 --- a/src/main/resources/mapper/UploadConfigMapper.xml +++ b/src/main/resources/mapper/UploadConfigMapper.xml @@ -1,12 +1,12 @@ - + - select * from uploadconfig where id = 1 - + UPDATE uploadconfig diff --git a/src/main/resources/mapper/UserGroupMapper.xml b/src/main/resources/mapper/UserGroupMapper.xml index 60d925bf..8a85404d 100644 --- a/src/main/resources/mapper/UserGroupMapper.xml +++ b/src/main/resources/mapper/UserGroupMapper.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM @@ -14,7 +14,7 @@ - SELECT * FROM @@ -23,11 +23,11 @@ - + insert into `usergroup` (id,userid,groupid) values (null,#{userid},#{groupid}) - + UPDATE `usergroup` SET groupid = #{groupid} where userid = #{userid} diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index b65d446d..879b7319 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -1,9 +1,9 @@ - + - + INSERT INTO user (id, username, PASSWORD, email, birthder, LEVEL,uid,isok,memory,groupid) VALUES (NULL, #{username}, #{password}, #{email}, #{birthder}, #{level},#{uid},#{isok},#{memory},#{groupid} ) @@ -21,7 +21,7 @@ - + UPDATE `user` set `isok`=1 where uid=#{uid} @@ -48,7 +48,7 @@ - SELECT id, username, email, @@ -63,7 +63,7 @@ WHERE email = #{email} - SELECT id, username, email, @@ -78,7 +78,7 @@ WHERE id = #{id} - SELECT id, username, email, @@ -94,13 +94,13 @@ - + INSERT INTO imgdata (id, imgname, imgurl, userid, updatetime,sizes,abnormal,source,imgtype,md5key) VALUES (NULL, #{imgname}, #{imgurl}, #{userid}, #{updatetime},#{sizes},#{abnormal},#{source},#{imgtype},#{md5key}) - + UPDATE `user` @@ -124,7 +124,7 @@ @@ -132,7 +132,7 @@ SELECT count(*) FROM `user` - SELECT * FROM @@ -152,16 +152,16 @@ DELETE FROM user WHERE id=#{id} - + UPDATE `user` set `isok`=#{isok} where id=#{id} - + UPDATE `user` set `memory`=#{memory} where id=#{id} - select * from user where groupid=#{groupid} diff --git a/src/main/resources/templates/admin/about.html b/src/main/resources/templates/admin/about.html index 282856be..a1556887 100644 --- a/src/main/resources/templates/admin/about.html +++ b/src/main/resources/templates/admin/about.html @@ -19,13 +19,9 @@

style="border-radius :5px;max-width: 80%;-moz-box-shadow: 2px 2px 10px #909090;-webkit-box-shadow: 2px 2px 10px #909090;box-shadow:2px 2px 10px #909090;" />


-

 开发者：Hellohao

+

 请叫我师哥

-

 技术博客：http://www.hellohao.cn

-
-

 Guthub开源：https://github.com/Hello-hao/Tbed

-
-

开发者交流群：864800972

+

 技术博客：https://www.qjwsg.com

 2020-03-18    检查更新

diff --git a/src/main/resources/templates/admin/user.html b/src/main/resources/templates/admin/user.html index 444cb3ec..2b9f34d6 100644 --- a/src/main/resources/templates/admin/user.html +++ b/src/main/resources/templates/admin/user.html @@ -17,6 +17,7 @@ +
diff --git a/src/test/java/cn/hellohao/Tbed/TbedApplicationTests.java b/src/test/java/cn/mq/tbed/Tbed/TbedApplicationTests.java similarity index 92% rename from src/test/java/cn/hellohao/Tbed/TbedApplicationTests.java rename to src/test/java/cn/mq/tbed/Tbed/TbedApplicationTests.java index ac5cb21f..d64717a9 100644 --- a/src/test/java/cn/hellohao/Tbed/TbedApplicationTests.java +++ b/src/test/java/cn/mq/tbed/Tbed/TbedApplicationTests.java @@ -1,4 +1,4 @@ -package cn.hellohao.Tbed; +package cn.mq.tbed.Tbed; import org.junit.Test; import org.junit.runner.RunWith;