:art:完善部分新功能

# Conflicts:
#	src/main/java/cn/hellohao/utils/FirstRun.java

README.md

@@ -1,105 +1,123 @@
 # Hellohao图像托管程序 - 也许这会是最优秀的图床程序
 
-![banner.png](http://img.wwery.com/Hellohao/HqXVDR2b.png)
+![宣传图Banner](https://upload.cc/i1/2022/02/11/HSg5tX.png)
+
 
 ![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)
 
 
+### 引导
+
+[官网](https://tbed.hellohao.cn) | [宣传视频](https://www.bilibili.com/video/BV11r4y1y7mH/) | [文档](https://doc.hellohao.cn) | [演示站](https://pic.hellohao.cn) | [前端源码](https://github.com/Hello-hao/tbed-web) | [桌面客户端](https://tbed.hellohao.cn/app)
+
 
 ### 前言
 
-**Hellohao图像托管程序**(图床)这是一个由JAVA语言编写SpringBoot框架开发的开源图像托管程序。具备多对象存储源对接，采用`前后端分离`式设计的一款专门托管图像的程序，支持多种格式的图像 多功能的图床系统。
+**Hellohao图像托管程序**(图床)这是一个由JAVA语言编写SpringBoot框架开发的开源图像托管程序。具备多对象存储源对接，采用`前后端分离`式设计的一款专门托管图像的程序，支持多种格式的图像 多功能的图床系统。该程序支持除了`web端`之外，同时支持`客户端（win/mac）`,`移动端（小程序）`等常用全平台支持。
 
 程序主要使用领域：`个人照片存储`，`团队共享图像`，`博客/商城等网站图片托管`，`图像批量云分享`等。具备优秀的多用户图像上传功能和完善的图像查询管理逻辑，同时支持对接多家对象存储。
 
-> 无论你使用开源版或者Core版，都希望你能给我点个赞，你的`star`是对一名开发者最大的支持
-
 **存储源支持：**
 
-开源版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,`U-File`,`FTP`
+开源版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,~~`U-File`~~,`FTP`
 
-Core版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,`U-File`,`FTP`,`Backblaze(B2)`,`百度云BOS`,`青云Qingstor`,`Ucloud US3`,`Minio`,`AWS S3`
+Core版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,~~`U-File`~~,`FTP`,`Backblaze(B2)`,`百度云BOS`,`青云Qingstor`,`Ucloud US3`,`Minio`,`AWS S3`等通用S3协议
 
 
-### 更新日志
-> `20211129`
-- 修复FTP存储源上传失败的问题
-- 修复MAC系统下路径问题
-- 优化系统部分代码
+### 更新日志 `20221027`
 
-### 引导
+- `修复`部分场景下登录或者注册时出现验证码一直不正确的问题
+- `调整`URL转存时提示登陆的限制
+- `优化`服务端返回值的一些问题
+  
 
-> 目前`*.hellohao.cn`在国内多个省被运营商劫持，部分省市打不开，恢复时间尚不明确。
-> 迫于无奈，我已经准备了备用域名，后续陆续添加备用域名。
-> 如：`xxx.hellohao.cn`打不开，请尝试访问`xxx.wwery.com`
+[^_^]:程序宣传视频：[自制宣传视频](https://www.bilibili.com/video/BV11r4y1y7mH/)
 
-程序宣传视频：[自制宣传视频](https://www.bilibili.com/video/BV11r4y1y7mH/)
+[^_^]:官网(含Core版)：[https://tbed.hellohao.cn](https://tbed.hellohao.cn)
 
-开源版编译包下载: [下载开源版程序包](https://github.com/Hello-hao/Tbed/releases/)
+[^_^]:前端源码：[https://github.com/Hello-hao/tbed-web](https://github.com/Hello-hao/tbed-web)
 
-官网(含Core版)：[http://Tbed.wwery.com](http://Tbed.wwery.com)
+[^_^]:文档地址：[https://doc.hellohao.cn](https://doc.hellohao.cn)
 
-前端源码：[https://github.com/Hello-hao/tbed-web](https://github.com/Hello-hao/tbed-web)
+[^_^]:程序展示：[https://tc.hellohao.cn](https://tc.hellohao.cn)
 
-文档地址：[http://doc.hellohao.cn](http://doc.hellohao.cn)
+[^_^]:作者博客：[https://www.hellohao.cn](https://www.hellohao.cn)
 
-文档地址(备用)：[http://doc.wwery.com](http://doc.hellohao.cn)
 
-程序展示：[http://tc.hellohao.cn](http://tc.hellohao.cn)
+[^_^]:官网(含Core版)(备用)：[http://tbed.wwery.com](http://tbed.wwery.com)
+
+[^_^]:文档地址(备用)：[http://doc.wwery.com](http://doc.wwery.com)
+
+[^_^]:程序展示(备用)：[http://tc.wwery.com](http://tc.wwery.com)
+
+[^_^]:作者博客(备用)：[http://www.wwery.com](http://www.wwery.com)
 
-作者博客：[http://www.hellohao.cn](http://www.hellohao.cn)
 
 
 
 ### 主要功能
 
-- 前后端分离式架构设计，部署更方便
+- [x] 全端支持，不限于(`web端`/`桌面端Windows/Mac`/`移动端小程序`)
 
-- 个人相册浏览，图像详细资料展示卡片
+- [x] 前后端分离式架构设计，部署更方便
 
-- 支持 图片拖拽、截图直接(Ctrl+V)和URL地址上传
+- [x] 个人相册浏览，图像详细资料展示卡片
 
-- 对接邮箱服务，注册/找回密码等功能
+- [x] 支持 图片拖拽、截图直接(Ctrl+V)
 
-- 违规图像实时多线程鉴别
+- [x] 支持URL地址批量上传
 
-- 图片定期暂存
+- [x] 一键复制嵌入式链接代码，也可以自定义嵌入式代码格式
 
-- 支持多种图像格式如:`jfif`,`webp`,`ico`,`svg`等
+- [x] 对接邮箱服务，注册/找回密码等功能
 
-- 支持画廊批量分享模式
+- [x] 违规图像实时多线程鉴别
 
-- 账户图像查重上传
+- [x] 图片定期暂存
 
-- 配置IP黑名单操作
+- [x] 图片名称记录/修改
 
-- 站点上传可控API接口
+- [x] 支持常见多种图像格式如:`webp`,`ico`,`svg`等等
 
-- 设置用户可用容量
+- [x] 支持画廊批量分享模式
 
-- 账户扩容码批量生成
+- [x] 账户图像查重上传
 
-- 细致的上传分发配置，分发群组功能
+- [x] 配置IP黑名单操作
 
-- 游客、用户的上传管理
+- [x] 站点上传可控API接口
 
-- 图像直链二维码生成
+- [x] 设置用户可用容量
+
+- [x] 账户扩容码批量生成
+
+- [x] 细致的上传分发配置，分发群组功能
+
+- [x] 游客、用户的上传管理
+
+- [x] 图像直链二维码生成
 
 
 
 ### 系统预览
 
-![首页](http://img.wwery.com/Hellohao/xI9TSKcI.png)
+![首页](https://upload.cc/i1/2022/02/11/t2wCEF.png)
 
-![控制台详情](http://img.wwery.com/Hellohao/klytOMWr.png)
+![控制台详情](https://upload.cc/i1/2022/02/11/Al8UrH.png)
 
-![相册](http://img.wwery.com/Hellohao/2UQkXTHw.png)
+![相册](https://upload.cc/i1/2022/02/11/2LhEHJ.png)
 
-![多存储源](http://img.wwery.com/Hellohao/xXSMlsTg.png)
+![多存储源](https://upload.cc/i1/2022/02/11/gOPxZW.png)
 
-![站点设置](http://img.wwery.com/Hellohao/n5zXistG.png)
+![站点设置](https://upload.cc/i1/2022/02/11/Hj7pWM.png)
+
+[^_^]: ![首页](http://img.wwery.com/Hellohao/xI9TSKcI.png)
+[^_^]: ![控制台详情](http://img.wwery.com/Hellohao/klytOMWr.png)
+[^_^]: ![相册](http://img.wwery.com/Hellohao/2UQkXTHw.png)
+[^_^]: ![多存储源](http://img.wwery.com/Hellohao/xXSMlsTg.png)
+[^_^]: ![站点设置](http://img.wwery.com/Hellohao/n5zXistG.png)
 
 
 ### 运行环境
@@ -134,17 +152,26 @@ Core版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,
 > 2.自定义部署 前后端分离式部署:`Tbed.zip`（拓展性高适合有一定java前后端分离部署经验的人）
 > 需要注意：一键部署的端口为：服务器：`10088` 前端：`10089`
 
-详细部署教程参考程序文档：[开源版部署教程](http://doc.hellohao.cn/#/opensource)
+详细部署教程参考程序[相关文档](http://doc.hellohao.cn)
 
 ### 启动项目
 
 初始用户名：`admin`
 初始邮箱：`admin`
-初始密码`admin`
+初始密码：`admin`
 
-### PC客户端
+### 客户端(win64/mac)
+> 目前已经正式上线
+![桌面客户端软件](https://upload.cc/i1/2022/07/13/5W8Pxh.png)
 
-作者精力不够，工作繁忙，暂停更新
+
+### 微信小程序
+> 目前已有测试版，更多功能开发中，开发进度的快慢要根据作者的工作压力、心情状况等自身情况进行评估。
+> 暂时无法给出具体发布小程序的时间。大家期待吧。
+
+![Hellohao图像托管](https://upload.cc/i1/2022/03/28/Vnp0bT.png)
+
+[^_^]: ![小程序UI](https://upload.cc/i1/2022/02/11/6kPmr8.png)
 
 ### 声明
 
@@ -154,8 +181,7 @@ Core版：`本地`,`阿里OSS`,`又拍USS`,`七牛KODO`,`腾讯COS`,`网易NOS`,
 
 ### 反馈交流
 
-**如果你遇到BUG可以去我的博客反馈**
-Hellohao博客: [http://www.hellohao.cn/](http://www.hellohao.cn/)
+**如果你遇到BUG欢迎反馈**
 
 欢迎加入Hellohao开发者交流群，群聊号码：**864800972**
 
@@ -163,5 +189,5 @@ Hellohao博客: [http://www.hellohao.cn/](http://www.hellohao.cn/)
 
 **如果你也支持Hellohao图床，可以请我喝杯咖啡。我会持续更新Hellohao图床**
 
-**捐赠地址:** [**http://tbed.hellohao.cn/pay**](http://tbed.hellohao.cn/pay)
+**捐赠地址:** [**https://tbed.hellohao.cn/pay**](https://tbed.hellohao.cn/pay)
 

pom.xml

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring</artifactId>
-            <version>1.7.1</version>
+            <version>1.9.0</version>
         </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.76</version>
+            <version>2.0.7</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

sql/tbed.sql

@@ -1,17 +1,17 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : localhost
+ Source Server         : locMysql
  Source Server Type    : MySQL
- Source Server Version : 50720
+ Source Server Version : 80028
  Source Host           : localhost:3306
  Source Schema         : tbed
 
  Target Server Type    : MySQL
- Target Server Version : 50720
+ Target Server Version : 80028
  File Encoding         : 65001
 
- Date: 29/10/2021 14:42:28
+ Date: 01/09/2022 00:28:28
 */
 
 SET NAMES utf8mb4;
@@ -26,23 +26,42 @@ CREATE TABLE `album`  (
   `albumtitle` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `createdate` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `userid` int(10) NULL DEFAULT NULL
+  `userid` int(0) NULL DEFAULT NULL
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of album
 -- ----------------------------
 
+-- ----------------------------
+-- Table structure for appclient
+-- ----------------------------
+DROP TABLE IF EXISTS `appclient`;
+CREATE TABLE `appclient`  (
+  `id` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `isuse` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `winpackurl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `macpackurl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `appname` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `applogo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `appupdate` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of appclient
+-- ----------------------------
+INSERT INTO `appclient` VALUES ('app', 'on', '', '', 'Hellohao图像托管', 'https://hellohao.nos-eastchina1.126.net/TbedClient/app.png', '1.0.1');
+
 -- ----------------------------
 -- Table structure for code
 -- ----------------------------
 DROP TABLE IF EXISTS `code`;
 CREATE TABLE `code`  (
-  `id` int(255) NOT NULL AUTO_INCREMENT,
+  `id` int(0) NOT NULL AUTO_INCREMENT,
   `value` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 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
@@ -53,24 +72,24 @@ CREATE TABLE `code`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `config`;
 CREATE TABLE `config`  (
-  `id` int(4) NOT NULL AUTO_INCREMENT,
-  `sourcekey` int(4) NULL DEFAULT NULL,
-  `emails` int(4) NULL DEFAULT NULL COMMENT '邮箱配置',
+  `id` int(0) NOT NULL AUTO_INCREMENT,
+  `sourcekey` int(0) NULL DEFAULT NULL,
+  `emails` int(0) NULL DEFAULT NULL COMMENT '邮箱配置',
   `webname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '网站名',
-  `explain` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `explain` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
   `video` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `backtype` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '背景类型',
-  `links` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `notice` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `baidu` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `links` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
+  `notice` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
+  `baidu` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
   `domain` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `background1` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `background2` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `sett` int(2) NOT NULL COMMENT '首页样式',
+  `sett` int(0) NOT NULL COMMENT '首页样式',
   `webms` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `webkeywords` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `webfavicons` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `theme` int(4) NULL DEFAULT 1 COMMENT '主题',
+  `theme` int(0) NULL DEFAULT 1 COMMENT '主题',
   `websubtitle` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
   `logo` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
   `aboutinfo` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
@@ -87,13 +106,13 @@ INSERT INTO `config` VALUES (1, 7, 1, 'Hellohao图床', 'Hellohao图像托管，
 -- ----------------------------
 DROP TABLE IF EXISTS `emailconfig`;
 CREATE TABLE `emailconfig`  (
-  `id` int(2) NOT NULL AUTO_INCREMENT,
+  `id` int(0) NOT NULL AUTO_INCREMENT,
   `emails` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '邮箱',
   `emailkey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权码',
   `emailurl` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '服务器',
   `port` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '端口',
   `emailname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名',
-  `using` int(4) NULL DEFAULT NULL COMMENT '1为可用，其他为不使用',
+  `using` int(0) 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;
 
@@ -107,11 +126,11 @@ INSERT INTO `emailconfig` VALUES (1, '', '', '', '465', 'Hellohao图床', 0);
 -- ----------------------------
 DROP TABLE IF EXISTS `group`;
 CREATE TABLE `group`  (
-  `id` int(255) NOT NULL AUTO_INCREMENT,
+  `id` int(0) NOT NULL AUTO_INCREMENT,
   `groupname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '组名称',
-  `keyid` int(255) NULL DEFAULT NULL,
-  `usertype` int(4) NULL DEFAULT NULL,
-  `compress` int(4) NULL DEFAULT NULL,
+  `keyid` int(0) NULL DEFAULT NULL,
+  `usertype` int(0) NULL DEFAULT NULL,
+  `compress` int(0) NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
@@ -140,24 +159,25 @@ INSERT INTO `imgandalbum` VALUES ('http://img.wwery.com/ccx51/5GBv93Ks.jpg', 'TO
 -- ----------------------------
 DROP TABLE IF EXISTS `imgdata`;
 CREATE TABLE `imgdata`  (
-  `id` int(255) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `imgname` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片名',
   `imgurl` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片链接',
-  `userid` int(10) NULL DEFAULT NULL COMMENT '用户名',
+  `userid` int(0) NULL DEFAULT NULL COMMENT '用户名',
   `updatetime` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '上传时间',
   `sizes` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `abnormal` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `source` int(2) NULL DEFAULT NULL COMMENT '存储源',
-  `imgtype` int(2) NULL DEFAULT NULL,
+  `source` int(0) NULL DEFAULT NULL COMMENT '存储源',
+  `imgtype` int(0) NULL DEFAULT NULL,
   `explains` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `md5key` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `imguid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `format` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `about` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
   `violation` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `idname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '未命名图像',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `index_md5key_url`(`md5key`(255), `imgurl`(255)) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compressed;
+) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compressed;
 
 -- ----------------------------
 -- Records of imgdata
@@ -168,12 +188,12 @@ CREATE TABLE `imgdata`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `imgreview`;
 CREATE TABLE `imgreview`  (
-  `id` int(4) NOT NULL AUTO_INCREMENT,
+  `id` int(0) NOT NULL AUTO_INCREMENT,
   `app_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `api_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `secret_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `Using` int(4) NULL DEFAULT NULL,
-  `count` int(255) NULL DEFAULT NULL COMMENT '拦截数量',
+  `Using` int(0) NULL DEFAULT NULL,
+  `count` int(0) NULL DEFAULT NULL COMMENT '拦截数量',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
@@ -187,7 +207,7 @@ INSERT INTO `imgreview` VALUES (1, '', '', '', 0, 0);
 -- ----------------------------
 DROP TABLE IF EXISTS `imgtemp`;
 CREATE TABLE `imgtemp`  (
-  `id` int(255) NOT NULL AUTO_INCREMENT,
+  `id` int(0) NOT NULL AUTO_INCREMENT,
   `imguid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `deltime` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
@@ -202,13 +222,13 @@ CREATE TABLE `imgtemp`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `keys`;
 CREATE TABLE `keys`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int(0) NOT NULL AUTO_INCREMENT,
   `AccessKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `AccessSecret` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `Endpoint` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `Bucketname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `RequestAddress` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `storageType` int(11) NULL DEFAULT NULL,
+  `storageType` int(0) NULL DEFAULT NULL,
   `keyname` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '未定义策略名称' COMMENT '策略名称',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
@@ -230,8 +250,8 @@ INSERT INTO `keys` VALUES (13, '', '', '', '0', '', 7, 'ftp');
 -- ----------------------------
 DROP TABLE IF EXISTS `sysconfig`;
 CREATE TABLE `sysconfig`  (
-  `id` int(2) NOT NULL AUTO_INCREMENT,
-  `register` int(2) NOT NULL COMMENT '是否可以注册',
+  `id` int(0) NOT NULL AUTO_INCREMENT,
+  `register` int(0) NOT NULL COMMENT '是否可以注册',
   `checkduplicate` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
@@ -246,19 +266,19 @@ INSERT INTO `sysconfig` VALUES (1, 1, '0');
 -- ----------------------------
 DROP TABLE IF EXISTS `uploadconfig`;
 CREATE TABLE `uploadconfig`  (
-  `id` int(2) NOT NULL AUTO_INCREMENT,
+  `id` int(0) NOT NULL AUTO_INCREMENT,
   `filesizetourists` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `filesizeuser` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `imgcounttourists` int(10) NULL DEFAULT NULL COMMENT '游客文件总数量, 超出则不允许加入队列',
-  `imgcountuser` int(10) NULL DEFAULT NULL COMMENT '用户文件总数量, 超出则不允许加入队列',
+  `imgcounttourists` int(0) NULL DEFAULT NULL COMMENT '游客文件总数量, 超出则不允许加入队列',
+  `imgcountuser` int(0) NULL DEFAULT NULL COMMENT '用户文件总数量, 超出则不允许加入队列',
   `suffix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '支持后缀',
-  `urltype` int(2) NULL DEFAULT NULL COMMENT 'url类型',
-  `isupdate` int(2) NULL DEFAULT NULL COMMENT '禁止游客上传',
-  `api` int(2) NOT NULL COMMENT '开启api',
+  `urltype` int(0) NULL DEFAULT NULL COMMENT 'url类型',
+  `isupdate` int(0) NULL DEFAULT NULL COMMENT '禁止游客上传',
+  `api` int(0) NOT NULL COMMENT '开启api',
   `visitormemory` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `usermemory` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `blacklist` varchar(4000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `userclose` int(4) NULL DEFAULT 0 COMMENT '用户上传开关',
+  `userclose` int(0) NULL DEFAULT 0 COMMENT '用户上传开关',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
@@ -272,34 +292,35 @@ INSERT INTO `uploadconfig` VALUES (1, '10485760', '20971520', 5, 10, 'gif,jpg,jp
 -- ----------------------------
 DROP TABLE IF EXISTS `user`;
 CREATE TABLE `user`  (
-  `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户名',
   `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码',
   `email` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `birthder` date NULL DEFAULT NULL COMMENT '注册时间',
-  `level` int(10) NULL DEFAULT NULL COMMENT '等级',
+  `level` int(0) NULL DEFAULT NULL COMMENT '等级',
   `uid` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户唯一标识',
-  `isok` int(2) NOT NULL,
+  `isok` int(0) NOT NULL,
   `memory` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `groupid` int(255) NULL DEFAULT NULL,
+  `groupid` int(0) NULL DEFAULT NULL,
+  `token` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of user
 -- ----------------------------
-INSERT INTO `user` VALUES (1, 'admin', 'YWRtaW4=', 'admin', '2019-01-10', 2, 'e95c0571bfe04ec680c249fb15cc22e9', 1, '2147483648', 1);
+INSERT INTO `user` VALUES (1, 'admin', 'YWRtaW4=', 'admin', '2019-01-10', 2, '9b76655b2706483780bf54988ca12531', 1, '2147483648', 1, '');
 
 -- ----------------------------
 -- Table structure for usergroup
 -- ----------------------------
 DROP TABLE IF EXISTS `usergroup`;
 CREATE TABLE `usergroup`  (
-  `id` int(255) NOT NULL AUTO_INCREMENT,
-  `userid` int(255) NULL DEFAULT NULL,
-  `groupid` int(255) NULL DEFAULT NULL,
+  `id` int(0) NOT NULL AUTO_INCREMENT,
+  `userid` int(0) NULL DEFAULT NULL,
+  `groupid` int(0) NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of usergroup

src/main/java/cn/hellohao/auth/filter/SubjectFilter.java

@@ -32,9 +32,10 @@ public class SubjectFilter extends BasicHttpAuthenticationFilter {
         HttpServletResponse httpServletResponse =(HttpServletResponse) response;
         String serviceName = httpServletRequest.getServletPath();//获取接口
         String Users_Origin = httpServletRequest.getHeader("usersOrigin");
-
+        String token = httpServletRequest.getHeader("Authorization");
         //验证前端域名
-        if(httpServletRequest.getMethod().equals("POST") && !serviceName.contains("/api") && !serviceName.contains("/verifyCode")){
+        if(httpServletRequest.getMethod().equals("POST") && !serviceName.contains("/api") && !serviceName.contains("/verifyCode")
+                && !serviceName.contains("/getClientVersion") && !serviceName.contains("/client")){
             try{
                 if(Users_Origin.compareTo(SecureUtil.md5(WEBHOST))!=0){
                     System.out.println("前端域名校验未通过");
@@ -50,10 +51,40 @@ public class SubjectFilter extends BasicHttpAuthenticationFilter {
                 return false;
             }
         }
-        String token = httpServletRequest.getHeader("Authorization");
+
+        if(serviceName.contains("/client")){
+            token = httpServletRequest.getHeader("jwttoken");
+            String userToken = httpServletRequest.getHeader("userToken");
+            User user = new User();
+            user.setToken(userToken);
+            User userData = userService.loginByToken(userToken);
+            if(null==userData){
+                this.CODE = "110404";
+                return false;
+            }else{
+                if(userData.getIsok()<1){
+                    this.CODE = "110403";
+                    return false;
+                }
+                Subject sub = SecurityUtils.getSubject();
+                User u = (User) sub.getPrincipal();
+                if(null==u){
+                    httpServletRequest.getSession().setAttribute("user",userData);
+                    Subject subject = SecurityUtils.getSubject();
+                    UsernamePasswordToken tokenOBJ = new UsernamePasswordToken(userData.getEmail(),userData.getPassword());
+                    tokenOBJ.setRememberMe(true);
+                    //执行登录方法，如果没有异常，说明登录成功
+                    subject.login(tokenOBJ);
+                    SecurityUtils.getSubject().getSession().setTimeout(3600000);
+                    User loginUser = (User) SecurityUtils.getSubject().getPrincipal();
+                }
+            }
+        }
+
+//        String token = httpServletRequest.getHeader("Authorization");
         JSONObject jsonObject = JWTUtil.checkToken(token);
         if(!jsonObject.getBoolean("check")){
-            if(!serviceName.contains("admin")){
+            if(!serviceName.contains("admin") || serviceName.contains("admin/client")){
                 return true;
             }else{
                 this.CODE = "403";
@@ -102,6 +133,10 @@ public class SubjectFilter extends BasicHttpAuthenticationFilter {
                 info = "当前用户无权访问该请求";
             }else if(this.CODE.equals("402")){
                 info = "当前web请求不合规";
+            }else if(this.CODE.equals("110403")){
+                info = "该账户暂时无法使用";
+            }else if(this.CODE.equals("110404")){
+                info = "用户未找到";
             }
             System.err.println("拦截器False-"+info);
             response.setContentType("application/json;charset=UTF-8");

src/main/java/cn/hellohao/auth/filter/xss/XssFilter.java

@@ -24,7 +24,6 @@ public class XssFilter implements Filter {
         //由于我的@WebFilter注解配置的是urlPatterns="/*"(过滤所有请求),所以这里对不需要过滤的静态资源url,作忽略处理(大家可以依照具体需求配置)
         String[] exclusionsUrls = {".js",".gif",".jpg",".png",".bmp",".css",".ico"};//,"/","/index","/admin/root/"
         for (String str : exclusionsUrls) {
-            //System.out.println(path.contains(str));
             if (path.contains(str)) {
                 filterChain.doFilter(servletRequest,servletResponse);
                 return;

src/main/java/cn/hellohao/auth/filter/xss/XssHttpServletRequestWrapper.java

@@ -89,8 +89,6 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
         String line = "";
         StringBuilder body = new StringBuilder();
         int counter = 0;
-
-        // 读取POST提交的数据内容
         BufferedReader reader = new BufferedReader(new InputStreamReader(stream, Charset.forName("UTF-8")));
         try {
             while ((line = reader.readLine()) != null) {

src/main/java/cn/hellohao/config/GlobalConstant.java

@@ -0,0 +1,13 @@
+package cn.hellohao.config;
+
+import java.io.File;
+
+/**
+ * @author Hellohao
+ * @version 1.0
+ * @date 29/11/2021 上午 10:35
+ */
+public class GlobalConstant {
+    public static String SYSTYPE = "LINUX";
+    public static String LOCPATH = File.separator + "HellohaoData";
+}

src/main/java/cn/hellohao/config/WebImgConfigurer.java

@@ -12,7 +12,7 @@ public class WebImgConfigurer implements WebMvcConfigurer {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        String filePath = File.separator + "HellohaoData" + File.separator;
+        String filePath = GlobalConstant.LOCPATH + File.separator;
         registry.addResourceHandler("/ota/**").addResourceLocations("file:"+filePath);
     }
 

src/main/java/cn/hellohao/controller/AdminController.java

@@ -4,8 +4,14 @@ import cn.hellohao.config.SysName;
 import cn.hellohao.pojo.*;
 import cn.hellohao.pojo.vo.PageResultBean;
 import cn.hellohao.service.*;
-import cn.hellohao.service.impl.*;
-import cn.hellohao.utils.*;
+import cn.hellohao.service.impl.AlbumServiceImpl;
+import cn.hellohao.service.impl.UserServiceImpl;
+import cn.hellohao.service.impl.deleImages;
+import cn.hellohao.utils.Base64Encryption;
+import cn.hellohao.utils.SetFiles;
+import cn.hellohao.utils.SetText;
+import cn.hellohao.utils.progress.MyProgress;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
@@ -14,11 +20,17 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * @author Hellohao
@@ -29,98 +41,78 @@ import java.util.*;
 @RequestMapping("/admin")
 public class AdminController {
 
-    @Autowired
-    private ImgService imgService;
-    @Autowired
-    private KeysService keysService;
-    @Autowired
-    private UserServiceImpl userService;
-    @Autowired
-    private ImgreviewService imgreviewService;
-    @Autowired
-    private ImgTempService imgTempService;
-    @Autowired
-    private UploadConfigService uploadConfigService;
-    @Autowired
-    private CodeService codeService;
-    @Autowired
-    private ImgAndAlbumService imgAndAlbumService;
-    @Autowired
-    private AlbumService albumService;
-    @Autowired
-    AlbumServiceImpl albumServiceI;
+    @Autowired private ImgService imgService;
+    @Autowired private KeysService keysService;
+    @Autowired private UserServiceImpl userService;
+    @Autowired private ImgreviewService imgreviewService;
+    @Autowired private UploadConfigService uploadConfigService;
+    @Autowired private CodeService codeService;
+    @Autowired private AlbumService albumService;
+    @Autowired AlbumServiceImpl albumServiceI;
+    @Autowired private deleImages deleimages;
+    @Autowired private IRedisService iRedisService;
 
-    @Autowired
-    private NOSImageupload nosImageupload;
-    @Autowired
-    private OSSImageupload ossImageupload;
-    @Autowired
-    private COSImageupload cosImageupload;
-    @Autowired
-    private KODOImageupload kodoImageupload;
-    @Autowired
-    private USSImageupload ussImageupload;
-    @Autowired
-    private UFileImageupload uFileImageupload;
-    @Autowired
-    private FTPImageupload ftpImageupload;
-
-
-    @PostMapping(value = "/overviewData") //new
+    @PostMapping(value = "/overviewData")
     @ResponseBody
     public Msg overviewData(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
         Subject subject = SecurityUtils.getSubject();
         User user = (User) subject.getPrincipal();
-        user =  userService.getUsers(user);
+        user = userService.getUsers(user);
         JSONObject jsonObject = new JSONObject();
         UploadConfig uploadConfig = uploadConfigService.getUpdateConfig();
-        Imgreview imgreview = imgreviewService.selectByPrimaryKey(1);//查询非法个数
-        Imgreview isImgreviewOK = imgreviewService.selectByusing(1);//查询有没有启动鉴别功能
+        Imgreview imgreview = imgreviewService.selectByPrimaryKey(1);
+        Imgreview isImgreviewOK = imgreviewService.selectByusing(1);
         String ok = "false";
-        jsonObject.put("myImgTotal", imgService.countimg(user.getId())); //我的图片数
-        jsonObject.put("myAlbumTitle", albumService.selectAlbumCount(user.getId()));//我的画廊数量
-        long memory = Long.valueOf(user.getMemory());//分配量
-        Long usermemory = imgService.getusermemory(user.getId())==null?0L:imgService.getusermemory(user.getId());
-        if(memory==0){
-            jsonObject.put("myMemory","无容量");
-        }else{
-            Double aDouble = Double.valueOf(String.format("%.2f", (((double)usermemory/(double)memory)*100)));
-            if(aDouble>=999){
-                jsonObject.put("myMemory",999);
-            }else{
-                jsonObject.put("myMemory",aDouble);
+        jsonObject.put("myToken", user.getToken());
+        jsonObject.put("myImgTotal", imgService.countimg(user.getId()));
+        jsonObject.put("myAlbumTitle", albumService.selectAlbumCount(user.getId()));
+        long memory = Long.valueOf(user.getMemory());
+        Long usermemory =
+                imgService.getusermemory(user.getId()) == null
+                        ? 0L
+                        : imgService.getusermemory(user.getId());
+        if (memory == 0) {
+            jsonObject.put("myMemory", "无容量");
+        } else {
+            Double aDouble =
+                    Double.valueOf(String.format("%.2f", (((double) usermemory / (double) memory) * 100)));
+            if (aDouble >= 999) {
+                jsonObject.put("myMemory", 999);
+            } else {
+                jsonObject.put("myMemory", aDouble);
             }
         }
-        jsonObject.put("myMemorySum",SetFiles.readableFileSize(memory));
-        if(user.getLevel()>1){
+        jsonObject.put("myMemorySum", SetFiles.readableFileSize(memory));
+        if (user.getLevel() > 1) {
             ok = "true";
-            //管理员
-            jsonObject.put("imgTotal", imgService.counts(null) ); //admin  站点图片数
-            jsonObject.put("userTotal", userService.getUserTotal()); //admin  用户个数
-            jsonObject.put("ViolationImgTotal", imgreview.getCount()); //admin 非法图片
-            jsonObject.put("ViolationSwitch", isImgreviewOK==null?0:isImgreviewOK.getId()); //admin 非法图片开关
-            jsonObject.put("VisitorUpload", uploadConfig.getIsupdate());//是否禁用了游客上传
-            jsonObject.put("VisitorMemory", SetFiles.readableFileSize(Long.valueOf(uploadConfig.getVisitormemory())));//访客共大小
-            if(uploadConfig.getIsupdate()!=1){
-                jsonObject.put("VisitorUpload", 0);//是否禁用了游客上传
-                jsonObject.put("VisitorProportion",100.00);//游客用量%占比
-                jsonObject.put("VisitorMemory", "禁用");//访客共大小
-            }else{
-                Long temp = imgService.getusermemory(0)==null?0:imgService.getusermemory(0);
-                jsonObject.put("UsedMemory", (temp == null ? 0 : SetFiles.readableFileSize(temp)));//访客已用大小
-                if(Long.valueOf(uploadConfig.getVisitormemory())==0){
-                    jsonObject.put("VisitorProportion",100.00);//游客用量%占比
-                }else if(Long.valueOf(uploadConfig.getVisitormemory())==-1){
-                    jsonObject.put("VisitorProportion",0);//游客用量%占比
-                    jsonObject.put("VisitorMemory", "无限");//访客共大小
-                }else{
+            jsonObject.put("imgTotal", imgService.counts(null));
+            jsonObject.put("userTotal", userService.getUserTotal());
+            jsonObject.put("ViolationImgTotal", imgreview.getCount());
+            jsonObject.put("ViolationSwitch", isImgreviewOK == null ? 0 : isImgreviewOK.getId());
+            jsonObject.put("VisitorUpload", uploadConfig.getIsupdate());
+            jsonObject.put(
+                    "VisitorMemory",
+                    SetFiles.readableFileSize(Long.valueOf(uploadConfig.getVisitormemory()))); // 访客共大小
+            if (uploadConfig.getIsupdate() != 1) {
+                jsonObject.put("VisitorUpload", 0);
+                jsonObject.put("VisitorProportion", 100.00);
+                jsonObject.put("VisitorMemory", "禁用");
+            } else {
+                Long temp = imgService.getusermemory(0) == null ? 0 : imgService.getusermemory(0);
+                jsonObject.put("UsedMemory", (temp == null ? 0 : SetFiles.readableFileSize(temp)));
+                if (Long.valueOf(uploadConfig.getVisitormemory()) == 0) {
+                    jsonObject.put("VisitorProportion", 100.00);
+                } else if (Long.valueOf(uploadConfig.getVisitormemory()) == -1) {
+                    jsonObject.put("VisitorProportion", 0);
+                    jsonObject.put("VisitorMemory", "无限");
+                } else {
                     double sum = Double.valueOf(uploadConfig.getVisitormemory());
                     Double aDouble = Double.valueOf(String.format("%.2f", ((double) temp / sum) * 100));
-                    if(aDouble>=999){
-                        jsonObject.put("VisitorProportion",999);//游客用量%占比
-                    }else{
-                        jsonObject.put("VisitorProportion",aDouble);//游客用量%占比
+                    if (aDouble >= 999) {
+                        jsonObject.put("VisitorProportion", 999);
+                    } else {
+                        jsonObject.put("VisitorProportion", aDouble);
                     }
                 }
             }
@@ -130,60 +122,77 @@ public class AdminController {
         return msg;
     }
 
-
-    @PostMapping(value = "/SpaceExpansion")//new
+    @PostMapping(value = "/SpaceExpansion")
     @ResponseBody
     public Msg SpaceExpansion(@RequestParam(value = "data", defaultValue = "") String data) {
-        final Msg msg = new Msg();
-        final JSONObject jsonObject = JSONObject.parseObject(data);
+        Msg msg = new Msg();
+        JSONObject jsonObject = JSONObject.parseObject(data);
         Subject subject = SecurityUtils.getSubject();
         User user = (User) subject.getPrincipal();
-        user =  userService.getUsers(user);
-        if(user.getIsok()==0){
+        user = userService.getUsers(user);
+        if (user.getIsok() == 0) {
             msg.setCode("100403");
             msg.setInfo("你暂时无法使用此功能");
             return msg;
         }
-        if(null==user){
+        if (null == user) {
             msg.setCode("100405");
             msg.setInfo("用户信息不存在");
             return msg;
-        }else{
+        } else {
             long sizes = 0;
             Code code = codeService.selectCodekey(jsonObject.getString("code"));
-            if(null==code){
+            if (null == code) {
                 msg.setCode("100404");
                 msg.setInfo("扩容码不存在,请重新填写");
                 return msg;
             }
             Long userMemory = Long.valueOf(user.getMemory());
-            sizes = Long.valueOf(code.getValue())+ userMemory;
+            sizes = Long.valueOf(code.getValue()) + userMemory;
             User newMemoryUser = new User();
             newMemoryUser.setMemory(Long.toString(sizes));
             newMemoryUser.setId(user.getId());
-            userService.usersetmemory(newMemoryUser,jsonObject.getString("code"));
-            msg.setInfo("你已成功扩容"+SetFiles.readableFileSize(sizes));
+            userService.usersetmemory(newMemoryUser, jsonObject.getString("code"));
+            msg.setInfo("你已成功扩容" + SetFiles.readableFileSize(sizes));
             return msg;
         }
     }
 
-
-    @PostMapping("/getRecently")//new
+    @PostMapping(value = {"/setImgFileName", "/client/setImgFileName"})
     @ResponseBody
-    public Msg getRecently(@RequestParam(value = "data", defaultValue = "") String data) {
+    public Msg setImgFileName(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
-        final JSONObject jsonObject = new JSONObject();
+        try {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            String name = jsonObject.getString("name");
+            String imgname = jsonObject.getString("imgname");
+            Images images = new Images();
+            images.setIdname(name.replaceAll(" ", ""));
+            images.setImgname(imgname);
+            imgService.setImg(images);
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg.setCode("500");
+        }
+        return msg;
+    }
+
+    @PostMapping("/getRecently")
+    @ResponseBody
+    public Msg getRecently() {
+        Msg msg = new Msg();
+        JSONObject jsonObject = new JSONObject();
         try {
             Subject subject = SecurityUtils.getSubject();
             User user = (User) subject.getPrincipal();
-            user =  userService.getUsers(user);
-            if(user.getLevel()>1){
-                jsonObject.put("RecentlyUser",imgService.RecentlyUser());
-                jsonObject.put("RecentlyUploaded",imgService.RecentlyUploaded(user.getId()));
-            }else{
-                jsonObject.put("RecentlyUploaded",imgService.RecentlyUploaded(user.getId()));
+            user = userService.getUsers(user);
+            if (user.getLevel() > 1) {
+                jsonObject.put("RecentlyUser", imgService.RecentlyUser());
+                jsonObject.put("RecentlyUploaded", imgService.RecentlyUploaded(user.getId()));
+            } else {
+                jsonObject.put("RecentlyUploaded", imgService.RecentlyUploaded(user.getId()));
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg.setInfo("系统内部错误");
             msg.setCode("500");
@@ -193,55 +202,78 @@ public class AdminController {
         return msg;
     }
 
-    @PostMapping("/getYyyy")//new
+    @PostMapping("/updateToken")
     @ResponseBody
-    public Msg getYyyy(@RequestParam(value = "data", defaultValue = "") String data){
-        final Msg msg = new Msg();
+    public Msg updateToken() {
+        Msg msg = new Msg();
+        try {
+            Subject subject = SecurityUtils.getSubject();
+            User user = (User) subject.getPrincipal();
+            User u = new User();
+            u.setId(user.getId());
+            u.setToken(UUID.randomUUID().toString().replace("-", ""));
+            userService.changeUser(u);
+            user.setToken(u.getToken());
+            msg.setData(u.getToken());
+            msg.setInfo("Token更新成功,即可生效");
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg.setCode("500");
+            msg.setInfo("Token更新失败");
+        }
+        return msg;
+    }
+
+    @PostMapping("/getYyyy")
+    @ResponseBody
+    public Msg getYyyy() {
+        Msg msg = new Msg();
         Subject subject = SecurityUtils.getSubject();
         User u = (User) subject.getPrincipal();
-        final JSONObject jsonObject = new JSONObject();
-        jsonObject.put("allYyyy",imgService.getyyyy(null));
-        jsonObject.put("userYyyy",imgService.getyyyy(u.getId()));
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("allYyyy", imgService.getyyyy(null));
+        jsonObject.put("userYyyy", imgService.getyyyy(u.getId()));
         msg.setData(jsonObject);
         return msg;
     }
 
-    @PostMapping("/getChart")//new
+    @PostMapping("/getChart")
     @ResponseBody
-    public Msg getChart(@RequestParam(value = "data", defaultValue = "") String data){
+    public Msg getChart(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
         JSONObject jsonObject = JSONObject.parseObject(data);
         String yyyy = jsonObject.getString("yyyy");
         Integer type = jsonObject.getInteger("type");
-
         Subject subject = SecurityUtils.getSubject();
         User u = (User) subject.getPrincipal();
-        List<Images> list =null;
-        if(u.getLevel()>1){
-            if(type==2){
+        List<Images> list = null;
+        if (u.getLevel() > 1) {
+            if (type == 2) {
                 Images images = new Images();
                 images.setYyyy(yyyy);
                 list = imgService.countByM(images);
-            }else{
+            } else {
                 Images images = new Images();
                 images.setYyyy(yyyy);
                 images.setUserid(u.getId());
                 list = imgService.countByM(images);
             }
-        }else{
+        } else {
             Images images = new Images();
             images.setYyyy(yyyy);
             images.setUserid(u.getId());
             list = imgService.countByM(images);
         }
-        JSONArray json = JSONArray.parseArray("[{\"id\":1,\"monthNum\":\"一月\",\"countNum\":0},{\"id\":2,\"monthNum\":\"二月\",\"countNum\":0},{\"id\":3,\"monthNum\":\"三月\",\"countNum\":0},{\"id\":4,\"monthNum\":\"四月\",\"countNum\":0},{\"id\":5,\"monthNum\":\"五月\",\"countNum\":0},{\"id\":6,\"monthNum\":\"六月\",\"countNum\":0},{\"id\":7,\"monthNum\":\"七月\",\"countNum\":0},{\"id\":8,\"monthNum\":\"八月\",\"countNum\":0},{\"id\":9,\"monthNum\":\"九月\",\"countNum\":0},{\"id\":10,\"monthNum\":\"十月\",\"countNum\":0},{\"id\":11,\"monthNum\":\"十一月\",\"countNum\":0},{\"id\":12,\"monthNum\":\"十二月\",\"countNum\":0}]");
+        JSONArray json =
+                JSONArray.parseArray(
+                        "[{\"id\":1,\"monthNum\":\"一月\",\"countNum\":0},{\"id\":2,\"monthNum\":\"二月\",\"countNum\":0},{\"id\":3,\"monthNum\":\"三月\",\"countNum\":0},{\"id\":4,\"monthNum\":\"四月\",\"countNum\":0},{\"id\":5,\"monthNum\":\"五月\",\"countNum\":0},{\"id\":6,\"monthNum\":\"六月\",\"countNum\":0},{\"id\":7,\"monthNum\":\"七月\",\"countNum\":0},{\"id\":8,\"monthNum\":\"八月\",\"countNum\":0},{\"id\":9,\"monthNum\":\"九月\",\"countNum\":0},{\"id\":10,\"monthNum\":\"十月\",\"countNum\":0},{\"id\":11,\"monthNum\":\"十一月\",\"countNum\":0},{\"id\":12,\"monthNum\":\"十二月\",\"countNum\":0}]");
         JSONArray jsonArray = new JSONArray();
         for (int j = 0; j < list.size(); j++) {
             for (int i = 0; i < json.size(); i++) {
                 JSONObject jobj = json.getJSONObject(i);
-                if(jobj.getInteger("id")==list.get(j).getMonthNum()){
-                    jobj.put("monthNum",getChinaes(list.get(j).getMonthNum()));
-                    jobj.put("countNum",list.get(j).getCountNum());
+                if (jobj.getInteger("id") == list.get(j).getMonthNum()) {
+                    jobj.put("monthNum", getChinaes(list.get(j).getMonthNum()));
+                    jobj.put("countNum", list.get(j).getCountNum());
                 }
             }
         }
@@ -249,7 +281,7 @@ public class AdminController {
         return msg;
     }
 
-    @PostMapping("/getStorage")//new
+    @PostMapping("/getStorage")
     @ResponseBody
     public Msg getStorage() {
         Msg msg = new Msg();
@@ -258,7 +290,7 @@ public class AdminController {
         return msg;
     }
 
-    @PostMapping("/getStorageName")//new
+    @PostMapping("/getStorageName")
     @ResponseBody
     public Msg getStorageName() {
         Msg msg = new Msg();
@@ -267,7 +299,7 @@ public class AdminController {
         return msg;
     }
 
-    @PostMapping(value = "/selectPhoto")//new
+    @PostMapping(value = {"/selectPhoto", "/client/selectPhoto"})
     @ResponseBody
     public Msg selectPhoto(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
@@ -276,21 +308,21 @@ public class AdminController {
         JSONObject jsonObj = JSONObject.parseObject(data);
         Integer pageNum = jsonObj.getInteger("pageNum");
         Integer pageSize = jsonObj.getInteger("pageSize");
-        String username = jsonObj.getString("username");
         Integer source = jsonObj.getInteger("source");
         String starttime = jsonObj.getString("starttime");
         String stoptime = jsonObj.getString("stoptime");
+        String selectUserType = jsonObj.getString("selectUserType"); // me/all
+        String username = jsonObj.getString("username");
         Integer selecttype = jsonObj.getInteger("selecttype");
-        String classifuids = jsonObj.getString("classifuids");
         boolean violation = jsonObj.getBoolean("violation");
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if(starttime!=null){
+        if (starttime != null) {
             try {
                 Date date1 = format.parse(starttime);
-                Date date2 = format.parse(stoptime==null?format.format(new Date()):stoptime);
+                Date date2 = format.parse(stoptime == null ? format.format(new Date()) : stoptime);
                 int compareTo = date1.compareTo(date2);
                 System.out.println(compareTo);
-                if(compareTo==1){
+                if (compareTo == 1) {
                     msg.setCode("110500");
                     msg.setInfo("起始日期不能大于结束日期");
                     return msg;
@@ -304,45 +336,45 @@ public class AdminController {
         }
         Images img = new Images();
         PageHelper.startPage(pageNum, pageSize);
-        if(violation){
+        if (violation) {
             img.setViolation("true");
         }
-        img.setUsername(username);
-        img.setSource(source);
-        img.setSelecttype(selecttype);
         img.setStarttime(starttime);
         img.setStoptime(stoptime);
-        if(classifuids!=null){
-            String[] calssif = classifuids.split(",");
-            img.setClassifuidlist(calssif);
-        }
-        if(subject.hasRole("admin")){
-            img.setUserid(null);
-        }else{
-            //普通用户
+        if (subject.hasRole("admin")) {
+            img.setSource(source);
+            if (selectUserType.equals("me")) {
+                img.setUserid(user.getId());
+                img.setUsername(null);
+                img.setSelecttype(null);
+            } else {
+                img.setUsername(username);
+                img.setSelecttype(selecttype);
+            }
+        } else {
             img.setUserid(user.getId());
         }
         List<Images> images = imgService.selectimg(img);
         PageInfo<Images> rolePageInfo = new PageInfo<>(images);
-        PageResultBean<Images> pageResultBean = new PageResultBean<>(rolePageInfo.getTotal(), rolePageInfo.getList());
+        PageResultBean<Images> pageResultBean =
+                new PageResultBean<>(rolePageInfo.getTotal(), rolePageInfo.getList());
         msg.setData(pageResultBean);
         return msg;
     }
 
-
-    @PostMapping(value = "/getUserInfo") //new
+    @PostMapping(value = "/getUserInfo")
     @ResponseBody
     public Msg getUserInfo() {
         Msg msg = new Msg();
         try {
             Subject subject = SecurityUtils.getSubject();
             User user = (User) subject.getPrincipal();
-            final User u = new User();
+            User u = new User();
             u.setId(user.getId());
             User userInfo = userService.getUsers(u);
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("username",userInfo.getUsername());
-            jsonObject.put("email",userInfo.getEmail());
+            jsonObject.put("username", userInfo.getUsername());
+            jsonObject.put("email", userInfo.getEmail());
             msg.setData(jsonObject);
         } catch (Exception e) {
             e.printStackTrace();
@@ -352,7 +384,7 @@ public class AdminController {
         return msg;
     }
 
-    @PostMapping("/setUserInfo") //new
+    @PostMapping("/setUserInfo")
     @ResponseBody
     public Msg setUserInfo(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
@@ -364,44 +396,44 @@ public class AdminController {
             Subject subject = SecurityUtils.getSubject();
             User u = (User) subject.getPrincipal();
             User user = new User();
-            if(!SetText.checkEmail(email)){
+            if (!SetText.checkEmail(email)) {
                 msg.setCode("110403");
                 msg.setInfo("邮箱格式不正确");
                 return msg;
             }
             String regex = "^\\w+$";
-            if(username.length()>20 || !username.matches (regex)){
+            if (username.length() > 20 || !username.matches(regex)) {
                 msg.setCode("110403");
                 msg.setInfo("用户名不得超过20位字符");
                 return msg;
             }
-            if(subject.hasRole("admin")){
-                final User userOld = new User();
+            if (subject.hasRole("admin")) {
+                User userOld = new User();
                 userOld.setId(u.getId());
                 User userInfo = userService.getUsers(userOld);
-                if(!userInfo.getUsername().equals(username)){
+                if (!userInfo.getUsername().equals(username)) {
                     Integer countusername = userService.countusername(username);
-                    if(countusername == 1 || !SysName.CheckSysName(username)){
+                    if (countusername == 1 || !SysName.CheckSysName(username)) {
                         msg.setCode("110406");
                         msg.setInfo("此用户名已存在");
                         return msg;
-                    }else {
+                    } else {
                         user.setUsername(username);
                     }
                 }
-                if(!userInfo.getEmail().equals(email)){
+                if (!userInfo.getEmail().equals(email)) {
                     Integer countmail = userService.countmail(email);
-                    if(countmail == 1){
+                    if (countmail == 1) {
                         msg.setCode("110407");
                         msg.setInfo("此邮箱已被注册");
                         return msg;
-                    }else{
+                    } else {
                         user.setEmail(email);
                     }
                 }
                 user.setPassword(Base64Encryption.encryptBASE64(password.getBytes()));
                 user.setUid(u.getUid());
-            }else{
+            } else {
                 user.setPassword(Base64Encryption.encryptBASE64(password.getBytes()));
                 user.setUid(u.getUid());
             }
@@ -415,131 +447,134 @@ public class AdminController {
         return msg;
     }
 
-
-    @PostMapping("/deleImages") //new
+    @PostMapping({"/deleImages", "/client/deleImages"})
     @ResponseBody
     public Msg deleImages(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
         JSONObject jsonObj = JSONObject.parseObject(data);
-        JSONArray images = jsonObj.getJSONArray("images");
-        Subject subject = SecurityUtils.getSubject();
-        User user = (User) subject.getPrincipal();
-
-        if(null == user){
-            msg.setCode("500");
-            msg.setInfo("当前用户信息不存在");
-            return msg;
-        }
-        if(images.size()==0){
+        String images = jsonObj.getString("images");
+        String uuid = jsonObj.getString("uuid");
+        if (images == null) {
             msg.setCode("404");
             msg.setInfo("为获取到图像信息");
             return msg;
         }
-        for (int i = 0; i < images.size(); i++) {
-            Integer imgid = images.getInteger(i);
+        String[] split = images.split(",");
+        Subject subject = SecurityUtils.getSubject();
+        User user = (User) subject.getPrincipal();
+        if (null == user) {
+            msg.setCode("500");
+            msg.setInfo("当前用户信息不存在");
+            return msg;
+        }
+        if (split.length == 0) {
+            msg.setCode("404");
+            msg.setInfo("为获取到图像信息");
+            return msg;
+        }
+        List<Integer> imgIds = new ArrayList<Integer>();
+        for (int i = 0; i < split.length; i++) {
+            Integer imgid = Integer.valueOf(split[i]);
             Images image = imgService.selectByPrimaryKey(imgid);
-            Integer keyid = image.getSource();
-            String imgname = image.getImgname();
-            Keys key = keysService.selectKeys(keyid);
-
-            if(!subject.hasRole("admin")){
-                if(image.getUserid()!=user.getId()){
+            if (!subject.hasRole("admin")) {
+                if (!image.getUserid().equals(user.getId())) {
                     break;
                 }
             }
-            boolean isDele = false;
-            try{
-                if (key.getStorageType() == 1) {
-                    isDele = nosImageupload.delNOS(key.getId(), imgname);
-                } else if (key.getStorageType() == 2) {
-                    isDele = ossImageupload.delOSS(key.getId(), imgname);
-                } else if (key.getStorageType() == 3) {
-                    isDele = ussImageupload.delUSS(key.getId(), imgname);
-                } else if (key.getStorageType() == 4) {
-                    isDele = kodoImageupload.delKODO(key.getId(), imgname);
-                } else if (key.getStorageType() == 5) {
-                    isDele = LocUpdateImg.deleteLOCImg(imgname);
-                }else if (key.getStorageType() == 6) {
-                    isDele = cosImageupload.delCOS(key.getId(), imgname);
-                }else if (key.getStorageType() == 7) {
-                    isDele = ftpImageupload.delFTP(key.getId(), imgname);
-                }else if (key.getStorageType() == 8) {
-                    isDele = uFileImageupload.delUFile(key.getId(), imgname);
-                }else {
-                    System.err.println("未获取到对象存储参数，删除失败。");
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-            if(isDele){
-                try {
-                    imgTempService.delImgAndExp(image.getImguid());
-                    imgService.deleimg(imgid);
-                    imgAndAlbumService.deleteImgAndAlbum(imgname);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    msg.setInfo("图片记录删除失败，请重试");
-                    msg.setCode("500");
-                    return msg;
-                }
-                msg.setInfo("删除成功");
-            }else{
-                imgTempService.delImgAndExp(image.getImguid());
-                imgService.deleimg(imgid);
-                imgAndAlbumService.deleteImgAndAlbum(imgname);
-                msg.setInfo("图片记录已删除，但是图片源删除失败");
-            }
+            imgIds.add(imgid);
+        }
+        if (imgIds.size() == 0) {
+            msg.setCode("110404");
+        } else {
+            deleimages.dele(uuid, imgIds.stream().toArray(Integer[]::new));
+            msg.setCode("200");
         }
         return msg;
     }
 
-
-    //工具函数
-    private static String getChinaes(int v){
-        String ch = "";
-        switch(v){
-            case 1 :
-                ch = "一月";
-                break; //可选
-            case 2 :
-                ch = "二月";
-                break; //可选
-            case 3 :
-                ch = "三月";
-                break; //可选
-            case 4 :
-                ch = "四月";
-                break; //可选
-            case 5 :
-                ch = "五月";
-                break; //可选
-            case 6 :
-                ch = "六月";
-                break; //可选
-            case 7 :
-                ch = "七月";
-                break; //可选
-            case 8 :
-                ch = "八月";
-                break; //可选
-            case 9 :
-                ch = "九月";
-                break; //可选
-            case 10 :
-                ch = "十月";
-                break; //可选
-            case 11 :
-                ch = "十一月";
-                break; //可选
-            case 12 :
-                ch = "十二月";
-                break; //可选
-            default : ch = "";//可选
-                //语句
+    @PostMapping({"/GetDelprogress", "/client/GetDelprogress"})
+    @ResponseBody
+    public Msg GetDelprogress(@RequestParam(value = "data", defaultValue = "") String data) {
+        Msg msg = new Msg();
+        try {
+            JSONObject jsonObj = JSONObject.parseObject(data);
+            String uuid = jsonObj.getString("uuid");
+            JSONObject jsonObject = new JSONObject();
+            MyProgress myProgress = null;
+            try{
+                myProgress = JSON.parseObject(iRedisService.getValue(uuid).toString(), MyProgress.class);
+            }catch (Exception e){ }
+            if (null == myProgress) {
+                jsonObject.put("succ", myProgress.getDelSuccessCount());
+                jsonObject.put("errorlist", new ArrayList<String>());
+                jsonObject.put("oklist", new ArrayList<Long>());
+                jsonObject.put("delover", false);
+            } else {
+                jsonObject.put("succ", myProgress.getDelSuccessCount());
+                jsonObject.put("errorlist", myProgress.getDelErrorImgListt());
+                jsonObject.put("oklist", myProgress.getDelSuccessImgList());
+                jsonObject.put("delover", myProgress.getDelOCT());
+            }
+            msg.setData(jsonObject);
+            if (myProgress.getDelOCT()==1) {
+                System.out.println("循环遍历的值：" + myProgress.getDelOCT());
+                msg.setCode("100");
+            } else {
+                msg.setCode("110666");
+                msg.setInfo("正在执行");
+            }
+            return msg;
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg.setCode("110500");
+            msg.setInfo("正在执行过程中发生错误");
+            return msg;
         }
-
-        return ch;
-
     }
 
+    private static String getChinaes(int v) {
+        String ch = "";
+        switch (v) {
+            case 1:
+                ch = "一月";
+                break; // 可选
+            case 2:
+                ch = "二月";
+                break; // 可选
+            case 3:
+                ch = "三月";
+                break; // 可选
+            case 4:
+                ch = "四月";
+                break; // 可选
+            case 5:
+                ch = "五月";
+                break; // 可选
+            case 6:
+                ch = "六月";
+                break; // 可选
+            case 7:
+                ch = "七月";
+                break; // 可选
+            case 8:
+                ch = "八月";
+                break; // 可选
+            case 9:
+                ch = "九月";
+                break; // 可选
+            case 10:
+                ch = "十月";
+                break; // 可选
+            case 11:
+                ch = "十一月";
+                break; // 可选
+            case 12:
+                ch = "十二月";
+                break; // 可选
+            default:
+                ch = ""; // 可选
+                // 语句
+        }
+        return ch;
+    }
 }

src/main/java/cn/hellohao/controller/AdminRootController.java

@@ -3,8 +3,8 @@ package cn.hellohao.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.hellohao.utils.NewSendEmail;
+import cn.hellohao.utils.SetFiles;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -13,19 +13,13 @@ import com.github.pagehelper.PageInfo;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Controller
 @RequestMapping("/admin/root")
@@ -46,31 +40,35 @@ public class AdminRootController {
     private ImgService imgService;
     @Autowired
     private ImgreviewService imgreviewService;
+    @Autowired
+    private AppClientService appClientService;
 
 
-    @PostMapping(value = "/getUserList")//new
+    @PostMapping(value = "/getUserList")
     @ResponseBody
-    public Map<String, Object> getUserList(@RequestParam(value = "data", defaultValue = "") String data) {
-        JSONObject jsonObj = JSONObject.parseObject(data);
-        Integer pageNum = jsonObj.getInteger("pageNum");
-        Integer pageSize = jsonObj.getInteger("pageSize");
-        String queryText = jsonObj.getString("queryText");
-        PageHelper.startPage(pageNum, pageSize);
-        List<User> users = userService.getuserlist(queryText);
-        PageInfo<User> rolePageInfo = new PageInfo<>(users);
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("count", rolePageInfo.getTotal());
-        map.put("users", rolePageInfo.getList());
-        return map;
-
+    public Msg getUserList(@RequestParam(value = "data", defaultValue = "") String data) {
+        Msg msg = new Msg();
+        try{
+            JSONObject jsonObj = JSONObject.parseObject(data);
+            Integer pageNum = jsonObj.getInteger("pageNum");
+            Integer pageSize = jsonObj.getInteger("pageSize");
+            String queryText = jsonObj.getString("queryText");
+            PageHelper.startPage(pageNum, pageSize);
+            List<User> users = userService.getuserlist(queryText);
+            PageInfo<User> rolePageInfo = new PageInfo<>(users);
+            msg.setData(rolePageInfo);
+        }catch (Exception e){
+            msg.setCode("500");
+        }
+        return msg;
     }
 
 
-    @PostMapping(value = "/updateUserInfo")//new
+    @PostMapping(value = "/updateUserInfo")
     @ResponseBody
     public Msg updateUserInfo(@RequestParam(value = "data", defaultValue = "") String data) {
         final Msg msg = new Msg();
-        try{
+        try {
             Subject subject = SecurityUtils.getSubject();
             User u = (User) subject.getPrincipal();
             JSONObject jsonObj = JSONObject.parseObject(data);
@@ -79,7 +77,7 @@ public class AdminRootController {
             Long memory = jsonObj.getLong("memory");
             Integer groupid = jsonObj.getInteger("groupid");
             Integer isok = jsonObj.getInteger("isok");
-            if(memory<0 || memory>1048576L){
+            if (memory < 0 || memory > 1048576L) {
                 msg.setCode("500");
                 msg.setInfo("容量不得超过1048576");
                 return msg;
@@ -90,14 +88,14 @@ public class AdminRootController {
             User userInfo = userService.getUsers(user2);
             user.setId(id);
             user.setEmail(email);
-            user.setMemory(Long.toString(memory*1024*1024));
+            user.setMemory(Long.toString(memory * 1024 * 1024));
             user.setGroupid(groupid);
-            if(userInfo.getLevel()==1){
-                user.setIsok(isok==1?1:-1);
+            if (userInfo.getLevel() == 1) {
+                user.setIsok(isok == 1 ? 1 : -1);
             }
             userService.changeUser(user);
             msg.setInfo("修改成功");
-        }catch (Exception e){
+        } catch (Exception e) {
             msg.setCode("500");
             msg.setInfo("修改失败");
             e.printStackTrace();
@@ -106,7 +104,7 @@ public class AdminRootController {
     }
 
 
-    @PostMapping("/disableUser")//new
+    @PostMapping("/disableUser")
     @ResponseBody
     public Msg disableUser(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
@@ -117,7 +115,7 @@ public class AdminRootController {
                 User u = new User();
                 u.setId(userIdList.getInteger(i));
                 User u2 = userService.getUsers(u);
-                if(u2.getLevel()==1){
+                if (u2.getLevel() == 1) {
                     User user = new User();
                     user.setId(userIdList.getInteger(i));
                     user.setIsok(-1);
@@ -126,7 +124,7 @@ public class AdminRootController {
 
             }
             msg.setInfo("所选用户已被禁用");
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg.setInfo("系统错误");
             msg.setCode("500");
@@ -134,7 +132,7 @@ public class AdminRootController {
         return msg;
     }
 
-    @PostMapping("/deleUser")//new
+    @PostMapping("/deleUser")
     @ResponseBody
     public Msg deleuser(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
@@ -146,18 +144,18 @@ public class AdminRootController {
                 User u = new User();
                 u.setId(userIdList.getInteger(i));
                 User user = userService.getUsers(u);
-                if(user.getLevel()==1){
+                if (user.getLevel() == 1) {
                     userService.deleuser(userIdList.getInteger(i));
-                }else{
+                } else {
                     b = true;
                 }
             }
-            if(b && userIdList.size()==1){
+            if (b && userIdList.size() == 1) {
                 msg.setInfo("管理员账户不可删除");
-            }else {
+            } else {
                 msg.setInfo("用户已删除成功");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg.setInfo("系统错误");
             msg.setCode("500");
@@ -165,7 +163,7 @@ public class AdminRootController {
         return msg;
     }
 
-    @PostMapping("/getKeysList") //new
+    @PostMapping("/getKeysList")
     @ResponseBody
     public Msg getKeysList() {
         Msg msg = new Msg();
@@ -174,7 +172,7 @@ public class AdminRootController {
         return msg;
     }
 
-    @PostMapping("/LoadInfo")//new
+    @PostMapping("/LoadInfo")
     @ResponseBody
     public Msg LoadInfo(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
@@ -182,34 +180,34 @@ public class AdminRootController {
             JSONObject jsonData = JSONObject.parseObject(data);
             Integer keyId = jsonData.getInteger("keyId");
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("id",keyId);
+            jsonObject.put("id", keyId);
             Keys key = keysService.selectKeys(keyId);
             Integer ret = 0;
-            if(key.getStorageType()==1){
+            if (key.getStorageType() == 1) {
                 ret = NOSImageupload.Initialize(key);
-            }else if (key.getStorageType()==2){
+            } else if (key.getStorageType() == 2) {
                 ret = OSSImageupload.Initialize(key);
-            }else if(key.getStorageType()==3){
+            } else if (key.getStorageType() == 3) {
                 ret = USSImageupload.Initialize(key);
-            }else if(key.getStorageType()==4){
+            } else if (key.getStorageType() == 4) {
                 ret = KODOImageupload.Initialize(key);
-            }else if(key.getStorageType()==6){
+            } else if (key.getStorageType() == 6) {
                 ret = COSImageupload.Initialize(key);
-            }else if(key.getStorageType()==7){
+            } else if (key.getStorageType() == 7) {
                 ret = FTPImageupload.Initialize(key);
-            }else if(key.getStorageType()==8){
+            } else if (key.getStorageType() == 8) {
                 ret = UFileImageupload.Initialize(key);
             }
             Long l = imgService.getsourcememory(keyId);
-            jsonObject.put("isok",ret);
-            jsonObject.put("storagetype",key.getStorageType());
-            if(l==null){
-                jsonObject.put("usedCapacity",0);
-            }else{
+            jsonObject.put("isok", ret);
+            jsonObject.put("storagetype", key.getStorageType());
+            if (l == null) {
+                jsonObject.put("usedCapacity", 0);
+            } else {
                 jsonObject.put("usedCapacity", SetFiles.readableFileSize(l));
             }
             msg.setData(jsonObject);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg.setCode("500");
         }
@@ -217,7 +215,7 @@ public class AdminRootController {
     }
 
 
-    @PostMapping("/updateStorage") //new
+    @PostMapping("/updateStorage")
     @ResponseBody
     public Msg updateStorage(@RequestParam(value = "data", defaultValue = "") String data) {
         JSONObject jsonObj = JSONObject.parseObject(data);
@@ -242,7 +240,7 @@ public class AdminRootController {
         return msg;
     }
 
-    @PostMapping("/getStorageById")//new
+    @PostMapping("/getStorageById")
     @ResponseBody
     public Msg getselectkey(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
@@ -253,8 +251,7 @@ public class AdminRootController {
         return msg;
     }
 
-
-    @PostMapping("/getSettingConfig") //new
+    @PostMapping("/getSettingConfig")
     @ResponseBody
     public Msg getSettingConfig(@RequestParam(value = "data", defaultValue = "") String data) {
         final Msg msg = new Msg();
@@ -265,13 +262,15 @@ public class AdminRootController {
             UploadConfig uploadConfig = uploadConfigService.getUpdateConfig();
             Config config = configService.getSourceype();
             SysConfig sysConfig = sysConfigService.getstate();
-            uploadConfig.setUsermemory(Long.toString(Long.valueOf(uploadConfig.getUsermemory())/1024/1024));
-            uploadConfig.setVisitormemory(Long.toString(Long.valueOf(uploadConfig.getVisitormemory())/1024/1024));
-            uploadConfig.setFilesizetourists(Long.toString(Long.valueOf(uploadConfig.getFilesizetourists())/1024/1024));
-            uploadConfig.setFilesizeuser(Long.toString(Long.valueOf(uploadConfig.getFilesizeuser())/1024/1024));
-            jsonObject.put("uploadConfig",uploadConfig);
-            jsonObject.put("config",config);
-            jsonObject.put("sysConfig",sysConfig);
+            AppClient appClientData = appClientService.getAppClientData("app");
+            uploadConfig.setUsermemory(Long.toString(Long.valueOf(uploadConfig.getUsermemory()) / 1024 / 1024));
+            uploadConfig.setVisitormemory(Long.toString(Long.valueOf(uploadConfig.getVisitormemory()) / 1024 / 1024));
+            uploadConfig.setFilesizetourists(Long.toString(Long.valueOf(uploadConfig.getFilesizetourists()) / 1024 / 1024));
+            uploadConfig.setFilesizeuser(Long.toString(Long.valueOf(uploadConfig.getFilesizeuser()) / 1024 / 1024));
+            jsonObject.put("uploadConfig", uploadConfig);
+            jsonObject.put("config", config);
+            jsonObject.put("sysConfig", sysConfig);
+            jsonObject.put("appClient", appClientData);
             msg.setData(jsonObject);
         } catch (Exception e) {
             e.printStackTrace();
@@ -282,36 +281,41 @@ public class AdminRootController {
     }
 
 
-    @PostMapping("/updateConfig")//new
+    @PostMapping("/updateConfig")
     @ResponseBody
     public Msg updateConfig(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
         try {
             JSONObject jsonObject = JSONObject.parseObject(data);
-            UploadConfig uploadConfig = JSON.toJavaObject((JSON) jsonObject.get("uploadConfig"),UploadConfig.class);
-            String vm =  uploadConfig.getVisitormemory();
-            if((Long.valueOf(vm)<-1) || Long.valueOf(vm) > 104857600 || Long.valueOf(uploadConfig.getFilesizetourists())<0 || Long.valueOf(uploadConfig.getFilesizetourists()) > 5120
-                    || Long.valueOf(uploadConfig.getUsermemory())<0 || Long.valueOf(uploadConfig.getUsermemory())>1048576
-                    || Long.valueOf(uploadConfig.getFilesizeuser())<0 || Long.valueOf(uploadConfig.getFilesizeuser())>5120 ){
+            UploadConfig uploadConfig = JSON.toJavaObject((JSON) jsonObject.get("uploadConfig"), UploadConfig.class);
+            String vm = uploadConfig.getVisitormemory();
+            if ((Long.valueOf(vm) < -1) || Long.valueOf(vm) > 104857600 || Long.valueOf(uploadConfig.getFilesizetourists()) < 0 || Long.valueOf(uploadConfig.getFilesizetourists()) > 5120
+                    || Long.valueOf(uploadConfig.getUsermemory()) < 0 || Long.valueOf(uploadConfig.getUsermemory()) > 1048576
+                    || Long.valueOf(uploadConfig.getFilesizeuser()) < 0 || Long.valueOf(uploadConfig.getFilesizeuser()) > 5120) {
                 msg.setInfo("你输入的值不正确");
                 msg.setCode("500");
-                return  msg;
+                return msg;
             }
-            Config config = JSON.toJavaObject((JSON) jsonObject.get("config"),Config.class);
-            SysConfig sysConfig = JSON.toJavaObject((JSON) jsonObject.get("sysConfig"),SysConfig.class);
-            if(Integer.valueOf(vm)==-1){
+            Config config = JSON.toJavaObject((JSON) jsonObject.get("config"), Config.class);
+            SysConfig sysConfig = JSON.toJavaObject((JSON) jsonObject.get("sysConfig"), SysConfig.class);
+            AppClient appClient = JSON.toJavaObject((JSON) jsonObject.get("appClient"), AppClient.class);
+            if (Integer.valueOf(vm) == -1) {
                 uploadConfig.setVisitormemory("-1");
-            }else{
-                uploadConfig.setVisitormemory(Long.toString(Long.valueOf(uploadConfig.getVisitormemory())*1024*1024));
+            } else {
+                uploadConfig.setVisitormemory(Long.toString(Long.valueOf(uploadConfig.getVisitormemory()) * 1024 * 1024));
             }
-            uploadConfig.setFilesizetourists(Long.toString(Long.valueOf(uploadConfig.getFilesizetourists())*1024*1024));
-            uploadConfig.setUsermemory(Long.toString(Long.valueOf(uploadConfig.getUsermemory())*1024*1024));
-            uploadConfig.setFilesizeuser(Long.toString(Long.valueOf(uploadConfig.getFilesizeuser())*1024*1024));
+            uploadConfig.setFilesizetourists(Long.toString(Long.valueOf(uploadConfig.getFilesizetourists()) * 1024 * 1024));
+            uploadConfig.setUsermemory(Long.toString(Long.valueOf(uploadConfig.getUsermemory()) * 1024 * 1024));
+            uploadConfig.setFilesizeuser(Long.toString(Long.valueOf(uploadConfig.getFilesizeuser()) * 1024 * 1024));
             uploadConfigService.setUpdateConfig(uploadConfig);
             configService.setSourceype(config);
             sysConfigService.setstate(sysConfig);
+            if (!appClient.getIsuse().equals("on")) {
+                appClient.setIsuse("off");
+            }
+            appClientService.editAppClientData(appClient);
             msg.setInfo("配置保存成功");
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg.setInfo("操作出现异常");
             msg.setCode("500");
@@ -320,7 +324,7 @@ public class AdminRootController {
     }
 
 
-    @PostMapping(value = "/getOrderConfig")//new
+    @PostMapping(value = "/getOrderConfig")
     @ResponseBody
     public Msg emailconfig() {
         final Msg msg = new Msg();
@@ -330,8 +334,8 @@ public class AdminRootController {
             final JSONObject jsonObject = new JSONObject();
             emailConfig = emailConfigService.getemail();
             imgreview = imgreviewService.selectByPrimaryKey(1);
-            jsonObject.put("emailConfig",emailConfig);
-            jsonObject.put("imgreview",imgreview);
+            jsonObject.put("emailConfig", emailConfig);
+            jsonObject.put("imgreview", imgreview);
             msg.setData(jsonObject);
         } catch (Exception e) {
             e.printStackTrace();
@@ -342,17 +346,17 @@ public class AdminRootController {
     }
 
 
-    @PostMapping("/updateEmailConfig") //new
+    @PostMapping("/updateEmailConfig")
     @ResponseBody
-    public Msg updateemail(@RequestParam(value = "data", defaultValue = "") String data ) {
+    public Msg updateemail(@RequestParam(value = "data", defaultValue = "") String data) {
         final Msg msg = new Msg();
         try {
             JSONObject jsonObj = JSONObject.parseObject(data);
-            EmailConfig emailConfig = JSON.toJavaObject(jsonObj,EmailConfig.class);
-            if(null==emailConfig.getId() || null==emailConfig.getEmailname()  || null==emailConfig.getEmailurl() || null==emailConfig.getEmails()
-                    || null==emailConfig.getEmailkey()  || null==emailConfig.getPort() || null==emailConfig.getUsing()
-                    || emailConfig.getEmailname().equals("")  || emailConfig.getEmailurl().equals("")  || emailConfig.getEmails().equals("")
-                    || emailConfig.getEmailkey().equals("")   || emailConfig.getPort().equals("")){
+            EmailConfig emailConfig = JSON.toJavaObject(jsonObj, EmailConfig.class);
+            if (null == emailConfig.getId() || null == emailConfig.getEmailname() || null == emailConfig.getEmailurl() || null == emailConfig.getEmails()
+                    || null == emailConfig.getEmailkey() || null == emailConfig.getPort() || null == emailConfig.getUsing()
+                    || emailConfig.getEmailname().equals("") || emailConfig.getEmailurl().equals("") || emailConfig.getEmails().equals("")
+                    || emailConfig.getEmailkey().equals("") || emailConfig.getPort().equals("")) {
                 msg.setCode("110400");
                 msg.setInfo("各参数不能为空");
                 return msg;
@@ -367,19 +371,18 @@ public class AdminRootController {
         return msg;
     }
 
-    @PostMapping("/mailTest") //new
+    @PostMapping("/mailTest")
     @ResponseBody
-    public Msg mailTest(@RequestParam(value = "data", defaultValue = "") String data ) {
+    public Msg mailTest(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
         JSONObject jsonObj = JSONObject.parseObject(data);
         String tomail = jsonObj.getString("tomail");
-        EmailConfig emailConfig = JSON.toJavaObject(jsonObj,EmailConfig.class);
-        if(null==emailConfig.getEmails() || null==emailConfig.getEmailkey() || null==emailConfig.getEmailurl()
-                || null==emailConfig.getPort()  || null==emailConfig.getEmailname() || null==tomail){
-//        if(jsonObj.size()==0){
+        EmailConfig emailConfig = JSON.toJavaObject(jsonObj, EmailConfig.class);
+        if (null == emailConfig.getEmails() || null == emailConfig.getEmailkey() || null == emailConfig.getEmailurl()
+                || null == emailConfig.getPort() || null == emailConfig.getEmailname() || null == tomail) {
             msg.setCode("110400");
             msg.setInfo("邮箱配置参数不能为空");
-        }else{
+        } else {
             msg = NewSendEmail.sendTestEmail(emailConfig, tomail);
         }
         return msg;

src/main/java/cn/hellohao/controller/AlbumController.java

@@ -35,13 +35,13 @@ public class AlbumController {
     @Autowired
     private UserService userService;
 
-    @PostMapping("/admin/getGalleryList") //new
+    @PostMapping("/admin/getGalleryList")  
     @ResponseBody
-    public Map<String, Object> getGalleryList (@RequestParam(value = "data", defaultValue = "") String data){
+    public Msg getGalleryList (@RequestParam(value = "data", defaultValue = "") String data){
+        Msg msg = new Msg();
         Subject subject = SecurityUtils.getSubject();
         User user = (User) subject.getPrincipal();
         user =  userService.getUsers(user);
-        Map<String, Object> map = new HashMap<String, Object>();
         Album album = new Album();
         JSONObject jsonObj = JSONObject.parseObject(data);
         Integer pageNum = jsonObj.getInteger("pageNum");
@@ -56,20 +56,17 @@ public class AlbumController {
         try {
             albums = albumServiceImpl.selectAlbumURLList(album);
             PageInfo<Album> rolePageInfo = new PageInfo<>(albums);
-            map.put("code", 200);
-            map.put("info", "");
-            map.put("count", rolePageInfo.getTotal());
-            map.put("data", rolePageInfo.getList());
+            msg.setData(rolePageInfo);
         } catch (Exception e) {
             e.printStackTrace();
-            map.put("code", 500);
-            map.put("info", "获取数据异常");
+            msg.setInfo("获取数据异常");
+            msg.setCode("500");
         }
-        return map;
+        return msg;
 
     }
 
-    @PostMapping("/admin/deleGallery") //new 删除画廊
+    @PostMapping("/admin/deleGallery")
     @ResponseBody
     public Msg deleGallery (@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
@@ -100,7 +97,39 @@ public class AlbumController {
 
     }
 
-    @PostMapping("/getAlbumImgList") //new
+    //后台列表要修改时的查询表单
+    @PostMapping("/admin/getAlbumListForKey")  
+    @ResponseBody
+    public Msg getAlbumListForKey(@RequestParam(value = "data", defaultValue = "") String data){
+        Msg msg = new Msg();
+        try{
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            String key = jsonObject.getString("key");
+            Subject subject = SecurityUtils.getSubject();
+            User user = (User) subject.getPrincipal();
+            Album album = new Album();
+            album.setAlbumkey(key);
+            if(subject.hasRole("admin")){
+                album.setUserid(null);
+            }else{
+                album.setUserid(user.getId());
+            }
+            JSONObject jsonObj = new JSONObject();
+            Album album1 = albumServiceImpl.selectAlbum(album);
+            List<Images> imagesList =  imgAndAlbumService.selectImgForAlbumkey(key);
+            jsonObj.put("album",album1);
+            jsonObj.put("imagesList",imagesList);
+            msg.setData(jsonObj);
+        }catch (Exception e){
+            e.printStackTrace();
+            msg.setCode("500");
+            msg.setInfo("获取画廊数据错误");
+        }
+        return msg;
+
+    }
+
+    @PostMapping("/getAlbumImgList")  
     @ResponseBody
     public Msg getAlbumImgList(@RequestParam("data") String data) {
         Msg msg = new Msg();
@@ -111,7 +140,7 @@ public class AlbumController {
         return msg;
     }
 
-    @PostMapping("/SaveForAlbum")//new
+    @PostMapping("/SaveForAlbum") 
     @ResponseBody
     public Msg SaveForAlbum(@RequestParam(value = "data", defaultValue = "") String data){
         data = StringEscapeUtils.unescapeHtml4(data);
@@ -136,7 +165,7 @@ public class AlbumController {
             }
             Subject subject = SecurityUtils.getSubject();
             User u = (User) subject.getPrincipal();
-            String uuid = "TOALBUM"+ UUID.randomUUID().toString().replace("-", "").toLowerCase().substring(0,5)+"N";
+            String uuid = "TOALBUM"+ UUID.randomUUID().toString().replace("-", "").toLowerCase().substring(0,7)+"N";
             SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Album album = new Album();
             album.setAlbumtitle(albumtitle);
@@ -173,7 +202,66 @@ public class AlbumController {
     }
 
 
-    @PostMapping("/checkPass")//new
+    @PostMapping("/admin/UpdateForAlbum") 
+    @ResponseBody
+    public Msg UpdateForAlbum(@RequestParam(value = "data", defaultValue = "") String data){
+        data = StringEscapeUtils.unescapeHtml4(data);
+        Msg msg = new Msg();
+        try {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            String albumkey = jsonObject.getString("albumkey");
+            String albumtitle = jsonObject.getString("albumtitle");
+            String password = jsonObject.getString("password");
+            JSONArray jsonArray = JSONArray.parseArray(jsonObject.getString("albumlist"));
+            if(null!=password){
+//                String regex = "^[a-z0-9A-Z\u4e00-\u9fa5]+$";
+//                return str.matches(regex);
+                password = password.replace(" ", "");
+                if(password.replace(" ", "").equals("") || password.length()<3){
+                    msg.setCode("110403");
+                    msg.setInfo("密码长度不得小于三位有效字符");
+                    return msg;
+                }
+            }
+            if(albumtitle==null || jsonArray.size()==0){
+                msg.setCode("110404");
+                msg.setInfo("标题和图片参数不能为空");
+                return msg;
+            }
+            Subject subject = SecurityUtils.getSubject();
+            User u = (User) subject.getPrincipal();
+            Album album = new Album();
+            album.setAlbumtitle(albumtitle);
+            album.setPassword(password);
+            album.setAlbumkey(albumkey);
+
+            albumServiceImpl.updateAlbum(album);
+            imgAndAlbumService.deleteImgAndAlbumForKey(albumkey);
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject img = jsonArray.getJSONObject(i);
+                ImgAndAlbum imgAndAlbum = new ImgAndAlbum();
+                imgAndAlbum.setImgname(img.getString("imgurl"));
+                imgAndAlbum.setAlbumkey(albumkey);
+                imgAndAlbum.setNotes(img.getString("notes"));
+                albumServiceImpl.addAlbumForImgAndAlbumMapper(imgAndAlbum);
+            }
+            final JSONObject json = new JSONObject();
+            json.put("url",albumkey);
+            json.put("title",albumtitle);
+            json.put("password",password);
+            msg.setCode("200");
+            msg.setInfo("画廊修改成功");
+            msg.setData(json);
+        }catch (Exception e){
+            e.printStackTrace();
+            msg.setCode("500");
+            msg.setInfo("修改画廊失败");
+        }
+        return msg;
+    }
+
+
+    @PostMapping("/checkPass") 
     @ResponseBody
     public Msg checkPass(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
@@ -207,7 +295,7 @@ public class AlbumController {
         return msg;
     }
 
-    @PostMapping("/getAlbumList") //new
+    @PostMapping("/getAlbumList")  
     @ResponseBody
     public Msg getAlbumList(@RequestParam(value = "data", defaultValue = "") String data){
         Msg msg = new Msg();

src/main/java/cn/hellohao/controller/ClientAppController.java

@@ -0,0 +1,125 @@
+package cn.hellohao.controller;
+
+import cn.hellohao.auth.token.JWTUtil;
+import cn.hellohao.pojo.Msg;
+import cn.hellohao.pojo.UploadConfig;
+import cn.hellohao.pojo.User;
+import cn.hellohao.service.AppClientService;
+import cn.hellohao.service.ImgService;
+import cn.hellohao.service.UploadConfigService;
+import cn.hellohao.service.impl.UploadServicel;
+import cn.hellohao.service.impl.UserServiceImpl;
+import cn.hellohao.utils.Base64ToMultipartFile;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Hellohao
+ * @version 1.0
+ * @date 2022-05-16 32:45
+ */
+@RestController
+@RequestMapping("/client")
+public class ClientAppController {
+
+    @Autowired
+    private ImgService imgService;
+    @Autowired
+    private AppClientService appClientService;
+    @Autowired
+    private UserServiceImpl userService;
+    @Autowired
+    private UploadConfigService uploadConfigService;
+    @Autowired
+    private UploadServicel uploadServicel;
+
+    @PostMapping("/loginByToken")
+    @ResponseBody
+    public Msg loginByToken(@RequestParam(value = "data", defaultValue = "") String data) {
+        Msg msg = new Msg();
+        try{
+            JSONObject jsonObj = JSONObject.parseObject(data);
+            JSONObject jsonObject = new JSONObject();
+            User newUser = new User();
+            String userToken = jsonObj.getString("userToken");
+            newUser.setToken(userToken);
+            User userData = userService.loginByToken(userToken);
+            if(userData.getIsok()<1){
+                SecurityUtils.getSubject().logout();
+                msg.setInfo("账号暂时无法使用，请咨询管理员");
+                msg.setCode("110403");
+                return msg;
+            }
+            String jwtToken = JWTUtil.createToken(userData);
+            UploadConfig uploadConfig = uploadConfigService.getUpdateConfig();
+            jsonObject.put("username", userData.getUsername());
+            jsonObject.put("jwttoken", jwtToken);
+            jsonObject.put("suffix",uploadConfig.getSuffix().split(","));
+            jsonObject.put("myImgTotal", imgService.countimg(userData.getId()));
+            jsonObject.put("filesize",Integer.valueOf(uploadConfig.getFilesizeuser())/1024);
+            jsonObject.put("imgcount",uploadConfig.getImgcountuser());
+            jsonObject.put("uploadSwitch",uploadConfig.getUserclose());
+            long memory = Long.valueOf(userData.getMemory());
+            Long usermemory = imgService.getusermemory(userData.getId())==null?0L:imgService.getusermemory(userData.getId());
+            if(memory==0){
+                jsonObject.put("myMemory","无容量");
+            }else{
+                Double aDouble = Double.valueOf(String.format("%.2f", (((double)usermemory/(double)memory)*100)));
+                if(aDouble>=999){
+                    jsonObject.put("myMemory",999);
+                }else{
+                    jsonObject.put("myMemory",aDouble);
+                }
+            }
+            msg.setData(jsonObject);
+        }catch (Exception e){
+            e.printStackTrace();
+            msg.setCode("110500");
+            msg.setInfo("未获取到用户，请先在设置中添加Token");
+        }
+        return msg;
+    }
+
+    @PostMapping("/imgUpload")
+    public Msg imgUpload(HttpServletRequest request, @RequestParam(required = true, value = "file") MultipartFile file,
+                         @RequestParam(required = true, value = "days") String days)  {
+        Msg msg = new Msg();
+        try{
+            if (null != file) {
+                msg = uploadServicel.uploadForLoc(request,file,Integer.valueOf(days),null);
+            }else{
+                msg.setCode("500");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            msg.setCode("500");
+        }
+        return msg;
+    }
+
+    @PostMapping("/imgUploadForCopy")
+    public Msg imgUploadForCopy(@RequestParam(required = true, value = "data") String data, HttpServletRequest request)  {
+        Msg msg = new Msg();
+        try{
+            JSONObject jsonObj = JSONObject.parseObject(data);
+            String imgstr = jsonObj.getString("imgstr");
+            Integer days = jsonObj.getInteger("days");
+            if (null != imgstr && !imgstr.isEmpty()) {
+                MultipartFile multipartFile = Base64ToMultipartFile.base64Convert(imgstr);
+                msg = uploadServicel.uploadForLoc(request, multipartFile, days, null);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            msg.setCode("500");
+        }
+        return msg;
+    }
+
+
+
+}

src/main/java/cn/hellohao/controller/ClientController.java

@@ -2,11 +2,9 @@ package cn.hellohao.controller;
 
 import cn.hellohao.pojo.Msg;
 import cn.hellohao.service.impl.ClientService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -17,18 +15,30 @@ import javax.servlet.http.HttpServletRequest;
  * @date 2019-07-18 17:22
  */
 @RestController
+@RequestMapping("/api")
 public class ClientController {
 
-    @Autowired
-    private ClientService clientService;
-
+    @Autowired private ClientService clientService;
 
     @PostMapping(value = "/uploadbymail")
     @ResponseBody
-    public Msg uploadbymail(HttpServletRequest request, @RequestParam("file") MultipartFile file, String mail, String pass)  {
-        Msg resultBean = clientService.uploadImg(request, file, mail, pass);
+    public Msg uploadbymail(
+            HttpServletRequest request,
+            @RequestParam(value = "file") MultipartFile file,
+            @RequestParam(value = "mail", defaultValue = "") String mail,
+            @RequestParam(value = "pass", defaultValue = "") String pass,
+            @RequestParam(value = "days", defaultValue = "0") String days) {
+        if (file == null
+                || StringUtils.isBlank(mail)
+                || StringUtils.isBlank(pass)) {
+            Msg msg = new Msg();
+            msg.setCode("400");
+            msg.setInfo("相关参数不能为空");
+            return msg;
+        }
+        Msg resultBean =
+                clientService.uploadImg(
+                        request, file, mail, pass, Integer.valueOf(days.toString()));
         return resultBean;
     }
-
-
 }

src/main/java/cn/hellohao/controller/CodeController.java

@@ -26,10 +26,10 @@ public class CodeController {
     @Autowired
     private CodeService codeService;
 
-    @RequestMapping(value = "/selectCodeList")//new
+    @RequestMapping(value = "/selectCodeList") 
     @ResponseBody
-    public Map<String, Object> selectCodeList(@RequestParam(value = "data", defaultValue = "") String data) {
-        Map<String, Object> map = new HashMap<String, Object>();
+    public Msg selectCodeList(@RequestParam(value = "data", defaultValue = "") String data) {
+        Msg msg = new Msg();
         JSONObject jsonObj = JSONObject.parseObject(data);
         Integer pageNum = jsonObj.getInteger("pageNum");
         Integer pageSize = jsonObj.getInteger("pageSize");
@@ -38,19 +38,16 @@ public class CodeController {
         try {
             codes = codeService.selectCode(null);
             PageInfo<Code> rolePageInfo = new PageInfo<>(codes);
-            map.put("code", 200);
-            map.put("info", "");
-            map.put("count", rolePageInfo.getTotal());
-            map.put("data", rolePageInfo.getList());
+            msg.setData(rolePageInfo);
         } catch (Exception e) {
             e.printStackTrace();
-            map.put("code", 500);
-            map.put("info", "获取数据异常");
+            msg.setCode("500");
+            msg.setInfo("获取数据异常");
         }
-        return map;
+        return msg;
     }
 
-    @RequestMapping("/deleteCodes")//new
+    @RequestMapping("/deleteCodes") 
     @ResponseBody
     public Msg deletecodes(@RequestParam(value = "data", defaultValue = "") String data){
         final Msg msg = new Msg();
@@ -72,7 +69,7 @@ public class CodeController {
     }
 
 
-    @RequestMapping("/addCode")//new
+    @RequestMapping("/addCode") 
     @ResponseBody
     public Msg addcode(@RequestParam(value = "data", defaultValue = "") String data){
         final Msg msg = new Msg();

src/main/java/cn/hellohao/controller/GroupController.java

@@ -12,9 +12,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import java.util.HashMap;
+
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Hellohao
@@ -28,7 +27,7 @@ public class GroupController {
     private GroupService groupService;
 
 
-    @PostMapping("/getGrouplistForUsers") //new
+    @PostMapping("/getGrouplistForUsers")  
     @ResponseBody
     public Msg getGrouplistForUsers() {
         Msg msg = new Msg();
@@ -37,10 +36,10 @@ public class GroupController {
         return msg;
     }
 
-    @PostMapping(value = "/getGroupList")//new
+    @PostMapping(value = "/getGroupList") 
     @ResponseBody
-    public Map<String, Object> getgrouplist(@RequestParam(value = "data", defaultValue = "") String data) {
-        Map<String, Object> map = new HashMap<String, Object>();
+    public Msg getgrouplist(@RequestParam(value = "data", defaultValue = "") String data) {
+        Msg msg = new Msg();
         JSONObject jsonObj = JSONObject.parseObject(data);
         Integer pageNum = jsonObj.getInteger("pageNum");
         Integer pageSize = jsonObj.getInteger("pageSize");
@@ -49,19 +48,16 @@ public class GroupController {
         try {
             group = groupService.grouplist(null);
             PageInfo<Group> rolePageInfo = new PageInfo<>(group);
-            map.put("code", 200);
-            map.put("info", "");
-            map.put("count", rolePageInfo.getTotal());
-            map.put("data", rolePageInfo.getList());
+            msg.setData(rolePageInfo);
         } catch (Exception e) {
             e.printStackTrace();
-            map.put("code", 500);
-            map.put("info", "获取数据异常");
+            msg.setCode("500");
+            msg.setInfo("获取数据异常");
         }
-        return map;
+        return msg;
     }
 
-    @PostMapping(value = "/addGroup")//new
+    @PostMapping(value = "/addGroup") 
     @ResponseBody
     public Msg addisgroup(@RequestParam(value = "data", defaultValue = "") String data) {
         JSONObject jsonObject = JSONObject.parseObject(data);
@@ -74,7 +70,7 @@ public class GroupController {
         return msg;
     }
 
-    @PostMapping("/updateGroup")//new
+    @PostMapping("/updateGroup") 
     @ResponseBody
     public Msg updategroup(@RequestParam(value = "data", defaultValue = "") String data) {
         JSONObject jsonObject = JSONObject.parseObject(data);
@@ -93,7 +89,7 @@ public class GroupController {
         return msg;
     }
 
-    @PostMapping(value = "/deleGroup")//new
+    @PostMapping(value = "/deleGroup") 
     @ResponseBody
     public Msg delegroup(@RequestParam(value = "data", defaultValue = "") String data) {
         JSONObject jsonObject = JSONObject.parseObject(data);

src/main/java/cn/hellohao/controller/IndexController.java

@@ -3,122 +3,137 @@ package cn.hellohao.controller;
 import cn.hellohao.auth.token.JWTUtil;
 import cn.hellohao.pojo.*;
 import cn.hellohao.service.*;
-import cn.hellohao.service.impl.*;
-import cn.hellohao.utils.*;
-import cn.hellohao.utils.verifyCode.IVerifyCodeGen;
-import cn.hellohao.utils.verifyCode.SimpleCharVerifyCodeGenImpl;
-import cn.hellohao.utils.verifyCode.VerifyCode;
+import cn.hellohao.service.impl.AlbumServiceImpl;
+import cn.hellohao.service.impl.UploadServicel;
+import cn.hellohao.service.impl.deleImages;
+import cn.hellohao.utils.GetIPS;
+import cn.hellohao.utils.MyVersion;
+import cn.hutool.captcha.CaptchaUtil;
+import cn.hutool.captcha.ShearCaptcha;
+import cn.hutool.captcha.generator.MathGenerator;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.*;
+import java.util.List;
+import java.util.UUID;
 
 @Controller
 public class IndexController {
-    @Autowired
-    private ImgService imgService;
-    @Autowired
-    private SysConfigService sysConfigService;
-    @Autowired
-    IRedisService iRedisService;
-    @Autowired
-    private ConfigService configService;
-    @Autowired
-    private UploadConfigService uploadConfigService;
-    @Autowired
-    private  UploadServicel uploadServicel;
-    @Autowired
-    private NOSImageupload nosImageupload;
-    @Autowired
-    private OSSImageupload ossImageupload;
-    @Autowired
-    private COSImageupload cosImageupload;
-    @Autowired
-    private KODOImageupload kodoImageupload;
-    @Autowired
-    private USSImageupload ussImageupload;
-    @Autowired
-    private UFileImageupload uFileImageupload;
-    @Autowired
-    private FTPImageupload ftpImageupload;
-    @Autowired
-    AlbumServiceImpl albumService;
-    @Autowired
-    private KeysService keysService;
-    @Autowired
-    private ImgTempService imgTempService;
-    @Autowired
-    private ImgAndAlbumService imgAndAlbumService;
+    @Autowired private ImgService imgService;
+    @Autowired private SysConfigService sysConfigService;
+    @Autowired private ConfigService configService;
+    @Autowired private UploadConfigService uploadConfigService;
+    @Autowired private UploadServicel uploadServicel;
+    @Autowired private deleImages deleimages;
+    @Autowired private IRedisService iRedisService;
+    @Autowired private AlbumServiceImpl albumService;
+    @Autowired private AppClientService appClientService;
 
+    @RequestMapping(value = "/")
+    public String Welcome(Model model, HttpServletRequest httpServletRequest) {
+        model.addAttribute("name", "服务端程序");
+        model.addAttribute("version", "20221027");
+        model.addAttribute("ip", GetIPS.getIpAddr(httpServletRequest));
+        model.addAttribute("links", "tbed.hellohao.cn");
+        return "welcome";
+    }
 
     @RequestMapping(value = "/webInfo")
     @ResponseBody
     public Msg webInfo() {
-        final Msg msg = new Msg();
+        Msg msg = new Msg();
         Config config = configService.getSourceype();
         UploadConfig updateConfig = uploadConfigService.getUpdateConfig();
         SysConfig sysConfig = sysConfigService.getstate();
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("webname",config.getWebname());
-        jsonObject.put("websubtitle",config.getWebsubtitle());
-        jsonObject.put("keywords",config.getWebkeywords());
-        jsonObject.put("description",config.getWebms());
-        jsonObject.put("explain",config.getExplain());
-        jsonObject.put("favicon",config.getWebfavicons());
-        jsonObject.put("baidu",config.getBaidu());
-        jsonObject.put("links",config.getLinks());
-        jsonObject.put("aboutinfo",config.getAboutinfo());
-        jsonObject.put("logo",config.getLogo());
-        jsonObject.put("api",updateConfig.getApi());
-        jsonObject.put("register",sysConfig.getRegister());
+        AppClient appClient = appClientService.getAppClientData("app");
+        jsonObject.put("webname", config.getWebname());
+        jsonObject.put("websubtitle", config.getWebsubtitle());
+        jsonObject.put("keywords", config.getWebkeywords());
+        jsonObject.put("description", config.getWebms());
+        jsonObject.put("explain", config.getExplain());
+        jsonObject.put("favicon", config.getWebfavicons());
+        jsonObject.put("baidu", config.getBaidu());
+        jsonObject.put("links", config.getLinks());
+        jsonObject.put("aboutinfo", config.getAboutinfo());
+        jsonObject.put("logo", config.getLogo());
+        jsonObject.put("api", updateConfig.getApi());
+        jsonObject.put("register", sysConfig.getRegister());
+        jsonObject.put("isuse", appClient.getIsuse());
+        jsonObject.put("clientname", appClient.getAppname());
+        jsonObject.put("clientlogo", appClient.getApplogo());
+        jsonObject.put("appupdate", appClient.getAppupdate());
         msg.setData(jsonObject);
         return msg;
     }
 
-
-    @PostMapping(value = "/upload")//upimg new
+    @PostMapping(value = {"/upload", "/client/upload"})
     @ResponseBody
-    public Msg upimg(HttpServletRequest request,HttpSession httpSession
-            , @RequestParam(value = "file", required = false) MultipartFile multipartFile,Integer day,
-                     @RequestParam(value = "classifications", defaultValue = "" ) String classifications) {
-        final JSONArray jsonArray = new JSONArray();
-        if(!classifications.equals("")){
-            String[] calssif = classifications.split(",");
-            for (int i = 0; i < calssif.length; i++) {
-                jsonArray.add(calssif[i]);
-            }
-        }
-        return uploadServicel.uploadForLoc(request,multipartFile,day,null,jsonArray);
+    public Msg upimg(
+            HttpServletRequest request,
+            @RequestParam(value = "file", required = false) MultipartFile multipartFile,
+            Integer day) {
+        return uploadServicel.uploadForLoc(request, multipartFile, day, null);
     }
 
-    //根据网络图片url上传
-    @PostMapping(value = "/uploadForUrl") //new
+    @PostMapping(value = {"/uploadForUrl", "/client/uploadForUrl"})
     @ResponseBody
-    public Msg upurlimg(HttpServletRequest request,@RequestParam(value = "data", defaultValue = "") String data) {
+    public Msg upurlimg(
+            HttpServletRequest request, @RequestParam(value = "data", defaultValue = "") String data) {
         JSONObject jsonObj = JSONObject.parseObject(data);
-        final JSONArray jsonArray = new JSONArray();
         Integer setday = jsonObj.getInteger("day");
         String imgUrl = jsonObj.getString("imgUrl");
-        String selectTreeListStr = jsonObj.getString("classifications");
-        if(null != selectTreeListStr){
-            String[] calssif = selectTreeListStr.split(",");
-            for (int i = 0; i < calssif.length; i++) {
-                jsonArray.add(calssif[i]);
+        String[] URLArr = imgUrl.split("\n");
+
+        Subject subject = SecurityUtils.getSubject();
+        User user = (User) subject.getPrincipal();
+        UploadConfig updateConfig = uploadConfigService.getUpdateConfig();
+        int syscounts = 0;
+        if (null == user) {
+            syscounts = updateConfig.getImgcounttourists();
+        } else {
+            syscounts = updateConfig.getImgcountuser();
+        }
+        Msg retMsg = new Msg();
+        JSONObject jsonObject = new JSONObject();
+        JSONArray retArray = new JSONArray();
+        int errcounts = 0;
+        int excess = 0;
+        for (int i = 0; i < URLArr.length; i++) {
+            int temp = i + 1;
+            if (syscounts >= temp) {
+                Msg msg = uploadServicel.uploadForLoc(request, null, setday, URLArr[i]);
+                if (!msg.getCode().equals("200")) {
+                    errcounts++;
+                } else {
+                    retArray.add(msg);
+                }
+            } else {
+                excess++;
             }
         }
-        return uploadServicel.uploadForLoc(request,null,setday,imgUrl,jsonArray);
+        jsonObject.put("counts", URLArr.length);
+        jsonObject.put("errcounts", errcounts);
+        jsonObject.put("excess", excess);
+        jsonObject.put("urls", retArray);
+        retMsg.setData(jsonObject);
+        return retMsg;
     }
 
-    @RequestMapping(value = "/getUploadInfo")//new
+    @RequestMapping(value = "/getUploadInfo")
     @ResponseBody
     public Msg getUploadInfo() {
         Msg msg = new Msg();
@@ -127,42 +142,45 @@ public class IndexController {
         User user = (User) subject.getPrincipal();
         try {
             UploadConfig updateConfig = uploadConfigService.getUpdateConfig();
-            jsonObject.put("suffix",updateConfig.getSuffix().split(","));
-            if(null==user){
-                jsonObject.put("filesize",Integer.valueOf(updateConfig.getFilesizetourists())/1024);
-                jsonObject.put("imgcount",updateConfig.getImgcounttourists());
-                jsonObject.put("uploadSwitch",updateConfig.getIsupdate());
-                jsonObject.put("uploadInfo","您登陆后才能使用此功能哦");
-            }else{
-                jsonObject.put("filesize",Integer.valueOf(updateConfig.getFilesizeuser())/1024);
-                jsonObject.put("imgcount",updateConfig.getImgcountuser());
+            jsonObject.put("suffix", updateConfig.getSuffix().split(","));
+            if (null == user) {
+                jsonObject.put("filesize", Integer.valueOf(updateConfig.getFilesizetourists()) / 1024);
+                jsonObject.put("imgcount", updateConfig.getImgcounttourists());
+                jsonObject.put("uploadSwitch", updateConfig.getIsupdate());
+                jsonObject.put("uploadInfo", "您登陆后才能使用此功能哦");
+            } else {
+                jsonObject.put("filesize", Integer.valueOf(updateConfig.getFilesizeuser()) / 1024);
+                jsonObject.put("imgcount", updateConfig.getImgcountuser());
+                jsonObject.put("uploadSwitch", updateConfig.getUserclose());
+                jsonObject.put("uploadInfo", "系统暂时关闭了用户上传功能");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         msg.setData(jsonObject);
         return msg;
     }
 
-
     @RequestMapping("/checkStatus")
     @ResponseBody
     public Msg checkStatus(HttpServletRequest request) {
         Msg msg = new Msg();
         String token = request.getHeader("Authorization");
-        if(token != null) {
+        if (token != null) {
             JSONObject tokenJson = JWTUtil.checkToken(token);
-            if(tokenJson.getBoolean("check")){
+            if (tokenJson.getBoolean("check")) {
                 Subject subject = SecurityUtils.getSubject();
-                UsernamePasswordToken tokenOBJ = new UsernamePasswordToken(tokenJson.getString("email"),tokenJson.getString("password"));
+                UsernamePasswordToken tokenOBJ =
+                        new UsernamePasswordToken(
+                                tokenJson.getString("email"), tokenJson.getString("password"));
                 tokenOBJ.setRememberMe(true);
                 try {
                     subject.login(tokenOBJ);
                     SecurityUtils.getSubject().getSession().setTimeout(3600000);
                     User u = (User) subject.getPrincipal();
-                    final JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("RoleLevel",u.getLevel()==2?"admin":"user");
-                    jsonObject.put("userName",u.getUsername());
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("RoleLevel", u.getLevel() == 2 ? "admin" : "user");
+                    jsonObject.put("userName", u.getUsername());
                     msg.setCode("200");
                     msg.setData(jsonObject);
                 } catch (Exception e) {
@@ -171,164 +189,172 @@ public class IndexController {
                     System.err.println("登录失效，请重新登录");
                     e.printStackTrace();
                 }
-            }else{
+            } else {
                 msg.setCode("40041");
                 msg.setInfo("登录失效，请重新登录");
             }
-        }else{
+        } else {
             msg.setCode("40040");
             msg.setInfo("当前未登录，请先登录");
         }
         return msg;
     }
 
-
-
-    @GetMapping("/verifyCode")
-    public void verifyCode(HttpServletRequest request, HttpServletResponse response,HttpSession httpSession) {
-        IVerifyCodeGen iVerifyCodeGen = new SimpleCharVerifyCodeGenImpl();
+    @PostMapping("/verifyCode")
+    @ResponseBody
+    public Msg verifyCode() {
+        Msg msg = new Msg();
         try {
-            //登录页面验证码
-            VerifyCode verifyCode = iVerifyCodeGen.generate(80, 38);
-            String code = verifyCode.getCode();
-            String userIP = GetIPS.getIpAddr(request);
-            iRedisService.setValue(userIP+"_hellohao_verifyCode",code);
-            response.setHeader("Pragma", "no-cache");
-            response.setHeader("Cache-Control", "no-cache");
-            response.setDateHeader("Expires", 0);
-            response.setContentType("image/jpeg");
-            response.getOutputStream().write(verifyCode.getImgBytes());
-            response.getOutputStream().flush();
-        } catch (IOException e) {
+            ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(90, 35, 2, 2);
+            captcha.setGenerator(new MathGenerator(1));
+            String code = getVerifyCodeOperator(captcha.getCode());
+            String uid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
+            iRedisService.setValue("verifyCode_" + uid, code);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("codeKey", uid);
+            jsonObject.put("codeImg", captcha.getImageBase64());
+            msg.setData(jsonObject);
+            return msg;
+        } catch (Exception e) {
             e.printStackTrace();
+            msg.setCode("500");
+            return msg;
         }
     }
 
-    @GetMapping("/verifyCodeForRegister")
-    public void verifyCodeForRegister(HttpServletRequest request, HttpServletResponse response,HttpSession httpSession) {
-        IVerifyCodeGen iVerifyCodeGen = new SimpleCharVerifyCodeGenImpl();
+    @PostMapping("/verifyCodeForRegister")
+    @ResponseBody
+    public Msg verifyCodeForRegister() {
+        Msg msg = new Msg();
         try {
-            VerifyCode verifyCode = iVerifyCodeGen.generate(80, 38);
-            String code = verifyCode.getCode();
-            String userIP = GetIPS.getIpAddr(request);
-            iRedisService.setValue(userIP+"_hellohao_verifyCodeForRegister",code);
-            response.setHeader("Pragma", "no-cache");
-            response.setHeader("Cache-Control", "no-cache");
-            response.setDateHeader("Expires", 0);
-            response.setContentType("image/jpeg");
-            response.getOutputStream().write(verifyCode.getImgBytes());
-            response.getOutputStream().flush();
-        } catch (IOException e) {
+            ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(90, 35, 2, 2);
+            captcha.setGenerator(new MathGenerator(1));
+            String code = getVerifyCodeOperator(captcha.getCode());
+            String uid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
+            iRedisService.setValue("verifyCodeForRegister_" + uid, code);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("codeKey", uid);
+            jsonObject.put("codeImg", captcha.getImageBase64());
+            msg.setData(jsonObject);
+            return msg;
+        } catch (Exception e) {
             e.printStackTrace();
+            msg.setCode("500");
+            return msg;
         }
     }
 
-    @GetMapping("/verifyCodeForRetrieve")
-    public void verifyCodeForRetrieve(HttpServletRequest request, HttpServletResponse response,HttpSession httpSession) {
-        IVerifyCodeGen iVerifyCodeGen = new SimpleCharVerifyCodeGenImpl();
+    @PostMapping("/verifyCodeForRetrieve")
+    @ResponseBody
+    public Msg verifyCodeForRetrieve() {
+        Msg msg = new Msg();
         try {
-            VerifyCode verifyCode = iVerifyCodeGen.generate(80, 38);
-            String code = verifyCode.getCode();
-            System.out.println("verifyCodeForRetrieve-zhaoHui httpSession ID==="+httpSession.getId());
-            String userIP = GetIPS.getIpAddr(request);
-            iRedisService.setValue(userIP+"_hellohao_verifyCodeForEmailRetrieve",code);
-            response.setHeader("Pragma", "no-cache");
-            response.setHeader("Cache-Control", "no-cache");
-            response.setDateHeader("Expires", 0);
-            response.setContentType("image/jpeg");
-            response.getOutputStream().write(verifyCode.getImgBytes());
-            response.getOutputStream().flush();
-        } catch (IOException e) {
+            ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(90, 35, 2, 2);
+            captcha.setGenerator(new MathGenerator(1));
+            String code = getVerifyCodeOperator(captcha.getCode());
+            String uid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
+            iRedisService.setValue("verifyCodeForRetrieve_" + uid, code);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("codeKey", uid);
+            jsonObject.put("codeImg", captcha.getImageBase64());
+            msg.setData(jsonObject);
+            return msg;
+        } catch (Exception e) {
             e.printStackTrace();
+            msg.setCode("500");
+            return msg;
         }
     }
 
-    //删除图像
-    @PostMapping("/deleImagesByUid") //new
+    public static String getVerifyCodeOperator(String str) {
+        int a = Integer.valueOf(str.substring(0, 1));
+        String yxf = str.substring(1, 2);
+        int b = Integer.valueOf(str.substring(2, 3));
+        switch (yxf) {
+            case "*":
+                return Integer.toString(a * b);
+            case "+":
+                return Integer.toString(a + b);
+            case ",":
+            default:
+                return Integer.toString(82);
+            case "-":
+                return Integer.toString(a - b);
+        }
+    }
+
+    @PostMapping({"/deleImagesByUid", "/client/deleImagesByUid"})
     @ResponseBody
     public Msg deleImagesByUid(@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
         JSONObject jsonObj = JSONObject.parseObject(data);
         String imguid = jsonObj.getString("imguid");
         Images image = imgService.selectImgUrlByImgUID(imguid);
+        if (null == image) {
+            msg.setInfo("图像已不存在，删除成功");
+            return msg;
+        }
         Subject subject = SecurityUtils.getSubject();
         User user = (User) subject.getPrincipal();
-        if(null!=user){
-            if(user.getId()!=image.getUserid()){
+        if (null != user) {
+            if (!user.getId().equals(image.getUserid())) {
                 msg.setInfo("删除失败，该图片不允许你执行操作");
                 msg.setCode("100403");
                 return msg;
             }
         }
-        Integer keyid = image.getSource();
-        String imgname = image.getImgname();
-        Keys key = keysService.selectKeys(keyid);
-        //删除图片
-        boolean isDele = false;
-        if (key.getStorageType() == 1) {
-            isDele = nosImageupload.delNOS(key.getId(), imgname);
-        } else if (key.getStorageType() == 2) {
-            isDele = ossImageupload.delOSS(key.getId(), imgname);
-        } else if (key.getStorageType() == 3) {
-            isDele = ussImageupload.delUSS(key.getId(), imgname);
-        } else if (key.getStorageType() == 4) {
-            isDele = kodoImageupload.delKODO(key.getId(), imgname);
-        } else if (key.getStorageType() == 5) {
-            isDele = LocUpdateImg.deleteLOCImg(imgname);
-        }else if (key.getStorageType() == 6) {
-            isDele = cosImageupload.delCOS(key.getId(), imgname);
-        }else if (key.getStorageType() == 7) {
-            isDele = ftpImageupload.delFTP(key.getId(), imgname);
-        }else if (key.getStorageType() == 8) {
-            isDele = uFileImageupload.delUFile(key.getId(), imgname);
-        }else {
-            System.err.println("未获取到对象存储参数，删除失败。");
-        }
-        //删除库
-        if(isDele){
-            try {
-                imgAndAlbumService.deleteImgAndAlbum(imgname);
-                imgTempService.delImgAndExp(image.getImguid());
-                imgService.deleimg(image.getId());
-            } catch (Exception e) {
-                e.printStackTrace();
-                msg.setInfo("图片记录时发生错误");
-                msg.setCode("500");
-                return msg;
-            }
-            msg.setInfo("删除成功");
-        }else{
-            imgAndAlbumService.deleteImgAndAlbum(imgname);
-            imgTempService.delImgAndExp(image.getImguid());
-            imgService.deleimg(image.getId());
-            msg.setInfo("图片记录已删除，但是图片源删除失败");
+        msg = deleimages.dele(null, image.getId());
+        List<Long> Delids = (List<Long>) msg.getData();
+        if (!Delids.contains(image.getId())) {
             msg.setCode("500");
+            msg.setInfo("图像删除失败");
+        } else {
+            msg.setCode("200");
+            msg.setInfo("图像已成功删除");
         }
-        System.out.println("返回的值："+msg.toString());
         return msg;
     }
 
+    @PostMapping("/getClientVersion")
+    @ResponseBody
+    public Msg getClientVersion(@RequestParam(value = "data", defaultValue = "") String data) {
+        Msg msg = new Msg();
+        msg.setCode("000");
+        try {
+            JSONObject jsonObj = JSONObject.parseObject(data);
+            String appv = jsonObj.getString("version");
+            AppClient app = appClientService.getAppClientData("app");
+            if (!StringUtils.isBlank(app.getAppupdate())) {
+                String version = app.getAppupdate().replaceAll("\\.", "");
+                if (MyVersion.compareVersion(app.getAppupdate(), appv) == 1) {
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("winpackurl", app.getWinpackurl());
+                    jsonObject.put("macpackurl", app.getMacpackurl());
+                    msg.setCode("200");
+                    msg.setData(jsonObject);
+                }
+            }
+        } catch (Exception e) {
+            msg.setCode("000");
+        }
+        return msg;
+    }
 
-    //没有权限
     @RequestMapping("/authError")
     @ResponseBody
-    public Msg authError(HttpServletRequest request){
+    public Msg authError(HttpServletRequest request) {
         Msg msg = new Msg();
         msg.setCode("4031");
         msg.setInfo("You don't have authority");
         return msg;
     }
 
-    //认证失败
     @RequestMapping("/jurisError")
     @ResponseBody
-    public Msg jurisError(HttpServletRequest request){
+    public Msg jurisError(HttpServletRequest request) {
         Msg msg = new Msg();
         msg.setCode("4031");
         msg.setInfo("Authentication request failed");
         return msg;
     }
-
-
-
 }

src/main/java/cn/hellohao/controller/UserController.java

@@ -1,18 +1,14 @@
 package cn.hellohao.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import cn.hellohao.auth.filter.SubjectFilter;
 import cn.hellohao.auth.token.JWTUtil;
 import cn.hellohao.config.SysName;
 import cn.hellohao.pojo.*;
 import cn.hellohao.service.*;
 import cn.hellohao.utils.*;
+import cn.hutool.captcha.ShearCaptcha;
 import cn.hutool.core.util.HexUtil;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.IncorrectCredentialsException;
 import org.apache.shiro.authc.UnknownAccountException;
@@ -21,9 +17,15 @@ import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
 
 @Controller
 @RequestMapping("/user")
@@ -39,21 +41,18 @@ public class UserController {
     @Autowired
     private SysConfigService sysConfigService;
     @Autowired
-    private UserGroupService userGroupService;
-    @Autowired
     IRedisService iRedisService;
 
     @PostMapping("/register")
     @ResponseBody
-    public Msg Register(HttpServletRequest request, @RequestParam(value = "data", defaultValue = "") String data) {//Validated
+    public Msg Register(HttpSession httpSession, @RequestParam(value = "data", defaultValue = "") String data) {//Validated
         Msg msg = new Msg();
         JSONObject jsonObj = JSONObject.parseObject(data);
         String username = jsonObj.getString("username");
         String email = jsonObj.getString("email");
         String password = Base64Encryption.encryptBASE64(jsonObj.getString("password").getBytes());
-        String userIP = GetIPS.getIpAddr(request);
         String verifyCodeForRegister = jsonObj.getString("verifyCode");
-        Object redis_verifyCodeForRegister = iRedisService.getValue(userIP+"_hellohao_verifyCodeForRegister");
+        ShearCaptcha redis_verifyCodeForRegister = (ShearCaptcha) httpSession.getAttribute("_hellohao_verifyCodeForRegister");//iRedisService.getValue(userIP+"_verifyCodeForRegister");
         if(!SetText.checkEmail(email)){
             msg.setCode("110403");
             msg.setInfo("邮箱格式不正确");
@@ -74,7 +73,7 @@ public class UserController {
             msg.setInfo("验证码不能为空。");
             return msg;
         }
-        if((redis_verifyCodeForRegister.toString().toLowerCase()).compareTo((verifyCodeForRegister.toLowerCase()))==0){
+        if(redis_verifyCodeForRegister.verify(verifyCodeForRegister.toLowerCase())){
             User user = new User();
             UploadConfig updateConfig = uploadConfigService.getUpdateConfig();
             EmailConfig emailConfig = emailConfigService.getemail();
@@ -132,14 +131,13 @@ public class UserController {
 
     @PostMapping("/login")//new
     @ResponseBody
-    public Msg login(HttpServletRequest request,@RequestParam(value = "data", defaultValue = "") String data) {
+    public Msg login(HttpServletRequest request,HttpSession httpSession,@RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
         JSONObject jsonObj = JSONObject.parseObject(data);
         String email = jsonObj.getString("email");
         String password = Base64Encryption.encryptBASE64(jsonObj.getString("password").getBytes());
         String verifyCode = jsonObj.getString("verifyCode");
-        String userIP = GetIPS.getIpAddr(request);
-        Object redis_VerifyCode = iRedisService.getValue(userIP+"_hellohao_verifyCode");
+        ShearCaptcha redis_VerifyCode = (ShearCaptcha)httpSession.getAttribute("_hellohao_verifyCode");
         if(null==redis_VerifyCode){
             msg.setCode("4035");
             msg.setInfo("验证码已失效，请重新弄获取。");
@@ -149,7 +147,7 @@ public class UserController {
             msg.setInfo("验证码不能为空。");
             return msg;
         }
-        if((redis_VerifyCode.toString().toLowerCase()).compareTo((verifyCode.toLowerCase()))==0){
+        if(redis_VerifyCode.verify(verifyCode.toLowerCase())){
             Subject subject = SecurityUtils.getSubject();
             UsernamePasswordToken tokenOBJ = new UsernamePasswordToken(email,password);
             tokenOBJ.setRememberMe(true);
@@ -240,15 +238,13 @@ public class UserController {
 
     @PostMapping("/retrievePass") //new
     @ResponseBody
-    public Msg retrievePass(HttpServletRequest request, @RequestParam(value = "data", defaultValue = "") String data) {
+    public Msg retrievePass(HttpServletRequest request,HttpSession httpSession, @RequestParam(value = "data", defaultValue = "") String data) {
         Msg msg = new Msg();
         try {
             JSONObject jsonObj = JSONObject.parseObject(data);
             String email = jsonObj.getString("email");
             String retrieveCode = jsonObj.getString("retrieveCode");
-            String userIP = GetIPS.getIpAddr(request);
-            Object redis_verifyCodeForEmailRetrieve = iRedisService.getValue(userIP+"_hellohao_verifyCodeForEmailRetrieve");
-
+            ShearCaptcha redis_verifyCodeForEmailRetrieve =(ShearCaptcha) httpSession.getAttribute("_hellohao_verifyCodeForEmailRetrieve");// iRedisService.getValue(userIP+"_verifyCodeForEmailRetrieve");
             EmailConfig emailConfig = emailConfigService.getemail();
             if(null==redis_verifyCodeForEmailRetrieve){
                 msg.setCode("4035");
@@ -259,7 +255,7 @@ public class UserController {
                 msg.setInfo("验证码不能为空。");
                 return msg;
             }
-            if((redis_verifyCodeForEmailRetrieve.toString().toLowerCase()).compareTo((retrieveCode.toLowerCase()))!=0){
+            if(!redis_verifyCodeForEmailRetrieve.verify(retrieveCode.toLowerCase())){
                 msg.setCode("40034");
                 msg.setInfo("验证码不正确");
                 return msg;
@@ -279,7 +275,7 @@ public class UserController {
                     Config config = configService.getSourceype();
                     Thread thread = new Thread() {
                         public void run() {
-                            Integer a = NewSendEmail.sendEmailFindPass(emailConfig,user.getUsername(), user.getUid(), user.getEmail(),config);//SendEmail.sendEmailT(message, user.getUsername(), user.getUid(), user.getEmail(),emailConfig,config);
+                        Integer a = NewSendEmail.sendEmailFindPass(emailConfig,user.getUsername(), user.getUid(), user.getEmail(),config);//SendEmail.sendEmailT(message, user.getUsername(), user.getUid(), user.getEmail(),emailConfig,config);
                         }
                     };
                     thread.start();

src/main/java/cn/hellohao/dao/AlbumMapper.java

@@ -23,4 +23,6 @@ public interface AlbumMapper {
     List<Album> selectAlbumURLList(Album album);
 
     Integer selectAlbumCount(@Param("userid")  Integer userid);
+
+    Integer updateAlbum(Album album);
 }

src/main/java/cn/hellohao/dao/AppClientMapper.java

@@ -0,0 +1,19 @@
+package cn.hellohao.dao;
+
+import cn.hellohao.pojo.AppClient;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author Hellohao
+ * @version 1.0
+ * @date 2022-06-10 18:33
+ */
+
+@Mapper
+public interface AppClientMapper {
+    AppClient getAppClientData(@Param("id") String id);
+
+    Integer editAppClientData(AppClient appClient);
+
+}

src/main/java/cn/hellohao/dao/ImgMapper.java

@@ -13,6 +13,8 @@ public interface ImgMapper {
 
     List<Images> selectimg(Images images);
 
+    Integer insertImgData(Images images);
+
     Integer countimg(@Param("userid") Integer userid);
 
     Integer deleimg(@Param("id") Integer id);
@@ -36,7 +38,7 @@ public interface ImgMapper {
 
     Integer md5Count(Images images);
 
-    Images selectImgUrlByMD5(@Param("md5key") String md5key);
+    List<Images> selectImgUrlByMD5(@Param("md5key") String md5key);
 
     List<Images> RecentlyUploaded(@Param("userid") Integer userid);
 

src/main/java/cn/hellohao/dao/UserMapper.java

@@ -1,54 +1,30 @@
 package cn.hellohao.dao;
 
+import cn.hellohao.pojo.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import cn.hellohao.pojo.Images;
-import cn.hellohao.pojo.User;
-
 import java.util.List;
 
 @Mapper
 public interface UserMapper {
-    //注册
     Integer register(User user);
-
-    //登录
     Integer login(@Param("email") String email, @Param("password") String password,@Param("uid") String uid);
-
-    //获取用户信息
     User getUsers(User user);
-
-    //插入图片
-    Integer insertimg(Images img);
-
-    //修改资料
+    User loginByToken (@Param("token") String token);
     Integer change(User user);
-
     Integer changeUser(User user);
-    //检查用户名是否重复
     Integer checkUsername(@Param("username") String username);
-
     Integer getUserTotal();
-
     List<User> getuserlist(String username);
-
-    //刪除用戶
     Integer deleuser(@Param("id") Integer id);
-
-    //查询用户名或者邮箱是否存在
     Integer countusername(@Param("username") String username);
-
     Integer countmail(@Param("email") String email);
-
     Integer uiduser(@Param("uid") String uid);
-
     User getUsersMail(@Param("uid") String uid);
     Integer setisok (User user);
-
     Integer setmemory(User user);
     User getUsersid(@Param("id") Integer id);
-
     List<User> getuserlistforgroupid(@Param("groupid") Integer groupid);
 
 }

src/main/java/cn/hellohao/pojo/AppClient.java

@@ -0,0 +1,81 @@
+package cn.hellohao.pojo;
+
+public class AppClient {
+
+    private String id;
+    private String isuse;
+    private String winpackurl;
+    private String macpackurl;
+    private String appname;
+    private String applogo;
+    private String appupdate;
+
+
+    public AppClient(){}
+
+    public AppClient(String id, String isuse, String winpackurl, String macpackurl, String appname, String applogo, String appupdate) {
+        this.id = id;
+        this.isuse = isuse;
+        this.winpackurl = winpackurl;
+        this.macpackurl = macpackurl;
+        this.appname = appname;
+        this.applogo = applogo;
+        this.appupdate = appupdate;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIsuse() {
+        return isuse;
+    }
+
+    public void setIsuse(String isuse) {
+        this.isuse = isuse;
+    }
+
+    public String getWinpackurl() {
+        return winpackurl;
+    }
+
+    public void setWinpackurl(String winpackurl) {
+        this.winpackurl = winpackurl;
+    }
+
+    public String getMacpackurl() {
+        return macpackurl;
+    }
+
+    public void setMacpackurl(String macpackurl) {
+        this.macpackurl = macpackurl;
+    }
+
+    public String getAppname() {
+        return appname;
+    }
+
+    public void setAppname(String appname) {
+        this.appname = appname;
+    }
+
+    public String getApplogo() {
+        return applogo;
+    }
+
+    public void setApplogo(String applogo) {
+        this.applogo = applogo;
+    }
+
+    public String getAppupdate() {
+        return appupdate;
+    }
+
+    public void setAppupdate(String isupdate) {
+        this.appupdate = isupdate;
+    }
+}

src/main/java/cn/hellohao/pojo/FixedResources.java

@@ -1,12 +0,0 @@
-package cn.hellohao.pojo;
-
-import java.io.File;
-
-/**
- * @author Hellohao
- * @version 1.0
- * @date 2020-04-04 2:12
- */
-public class FixedResources {
-    public static final String LOCPATH = File.separator + "HellohaoData";
-}

src/main/java/cn/hellohao/pojo/Images.java

@@ -35,6 +35,8 @@ public class Images {
     private String yyyy;
     private String[] classifuidlist; //类别uid集合
     private String classificationuid; //类别uid集合
+    private String idname;
+    private Integer isRepeat;//如果没有开启查重的时候他是0，开启为1
 
     public Images() {
         super();
@@ -54,7 +56,8 @@ public class Images {
                   Integer imgtype, String updatetime, String username, Integer storageType, String starttime, String stoptime,
                   String explains, String md5key, String notes, String useridlist, String imguid, String albumtitle,
                   String password, Integer selecttype,Long countNum,Integer monthNum,String yyyy,
-                  String format,String about,Integer great,String[] classifuidlist,String classificationuid,String violation) {
+                  String format,String about,Integer great,String[] classifuidlist,String classificationuid,String violation,
+                  String idname,Integer isRepeat) {
         this.id = id;
         this.imgname = imgname;
         this.imgurl = imgurl;
@@ -85,6 +88,8 @@ public class Images {
         this.classifuidlist = classifuidlist;
         this.classificationuid = classificationuid;
         this.violation = violation;
+        this.idname = idname;
+        this.isRepeat = isRepeat;
 
     }
 
@@ -328,6 +333,22 @@ public class Images {
     public void setViolation(String violation) {
         this.violation = violation;
     }
+
+    public String getIdname() {
+        return idname;
+    }
+
+    public void setIdname(String idname) {
+        this.idname = idname;
+    }
+
+    public Integer getIsRepeat() {
+        return isRepeat;
+    }
+
+    public void setIsRepeat(Integer isRepeat) {
+        this.isRepeat = isRepeat;
+    }
 }
 	
 		

src/main/java/cn/hellohao/pojo/User.java

@@ -16,6 +16,7 @@ public class User {
     private  String memory;
     private Integer groupid;
     private String groupname;
+    private String token;
 
     private Long counts;//用户img counts
 
@@ -25,7 +26,7 @@ public class User {
     }
 
     public User(Integer id, String username, String password, String email, String birthder, Integer level, String uid,
-                Integer isok, String memory, Integer groupid,String groupname,Long counts) {
+                Integer isok, String memory, Integer groupid,String groupname,Long counts,String token) {
         this.id = id;
         this.username = username;
         this.password = password;
@@ -38,6 +39,7 @@ public class User {
         this.groupid = groupid;
         this.groupname = groupname;
         this.counts = counts;
+        this.token = token;
     }
 
     public Integer getId() {
@@ -135,4 +137,12 @@ public class User {
     public void setCounts(Long counts) {
         this.counts = counts;
     }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
 }

src/main/java/cn/hellohao/quartz/job/FirstJob.java

@@ -63,21 +63,21 @@ public class FirstJob {
 				imgService.deleimgForImgUid(images.getImguid());
 				Keys keys = keysService.selectKeys(images.getSource());
 				if(keys.getStorageType()==1){
-					firstJob.nosImageupload.delNOS(keys.getId(),images.getImgname());
+					firstJob.nosImageupload.delNOS(keys.getId(),images);
 				}else if (keys.getStorageType()==2){
-					firstJob.ossImageupload.delOSS(keys.getId(), images.getImgname());
+					firstJob.ossImageupload.delOSS(keys.getId(), images);
 				}else if(keys.getStorageType()==3){
-					firstJob.ussImageupload.delUSS(keys.getId(), images.getImgname());
+					firstJob.ussImageupload.delUSS(keys.getId(), images);
 				}else if(keys.getStorageType()==4){
-					firstJob.kodoImageupload.delKODO(keys.getId(), images.getImgname());
+					firstJob.kodoImageupload.delKODO(keys.getId(), images);
 				}else if(keys.getStorageType()==5){
-					LocUpdateImg.deleteLOCImg(images.getImgname());
+					LocUpdateImg.deleteLOCImg(images);
 				}else if(keys.getStorageType()==6){
-					firstJob.cosImageupload.delCOS(keys.getId(),images.getImgname());
+					firstJob.cosImageupload.delCOS(keys.getId(),images);
 				}else if(keys.getStorageType()==7){
-					firstJob.ftpImageupload.delFTP(keys.getId(), images.getImgname());
+					firstJob.ftpImageupload.delFTP(keys.getId(), images);
 				}else if(keys.getStorageType()==8){
-					firstJob.uFileImageupload.delUFile(keys.getId(), images.getImgname());
+					firstJob.uFileImageupload.delUFile(keys.getId(), images);
 				}else{
 					System.err.println("未获取到对象存储参数，上传失败。");
 				}

src/main/java/cn/hellohao/service/AlbumService.java

@@ -26,4 +26,6 @@ public interface AlbumService {
     List<Album> selectAlbumURLList(Album album);
 
     Integer selectAlbumCount(Integer userid);
+
+    Integer updateAlbum(Album album);
 }

src/main/java/cn/hellohao/service/AppClientService.java

@@ -0,0 +1,12 @@
+package cn.hellohao.service;
+
+import cn.hellohao.pojo.AppClient;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface AppClientService {
+
+    AppClient getAppClientData( String id);
+
+    Integer editAppClientData(AppClient appClient);
+}

src/main/java/cn/hellohao/service/CodeService.java

@@ -13,12 +13,9 @@ import java.util.List;
  */
 @Service
 public interface CodeService {
-    //查询扩容码
     List<Code> selectCode(String value);
     Code selectCodekey(String code);
-    //添加
     Integer addCode(Code code);
-    //删除扩容码
     Integer deleteCode(String code);
 
 }

src/main/java/cn/hellohao/service/IRedisService.java

@@ -4,14 +4,16 @@ import java.util.Map;
 
 public interface IRedisService {
 
-    // 加入元素
-    void setValue(String key, Map<String, Object> value);
-    // 加入元素
-    void setValue(String key, String value);
-    // 加入元素
-    void setValue(String key, Object value);
-    // 获取元素
-    Object getMapValue(String key);
-    // 获取元素
-    Object getValue(String key);
-}
+  // 加入元素
+  void setValue(String key, Map<String, Object> value);
+  // 加入元素
+  void setValue(String key, String value);
+  // 加入元素
+  void setTimeValue(String key, Object value,Long time);
+  // 获取元素
+  Object getMapValue(String key);
+  // 获取元素
+  Object getValue(String key);
+    // 删除某个值
+  Boolean removeValue(String key);
+}

src/main/java/cn/hellohao/service/ImgService.java

@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
 public interface ImgService {
     List<Images> selectimg(Images images);
 
+    Integer insertImgData(Images images);
+
     Integer deleimg(Integer id);
 
     Integer deleimgForImgUid(String imguid);
@@ -37,7 +39,7 @@ public interface ImgService {
 
     Integer md5Count(Images images);
 
-    Images selectImgUrlByMD5(String md5key);
+    List<Images> selectImgUrlByMD5(String md5key);
 
     List<Images> RecentlyUploaded(Integer userid);
 

src/main/java/cn/hellohao/service/ImgTempService.java

@@ -12,6 +12,8 @@ import java.util.List;
 @Service
 public interface ImgTempService {
     List<Images> selectDelImgUidList(String datatime);
+
     Integer delImgAndExp(String imguid);
+
     Integer insertImgExp(ImgTemp imgDataExp);
 }

src/main/java/cn/hellohao/service/KeysService.java

@@ -9,11 +9,13 @@ import java.util.List;
 
 @Service
 public interface KeysService {
-    //查询密钥
     Keys selectKeys(Integer id);
+
     List<Keys> getStorageName();
+
     List<Keys> getStorage();
-    //修改key
+
     Msg updateKey(Keys key);
+
     List<Keys> getKeys();
 }

src/main/java/cn/hellohao/service/SysConfigService.java

@@ -11,5 +11,6 @@ import org.springframework.stereotype.Service;
 @Service
 public interface SysConfigService {
     SysConfig getstate();
+
     Integer setstate(SysConfig sysConfig);
 }

src/main/java/cn/hellohao/service/UploadConfigService.java

@@ -5,6 +5,8 @@ import org.springframework.stereotype.Service;
 
 @Service
 public interface UploadConfigService {
+
     UploadConfig getUpdateConfig();
+
     Integer setUpdateConfig(UploadConfig updateConfig);
 }

src/main/java/cn/hellohao/service/UserGroupService.java

@@ -10,10 +10,17 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public interface UserGroupService {
+
     UserGroup useridgetusergroup(Integer userid);
+
     UserGroup idgetusergroup(Integer id);
+
     Integer addusergroup(UserGroup userGroup);
+
     Integer updateusergroup(UserGroup userGroup);
+
     Integer updateusergroupdefault(Integer groupid);
+
     Integer deleusergroup(Integer userid);
+
 }

src/main/java/cn/hellohao/service/UserService.java

@@ -1,32 +1,24 @@
 package cn.hellohao.service;
 
-import cn.hellohao.pojo.Images;
 import cn.hellohao.pojo.User;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service
 public interface UserService {
-    //注册
     Integer register(User user);
 
-    //登录
     Integer login(String email, String password,String uid);
 
-    //获取用户信息
+    User loginByToken (String token);
+
     User getUsers(User user);
 
-    //插入图片
-    Integer insertimg(Images img);
-
-    //修改资料
     Integer change(User user);
 
     Integer changeUser(User user);
 
-    //检查用户名是否重复
     Integer checkUsername(String username);
 
     Integer getUserTotal();
@@ -35,7 +27,6 @@ public interface UserService {
 
     Integer deleuser(Integer id);
 
-    //查询用户名或者邮箱是否存在
     Integer countusername(String username);
 
     Integer countmail(String email);
@@ -43,8 +34,12 @@ public interface UserService {
     Integer uiduser(String uid);
 
     User getUsersMail(String uid);
+
     Integer setisok (User user);
+
     Integer setmemory(User user);
+
     User getUsersid(Integer id);
+
     List<User> getuserlistforgroupid(Integer groupid);
 }

src/main/java/cn/hellohao/service/impl/AlbumServiceImpl.java

@@ -8,16 +8,13 @@ import cn.hellohao.exception.CodeException;
 import cn.hellohao.pojo.Album;
 import cn.hellohao.pojo.Images;
 import cn.hellohao.pojo.ImgAndAlbum;
-import cn.hellohao.pojo.Msg;
 import cn.hellohao.service.AlbumService;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 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
@@ -26,86 +23,86 @@ import java.util.UUID;
  */
 @Service
 public class AlbumServiceImpl implements AlbumService {
-    @Autowired
-    AlbumMapper albumMapper;
-    @Autowired
-    ImgAndAlbumMapper andAlbumMapper;
-    @Autowired
-    ConfigMapper configMapper;
-    @Autowired
-    ImgMapper imgMapper;
+  @Autowired AlbumMapper albumMapper;
+  @Autowired ImgAndAlbumMapper andAlbumMapper;
+  @Autowired ConfigMapper configMapper;
+  @Autowired ImgMapper imgMapper;
 
-
-    @Override
-    public JSONArray getAlbumList(JSONArray array) {
-        JSONArray jsonArray = new JSONArray();
-        for (int i = 0; i < array.size(); i++) {
-            Images images = new Images();
-            images.setImguid(array.getString(i));
-            jsonArray.add(imgMapper.selectimg(images).get(0));
-        }
-        return jsonArray;
+  @Override
+  public JSONArray getAlbumList(JSONArray array) {
+    JSONArray jsonArray = new JSONArray();
+    for (int i = 0; i < array.size(); i++) {
+      Images images = new Images();
+      images.setImguid(array.getString(i));
+      jsonArray.add(imgMapper.selectimg(images).get(0));
     }
+    return jsonArray;
+  }
 
-    @Override
-    public Album selectAlbum(Album album) {
-        return albumMapper.selectAlbum(album);
-    }
+  @Override
+  public Album selectAlbum(Album album) {
+    return albumMapper.selectAlbum(album);
+  }
 
-    @Override
-    public Integer addAlbum(Album album) {
-        return albumMapper.addAlbum(album);
-    }
+  @Override
+  public Integer addAlbum(Album album) {
+    return albumMapper.addAlbum(album);
+  }
 
-    @Transactional
-    public Integer addAlbumForImgAndAlbumMapper(ImgAndAlbum imgAndAlbum) {
-        Integer tem = 0;
-        Integer r2 = andAlbumMapper.addImgAndAlbum(imgAndAlbum);
-        if(r2>0){
-            tem = 1;
-        }else{
-            throw new CodeException("插入画廊数据失败，回滚");
-        }
-        return tem;
+  @Transactional
+  public Integer addAlbumForImgAndAlbumMapper(ImgAndAlbum imgAndAlbum) {
+    Integer tem = 0;
+    Integer r2 = andAlbumMapper.addImgAndAlbum(imgAndAlbum);
+    if (r2 > 0) {
+      tem = 1;
+    } else {
+      throw new CodeException("插入画廊数据失败，回滚");
     }
+    return tem;
+  }
 
-    @Override
-    public Integer deleteAlbum(String albumkey) {
-        return albumMapper.deleteAlbum(albumkey);
-    }
+  @Override
+  public Integer deleteAlbum(String albumkey) {
+    return albumMapper.deleteAlbum(albumkey);
+  }
 
-    @Override
-    public List<Album> selectAlbumURLList(Album album) {
-        return albumMapper.selectAlbumURLList(album);
-    }
+  @Override
+  public List<Album> selectAlbumURLList(Album album) {
+    return albumMapper.selectAlbumURLList(album);
+  }
 
-    @Override
-    public Integer selectAlbumCount(Integer userid) {
-        return albumMapper.selectAlbumCount(userid);
-    }
+  @Override
+  public Integer selectAlbumCount(Integer userid) {
+    return albumMapper.selectAlbumCount(userid);
+  }
 
-    @Transactional
-    public Integer delete(String albumkey) {
-        Integer ret1 = albumMapper.deleteAlbum(albumkey);
-        if(ret1>0){
-            ret1 = andAlbumMapper.deleteImgAndAlbumForKey(albumkey);
-        }else{
-            throw new CodeException("删除画廊失败。");
-        }
-        return ret1;
-    }
+  @Override
+  public Integer updateAlbum(Album album) {
+    return albumMapper.updateAlbum(album);
+  }
 
-    @Transactional
-    public Integer deleteAll(String[] albumkeyArr) {
-        Integer ret1 = 0 ;
-        for (String s : albumkeyArr) {
-            ret1 = albumMapper.deleteAlbum(s);
-            if(ret1>0){
-                ret1 = andAlbumMapper.deleteImgAndAlbumForKey(s);
-            }else{
-                throw new CodeException("删除画廊失败。");
-            }
-        }
-        return ret1;
+  @Transactional
+  public Integer delete(String albumkey) {
+    Integer ret1 = albumMapper.deleteAlbum(albumkey);
+    if (ret1 > 0) {
+      ret1 = andAlbumMapper.deleteImgAndAlbumForKey(albumkey);
+    } else {
+      throw new CodeException("删除画廊失败。");
     }
+    return ret1;
+  }
+
+  @Transactional
+  public Integer deleteAll(String[] albumkeyArr) {
+    Integer ret1 = 0;
+    for (String s : albumkeyArr) {
+      ret1 = albumMapper.deleteAlbum(s);
+      if (ret1 > 0) {
+        ret1 = andAlbumMapper.deleteImgAndAlbumForKey(s);
+      } else {
+        throw new CodeException("删除画廊失败。");
+      }
+    }
+    return ret1;
+  }
 }

src/main/java/cn/hellohao/service/impl/AppClientServiceImpl.java

@@ -0,0 +1,25 @@
+package cn.hellohao.service.impl;
+
+import cn.hellohao.dao.AppClientMapper;
+import cn.hellohao.pojo.AppClient;
+import cn.hellohao.service.AppClientService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AppClientServiceImpl implements AppClientService {
+
+    @Autowired
+    AppClientMapper appClientMapper;
+
+
+    @Override
+    public AppClient getAppClientData(String id) {
+        return appClientMapper.getAppClientData(id);
+    }
+
+    @Override
+    public Integer editAppClientData(AppClient appClient) {
+        return appClientMapper.editAppClientData(appClient);
+    }
+}

src/main/java/cn/hellohao/service/impl/COSImageupload.java

@@ -1,108 +1,101 @@
 package cn.hellohao.service.impl;
 
+import cn.hellohao.pojo.Images;
 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 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.*;
+import com.qcloud.cos.model.ListObjectsRequest;
+import com.qcloud.cos.model.ObjectListing;
+import com.qcloud.cos.model.PutObjectRequest;
+import com.qcloud.cos.model.PutObjectResult;
 import com.qcloud.cos.region.Region;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.util.*;
+import java.util.Map;
 
 @Service
 public class COSImageupload {
     static COSClient cosClient;
     static Keys key;
 
-    public ReturnImage ImageuploadCOS(Map<String, File> fileMap, String username,Integer keyID) {
+    public ReturnImage ImageuploadCOS(
+            Map<Map<String, String>, File> fileMap, String username, Integer keyID) {
         ReturnImage returnImage = new ReturnImage();
         File file = null;
-        Map<ReturnImage, Integer> ImgUrl = new HashMap<>();
         try {
-            for (Map.Entry<String, File> entry : fileMap.entrySet()) {
-                String ShortUID = SetText.getShortUuid();
+            for (Map.Entry<Map<String, String>, File> entry : fileMap.entrySet()) {
+                String prefix = entry.getKey().get("prefix");
+                String ShortUIDName = entry.getKey().get("name");
                 file = entry.getValue();
                 try {
                     String bucketName = key.getBucketname();
-                    String userkey =username + "/" + ShortUID + "." + entry.getKey();
-                    PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, userkey, file);
+                    String userkey = username + "/" + ShortUIDName + "." + prefix;
+                    PutObjectRequest putObjectRequest =
+                            new PutObjectRequest(bucketName, userkey, file);
                     PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
-                    returnImage.setImgname(userkey);
-                    returnImage.setImgurl(key.getRequestAddress() + "/" + userkey);
-                    returnImage.setImgSize(entry.getValue().length());
-                    returnImage.setCode("200");
                 } catch (CosServiceException serverException) {
+                    returnImage.setCode("400");
                     serverException.printStackTrace();
                 } catch (CosClientException clientException) {
+                    returnImage.setCode("400");
                     clientException.printStackTrace();
                 }
             }
-        }catch(Exception e){
-            e.printStackTrace();
             returnImage.setCode("200");
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnImage.setCode("500");
         }
         return returnImage;
     }
 
-
     public static Integer Initialize(Keys k) {
         int ret = -1;
-        if(k.getEndpoint()!=null && k.getAccessSecret()!=null && k.getEndpoint()!=null
-                && k.getBucketname()!=null && k.getRequestAddress()!=null ) {
-            if (!k.getEndpoint().equals("") && !k.getAccessSecret().equals("") && !k.getEndpoint().equals("")
-                    && !k.getBucketname().equals("") && !k.getRequestAddress().equals("")) {
-                String secretId = k.getAccessKey();
-                String secretKey = k.getAccessSecret();
-                COSCredentials cred = new BasicCOSCredentials(secretId, secretKey);
-                Region region = new Region(k.getEndpoint());
-                ClientConfig clientConfig = new ClientConfig(region);
-                COSClient cosClient = new COSClient(cred, clientConfig);
-                ListObjectsRequest listObjectsRequest = new ListObjectsRequest();
-                listObjectsRequest.setBucketName(k.getBucketname());
-                listObjectsRequest.setDelimiter("/");
-                listObjectsRequest.setMaxKeys(1);
-                ObjectListing objectListing = null;
-                try {
-                    objectListing = cosClient.listObjects(listObjectsRequest);
-                    ret = 1;
-                    cosClient = cosClient;
-                    key = k;
-                } catch (Exception e) {
-                    System.out.println("COS Object Is null");
-                    ret = -1;
-                }
-            }
+        if (StringUtils.isBlank(k.getAccessKey())
+                || StringUtils.isBlank(k.getAccessSecret())
+                || StringUtils.isBlank(k.getEndpoint())
+                || StringUtils.isBlank(k.getBucketname())
+                || StringUtils.isBlank(k.getRequestAddress())) {
+            return -1;
+        }
+        String secretId = k.getAccessKey();
+        String secretKey = k.getAccessSecret();
+        COSCredentials cred = new BasicCOSCredentials(secretId, secretKey);
+        Region region = new Region(k.getEndpoint());
+        ClientConfig clientConfig = new ClientConfig(region);
+        COSClient cos = new COSClient(cred, clientConfig);
+        ListObjectsRequest listObjectsRequest = new ListObjectsRequest();
+        listObjectsRequest.setBucketName(k.getBucketname());
+        listObjectsRequest.setDelimiter("/");
+        listObjectsRequest.setMaxKeys(1);
+        ObjectListing objectListing = null;
+        try {
+            objectListing = cos.listObjects(listObjectsRequest);
+            ret = 1;
+            cosClient = cos;
+            key = k;
+        } catch (Exception e) {
+            System.out.println("COS Object Is null");
+            ret = -1;
         }
         return ret;
     }
 
-    public Boolean delCOS(Integer keyID, String fileName) {
+    public Boolean delCOS(Integer keyID, Images images) {
         boolean b = true;
         try {
-            cosClient.deleteObject(key.getBucketname(), fileName);
+            cosClient.deleteObject(key.getBucketname(), images.getImgname());
         } catch (Exception e) {
             e.printStackTrace();
             b = false;
         }
-        return b ;
+        return b;
     }
-
-
-
-
 }

src/main/java/cn/hellohao/service/impl/ClientService.java

@@ -2,19 +2,13 @@ package cn.hellohao.service.impl;
 
 import cn.hellohao.dao.*;
 import cn.hellohao.pojo.*;
-import cn.hellohao.pojo.vo.PageResultBean;
-import cn.hellohao.service.ImgAndAlbumService;
+import cn.hellohao.service.ImgTempService;
 import cn.hellohao.service.SysConfigService;
 import cn.hellohao.utils.*;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baidu.aip.contentcensor.AipContentCensor;
 import com.baidu.aip.contentcensor.EImgType;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import net.coobird.thumbnailator.filters.Watermark;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,47 +28,24 @@ import java.util.*;
 @Service
 public class ClientService {
 
-    @Autowired
-    private ImgAndAlbumService imgAndAlbumService;
-    @Autowired
-    private NOSImageupload nOSImageupload;
-    @Autowired
-    private OSSImageupload ossImageupload;
-    @Autowired
-    private USSImageupload ussImageupload;
-    @Autowired
-    private KODOImageupload kodoImageupload;
-    @Autowired
-    private COSImageupload cosImageupload;
-    @Autowired
-    private SysConfigService sysConfigService;
-    @Autowired
-    private FTPImageupload ftpImageupload;
-    @Autowired
-    private UFileImageupload uFileImageupload;
-    @Autowired
-    private UserMapper userMapper;
-    @Autowired
-    private KeysMapper keysMapper;
-    @Autowired
-    private ConfigMapper configMapper;
-    @Autowired
-    private UploadConfigMapper uploadConfigMapper;
-    @Autowired
-    private ImgMapper imgMapper;
-    @Autowired
-    ImgreviewMapper imgreviewMapper;
+    @Autowired private SysConfigService sysConfigService;
+    @Autowired private UserMapper userMapper;
+    @Autowired private KeysMapper keysMapper;
+    @Autowired private UploadConfigMapper uploadConfigMapper;
+    @Autowired private ImgMapper imgMapper;
+    @Autowired private ImgreviewMapper imgreviewMapper;
+    @Autowired private ImgTempService imgTempService;
+    @Autowired private KeysServiceImpl keysService;
 
-
-    public Msg uploadImg(HttpServletRequest request, MultipartFile multipartFile, String email, String pass ){
+    public Msg uploadImg(
+            HttpServletRequest request, MultipartFile multipartFile, String email, String pass,Integer setday) {
         Msg msg = new Msg();
         try {
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Integer sourceKeyId = 0;
             FileInputStream fis = null;
             String md5key = null;
-            Integer setday = 0;
             JSONObject jsonObject = new JSONObject();
-            Config config = configMapper.getSourceype();
             String userip = GetIPS.getIpAddr(request);
             UploadConfig uploadConfig = uploadConfigMapper.getUpdateConfig();
             if (uploadConfig.getApi() != 1) {
@@ -92,14 +63,12 @@ public class ClientService {
             u2.setEmail(email);
             u2.setPassword(Base64Encryption.encryptBASE64(pass.getBytes()));
             User u = userMapper.getUsers(u2);
-            //判断用户的账号密码是否存在（正确）
             if (null == u || u.getIsok() != 1) {
                 msg.setCode("4006");
                 msg.setInfo("用户信息不正确,账号异常");
                 return msg;
             }
             String imguid = UUID.randomUUID().toString().replace("-", "");
-            //判断上传前的一些用户限制信息
             Msg msg1 = updateImgCheck(u, uploadConfig);
             if (!msg1.getCode().equals("300")) {
                 return msg1;
@@ -126,9 +95,8 @@ public class ClientService {
                 e.printStackTrace();
                 System.out.println("未获取到图片的MD5,成成UUID");
             }
-            Msg fileMiME = TypeDict.FileMiME(file, uploadConfig.getSuffix());
+            Msg fileMiME = TypeDict.FileMiME(file);
             if (!fileMiME.getCode().equals("200")) {
-                //非图像文本
                 msg.setCode("4009");
                 msg.setInfo(fileMiME.getInfo());
                 return msg;
@@ -147,59 +115,96 @@ public class ClientService {
                     }
                 }
             }
-            //判断图片是否存在
-            if(Integer.valueOf(sysConfigService.getstate().getCheckduplicate())==1) {
+//            if (Integer.valueOf(sysConfigService.getstate().getCheckduplicate()) == 1) {
+//                Images imaOBJ = new Images();
+//                imaOBJ.setMd5key(md5key);
+//                imaOBJ.setUserid(u.getId());
+//                if (imgMapper.md5Count(imaOBJ) > 0) {
+//                    List<Images> images = imgMapper.selectImgUrlByMD5(md5key);
+//                    jsonObject.put("url", images.get(0).getImgurl());
+//                    jsonObject.put("name", file.getName());
+//                    jsonObject.put("size", images.get(0).getSizes());
+//                    msg.setData(jsonObject);
+//                    return msg;
+//                }
+//            }
+            Images imgObj = new Images();
+            String imgnameEd = null;
+            Map<Map<String, String>, File> map = new HashMap<>();
+            if (file.exists()) {
+                Map<String, String> m1 = new HashMap<>();
+                String shortUuid_y = SetText.getShortUuid();
+                m1.put("prefix", prefix);
+                m1.put("name", shortUuid_y);
+                map.put(m1, file);
+                imgnameEd = updatePath + "/" + shortUuid_y + "." + prefix;
+                imgObj.setImgname(imgnameEd);
+                if (key.getStorageType().equals(5)) {
+                    imgObj.setImgurl(key.getRequestAddress() + "/ota/" + imgnameEd);
+                } else {
+                    imgObj.setImgurl(key.getRequestAddress() + "/" + imgnameEd);
+                }
+                imgObj.setSizes(Long.toString(file.length()));
+            }
+            imgObj.setUpdatetime(df.format(new Date()));
+            imgObj.setSource(key.getId());
+            imgObj.setUserid(u == null ? 0 : u.getId());
+            if (setday == 1 || setday == 3 || setday == 7 || setday == 30) {
+                imgObj.setImgtype(1);
+                ImgTemp imgDataExp = new ImgTemp();
+                imgDataExp.setDeltime(UploadServicel.plusDay(setday));
+                imgDataExp.setImguid(imguid);
+                imgTempService.insertImgExp(imgDataExp);
+            } else {
+                imgObj.setImgtype(0);
+            }
+            imgObj.setAbnormal(userip);
+            imgObj.setMd5key(md5key);
+            imgObj.setImguid(imguid);
+            imgObj.setFormat(fileMiME.getData().toString());
+            Integer insertRet = imgMapper.insertImgData(imgObj);
+            if (insertRet == 0) {
                 Images imaOBJ = new Images();
                 imaOBJ.setMd5key(md5key);
-                imaOBJ.setUserid(u.getId());
-                if (imgMapper.md5Count(imaOBJ) > 0) {
-                    Images images = imgMapper.selectImgUrlByMD5(md5key);
-                    jsonObject.put("url", images.getImgurl());
+                imaOBJ.setUserid(u == null ? 0 : u.getId());
+                List<Images> images = imgMapper.selectImgUrlByMD5(md5key);
+                if (images.size() > 0) {
+                    jsonObject.put("url", images.get(0).getImgurl());
+//                    Keys imgFromKey = keysService.selectKeys(images.get(0).getSource());
+//                    if (imgFromKey.getStorageType().equals(5)) {
+//                        jsonObject.put(
+//                                "url",
+//                                imgFromKey.getRequestAddress()
+//                                        + "/ota/"
+//                                        + images.get(0).getImgname());
+//                    } else {
+//                        jsonObject.put("url", images.get(0).getImgurl());
+//                    }
                     jsonObject.put("name", file.getName());
-                    jsonObject.put("size", images.getSizes());
+                    jsonObject.put("size", images.get(0).getSizes());
                     msg.setData(jsonObject);
                     return msg;
+                } else {
+                    msg.setInfo("未获取到指定图像");
+                    msg.setCode("110501");
+                    return msg;
                 }
             }
-            Map<String, File> map = new HashMap<>();
-            String fileName = file.getName();
-            if (file.exists()) {
-                map.put(prefix, file);
-            }
             long stime = System.currentTimeMillis();
             Map<ReturnImage, Integer> m = null;
-            ReturnImage returnImage = GetSource.storageSource(key.getStorageType(), map, updatePath,  key.getId());
-            Images img = new Images();
-            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            ReturnImage returnImage =
+                    GetSource.storageSource(key.getStorageType(), map, updatePath, key.getId());
             if (returnImage.getCode().equals("200")) {
-                String imgurl = returnImage.getImgurl();
-                Long imgsize = returnImage.getImgSize();
-                String imgname = returnImage.getImgname();
-                img.setImgurl(imgurl);
-                img.setUpdatetime(df.format(new Date()));
-                img.setSource(key.getId());
-                img.setUserid(u == null ? 0 : u.getId());
-                img.setSizes(imgsize.toString());
-                if (uploadConfig.getUrltype() == 2) {
-                    img.setImgname(imgname);
-                } else {
-                    img.setImgname(SetText.getSubString(imgname, key.getRequestAddress() + "/", ""));
-                }
-                img.setImgtype(setday > 0 ? 1 : 0);
-                img.setAbnormal(userip);
-                img.setMd5key(md5key);
-                img.setImguid(imguid);
-                img.setFormat(fileMiME.getData().toString());
-                userMapper.insertimg(img);
                 long etime = System.currentTimeMillis();
                 Print.Normal("上传图片所用总时长：" + String.valueOf(etime - stime) + "ms");
-                jsonObject.put("url", img.getImgurl());
-                jsonObject.put("name", imgname);
-                jsonObject.put("size", img.getSizes());
-                //启动鉴黄线程
-                new Thread(() -> {
-                    LegalImageCheck(img);
-                }).start();
+                jsonObject.put("url", imgObj.getImgurl());
+                jsonObject.put("name", imgObj.getImgname());
+                jsonObject.put("size", imgObj.getSizes());
+                new Thread(
+                                () -> {
+                                    LegalImageCheck(imgObj);
+                                })
+                        .start();
             } else {
                 msg.setCode("5001");
                 msg.setInfo("上传服务内部错误");
@@ -207,55 +212,56 @@ public class ClientService {
             }
             file.delete();
             msg.setData(jsonObject);
-//            新代码结束=========
             return msg;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg.setCode("5001");
             msg.setInfo("Error for server:500");
             return msg;
         }
-
     }
 
+    public static Group group;
+    public static Long memory;
+    public static Long TotleMemory;
+    public static Long UsedTotleMemory;
+    public static String updatePath = "tourist";
 
-    public static Group group; //上传用户或游客的所属分组
-    public static Long memory;//上传用户或者游客的分配容量 memory
-    public static Long TotleMemory;//用户或者游客下可使用的总容量 //maxsize
-    public static Long UsedTotleMemory;//用户或者游客已经用掉的总容量 //usermemory
-    public static String updatePath="tourist";
-
-    //判断用户 或 游客 当前上传图片的一系列校验
-    private Msg updateImgCheck(User user, UploadConfig uploadConfig){
-        final Msg msg = new Msg();
+    private Msg updateImgCheck(User user, UploadConfig uploadConfig) {
+        Msg msg = new Msg();
         java.text.DateFormat dateFormat = null;
         try {
             dateFormat = new SimpleDateFormat("yyyy/MM/dd");
             if (user == null) {
-                //用户没有登陆，值判断游客能不能上传即可
-                if(uploadConfig.getIsupdate()!=1){
+                if (uploadConfig.getIsupdate() != 1) {
                     msg.setCode("1000");
                     msg.setInfo("系统已禁用游客上传");
                     return msg;
                 }
                 group = GetCurrentSource.GetSource(null);
-                memory = Long.valueOf(uploadConfig.getVisitormemory());//单位 B 游客设置总量
-                TotleMemory = Long.valueOf(uploadConfig.getFilesizetourists());//单位 B  游客单文件大小
-                UsedTotleMemory = imgMapper.getusermemory(0)==null?0L : imgMapper.getusermemory(0);//单位 B
+                memory = Long.valueOf(uploadConfig.getVisitormemory()); // 单位 B 游客设置总量
+                TotleMemory = Long.valueOf(uploadConfig.getFilesizetourists()); // 单位 B  游客单文件大小
+                UsedTotleMemory =
+                        imgMapper.getusermemory(0) == null
+                                ? 0L
+                                : imgMapper.getusermemory(0); // 单位 B
             } else {
-                //判断用户能不能上传
-                if(uploadConfig.getUserclose()!=1){
+                // 判断用户能不能上传
+                if (uploadConfig.getUserclose() != 1) {
                     msg.setCode("1001");
                     msg.setInfo("系统已禁用上传功能");
                     return msg;
                 }
                 updatePath = user.getUsername();
-                group= GetCurrentSource.GetSource(user.getId());
-                memory = Long.valueOf(user.getMemory())*1024*1024;//单位 B
-                TotleMemory = Long.valueOf(uploadConfig.getFilesizeuser());//单位 B
-                UsedTotleMemory = imgMapper.getusermemory(user.getId())==null?0L:imgMapper.getusermemory(user.getId());//单位 B
+                group = GetCurrentSource.GetSource(user.getId());
+                memory = Long.valueOf(user.getMemory()); // 单位 B
+                TotleMemory = Long.valueOf(uploadConfig.getFilesizeuser()); // 单位 B
+                UsedTotleMemory =
+                        imgMapper.getusermemory(user.getId()) == null
+                                ? 0L
+                                : imgMapper.getusermemory(user.getId()); // 单位 B
             }
-            //判断上传的图片目录结构类型
+            // 判断上传的图片目录结构类型
             if (uploadConfig.getUrltype() == 2) {
                 updatePath = dateFormat.format(new Date());
             }
@@ -267,10 +273,8 @@ public class ClientService {
         return msg;
     }
 
-    //图片鉴黄
-
-    private synchronized void LegalImageCheck(Images images){
-        System.out.println("非法图像鉴别进程启动");
+    // 图片鉴黄
+    private synchronized void LegalImageCheck(Images images) {
         Imgreview imgreview = null;
         try {
             imgreview = imgreviewMapper.selectByusing(1);
@@ -278,30 +282,40 @@ public class ClientService {
             Print.warning("获取鉴别程序的时候发生错误");
             e.printStackTrace();
         }
-        LegalImageCheckForBaiDu(imgreview,images);
+        if(imgreview==null){
+            System.out.println("没有找到可用的图像鉴别进程");
+        }else{
+            LegalImageCheckForBaiDu(imgreview, images);
+        }
+
     }
 
-    private void LegalImageCheckForBaiDu(Imgreview imgreview,Images images){
-        if(imgreview.getUsing()==1){
+    private void LegalImageCheckForBaiDu(Imgreview imgreview, Images images) {
+        if (imgreview.getUsing() == 1) {
             try {
-                AipContentCensor client = new AipContentCensor(imgreview.getAppId(), imgreview.getApiKey(), imgreview.getSecretKey());
+                AipContentCensor client =
+                        new AipContentCensor(
+                                imgreview.getAppId(),
+                                imgreview.getApiKey(),
+                                imgreview.getSecretKey());
                 client.setConnectionTimeoutInMillis(5000);
                 client.setSocketTimeoutInMillis(30000);
                 org.json.JSONObject res = client.antiPorn(images.getImgurl());
                 res = client.imageCensorUserDefined(images.getImgurl(), EImgType.URL, null);
-                com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray("[" + res.toString() + "]");
+                com.alibaba.fastjson.JSONArray jsonArray =
+                        JSON.parseArray("[" + res.toString() + "]");
                 for (Object o : jsonArray) {
                     JSONObject jsonObject = (JSONObject) o;
                     com.alibaba.fastjson.JSONArray data = jsonObject.getJSONArray("data");
                     Integer conclusionType = jsonObject.getInteger("conclusionType");
-                    if(conclusionType!=null){
+                    if (conclusionType != null) {
                         if (conclusionType == 2) {
                             for (Object datum : data) {
                                 JSONObject imgdata = (JSONObject) datum;
                                 if (imgdata.getInteger("type") == 1) {
                                     Images img = new Images();
                                     img.setImgname(images.getImgname());
-                                    img.setViolation("1[1]");//数字是鉴别平台的主键ID，括号是非法的类型，参考上面的注释
+                                    img.setViolation("1[1]");
                                     imgMapper.setImg(img);
                                     Imgreview imgv = new Imgreview();
                                     imgv.setId(1);
@@ -316,14 +330,10 @@ public class ClientService {
                     }
                 }
 
-            }catch (Exception e){
+            } catch (Exception e) {
                 System.out.println("图像鉴黄线程执行过程中出现异常");
                 e.printStackTrace();
-
             }
-
         }
     }
-
-
 }

src/main/java/cn/hellohao/service/impl/CodeServiceImpl.java

@@ -19,7 +19,6 @@ public class CodeServiceImpl implements CodeService {
     @Autowired
     private CodeMapper codeMapper;
 
-
     @Override
     public List<Code> selectCode(String value) {
         return codeMapper.selectCode(value);

src/main/java/cn/hellohao/service/impl/ConfigServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 public class ConfigServiceImpl implements ConfigService {
     @Autowired
     private ConfigMapper configMapper;
+
     @Override
     public Config getSourceype() {
         return configMapper.getSourceype();

src/main/java/cn/hellohao/service/impl/EmailServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 public class EmailServiceImpl implements EmailConfigService {
     @Autowired
     EmailConfigMapper emailConfigMapper;
+
     @Override
     public EmailConfig getemail() {
         return emailConfigMapper.getemail();

src/main/java/cn/hellohao/service/impl/FTPImageupload.java

@@ -1,136 +1,132 @@
 package cn.hellohao.service.impl;
 
+import cn.hellohao.pojo.Images;
 import cn.hellohao.pojo.Keys;
 import cn.hellohao.pojo.ReturnImage;
-import cn.hellohao.pojo.UploadConfig;
-import cn.hellohao.utils.*;
+import cn.hellohao.utils.FTPUtils;
+import cn.hellohao.utils.Print;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPReply;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.Map;
 
 @Service
 public class FTPImageupload {
-    static FTPClient ftpClient1 ;
     static Keys key;
 
-    public ReturnImage ImageuploadFTP(Map<String, File> fileMap, String username,Integer keyID)  {
+    public ReturnImage ImageuploadFTP(
+            Map<Map<String, String>, File> fileMap, String username, Integer keyID) {
         ReturnImage returnImage = new ReturnImage();
-        Keys key = null;
         String[] host = key.getEndpoint().split("\\:");
         String h = host[0];
         Integer p = Integer.parseInt(host[1]);
         FTPUtils ftps = new FTPUtils(h, p, key.getAccessKey(), key.getAccessSecret());
         boolean flag = ftps.open();
         File file = null;
-        Map<ReturnImage, Integer> ImgUrl = new HashMap<>();
-        ftps.mkDir(File.separator+username);
+        ftps.mkDir(File.separator + username);
         try {
-            for (Map.Entry<String, File> entry : fileMap.entrySet()) {
-                String ShortUID = SetText.getShortUuid();
+            for (Map.Entry<Map<String, String>, File> entry : fileMap.entrySet()) {
+                String prefix = entry.getKey().get("prefix");
+                String ShortUIDName = entry.getKey().get("name");
                 file = entry.getValue();
-                String userkey =username + "/"+ ShortUID + "." + entry.getKey();
+                String userkey = username + "/" + ShortUIDName + "." + prefix;
                 if (flag) {
                     boolean isUpload = ftps.upload(file, "/" + userkey, "");
-                    if(isUpload){
-                        returnImage.setImgname(userkey);
-                        returnImage.setImgurl(key.getRequestAddress() + "/"+ userkey);
-                        returnImage.setImgSize(entry.getValue().length());
-                        returnImage.setCode("200");
-                    }else{
-                        returnImage.setCode("500");
+                    if (isUpload) {
+
+                    } else {
+                        returnImage.setCode("400");
                     }
+
+                } else {
+                    returnImage.setCode("400");
                 }
-                Print.Normal("要上传的文件路径：/"+userkey);
+                Print.Normal("要上传的文件路径：/" + userkey);
             }
-        }catch (Exception e){
+            returnImage.setCode("200");
+        } catch (Exception e) {
             e.printStackTrace();
             returnImage.setCode("500");
-//                ImgUrl.put(null, 500);
         }
         return returnImage;
-
     }
 
-    //初始化FTP对象存储
     public static Integer Initialize(Keys k) {
         int ret = -1;
-        if(k.getEndpoint()!=null && k.getAccessSecret()!=null && k.getEndpoint()!=null && k.getRequestAddress()!=null ) {
-            if(!k.getEndpoint().equals("") && !k.getAccessSecret().equals("") && !k.getEndpoint().equals("") && !k.getRequestAddress().equals("") ) {
-                FTPClient ftp = new FTPClient();
-                ftp.setConnectTimeout(0);
-                int flag = k.getEndpoint().indexOf(":");
-                if(flag>0){
-                    String[] host = k.getEndpoint().split("\\:");
-                    String h = host[0];
-                    Integer p = Integer.parseInt(host[1]);
-                    try {
-                        if(!ftp.isConnected()){
-                            ftp.connect(h,p);
-                        }
-                        ftp.login(k.getAccessKey(), k.getAccessSecret());
-                        int reply = ftp.getReplyCode();
-                        if (!FTPReply.isPositiveCompletion(reply)) {
-                            System.out.println("FTP Object Is null");
-                            ftp.disconnect();
-                            return -1;
-                        }
-                        ret = 1;
-                        key = k;
-//                        KeyObjectMap objectMap = new KeyObjectMap(ftp,k);
-                    } catch (IOException e) {
-                        System.out.println("FTP Object Is null");
-                        return -1;
-                    }
+        if (StringUtils.isBlank(k.getAccessKey())
+                || StringUtils.isBlank(k.getAccessSecret())
+                || StringUtils.isBlank(k.getEndpoint())
+                || StringUtils.isBlank(k.getRequestAddress())) {
+            return -1;
+        }
+        FTPClient ftp = new FTPClient();
+        ftp.setConnectTimeout(0);
+        int flag = k.getEndpoint().indexOf(":");
+        if (flag > 0) {
+            String[] host = k.getEndpoint().split("\\:");
+            String h = host[0];
+            Integer p = Integer.parseInt(host[1]);
+            try {
+                if (!ftp.isConnected()) {
+                    ftp.connect(h, p);
                 }
+                ftp.login(k.getAccessKey(), k.getAccessSecret());
+                int reply = ftp.getReplyCode();
+                if (!FTPReply.isPositiveCompletion(reply)) {
+                    System.out.println("FTP Object Is null");
+                    ftp.disconnect();
+                    return -1;
+                }
+                ret = 1;
+                key = k;
+            } catch (IOException e) {
+                System.out.println("FTP Object Is null");
+                return -1;
             }
         }
         return ret;
     }
 
-    public static void fuzhi(String p1,String p2){
-        String a=p1;
-        try{
-            File afile=new File(a);
-            File bfile=new File(p2);//定义一个复制后的文件路径
-            bfile.createNewFile();//新建文件
-            FileInputStream c=new FileInputStream(afile);//定义FileInputStream对象
-            FileOutputStream d=new FileOutputStream(bfile);//定义FileOutputStream对象
-            byte[] date=new byte[512];//定义一个byte数组
-            int i=0;
-            while((i=c.read(date))>0){//判断有没有读取到文件末尾
+    public static void copyFile(String p1, String p2) {
+        String a = p1;
+        try {
+            File afile = new File(a);
+            File bfile = new File(p2); // 定义一个复制后的文件路径
+            bfile.createNewFile();
+            FileInputStream c = new FileInputStream(afile);
+            FileOutputStream d = new FileOutputStream(bfile);
+            byte[] date = new byte[512];
+            int i = 0;
+            while ((i = c.read(date)) > 0) {
                 d.write(date);
             }
             c.close();
             d.close();
-            System.out.println("文件复制成功");}
-        catch(IOException e){
+            System.out.println("文件复制成功");
+        } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
-    public Boolean delFTP(Integer keyID, String fileName) {
+    public Boolean delFTP(Integer keyID, Images images) {
         boolean b = true;
         try {
             String[] host = key.getEndpoint().split("\\:");
             String h = host[0];
             Integer p = Integer.parseInt(host[1]);
-            //创建FTP客户端，所有的操作都基于FTPClinet
             FTPUtils ftps = new FTPUtils(h, p, key.getAccessKey(), key.getAccessSecret());
             ftps.open();
-            b = ftps.deleteFile(fileName);
+            b = ftps.deleteFile(images.getImgname());
         } catch (Exception e) {
             e.printStackTrace();
             b = false;
         }
         return b;
     }
-
-
 }

src/main/java/cn/hellohao/service/impl/GroupServiceImpl.java

@@ -88,8 +88,8 @@ public class GroupServiceImpl implements GroupService {
         if(group.getUsertype()!=0){
             Group groupFroUserType = groupMapper.getGroupFroUserType(group.getUsertype());
             if(groupFroUserType!=null){
-                if(groupFroUserType.getUsertype()==group.getUsertype()){
-                    if(groupFroUserType.getId()==group.getId()){
+                if(groupFroUserType.getUsertype().equals(group.getUsertype())){
+                    if(groupFroUserType.getId().equals(group.getId())){
                         groupMapper.setgroup(group);
                         msg.setInfo("修改成功");
                     }else{

src/main/java/cn/hellohao/service/impl/ImgServiceImpl.java

@@ -1,48 +1,17 @@
 package cn.hellohao.service.impl;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.hellohao.pojo.User;
-import cn.hellohao.utils.Print;
-import com.UpYun;
-import com.aliyun.oss.OSSClient;
-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.region.Region;
-import com.qiniu.common.QiniuException;
-import com.qiniu.common.Zone;
-import com.qiniu.storage.BucketManager;
-import com.qiniu.storage.Configuration;
-import com.qiniu.util.Auth;
-import com.upyun.UpException;
-import org.apache.commons.net.ftp.FTPClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-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.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.pojo.User;
 import cn.hellohao.service.ImgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class ImgServiceImpl implements ImgService {
     @Autowired
-    //@Resource
     private ImgMapper imgMapper;
 
     @Override
@@ -51,6 +20,11 @@ public class ImgServiceImpl implements ImgService {
         return imgMapper.selectimg(images);
     }
 
+    @Override
+    public Integer insertImgData(Images images) {
+        return imgMapper.insertImgData(images);
+    }
+
     @Override
     public Integer deleimg(Integer id) {
         // TODO Auto-generated method stub
@@ -65,113 +39,7 @@ public class ImgServiceImpl implements ImgService {
     public Images selectByPrimaryKey(Integer id) {
         return imgMapper.selectByPrimaryKey(id);
     }
-    //删除对象存储的图片文件
-    public void delect(Keys key, String fileName) {
-        // 初始化
-        Credentials credentials = new BasicCredentials(key.getAccessKey(), key.getAccessSecret());
-        NosClient nosClient = new NosClient(credentials);
-        nosClient.setEndpoint(key.getEndpoint());
-        // 初始化TransferManager
-        TransferManager transferManager = new TransferManager(nosClient);
-        //列举桶
-        ArrayList bucketList = new ArrayList();
-        String tname = "";
-        for (Bucket bucket : nosClient.listBuckets()) {
-            bucketList.add(bucket.getName());
-        }
-        for (Object object : bucketList) {
-            tname = object.toString();
-            //查看桶的ACL
-            CannedAccessControlList acl = nosClient.getBucketAcl(object.toString());
-        }
-        //这种方法不能删除指定文件夹下的文件
-        boolean isExist = nosClient.doesObjectExist(tname, fileName, null);
-        System.out.println("文件是否存在：" + isExist);
-        if (isExist) {
-            nosClient.deleteObject(tname, fileName);
-        }
-    }
-    public void delectOSS(Keys key, String fileName) {
-        String endpoint = key.getEndpoint();
-        String accessKeyId = key.getAccessKey();
-        String accessKeySecret = key.getAccessSecret();
-        String bucketName = key.getBucketname();
-        String objectName = fileName;
-        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
-        ossClient.deleteObject(bucketName, objectName);
-        ossClient.shutdown();
-    }
-    //删除USS对象存储的图片文件
-    public void delectUSS(Keys key, String fileName) {
-        UpYun upyun = new UpYun(key.getBucketname(), key.getAccessKey(), key.getAccessSecret());
-        try {
-            boolean result = upyun.deleteFile(fileName, null);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (UpException e) {
-            e.printStackTrace();
-        }
-    }
 
-    public void delectUFile(Keys key, String fileName) {
-        UpYun upyun = new UpYun(key.getBucketname(), key.getAccessKey(), key.getAccessSecret());
-        try {
-            boolean result = upyun.deleteFile(fileName, null);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (UpException e) {
-            e.printStackTrace();
-        }
-    }
-    public void delectKODO(Keys key, String fileName) {
-        Configuration cfg;
-        if(key.getEndpoint().equals("1")){cfg = new Configuration(Zone.zone0());}
-        else if(key.getEndpoint().equals("2")){cfg = new Configuration(Zone.zone1());}
-        else if(key.getEndpoint().equals("3")){cfg = new Configuration(Zone.zone2());}
-        else if(key.getEndpoint().equals("4")){cfg = new Configuration(Zone.zoneNa0());}
-        else{cfg = new Configuration(Zone.zoneAs0());}
-        Auth auth = Auth.create(key.getAccessKey(), key.getAccessSecret());
-        BucketManager bucketManager = new BucketManager(auth, cfg);
-        try {
-            bucketManager.delete(key.getBucketname(), fileName);
-        } catch (QiniuException ex) {
-            //如果遇到异常，说明删除失败
-            System.err.println(ex.code());
-            System.err.println(ex.response.toString());
-        }
-    }
-    //删除COS对象存储的图片文件
-    public void delectCOS(Keys key, String fileName) {
-        COSCredentials cred = new BasicCOSCredentials(key.getAccessKey(), key.getAccessSecret());
-        Region region = new Region(key.getEndpoint());
-        ClientConfig clientConfig = new ClientConfig(region);
-        COSClient cosClient= new COSClient(cred, clientConfig);
-        try {
-            String bucketName = key.getBucketname();
-            String userkey = fileName;
-             cosClient.deleteObject(key.getBucketname(), userkey);
-        } catch (CosServiceException serverException) {
-            serverException.printStackTrace();
-        } catch (CosClientException clientException) {
-            clientException.printStackTrace();
-        }
-    }
-    public void delectFTP(Keys key, String fileName) {
-        FTPClient ftp = new FTPClient();
-        String[] host = key.getEndpoint().split("\\:");
-        String h = host[0];
-        Integer p = Integer.parseInt(host[1]);
-        try {
-            if(!ftp.isConnected()){
-                ftp.connect(h,p);
-            }
-            ftp.login(key.getAccessKey(), key.getAccessSecret());
-            ftp.deleteFile(fileName);
-        } catch (IOException e) {
-            e.printStackTrace();
-            Print.warning("删除FTP存储的图片失败");
-        }
-    }
     @Override
     public Integer counts(Integer userid) {
         // TODO Auto-generated method stub
@@ -220,7 +88,7 @@ public class ImgServiceImpl implements ImgService {
     }
 
     @Override
-    public Images selectImgUrlByMD5(String md5key) {
+    public List<Images> selectImgUrlByMD5(String md5key) {
         return imgMapper.selectImgUrlByMD5(md5key);
     }
 

src/main/java/cn/hellohao/service/impl/KODOImageupload.java

@@ -1,11 +1,8 @@
 package cn.hellohao.service.impl;
 
+import cn.hellohao.pojo.Images;
 import cn.hellohao.pojo.Keys;
 import cn.hellohao.pojo.ReturnImage;
-import cn.hellohao.pojo.UploadConfig;
-import cn.hellohao.utils.*;
-import com.aliyun.oss.OSSClient;
-import com.aliyun.oss.model.ObjectMetadata;
 import com.google.gson.Gson;
 import com.qiniu.common.QiniuException;
 import com.qiniu.common.Zone;
@@ -16,14 +13,11 @@ import com.qiniu.storage.UploadManager;
 import com.qiniu.storage.model.DefaultPutRet;
 import com.qiniu.storage.model.FileInfo;
 import com.qiniu.util.Auth;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 @Service
 public class KODOImageupload {
@@ -31,9 +25,9 @@ public class KODOImageupload {
     static BucketManager bucketManager;
     static Keys key;
 
-    public ReturnImage ImageuploadKODO(Map<String, File> fileMap, String username, Integer keyID){
+    public ReturnImage ImageuploadKODO(
+            Map<Map<String, String>, File> fileMap, String username, Integer keyID) {
         ReturnImage returnImage = new ReturnImage();
-        Keys key = null;
         Configuration cfg;
         if (key.getEndpoint().equals("1")) {
             cfg = new Configuration(Zone.zone0());
@@ -48,21 +42,22 @@ public class KODOImageupload {
         }
         UploadManager uploadManager = new UploadManager(cfg);
         Auth auth = Auth.create(key.getAccessKey(), key.getAccessSecret());
-        String upToken = auth.uploadToken(key.getBucketname(),null,7200,null);
+        String upToken = auth.uploadToken(key.getBucketname(), null, 7200, null);
         File file = null;
         try {
-            for (Map.Entry<String, File> entry : fileMap.entrySet()) {
-                String ShortUID = SetText.getShortUuid();
-                java.text.DateFormat format1 = new java.text.SimpleDateFormat("MMddhhmmss");
+            for (Map.Entry<Map<String, String>, File> entry : fileMap.entrySet()) {
+                String prefix = entry.getKey().get("prefix");
+                String ShortUIDName = entry.getKey().get("name");
                 file = entry.getValue();
                 try {
-                    Response response = uploadManager.put(file,username + "/" + ShortUID + "." + entry.getKey(),upToken);
-                    DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class);
-                    returnImage.setImgname(username + "/" + ShortUID + "." + entry.getKey());
-                    returnImage.setImgurl(key.getRequestAddress() + "/" + username + "/" + ShortUID + "." + entry.getKey());
-                    returnImage.setImgSize(entry.getValue().length());
-                    returnImage.setCode("200");
+                    Response response =
+                            uploadManager.put(
+                                    file, username + "/" + ShortUIDName + "." + prefix, upToken);
+                    DefaultPutRet putRet =
+                            new Gson().fromJson(response.bodyString(), DefaultPutRet.class);
+
                 } catch (QiniuException ex) {
+                    returnImage.setCode("400");
                     Response r = ex.response;
                     System.err.println(r.toString());
                     try {
@@ -71,7 +66,8 @@ public class KODOImageupload {
                     }
                 }
             }
-        }catch (Exception e){
+            returnImage.setCode("200");
+        } catch (Exception e) {
             e.printStackTrace();
             returnImage.setCode("500");
         }
@@ -80,53 +76,57 @@ public class KODOImageupload {
 
     public static Integer Initialize(Keys k) {
         int ret = -1;
-        if (k.getEndpoint() != null && k.getAccessSecret() != null && k.getEndpoint() != null
-                && k.getBucketname() != null && k.getRequestAddress() != null) {
-            if (!k.getEndpoint().equals("") && !k.getAccessSecret() .equals("") && !k.getEndpoint() .equals("")
-                    && !k.getBucketname().equals("") && !k.getRequestAddress() .equals("")) {
-                Configuration cfg;
-                if (k.getEndpoint().equals("1")) {
-                    cfg = new Configuration(Zone.zone0());
-                } else if (k.getEndpoint().equals("2")) {
-                    cfg = new Configuration(Zone.zone1());
-                } else if (k.getEndpoint().equals("3")) {
-                    cfg = new Configuration(Zone.zone2());
-                } else if (k.getEndpoint().equals("4")) {
-                    cfg = new Configuration(Zone.zoneNa0());
-                } else {
-                    cfg = new Configuration(Zone.zoneAs0());
-                }
-                UploadManager uploadManager = new UploadManager(cfg);
-                Auth auth = Auth.create(k.getAccessKey(), k.getAccessSecret());
-                String upToken = auth.uploadToken(k.getBucketname(),null,7200,null);//auth.uploadToken(k.getBucketname());
-                BucketManager bucketManager = new BucketManager(auth, cfg);
-                BucketManager.FileListIterator fileListIterator = null;
-                try {
-                    fileListIterator = bucketManager.createFileListIterator(k.getBucketname(), "", 1, "/");
-                    FileInfo[] items = fileListIterator.next();
-                    if(items!=null){
-                        ret = 1;
-                        bucketManager = bucketManager;
-                        key = k;
-                    }
-                }catch (Exception e){
-                    System.out.println("KODO Object Is null");
-                    ret = -1;
-                }
+        if (org.apache.commons.lang3.StringUtils.isBlank(k.getAccessKey())
+                || org.apache.commons.lang3.StringUtils.isBlank(k.getAccessSecret())
+                || org.apache.commons.lang3.StringUtils.isBlank(k.getEndpoint())
+                || org.apache.commons.lang3.StringUtils.isBlank(k.getBucketname())
+                || StringUtils.isBlank(k.getRequestAddress())) {
+            return -1;
+        }
+        Configuration cfg;
+        if (k.getEndpoint().equals("1")) {
+            cfg = new Configuration(Zone.zone0());
+        } else if (k.getEndpoint().equals("2")) {
+            cfg = new Configuration(Zone.zone1());
+        } else if (k.getEndpoint().equals("3")) {
+            cfg = new Configuration(Zone.zone2());
+        } else if (k.getEndpoint().equals("4")) {
+            cfg = new Configuration(Zone.zoneNa0());
+        } else {
+            cfg = new Configuration(Zone.zoneAs0());
+        }
+        UploadManager uploadManager = new UploadManager(cfg);
+        Auth auth = Auth.create(k.getAccessKey(), k.getAccessSecret());
+        String upToken =
+                auth.uploadToken(
+                        k.getBucketname(),
+                        null,
+                        7200,
+                        null); // auth.uploadToken(k.getBucketname());
+        BucketManager bmObj = new BucketManager(auth, cfg);
+        BucketManager.FileListIterator fileListIterator = null;
+        try {
+            fileListIterator = bmObj.createFileListIterator(k.getBucketname(), "", 1, "/");
+            FileInfo[] items = fileListIterator.next();
+            if (items != null) {
+                ret = 1;
+                bucketManager = bmObj;
+                key = k;
             }
+        } catch (Exception e) {
+            System.out.println("KODO Object Is null");
+            ret = -1;
         }
         return ret;
     }
 
-    public Boolean delKODO(Integer keyID, String fileName) {
+    public Boolean delKODO(Integer keyID, Images images) {
         boolean b = true;
         try {
-            bucketManager.delete(key.getBucketname(), fileName);
+            bucketManager.delete(key.getBucketname(), images.getImgname());
         } catch (Exception ex) {
             b = false;
         }
         return b;
     }
-
-
 }

src/main/java/cn/hellohao/service/impl/KeysServiceImpl.java

@@ -52,9 +52,8 @@ public class KeysServiceImpl implements KeysService {
     public Msg updateKey(Keys key) {
         Msg msg = new Msg();
         Integer ret = -2;
-        //修改完初始化
         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 ){

src/main/java/cn/hellohao/service/impl/NOSImageupload.java

@@ -1,46 +1,37 @@
 package cn.hellohao.service.impl;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.*;
-
-import cn.hellohao.exception.StorageSourceInitException;
+import cn.hellohao.pojo.Images;
+import cn.hellohao.pojo.Keys;
 import cn.hellohao.pojo.ReturnImage;
-import cn.hellohao.pojo.UploadConfig;
-import cn.hellohao.utils.*;
-import com.netease.cloud.services.nos.model.NOSObjectSummary;
-import com.netease.cloud.services.nos.model.ObjectListing;
-import com.netease.cloud.services.nos.model.ObjectMetadata;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
+import cn.hellohao.utils.SetText;
 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 com.netease.cloud.services.nos.model.ObjectListing;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
 
-import cn.hellohao.pojo.Keys;
+import java.io.File;
+import java.util.Map;
 
 @Service
 public class NOSImageupload {
     static NosClient nosClient;
     static Keys key;
 
-    public ReturnImage Imageupload(Map<String, File> fileMap, String username,Integer keyID){
+    public ReturnImage Imageupload(Map<Map<String, String>, File> fileMap, String username,Integer keyID){
         ReturnImage returnImage = new ReturnImage();
         File file = null;
         try {
-            for (Map.Entry<String, File> entry : fileMap.entrySet()) {
-                String ShortUID = SetText.getShortUuid();
+            for (Map.Entry<Map<String, String>, File> entry : fileMap.entrySet()) {
+                String prefix = entry.getKey().get("prefix");
+                String ShortUIDName = entry.getKey().get("name");
                 file = entry.getValue();
-                nosClient.putObject(key.getBucketname(), username + "/" + ShortUID+ "." + entry.getKey(), file);
-                returnImage.setImgname(username + "/" + ShortUID+ "." + entry.getKey());
-                returnImage.setImgurl(key.getRequestAddress() + "/" + username + "/" + ShortUID + "." + entry.getKey());
-                returnImage.setImgSize(entry.getValue().length());
-                returnImage.setCode("200");
+                nosClient.putObject(
+                        key.getBucketname(), username + "/" + ShortUIDName + "." + prefix, file);
             }
-        }catch (Exception e){
+            returnImage.setCode("200");
+        } catch (Exception e) {
             e.printStackTrace();
             returnImage.setCode("500");
         }
@@ -49,42 +40,35 @@ public class NOSImageupload {
     }
 
 
-    //初始化网易NOS对象存储
     public static Integer Initialize(Keys k) {
         int ret = -1;
-        if(k.getEndpoint()!=null && k.getAccessSecret()!=null && k.getEndpoint()!=null
-                && k.getBucketname()!=null && k.getRequestAddress()!=null ){
-            if(!k.getEndpoint().equals("") && !k.getAccessSecret().equals("") && !k.getEndpoint().equals("")
-                    && !k.getBucketname().equals("") && !k.getRequestAddress().equals("") ){
-                // 初始化
-                Credentials credentials = new BasicCredentials(k.getAccessKey(), k.getAccessSecret());
-                NosClient nosClient = new NosClient(credentials);
-                nosClient.setEndpoint(k.getEndpoint());
-                ObjectListing objectListing = null;
-                try {
-                    objectListing = nosClient.listObjects(k.getBucketname());
-                    ret = 1;
-                    nosClient = nosClient;
-                    key = k;
-                }catch (Exception e){
-                    System.out.println("NOS Object Is null");
-                    ret = -1;
-                }
-            }
+        if (StringUtils.isBlank(k.getAccessKey())
+                || StringUtils.isBlank(k.getAccessSecret())
+                || StringUtils.isBlank(k.getEndpoint())
+                || StringUtils.isBlank(k.getBucketname())
+                || StringUtils.isBlank(k.getRequestAddress())) {
+            return -1;
+        }
+        Credentials credentials = new BasicCredentials(k.getAccessKey(), k.getAccessSecret());
+        NosClient nosObj = new NosClient(credentials);
+        nosObj.setEndpoint(k.getEndpoint());
+        ObjectListing objectListing = null;
+        try {
+            objectListing = nosObj.listObjects(k.getBucketname());
+            ret = 1;
+            nosClient = nosObj;
+            key = k;
+        }catch (Exception e){
+            System.out.println("NOS Object Is null");
+            ret = -1;
         }
-        //throw new StorageSourceInitException("当前数据源配置不完整，请管理员前往后台配置。");
         return ret;
     }
 
-
-    public Boolean delNOS(Integer keyID, String fileName) {
+    public Boolean delNOS(Integer keyID, Images images) {
         boolean b =true;
         try {
-            //这种方法不能删除指定文件夹下的文件
-            boolean isExist = nosClient.doesObjectExist(key.getBucketname(), fileName, null);
-            if (isExist) {
-                nosClient.deleteObject(key.getBucketname(), fileName);
-            }
+            nosClient.deleteObject(key.getBucketname(), images.getImgname());
         } catch (Exception e) {
             e.printStackTrace();
             b =false;

src/main/java/cn/hellohao/service/impl/OSSImageupload.java

@@ -1,79 +1,89 @@
 package cn.hellohao.service.impl;
 
+import cn.hellohao.pojo.Images;
 import cn.hellohao.pojo.Keys;
+import cn.hellohao.pojo.Msg;
 import cn.hellohao.pojo.ReturnImage;
-import cn.hellohao.utils.*;
+import cn.hellohao.utils.TypeDict;
 import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.ObjectListing;
 import com.aliyun.oss.model.ObjectMetadata;
+import com.aliyun.oss.model.PutObjectRequest;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+
 import java.io.File;
-import java.util.*;
+import java.util.Map;
 
 @Service
 public class OSSImageupload {
-    static OSSClient ossClient;
+    static OSS ossClient;
     static Keys key;
 
-    public ReturnImage ImageuploadOSS(Map<String, File> fileMap, String username,Integer keyID){
+    public ReturnImage ImageuploadOSS(
+            Map<Map<String, String>, File> fileMap, String username, Integer keyID) {
         ReturnImage returnImage = new ReturnImage();
         File file = null;
         ObjectMetadata meta = new ObjectMetadata();
         meta.setHeader("Content-Disposition", "inline");
         try {
-            for (Map.Entry<String, File> entry : fileMap.entrySet()) {
-                String ShortUID = SetText.getShortUuid();
-                java.text.DateFormat format1 = new java.text.SimpleDateFormat("MMddhhmmss");
+            for (Map.Entry<Map<String, String>, File> entry : fileMap.entrySet()) {
+                String prefix = entry.getKey().get("prefix");
+                String ShortUIDName = entry.getKey().get("name");
                 file = entry.getValue();
-                System.out.println("待上传的图片："+username + "/" + ShortUID + "." + entry.getKey());
-                ossClient.putObject(key.getBucketname(), username + "/" + ShortUID + "." + entry.getKey(),file);
-                returnImage.setImgname(username + "/" + ShortUID + "." + entry.getKey());//entry.getValue().getOriginalFilename()
-                returnImage.setImgurl(key.getRequestAddress() + "/" + username + "/" + ShortUID + "." + entry.getKey());
-                returnImage.setImgSize(file.length());
-                returnImage.setCode("200");
+                Msg fileMiME = TypeDict.FileMiME(file);
+                meta.setHeader("content-type", fileMiME.getData().toString());
+                PutObjectRequest putObjectRequest =
+                        new PutObjectRequest(
+                                key.getBucketname(),
+                                username + "/" + ShortUIDName + "." + prefix,
+                                file,
+                                meta);
+                ossClient.putObject(putObjectRequest);
             }
-        }catch (Exception e){
+            returnImage.setCode("200");
+        } catch (Exception e) {
             e.printStackTrace();
             returnImage.setCode("500");
         }
         return returnImage;
-
     }
 
     public static Integer Initialize(Keys k) {
         int ret = -1;
         ObjectListing objectListing = null;
-        if(k.getEndpoint()!=null && k.getAccessSecret()!=null && k.getAccessKey()!=null && k.getEndpoint()!=null
-                && k.getBucketname()!=null && k.getRequestAddress()!=null ) {
-            if(!k.getEndpoint().equals("") && !k.getAccessSecret().equals("") && !k.getAccessKey().equals("") && !k.getEndpoint().equals("")
-                    && !k.getBucketname().equals("") && !k.getRequestAddress().equals("") ) {
-                OSS ossClient = new OSSClientBuilder().build(k.getEndpoint(), k.getAccessKey(), k.getAccessSecret());
-                try {
-                    objectListing = ossClient.listObjects(k.getBucketname());
-                    ret=1;
-                    ossClient = ossClient;
-                    key = k;
-                } catch (Exception e) {
-                    System.out.println("OSS Object Is null");
-                    ret = -1;
-                }
-            }
+        if (StringUtils.isBlank(k.getAccessKey())
+                || StringUtils.isBlank(k.getAccessSecret())
+                || StringUtils.isBlank(k.getEndpoint())
+                || StringUtils.isBlank(k.getBucketname())
+                || StringUtils.isBlank(k.getRequestAddress())) {
+            return -1;
         }
+        OSS ossObj =
+                new OSSClientBuilder()
+                        .build(k.getEndpoint(), k.getAccessKey(), k.getAccessSecret());
+        try {
+            objectListing = ossObj.listObjects(k.getBucketname());
+            ret = 1;
+            ossClient = ossObj;
+            key = k;
+        } catch (Exception e) {
+            System.out.println("OSS Object Is null");
+            ret = -1;
+        }
+
         return ret;
     }
 
-    public boolean delOSS(Integer keyID, String fileName){
-        boolean b =true;
+    public boolean delOSS(Integer keyID, Images images) {
+        boolean b = true;
         try {
-            ossClient.deleteObject(key.getBucketname(), fileName);
+            ossClient.deleteObject(key.getBucketname(), images.getImgname());
         } catch (Exception e) {
             e.printStackTrace();
             b = false;
         }
         return b;
     }
-
-
 }

src/main/java/cn/hellohao/service/impl/RedisServiceImpl.java

@@ -12,42 +12,44 @@ import java.util.concurrent.TimeUnit;
 
 @Service
 public class RedisServiceImpl implements IRedisService {
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-    @Autowired
-    private RedisTemplate redisTemplate;
+  @Autowired private StringRedisTemplate stringRedisTemplate;
+  @Autowired private RedisTemplate redisTemplate;
 
+  @Override
+  public void setValue(String key, Map<String, Object> value) {
+    ValueOperations<String, Object> vo = redisTemplate.opsForValue();
+    vo.set(key, value);
+    redisTemplate.expire(key, 1, TimeUnit.HOURS); // 这里指的是1小时后失效
+  }
 
-    @Override
-    public void setValue(String key, Map<String, Object> value) {
-        ValueOperations<String, Object> vo = redisTemplate.opsForValue();
-        vo.set(key, value);
-        redisTemplate.expire(key, 1, TimeUnit.HOURS); // 这里指的是1小时后失效
-    }
+  @Override
+  public Object getValue(String key) {
+    ValueOperations<String, String> vo = redisTemplate.opsForValue();
+    return vo.get(key);
+  }
 
-    @Override
-    public Object getValue(String key) {
-        ValueOperations<String, String> vo = redisTemplate.opsForValue();
-        return vo.get(key);
-    }
+  @Override
+  public void setValue(String key, String value) {
+    ValueOperations<String, Object> vo = redisTemplate.opsForValue();
+    vo.set(key, value);
+    redisTemplate.expire(key, 3, TimeUnit.MINUTES); // 这里指的是1小时后失效 时HOURS  分 MINUTES
+  }
 
-    @Override
-    public void setValue(String key, String value) {
-        ValueOperations<String, Object> vo = redisTemplate.opsForValue();
-        vo.set(key, value);
-        redisTemplate.expire(key, 3, TimeUnit.MINUTES); // 这里指的是1小时后失效 时HOURS  分 MINUTES
-    }
+  @Override
+  public void setTimeValue(String key, Object value, Long time) {
+    ValueOperations<String, Object> vo = redisTemplate.opsForValue();
+    vo.set(key, value);
+    redisTemplate.expire(key, time, TimeUnit.HOURS);
+  }
 
-    @Override
-    public void setValue(String key, Object value) {
-        ValueOperations<String, Object> vo = redisTemplate.opsForValue();
-        vo.set(key, value);
-        redisTemplate.expire(key, 1, TimeUnit.HOURS); // 这里指的是1小时后失效
-    }
+  @Override
+  public Object getMapValue(String key) {
+    ValueOperations<String, String> vo = redisTemplate.opsForValue();
+    return vo.get(key);
+  }
 
-    @Override
-    public Object getMapValue(String key) {
-        ValueOperations<String, String> vo = redisTemplate.opsForValue();
-        return vo.get(key);
-    }
-}
+  @Override
+  public Boolean removeValue(String key) {
+    return redisTemplate.delete(key);
+  }
+}

src/main/java/cn/hellohao/service/impl/UFileImageupload.java

@@ -1,64 +1,84 @@
 package cn.hellohao.service.impl;
 
+import cn.hellohao.pojo.Images;
 import cn.hellohao.pojo.Keys;
+import cn.hellohao.pojo.Msg;
 import cn.hellohao.pojo.ReturnImage;
-import cn.hellohao.pojo.UploadConfig;
-import cn.hellohao.utils.*;
+import cn.hellohao.utils.SetText;
+import cn.hellohao.utils.TypeDict;
 import com.UpYun;
 import com.aliyun.oss.model.ObjectMetadata;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class UFileImageupload {
     static UpYun uFile;
     static Keys key;
 
-    public ReturnImage ImageuploadUFile(Map<String, File> fileMap, String username,Integer keyID) {
+    /*
+    * 废弃方法待补位
+    * */
+
+    public ReturnImage ImageuploadUFile(
+            Map<Map<String, String>, File> fileMap, String username, Integer keyID) {
         ReturnImage returnImage = new ReturnImage();
         File file = null;
         ObjectMetadata meta = new ObjectMetadata();
         meta.setHeader("Content-Disposition", "inline");
         try {
-            for (Map.Entry<String, File> entry : fileMap.entrySet()) {
+            for (Map.Entry<Map<String, String>, File> entry : fileMap.entrySet()) {
                 String ShortUID = SetText.getShortUuid();
                 file = entry.getValue();
+                Msg fileMiME = TypeDict.FileMiME(file);
+                meta.setHeader("content-type", fileMiME.getData().toString());
                 uFile.setContentMD5(UpYun.md5(file));
-                boolean result = uFile.writeFile(username + "/" + ShortUID + "." + entry.getKey(), file, true);
-                if(result){
+                boolean result =
+                        uFile.writeFile(
+                                username + "/" + ShortUID + "." + entry.getKey(), file, true);
+                if (result) {
                     returnImage.setImgname(username + "/" + ShortUID + "." + entry.getKey());
-                    returnImage.setImgurl(key.getRequestAddress() + "/" +username + "/" + ShortUID + "." + entry.getKey());
+                    returnImage.setImgurl(
+                            key.getRequestAddress()
+                                    + "/"
+                                    + username
+                                    + "/"
+                                    + ShortUID
+                                    + "."
+                                    + entry.getKey());
                     returnImage.setImgSize(entry.getValue().length());
                     returnImage.setCode("200");
-                }else{
+                } else {
+                    returnImage.setCode("400");
                     System.err.println("上传失败");
                 }
             }
-        }catch(Exception e){
+        } catch (Exception e) {
             returnImage.setCode("500");
         }
+        returnImage.setCode("500");
         return returnImage;
-
-
     }
 
-    //ufile初始化
     public static Integer Initialize(Keys k) {
         int ret = -1;
-        if(k.getAccessSecret()!=null && k.getAccessKey()!=null
-                && k.getBucketname()!=null && k.getRequestAddress()!=null ) {
-            if(!k.getAccessSecret().equals("") && !k.getAccessKey().equals("")
-                    && !k.getBucketname().equals("") && !k.getRequestAddress().equals("") ) {
-                // 创建UpYun实例。
-                UpYun uFile = new UpYun(k.getBucketname(), k.getAccessKey(), k.getAccessSecret());
+        if (k.getAccessSecret() != null
+                && k.getAccessKey() != null
+                && k.getBucketname() != null
+                && k.getRequestAddress() != null) {
+            if (!k.getAccessSecret().equals("")
+                    && !k.getAccessKey().equals("")
+                    && !k.getBucketname().equals("")
+                    && !k.getRequestAddress().equals("")) {
+                UpYun ufObj = new UpYun(k.getBucketname(), k.getAccessKey(), k.getAccessSecret());
                 List<UpYun.FolderItem> items = null;
                 try {
-                    items = uFile.readDir("/",null);
+                    items = ufObj.readDir("/", null);
                     ret = 1;
-                    uFile = uFile;
+                    uFile = ufObj;
                     key = k;
                 } catch (Exception e) {
                     System.out.println("UFile Object Is null");
@@ -69,15 +89,14 @@ public class UFileImageupload {
         return ret;
     }
 
-    public Boolean delUFile(Integer keyID, String fileName) {
+    public Boolean delUFile(Integer keyID, Images images) {
         boolean b = true;
         try {
-            boolean result = uFile.deleteFile(fileName, null);
+            boolean result = uFile.deleteFile(images.getImgname(), null);
         } catch (Exception e) {
             e.printStackTrace();
             b = false;
         }
         return b;
     }
-
 }

src/main/java/cn/hellohao/service/impl/USSImageupload.java

@@ -1,88 +1,89 @@
 package cn.hellohao.service.impl;
 
+import cn.hellohao.pojo.Images;
 import cn.hellohao.pojo.Keys;
+import cn.hellohao.pojo.Msg;
 import cn.hellohao.pojo.ReturnImage;
-import cn.hellohao.pojo.UploadConfig;
-import cn.hellohao.utils.*;
+import cn.hellohao.utils.TypeDict;
 import com.UpYun;
-import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.ObjectMetadata;
-import com.upyun.UpException;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class USSImageupload {
     static UpYun upyun;
     static Keys key;
 
-    public ReturnImage ImageuploadUSS(Map<String, File> fileMap, String username,Integer keyID) {
+    public ReturnImage ImageuploadUSS(
+            Map<Map<String, String>, File> fileMap, String username, Integer keyID) {
         ReturnImage returnImage = new ReturnImage();
         File file = null;
         ObjectMetadata meta = new ObjectMetadata();
         meta.setHeader("Content-Disposition", "inline");
         try {
-            for (Map.Entry<String, File> entry : fileMap.entrySet()) {
-                String ShortUID = SetText.getShortUuid();
+            for (Map.Entry<Map<String, String>, File> entry : fileMap.entrySet()) {
+                String prefix = entry.getKey().get("prefix");
+                String ShortUIDName = entry.getKey().get("name");
                 file = entry.getValue();
+                Msg fileMiME = TypeDict.FileMiME(file);
+                meta.setHeader("content-type", fileMiME.getData().toString());
                 upyun.setContentMD5(UpYun.md5(file));
-                boolean result = upyun.writeFile(username + "/" + ShortUID + "." + entry.getKey(), file, true);
-                if(result){
-                    returnImage.setImgname(username + "/" + ShortUID + "." + entry.getKey());
-                    returnImage.setImgurl(key.getRequestAddress() + "/" +username + "/" + ShortUID + "." + entry.getKey());
-                    returnImage.setImgSize(entry.getValue().length());
-                    returnImage.setCode("200");
-                }else{
+                boolean result =
+                        upyun.writeFile(username + "/" + ShortUIDName + "." + prefix, file, true);
+                if (result) {
+
+                } else {
                     System.err.println("上传失败");
+                    returnImage.setCode("400");
                 }
             }
-        }catch (Exception e){
+            returnImage.setCode("200");
+        } catch (Exception e) {
             e.printStackTrace();
             returnImage.setCode("500");
         }
         return returnImage;
-
     }
 
-    //初始化
+    // 初始化
     public static Integer Initialize(Keys k) {
         int ret = -1;
-        if(k.getStorageType()!=null && k.getAccessKey() != null && k.getAccessSecret() != null && k.getBucketname() != null
-                && k.getRequestAddress() !=null ) {
-            if(!k.getStorageType().equals("") && !k.getAccessKey().equals("") && !k.getAccessSecret().equals("") && !k.getBucketname().equals("")
-                    && !k.getRequestAddress().equals("") ) {
-                // 初始化
-                // 创建UpYun实例。
-                UpYun upyun = new UpYun(k.getBucketname(), k.getAccessKey(), k.getAccessSecret());
-                List<UpYun.FolderItem> items = null;
-                try {
-                    items = upyun.readDir("/",null);
-                    ret = 1;
-                    upyun = upyun;
-                    key = k;
-                } catch (Exception e) {
-                    System.out.println("USS Object Is null");
-                    ret = -1;
-                }
-            }
+        if (StringUtils.isBlank(k.getAccessKey())
+                || StringUtils.isBlank(k.getKeyname())
+                || StringUtils.isBlank(k.getAccessSecret())
+                || StringUtils.isBlank(k.getEndpoint())
+                || StringUtils.isBlank(k.getBucketname())
+                || StringUtils.isBlank(k.getRequestAddress())
+                || k.getStorageType() == null) {
+            return -1;
+        }
+        UpYun upObj = new UpYun(k.getBucketname(), k.getAccessKey(), k.getAccessSecret());
+        List<UpYun.FolderItem> items = null;
+        try {
+            items = upObj.readDir("/", null);
+            ret = 1;
+            upyun = upObj;
+            key = k;
+        } catch (Exception e) {
+            System.out.println("USS Object Is null");
+            ret = -1;
         }
         return ret;
     }
 
-    public Boolean delUSS(Integer keyID, String fileName) {
+    public Boolean delUSS(Integer keyID, Images images) {
         boolean b = true;
         try {
-            boolean result = upyun.deleteFile(fileName, null);
+            boolean result = upyun.deleteFile(images.getImgname(), null);
         } catch (Exception e) {
             e.printStackTrace();
-            b=false;
+            b = false;
         }
         return b;
     }
-
-
 }

src/main/java/cn/hellohao/service/impl/UploadServicel.java

@@ -3,12 +3,8 @@ package cn.hellohao.service.impl;
 import cn.hellohao.dao.*;
 import cn.hellohao.pojo.*;
 import cn.hellohao.service.ImgTempService;
-import cn.hellohao.service.SysConfigService;
 import cn.hellohao.utils.*;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baidu.aip.contentcensor.AipContentCensor;
 import com.baidu.aip.contentcensor.EImgType;
@@ -20,7 +16,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -29,76 +26,62 @@ import java.util.*;
  * @version 1.0
  * @date 2020/1/9 15:46
  */
-
 @Service
 public class UploadServicel {
-    @Autowired
-    ConfigMapper configMapper;
-    @Autowired
-    SysConfigService sysConfigService;
-    @Autowired
-    UploadConfigMapper uploadConfigMapper;
-    @Autowired
-    KeysMapper keysMapper;
-    @Autowired
-    ImgMapper imgMapper;
-    @Autowired
-    UserMapper userMapper;
-    @Autowired
-    ImgreviewMapper imgreviewMapper;
-    @Autowired
-    ImgTempService imgTempService;
+    @Autowired private UploadConfigMapper uploadConfigMapper;
+    @Autowired private KeysMapper keysMapper;
+    @Autowired private ImgMapper imgMapper;
+    @Autowired private UserMapper userMapper;
+    @Autowired private ImgreviewMapper imgreviewMapper;
+    @Autowired private ImgTempService imgTempService;
+    @Autowired private KeysServiceImpl keysService;
 
-
-
-    public Msg uploadForLoc(HttpServletRequest request,
-                            MultipartFile multipartFile, Integer setday, String imgUrl, JSONArray selectTreeList) {
+    public Msg uploadForLoc(
+            HttpServletRequest request,
+            MultipartFile multipartFile,
+            Integer setday,
+            String imgUrl) {
         Msg msg = new Msg();
-        try{
+        try {
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             JSONObject jsonObject = new JSONObject();
             UploadConfig uploadConfig = uploadConfigMapper.getUpdateConfig();
             String userip = GetIPS.getIpAddr(request);
             Subject subject = SecurityUtils.getSubject();
             User u = (User) subject.getPrincipal();
-            if(null!=u){
-                u =  userMapper.getUsers(u);
+            if (null != u) {
+                u = userMapper.getUsers(u);
             }
             Integer sourceKeyId = 0;
             String md5key = null;
             FileInputStream fis = null;
-            File file =null;
-            if(imgUrl==null){
+            File file = null;
+            if (imgUrl == null) {
                 file = SetFiles.changeFile_new(multipartFile);
-            }else{
-                //说明是URL上传
+            } else {
                 Msg imgData = uploadForURL(request, imgUrl);
-                if(imgData.getCode().equals("200")){
+                if (imgData.getCode().equals("200")) {
                     file = new File((String) imgData.getData());
-                }else{
+                } else {
                     return imgData;
                 }
             }
             String imguid = UUID.randomUUID().toString().replace("-", "");
-            //判断上传前的一些用户限制信息
-            Msg msg1 = updateImgCheck(u,uploadConfig);
-            if(!msg1.getCode().equals("300")){
+            Msg msg1 = updateImgCheck(u, uploadConfig);
+            if (!msg1.getCode().equals("300")) {
                 return msg1;
             }
-
-            //判断可用容量
             sourceKeyId = group.getKeyid();
             Keys key = keysMapper.selectKeys(sourceKeyId);
             Long tmp = (memory == -1 ? -2 : UsedTotleMemory);
             if (tmp >= memory) {
                 msg.setCode("4005");
-                msg.setInfo(u==null?"游客空间已用尽":"您的可用空间不足");
+                msg.setInfo(u == null ? "游客空间已用尽" : "您的可用空间不足");
                 return msg;
             }
-
-            //判断图片有没有超出设定大小
             if (file.length() > TotleMemory) {
-                System.err.println("文件大小："+file.length());
-                System.err.println("最大限制："+TotleMemory);
+                System.err.println("文件大小：" + file.length());
+                System.err.println("最大限制：" + TotleMemory);
                 msg.setCode("4006");
                 msg.setInfo("图像超出系统限制大小");
                 return msg;
@@ -110,36 +93,30 @@ public class UploadServicel {
                 e.printStackTrace();
                 System.out.println("未获取到图片的MD5,成成UUID");
             }
-            Msg fileMiME = TypeDict.FileMiME(file, uploadConfig.getSuffix());
-            if(!fileMiME.getCode().equals("200")) {
-                //非图像文本
+            Msg fileMiME = TypeDict.FileMiME(file);
+            if (!fileMiME.getCode().equals("200")) {
                 msg.setCode("4000");
                 msg.setInfo(fileMiME.getInfo());
                 return msg;
             }
-            if(md5key==null || md5key.equals("")){
+            if (md5key == null || md5key.equals("")) {
                 md5key = UUID.randomUUID().toString().replace("-", "");
             }
-
-            //判断图片是否存在
-            if(Integer.valueOf(sysConfigService.getstate().getCheckduplicate())==1){
-                Images imaOBJ = new Images();
-                imaOBJ.setMd5key(md5key);
-                imaOBJ.setUserid(u==null?0:u.getId());
-                if(imgMapper.md5Count(imaOBJ)>0){
-                    Images images = imgMapper.selectImgUrlByMD5(md5key);
-                    jsonObject.put("url", images.getImgurl());
-                    jsonObject.put("name",file.getName());
-                    jsonObject.put("imguid",images.getImguid());
-//                    jsonObject.put("shortLink",images.getShortlink());
-                    msg.setData(jsonObject);
-                    return msg;
-                }
-            }
-
-
-            String prefix = file.getName().substring(file.getName().lastIndexOf(".")+1);
-            //判断黑名单
+            //            if(Integer.valueOf(sysConfigService.getstate().getCheckduplicate())==1){
+            //                Images imaOBJ = new Images();
+            //                imaOBJ.setMd5key(md5key);
+            //                imaOBJ.setUserid(u==null?0:u.getId());
+            //                if(imgMapper.md5Count(imaOBJ)>0){
+            //                    List<Images>  images = imgMapper.selectImgUrlByMD5(md5key);
+            //                    jsonObject.put("url", images.get(0).getImgurl());
+            //                    jsonObject.put("name",file.getName());
+            //                    jsonObject.put("imguid",images.get(0).getImguid());
+            //                    msg.setData(jsonObject);
+            //                    return msg;
+            //                }
+            //            }
+            String prefix = file.getName().substring(file.getName().lastIndexOf(".") + 1);
+            // 判断黑名单
             if (uploadConfig.getBlacklist() != null) {
                 String[] iparr = uploadConfig.getBlacklist().split(";");
                 for (String s : iparr) {
@@ -151,52 +128,84 @@ public class UploadServicel {
                     }
                 }
             }
-
-            Map<String, File> map = new HashMap<>();
+            // 先存数据库
+            Images imgObj = new Images();
+            String imgnameEd = null;
+            Map<Map<String, String>, File> map = new HashMap<>();
             if (file.exists()) {
-                map.put(prefix, file);//prefix
+                Map<String, String> m1 = new HashMap<>();
+                String shortUuid_y = SetText.getShortUuid();
+                m1.put("prefix", prefix);
+                m1.put("name", shortUuid_y);
+                map.put(m1, file);
+                imgnameEd = updatePath + "/" + shortUuid_y + "." + prefix;
+                imgObj.setImgname(imgnameEd);
+                if (key.getStorageType().equals(5)) {
+                    imgObj.setImgurl(key.getRequestAddress() + "/ota/" + imgnameEd);
+                } else {
+                    imgObj.setImgurl(key.getRequestAddress() + "/" + imgnameEd);
+                }
+                imgObj.setSizes(Long.toString(file.length()));
+            }
+            imgObj.setUpdatetime(df.format(new Date()));
+            imgObj.setSource(key.getId());
+            imgObj.setUserid(u == null ? 0 : u.getId());
+            if (setday == 1 || setday == 3 || setday == 7 || setday == 30) {
+                imgObj.setImgtype(1);
+                ImgTemp imgDataExp = new ImgTemp();
+                imgDataExp.setDeltime(plusDay(setday));
+                imgDataExp.setImguid(imguid);
+                imgTempService.insertImgExp(imgDataExp);
+            } else {
+                imgObj.setImgtype(0);
+            }
+            imgObj.setAbnormal(userip);
+            imgObj.setMd5key(md5key);
+            imgObj.setImguid(imguid);
+            imgObj.setFormat(fileMiME.getData().toString());
+            Integer insertRet = imgMapper.insertImgData(imgObj);
+            if (insertRet == 0) {
+                Images imaOBJ = new Images();
+                imaOBJ.setMd5key(md5key);
+                imaOBJ.setUserid(u == null ? 0 : u.getId());
+                List<Images> images = imgMapper.selectImgUrlByMD5(md5key);
+                if (images.size() > 0) {
+                    jsonObject.put("url", images.get(0).getImgurl());
+//                    Keys imgFromKey = keysService.selectKeys(images.get(0).getSource());
+//                    if (imgFromKey.getStorageType().equals(5)) {
+//                        jsonObject.put(
+//                                "url",
+//                                imgFromKey.getRequestAddress()
+//                                        + "/ota/"
+//                                        + images.get(0).getImgname());
+//                    } else {
+//                        jsonObject.put("url", images.get(0).getImgurl());
+//                    }
+                    jsonObject.put("name", file.getName());
+                    jsonObject.put("imguid", images.get(0).getImguid());
+                    msg.setData(jsonObject);
+                    return msg;
+                } else {
+                    msg.setInfo("未获取到指定图像");
+                    msg.setCode("110501");
+                    return msg;
+                }
             }
             long stime = System.currentTimeMillis();
-            Map<ReturnImage, Integer> m = null;
-            ReturnImage returnImage = GetSource.storageSource(key.getStorageType(), map, updatePath, key.getId());
-            Images img = new Images();
-            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            if(returnImage.getCode().equals("200")){
-                String imgurl = returnImage.getImgurl();
-                Long imgsize = returnImage.getImgSize();
-                String imgname = returnImage.getImgname();
-                img.setImgurl(imgurl);
-                img.setUpdatetime(df.format(new Date()));
-                img.setSource(key.getId());
-                img.setUserid(u == null ? 0 : u.getId());
-                img.setSizes(imgsize.toString());
-                if(uploadConfig.getUrltype()==2){
-                    img.setImgname(imgname);
-                }else{
-                    img.setImgname(SetText.getSubString(imgname, key.getRequestAddress() + "/", ""));
-                }
-                if(setday == 1 || setday == 3 || setday == 7 || setday == 30){
-                    img.setImgtype(1);
-                    ImgTemp imgDataExp = new ImgTemp();
-                    imgDataExp.setDeltime(plusDay(setday));
-                    imgDataExp.setImguid(imguid);
-                    imgTempService.insertImgExp(imgDataExp);
-                }else{
-                    img.setImgtype(0);
-                }
-                img.setAbnormal(userip);
-                img.setMd5key(md5key);
-                img.setImguid(imguid);
-                img.setFormat(fileMiME.getData().toString());
-                userMapper.insertimg(img);
+            ReturnImage returnImage =
+                    GetSource.storageSource(key.getStorageType(), map, updatePath, key.getId());
+            if (returnImage.getCode().equals("200")) {
                 long etime = System.currentTimeMillis();
                 Print.Normal("上传图片所用总时长：" + String.valueOf(etime - stime) + "ms");
-                jsonObject.put("url", img.getImgurl());
-                jsonObject.put("name", imgname);
-                jsonObject.put("imguid",img.getImguid());
-//                jsonObject.put("shortLink", img.getShortlink());
-                new Thread(()->{LegalImageCheck(img);}).start();
-            }else{
+                jsonObject.put("url", imgObj.getImgurl());
+                jsonObject.put("name", imgObj.getImgname());
+                jsonObject.put("imguid", imgObj.getImguid());
+                new Thread(
+                                () -> {
+                                    LegalImageCheck(imgObj);
+                                })
+                        .start();
+            } else {
                 msg.setCode("5001");
                 msg.setInfo("上传服务内部错误");
                 return msg;
@@ -204,94 +213,95 @@ public class UploadServicel {
             file.delete();
             msg.setData(jsonObject);
             return msg;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg.setInfo("上传时发生了一些错误");
             msg.setCode("110500");
             return msg;
         }
-
     }
 
-
-    //通过图片Url上传图片
-    public static Msg uploadForURL(HttpServletRequest request, String imgurl){
-        final Msg msg = new Msg();
-        //先判断是不是有效链接
-//        final boolean valid = ImgUrlUtil.isValid(imgurl);
-        if(true){
-            Long imgsize = null;
+    public static Msg uploadForURL(HttpServletRequest request, String imgurl) {
+        Msg msg = new Msg();
+        if (true) {
+            Long imgsize = 0L;
             try {
-                imgsize = ImgUrlUtil.getFileLength(imgurl);
-                if(imgsize>0){
-//                    String uuid= UUID.randomUUID().toString().replace("-", "");
+                if (imgsize == 0) {
                     String ShortUID = SetText.getShortUuid();
-                    String savePath = request.getSession().getServletContext().getRealPath("/")+File.separator+"hellohaotmp"+File.separator;
-                    Map<String ,Object> bl =ImgUrlUtil.downLoadFromUrl (imgurl, ShortUID, savePath);
-                    if((Boolean) bl.get("res")==true){
-//                        File file = new File();
+                    String savePath =
+                            request.getSession().getServletContext().getRealPath("/")
+                                    + File.separator
+                                    + "hellohaotmp"
+                                    + File.separator;
+                    Map<String, Object> bl = ImgUrlUtil.downLoadFromUrl(imgurl, ShortUID, savePath);
+                    if ((Boolean) bl.get("res") == true) {
                         msg.setCode("200");
-                        msg.setData(bl.get("imgPath"));//savePath + File.separator + ShortUID
+                        msg.setData(bl.get("imgPath"));
                         return msg;
-                    }else{
-                        if(bl.get("StatusCode").equals("110403")){
+                    } else {
+                        if (bl.get("StatusCode").equals("110403")) {
                             msg.setInfo("该链接非图像文件，无法上传");
-                        }else{
+                        } else {
                             msg.setInfo("该链接暂时无法上传");
                         }
                         msg.setCode("500");
                     }
-                }else{
+                } else {
                     msg.setCode("500");
                     msg.setInfo("获取资源失败");
                 }
-            } catch (IOException e) {
+            } catch (Exception e) {
                 msg.setCode("500");
                 msg.setInfo("获取资源失败");
             }
-        }else{
+        } else {
             msg.setCode("500");
             msg.setInfo("该链接无效");
         }
+
         return msg;
     }
 
+    private static Group group; // 上传用户或游客的所属分组
+    private static Long memory; // 上传用户或者游客的分配容量 memory
+    private static Long TotleMemory; // 用户或者游客下可使用的总容量 //maxsize
+    private static Long UsedTotleMemory; // 用户或者游客已经用掉的总容量 //usermemory
+    private static String updatePath = "tourist";
 
-    public static Group group; //上传用户或游客的所属分组
-    public static Long memory;//上传用户或者游客的分配容量 memory
-    public static Long TotleMemory;//用户或者游客下可使用的总容量 //maxsize
-    public static Long UsedTotleMemory;//用户或者游客已经用掉的总容量 //usermemory
-    public static String updatePath="tourist";
-
-    //判断用户 或 游客 当前上传图片的一系列校验
-    private Msg updateImgCheck(User user, UploadConfig uploadConfig){
-        final Msg msg = new Msg();
+    // 判断用户 或 游客 当前上传图片的一系列校验
+    private Msg updateImgCheck(User user, UploadConfig uploadConfig) {
+        Msg msg = new Msg();
         java.text.DateFormat dateFormat = null;
         try {
             dateFormat = new SimpleDateFormat("yyyy/MM/dd");
             if (user == null) {
-                //用户没有登陆，值判断游客能不能上传即可
-                if(uploadConfig.getIsupdate()!=1){
+                if (uploadConfig.getIsupdate() != 1) {
                     msg.setCode("1000");
                     msg.setInfo("系统已禁用游客上传");
                     return msg;
                 }
+                updatePath = "tourist";
                 group = GetCurrentSource.GetSource(null);
-                memory = Long.valueOf(uploadConfig.getVisitormemory());//单位 B 游客设置总量
-                TotleMemory = Long.valueOf(uploadConfig.getFilesizetourists());//单位 B  游客单文件大小
-                UsedTotleMemory = imgMapper.getusermemory(0)==null?0L : imgMapper.getusermemory(0);//单位 B
+                memory = Long.valueOf(uploadConfig.getVisitormemory()); // 单位 B 游客设置总量
+                TotleMemory = Long.valueOf(uploadConfig.getFilesizetourists()); // 单位 B  游客单文件大小
+                UsedTotleMemory =
+                        imgMapper.getusermemory(0) == null
+                                ? 0L
+                                : imgMapper.getusermemory(0); // 单位 B
             } else {
-                //判断用户能不能上传
-                if(uploadConfig.getUserclose()!=1){
+                if (uploadConfig.getUserclose() != 1) {
                     msg.setCode("1001");
                     msg.setInfo("系统已禁用上传功能");
                     return msg;
                 }
                 updatePath = user.getUsername();
-                group= GetCurrentSource.GetSource(user.getId());
-                memory = Long.valueOf(user.getMemory())*1024*1024;//单位 B
-                TotleMemory = Long.valueOf(uploadConfig.getFilesizeuser());//单位 B
-                UsedTotleMemory = imgMapper.getusermemory(user.getId())==null?0L:imgMapper.getusermemory(user.getId());//单位 B
+                group = GetCurrentSource.GetSource(user.getId());
+                memory = Long.valueOf(user.getMemory()); // 单位 B  *1024*1024
+                TotleMemory = Long.valueOf(uploadConfig.getFilesizeuser()); // 单位 B
+                UsedTotleMemory =
+                        imgMapper.getusermemory(user.getId()) == null
+                                ? 0L
+                                : imgMapper.getusermemory(user.getId()); // 单位 B
             }
             if (uploadConfig.getUrltype() == 2) {
                 updatePath = dateFormat.format(new Date());
@@ -304,7 +314,7 @@ public class UploadServicel {
         return msg;
     }
 
-    private synchronized void LegalImageCheck(Images images){
+    private synchronized void LegalImageCheck(Images images) {
         System.out.println("非法图像鉴别进程启动");
         Imgreview imgreview = null;
         try {
@@ -313,31 +323,37 @@ public class UploadServicel {
             Print.warning("获取鉴别程序的时候发生错误");
             e.printStackTrace();
         }
-        if(null != imgreview){
-            LegalImageCheckForBaiDu(imgreview,images);
+        if (null != imgreview) {
+            LegalImageCheckForBaiDu(imgreview, images);
         }
-
     }
 
-    private void LegalImageCheckForBaiDu(Imgreview imgreview,Images images){
+    private void LegalImageCheckForBaiDu(Imgreview imgreview, Images images) {
         System.out.println("非法图像鉴别进程启动-BaiDu");
-        if(imgreview.getUsing()==1){
+        if (imgreview.getUsing() == 1) {
             try {
-                AipContentCensor client = new AipContentCensor(imgreview.getAppId(), imgreview.getApiKey(), imgreview.getSecretKey());
+                AipContentCensor client =
+                        new AipContentCensor(
+                                imgreview.getAppId(),
+                                imgreview.getApiKey(),
+                                imgreview.getSecretKey());
                 client.setConnectionTimeoutInMillis(5000);
                 client.setSocketTimeoutInMillis(30000);
                 org.json.JSONObject res = client.antiPorn(images.getImgurl());
                 res = client.imageCensorUserDefined(images.getImgurl(), EImgType.URL, null);
-                System.err.println("返回的鉴黄json:"+res.toString());
-                com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray("[" + res.toString() + "]");
+                System.err.println("返回的鉴黄json:" + res.toString());
+                com.alibaba.fastjson.JSONArray jsonArray =
+                        JSON.parseArray("[" + res.toString() + "]");
                 for (Object o : jsonArray) {
-                    com.alibaba.fastjson.JSONObject jsonObject = (com.alibaba.fastjson.JSONObject) o;
+                    com.alibaba.fastjson.JSONObject jsonObject =
+                            (com.alibaba.fastjson.JSONObject) o;
                     com.alibaba.fastjson.JSONArray data = jsonObject.getJSONArray("data");
                     Integer conclusionType = jsonObject.getInteger("conclusionType");
-                    if(conclusionType!=null){
+                    if (conclusionType != null) {
                         if (conclusionType == 2) {
                             for (Object datum : data) {
-                                com.alibaba.fastjson.JSONObject imgdata = (com.alibaba.fastjson.JSONObject) datum;
+                                com.alibaba.fastjson.JSONObject imgdata =
+                                        (com.alibaba.fastjson.JSONObject) datum;
                                 if (imgdata.getInteger("type") == 1) {
                                     Images img = new Images();
                                     img.setImgname(images.getImgname());
@@ -356,30 +372,25 @@ public class UploadServicel {
                     }
                 }
 
-            }catch (Exception e){
+            } catch (Exception e) {
                 System.out.println("图像鉴黄线程执行过程中出现异常");
                 e.printStackTrace();
-
             }
-
         }
     }
 
-
-    //计算时间
-    public static String plusDay(int setday){
+    // 计算时间
+    public static String plusDay(int setday) {
         Date d = new Date();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String currdate = format.format(d);
         System.out.println("现在的日期是：" + currdate);
         Calendar ca = Calendar.getInstance();
         ca.setTime(d);
-        ca.add(Calendar.DATE, setday);// num为增加的天数，可以改变的
+        ca.add(Calendar.DATE, setday); // num为增加的天数，可以改变的
         d = ca.getTime();
         String enddate = format.format(d);
         System.out.println("到期的日期：" + enddate);
         return enddate;
     }
-
-
 }

src/main/java/cn/hellohao/service/impl/UserServiceImpl.java

@@ -3,7 +3,6 @@ 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;
@@ -31,17 +30,17 @@ public class UserServiceImpl implements UserService {
         return userMapper.login(email, password,uid);
     }
 
+    @Override
+    public User loginByToken(String token) {
+        return userMapper.loginByToken(token);
+    }
+
     @Override
     public User getUsers(User user) {
         // TODO Auto-generated method stub
         return userMapper.getUsers(user);
     }
 
-    @Override
-    public Integer insertimg(Images img) {
-        // TODO Auto-generated method stub
-        return userMapper.insertimg(img);
-    }
 
     @Override
     public Integer change(User user) {

src/main/java/cn/hellohao/service/impl/deleImages.java

@@ -0,0 +1,109 @@
+package cn.hellohao.service.impl;
+
+import cn.hellohao.pojo.Images;
+import cn.hellohao.pojo.Keys;
+import cn.hellohao.pojo.Msg;
+import cn.hellohao.service.IRedisService;
+import cn.hellohao.service.ImgAndAlbumService;
+import cn.hellohao.service.ImgService;
+import cn.hellohao.service.ImgTempService;
+import cn.hellohao.utils.LocUpdateImg;
+import cn.hellohao.utils.progress.MyProgress;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class deleImages {
+
+  @Autowired private NOSImageupload nosImageupload;
+  @Autowired private OSSImageupload ossImageupload;
+  @Autowired private COSImageupload cosImageupload;
+  @Autowired private KODOImageupload kodoImageupload;
+  @Autowired private USSImageupload ussImageupload;
+  @Autowired private UFileImageupload uFileImageupload;
+  @Autowired private FTPImageupload ftpImageupload;
+  @Autowired private ImgAndAlbumService imgAndAlbumService;
+  @Autowired private ImgTempService imgTempService;
+  @Autowired private ImgService imgService;
+  @Autowired private KeysServiceImpl keysService;
+  @Autowired private IRedisService iRedisService;
+
+  public Msg dele(String uuid, Integer... imgIds) {
+    Msg msg = new Msg();
+    MyProgress myProgress = new MyProgress();
+    myProgress.InitializeDelImg();
+    List<Integer> ids = new ArrayList<>();
+    int successCount = 0;
+    List<String> errorIds = new ArrayList<>();
+    for (int i = 0; i < imgIds.length; i++) {
+      // 删除图片
+      boolean isDele = false;
+      try {
+        Images image = imgService.selectByPrimaryKey(imgIds[i]);
+        Keys key = keysService.selectKeys(image.getSource());
+        if (key.getStorageType() == 1) {
+          isDele = nosImageupload.delNOS(key.getId(), image);
+        } else if (key.getStorageType() == 2) {
+          isDele = ossImageupload.delOSS(key.getId(), image);
+        } else if (key.getStorageType() == 3) {
+          isDele = ussImageupload.delUSS(key.getId(), image);
+        } else if (key.getStorageType() == 4) {
+          isDele = kodoImageupload.delKODO(key.getId(), image);
+        } else if (key.getStorageType() == 5) {
+          isDele = LocUpdateImg.deleteLOCImg(image);
+        } else if (key.getStorageType() == 6) {
+          isDele = cosImageupload.delCOS(key.getId(), image);
+        } else if (key.getStorageType() == 7) {
+          isDele = ftpImageupload.delFTP(key.getId(), image);
+        } else if (key.getStorageType() == 8) {
+          isDele = uFileImageupload.delUFile(key.getId(), image);
+        } else {
+          System.err.println("未获取到对象存储参数，删除失败。");
+        }
+        if (isDele) {
+          try {
+            imgAndAlbumService.deleteImgAndAlbum(image.getImgurl());
+            imgTempService.delImgAndExp(image.getImguid());
+            imgService.deleimg(image.getId());
+            ids.add(image.getId());
+            successCount++;
+            System.out.println("删除成功加一个" + image.getId());
+          } catch (Exception e) {
+            e.printStackTrace();
+            System.err.println(image.getImgname() + ":图片数据库记录时发生错误");
+            errorIds.add(image.getImgurl());
+          }
+        }
+        if(uuid!=null){
+          myProgress.setDelSuccessCount(successCount);
+          myProgress.setDelSuccessImgList(ids);
+          myProgress.setDelErrorImgListt(errorIds);
+          if (imgIds.length == (i + 1)) {
+            myProgress.setDelOCT(1);
+          } else {
+            myProgress.setDelOCT(0);
+          }
+          iRedisService.setTimeValue(uuid, JSONObject.toJSONString(myProgress), 24L);
+        }
+        //        if (null != httpSession) {
+        //          httpSession.setAttribute("myProgressForDel", myProgress);
+        //        }
+      } catch (Exception e) {
+        System.err.println("删除的时候发生了一些异常");
+        e.printStackTrace();
+      }
+    }
+    msg.setData(ids);
+    return msg;
+  }
+
+  public static void main(String[] args) {
+    MyProgress myProgress = new MyProgress();
+    myProgress.InitializeDelImg();
+    System.out.println(JSONObject.toJSONString(myProgress));
+  }
+}

src/main/java/cn/hellohao/utils/Base64ToMultipartFile.java

@@ -0,0 +1,98 @@
+package cn.hellohao.utils;
+
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Decoder;
+
+import java.io.*;
+
+/**
+ * base64转为multipartFile工具类
+ * base64Convert
+ */
+
+public class Base64ToMultipartFile implements MultipartFile {
+    private final byte[] imgContent;
+    private final String header;
+
+
+
+    public Base64ToMultipartFile (byte[] imgContent, String header) {
+        this.imgContent = imgContent;
+        this.header = header.split(";")[0];
+    }
+
+    @Override
+    public String getName() {
+        return System.currentTimeMillis() + Math.random() + "." + header.split("/")[1];
+    }
+
+    @Override
+    public String getOriginalFilename() {
+        return System.currentTimeMillis() + (int) Math.random() * 10000 + "." + header.split("/")[1];
+    }
+
+    @Override
+    public String getContentType() {
+        return header.split(":")[1];
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return imgContent == null || imgContent.length == 0;
+    }
+
+    @Override
+    public long getSize() {
+        return imgContent.length;
+    }
+
+    @Override
+    public byte[] getBytes() throws IOException {
+        return imgContent;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+       ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(imgContent);
+		// 关闭流，不然文件会一直占用资源，无法对其操作
+		byteArrayInputStream.close();
+		return byteArrayInputStream;
+    }
+
+    @Override
+    public void transferTo(File dest) throws IOException, IllegalStateException {
+      	FileOutputStream fileOutputStream = new FileOutputStream(dest);
+		fileOutputStream.write(imgContent);
+		// 关闭流，不然文件会一直占用资源，无法对其操作
+		fileOutputStream.close();
+    }
+
+    /**
+     * base64转multipartFile
+     *
+     * @param base64
+     * @return
+     */
+    public static MultipartFile base64Convert(String base64) {
+        String[] baseStrs = base64.split(",");
+
+        BASE64Decoder decoder = new BASE64Decoder();
+        byte[] b = new byte[0];
+        try {
+            b = decoder.decodeBuffer(baseStrs[1]);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        for (int i = 0; i < b.length; ++i) {
+            if (b[i] < 0) {
+                b[i] += 256;
+            }
+        }
+        return new Base64ToMultipartFile (b, baseStrs[0]);
+    }
+
+
+
+
+}
+

src/main/java/cn/hellohao/utils/DeleImg.java

@@ -1,59 +0,0 @@
-package cn.hellohao.utils;
-
-
-import java.io.*;
-
-public class DeleImg {
-    public static void charu(String imgUrlText) {
-        String filePath =File.separator + "HellohaoData" ;
-        File file = new File(filePath);
-        File file1 = new File(filePath+File.separator+"img.ini");
-        if(!file.exists()){
-            file.mkdirs();
-        }
-        if(!file1.exists()){
-            try {
-                file1.createNewFile();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        FileWriter fw = null;
-        try {
-            //如果文件存在，则追加内容；如果文件不存在，则创建文件
-            fw = new FileWriter(file1, true);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        PrintWriter pw = new PrintWriter(fw);
-        pw.println(imgUrlText);
-        pw.flush();
-        try {
-            fw.flush();
-            pw.close();
-            fw.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    // 读取文件内容
-    public static String readFile(String path) {//路径
-        File file = new File(path);
-        StringBuilder result = new StringBuilder();
-        try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "GBK"));//构造一个BufferedReader类来读取文件
-            String s = null;
-            while ((s = br.readLine()) != null) {//使用readLine方法，一次读一行
-                result.append(System.lineSeparator() + s);
-                Print.Normal( s);
-            }
-            br.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return result.toString();
-    }
-
-}

src/main/java/cn/hellohao/utils/FirstRun.java

@@ -1,13 +1,12 @@
 package cn.hellohao.utils;
 
-import org.omg.CORBA.Environment;
+import cn.hellohao.config.GlobalConstant;
 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;
 
 import java.io.File;
-import java.sql.SQLException;
+import java.util.Properties;
 import java.util.UUID;
 
 /**
@@ -28,7 +27,8 @@ public class FirstRun implements InitializingBean {
     private String jdbcurl;
 
     @Override
-    public void afterPropertiesSet() throws Exception {
+    public void afterPropertiesSet() {
+        isWindows();
         RunSqlScript.USERNAME = jdbcusername;
         RunSqlScript.PASSWORD = jdbcpass;
         RunSqlScript.DBURL = jdbcurl;
@@ -43,8 +43,6 @@ public class FirstRun implements InitializingBean {
         if(ret1==0){
             Print.Normal("In execution...");
             RunSqlScript.RunInsert(sql2);
-            ;
-
         }else{
             if(ret1>0){
                 Print.Normal("Stage 1");
@@ -82,27 +80,40 @@ public class FirstRun implements InitializingBean {
             RunSqlScript.RunInsert(sql9);
             Print.Normal("Stage 7");
         }
-
-        Integer ret6 = RunSqlScript.RunSelectCount(judgeTable+"'imgandalbum' and column_name = 'notes' and TABLE_SCHEMA='picturebed'");
+        Integer ret6 = RunSqlScript.RunSelectCount(judgeTable+" 'user' and column_name = 'token'");
         if(ret6==0){
-            RunSqlScript.RunInsert(sql11);
-            Print.Normal("Stage 8");
+            RunSqlScript.RunInsert(sql12);
+            Print.Normal("Add user.token");
         }
+        Integer isappclient = RunSqlScript.RunSelectCount(isTableName+"'appclient'");
+        if(isappclient==0){
+            Integer integer = RunSqlScript.RunInsert(createAppclient);
+            RunSqlScript.RunInsert(instartAppclient);
+            Print.Normal("Add table.appclient");
+        }
+//        Integer ret6 = RunSqlScript.RunSelectCount(judgeTable+" 'imgdata' and column_name = 'idname'");
+//        if(ret6==0){
+//            RunSqlScript.RunInsert(sql11);
+//            Print.Normal("Add imgdata.idname");
+//        }
 
-        RunSqlScript.RunInsert(sql10);
+        RunSqlScript.RunInsert("alter table `config` modify column `explain` text,modify column `links` text,modify column `notice` text,modify column `baidu` text");
 
         //RunSqlScript.RunInsert("alter table imgdata drop index index_md5key_url");
         RunSqlScript.RunInsert(inddx_md5key);
         RunSqlScript.RunInsert("UPDATE `keys` SET `Endpoint` = '0' WHERE `id` = 8");
         Print.Normal("Stage success");
+
+        clears();
     }
 
     //检查表是否存在，后边加'imgdata' and column_name = 'explains'  检查字段是否存在
-    private String judgeTable = "select count(*) from information_schema.columns where table_name = ";
+    private String isTableName = "SELECT count(table_name) FROM information_schema.TABLES WHERE TABLE_SCHEMA='tbed' and table_name =";
+    private String judgeTable = "select count(*) from information_schema.columns where TABLE_SCHEMA='tbed' and table_name = ";
     //创建blacklist  2019-11-29
     private String sql1 = "select count(*) from information_schema.columns where table_name = 'uploadconfig' and column_name = 'blacklist'";
     private String sql2 = "alter table uploadconfig add blacklist varchar(500);";
-    //创建imgandalbum和album  添加imgdata表字段explain 2019-12-20
+    //创建imgandalbum和album 添加imgdata表字段explain 2019-12-20
     private String sql3 ="CREATE TABLE `imgandalbum`  (`imgname` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,`albumkey` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic";
     private String sql4 ="CREATE TABLE `album`  (`albumkey` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,`albumtitle` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,`createdate` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `password` varchar(5000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic";
     private String sql6 = "alter table imgdata add explains varchar(5000)";
@@ -111,11 +122,14 @@ public class FirstRun implements InitializingBean {
     //添加imgdata表字段md5key
     private String sql8 = "alter table imgdata add md5key varchar(5000)";
     private String sql9 = "ALTER TABLE config ADD theme int(4) DEFAULT '1' COMMENT '主题'  ";
-//修改字段长度
-    private String sql10 = "alter table config modify column `explain` varchar(1000),modify column links varchar(1000),modify column notice varchar(1000),modify column baidu varchar(1000)";
+    //  图片标识名字段
+    private String sql11 = "alter table `imgdata` add idname varchar(255) DEFAULT '未命名' ;";
+
+    private String sql12 = "alter table tbed.user add `token` varchar(255)";
+    //创建客户端程序相关表
+    private String createAppclient = "CREATE TABLE `appclient`  (`id` varchar(10) NOT NULL,`isuse` varchar(10) NOT NULL,`winpackurl` varchar(255) NULL DEFAULT NULL,`macpackurl` varchar(255) NULL DEFAULT NULL,`appname` varchar(20) NULL,`applogo` varchar(255) NULL,`appupdate` varchar(10) NOT NULL) ";
+    private String instartAppclient = "INSERT INTO `appclient` VALUES ('app', 'on', NULL, NULL, 'Hellohao图像托管', 'https://hellohao.nos-eastchina1.126.net/TbedClient/app.png', '1.0.1');";
 
-    //添加imgandalbum字段notes(添加画廊图片说明)
-    private String sql11 = "alter table imgandalbum add notes varchar(1000) DEFAULT ' '";
 
     private String inddx_md5key = "ALTER TABLE imgdata ADD INDEX index_md5key_url ( md5key,imgurl)";
     //                             create index yarn_app_result_i4 on yarn_app_result (flow_exec_id(100), another_column(50));
@@ -124,11 +138,11 @@ public class FirstRun implements InitializingBean {
     private String compressed = "alter table imgdata row_format=compressed";
 
     private void clears(){
-        File file1 = new File(File.separator+"HellohaoData"+File.separator+"hellohaotempimg");
-        File file2 = new File(File.separator+"HellohaoData"+File.separator+"hellohaotempwatermarimg");
+        File file1 = new File(GlobalConstant.LOCPATH+File.separator+"hellohaotempimg");
+        File file2 = new File(GlobalConstant.LOCPATH+File.separator+"hellohaotempwatermarimg");
 
         //判断目录有没有创建
-        File file = new File(File.separator+"HellohaoData");
+        File file = new File(GlobalConstant.LOCPATH);
         if(!file.exists()){
             file.mkdirs();
             file1.mkdirs();
@@ -143,4 +157,14 @@ public class FirstRun implements InitializingBean {
     }
 
 
+    public boolean isWindows() {
+        System.out.println("当前系统类型:"+System.getProperties().getProperty("os.name").toUpperCase());
+        if(System.getProperties().getProperty("os.name").toUpperCase().contains("MAC")){
+            GlobalConstant.SYSTYPE = "MAC";
+            Properties props=System.getProperties();
+            GlobalConstant.LOCPATH = props.getProperty("user.home")+File.separator+".HellohaoData";
+        }
+        return System.getProperties().getProperty("os.name").toUpperCase().indexOf("WINDOWS") != -1;
+    }
+
 }

src/main/java/cn/hellohao/utils/GetIPS.java

@@ -1,8 +1,6 @@
 package cn.hellohao.utils;
 
 import cn.hellohao.service.impl.ImgServiceImpl;
-import cn.hellohao.service.impl.ImgreviewServiceImpl;
-
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -27,9 +25,6 @@ public class GetIPS implements Runnable {
         thread.start();
     }
 
-
-    /*** * 用于测试跨域 * @author huangweii * 2015年5月29日 */
-
     public static String getIpAddr(HttpServletRequest request){
         String ip = request.getHeader("X-Forwarded-For");
         if(org.apache.commons.lang3.StringUtils.isNotEmpty(ip) && !"unKnown".equalsIgnoreCase(ip)){

src/main/java/cn/hellohao/utils/GetSource.java

@@ -14,7 +14,7 @@ import java.util.Map;
  * @date 2019/11/7 17:12
  */
 public class GetSource {
-    public static ReturnImage  storageSource(Integer type, Map<String, File> fileMap, String userpath,Integer keyID){
+    public static ReturnImage  storageSource(Integer type, Map<Map<String, String>, File> fileMap, String userpath,Integer keyID){
         NOSImageupload nosImageupload = SpringContextHolder.getBean(NOSImageupload.class);
         OSSImageupload ossImageupload = SpringContextHolder.getBean(OSSImageupload.class);
         USSImageupload ussImageupload = SpringContextHolder.getBean(USSImageupload.class);

src/main/java/cn/hellohao/utils/ImgUrlUtil.java

@@ -90,12 +90,11 @@ public class ImgUrlUtil {
      * @param savePath
      * @throws IOException
      */
-    public static Map<String ,Object> downLoadFromUrl(String urlStr, String fileName, String savePath){
+    public static Map<String ,Object>  downLoadFromUrl(String urlStr,String fileName,String savePath){
 
         Map<String ,Object> resmap = new HashMap<>();
         Map<String ,String> map = checkURLStatusCode(urlStr);
-        if(map.get("Check").equals("false")){
-//            StatusCode
+        if(map.size()==0 || map.get("Check").equals("false")){
             resmap.put("res",false);
             resmap.put("StatusCode",map.get("StatusCode"));
             return resmap;
@@ -128,13 +127,14 @@ public class ImgUrlUtil {
             //下载并且保存成功后 判断格式 如果不是图像格式 就删除
 //
             if(new File(saveDir+File.separator+fileName).exists()){
-                Msg msg = TypeDict.FileMiME(file,null);
+                Msg msg = TypeDict.FileMiME(file);
                 if(msg.getCode().equals("200")){
                     File f = new File(saveDir+File.separator+fileName);
                     String imgPath = saveDir+File.separator+fileName+"."+(msg.getData().toString().replace("image/",""));
                     f.renameTo(new File(imgPath));
                     resmap.put("res",true);
                     resmap.put("imgPath",imgPath);
+                    resmap.put("imgsize",new File(imgPath).length());
                 }else{
                     new File(saveDir+File.separator+fileName).delete();
                     resmap.put("res",false);

src/main/java/cn/hellohao/utils/LocUpdateImg.java

@@ -1,24 +1,25 @@
 package cn.hellohao.utils;
 
+import cn.hellohao.config.GlobalConstant;
+import cn.hellohao.pojo.Images;
 import cn.hellohao.pojo.Keys;
 import cn.hellohao.pojo.ReturnImage;
-import cn.hellohao.pojo.UploadConfig;
 import cn.hellohao.service.impl.KeysServiceImpl;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 public class LocUpdateImg {
-    public static boolean deleteLOCImg(String imagename){
+    public static boolean deleteLOCImg(Images images){
         boolean isDele = false;
         try {
-            String filePath =File.separator + "HellohaoData" + File.separator+imagename;
+            String filePath = GlobalConstant.LOCPATH + File.separator+images.getImgname();
             File file = new File(filePath);
-            isDele = file.delete();
+            if(file.exists()){
+                isDele = file.delete();
+            }else{
+                isDele = true;
+            }
         }catch (Exception e){
             e.printStackTrace();
             isDele = false;
@@ -26,43 +27,35 @@ public class LocUpdateImg {
         return isDele;
     }
 
-    public static ReturnImage ImageuploadLOC(Map<String, File> fileMap, String username,Integer keyID) throws Exception {
-        KeysServiceImpl keysService = SpringContextHolder.getBean(KeysServiceImpl.class);
-        final Keys key = keysService.selectKeys(keyID);
+  public static ReturnImage ImageuploadLOC(
+      Map<Map<String, String>, File> fileMap, String username, Integer keyID) {
         ReturnImage returnImage = new ReturnImage();
-        String filePath =File.separator + "HellohaoData" + File.separator;
-        File file = null;
-        for (Map.Entry<String, File> entry : fileMap.entrySet()) {
-            String ShortUID = SetText.getShortUuid();
-            System.out.println("待上传的图片："+username + File.separator + ShortUID + "." + entry.getKey());
-            File dest = new File(filePath + username + File.separator+ ShortUID + "." + entry.getKey());
-            File temppath = new File(filePath + username+ File.separator );
+        String filePath = GlobalConstant.LOCPATH + File.separator;
+        try {
+          for (Map.Entry<Map<String, String>, File> entry : fileMap.entrySet()) {
+            String prefix = entry.getKey().get("prefix");
+            String ShortUIDName = entry.getKey().get("name");
+            File dest = new File(filePath + username + File.separator + ShortUIDName + "." + prefix);
             if (!dest.getParentFile().exists()) {
-                dest.getParentFile().mkdirs();
+              dest.getParentFile().mkdirs();
             }
-            try {
-                InputStream fileInputStream = new FileInputStream(entry.getValue());
-                BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(dest));
-                byte[] bs = new byte[1024];
-                int len;
-                while ((len = fileInputStream.read(bs)) != -1) {
-                    bos.write(bs, 0, len);
-                }
-                bos.flush();
-                bos.close();
-                returnImage.setImgname(username + "/" +ShortUID + "." + entry.getKey());//entry.getValue().getOriginalFilename()
-                returnImage.setImgurl(key.getRequestAddress() +"/ota/"+username + "/" + ShortUID + "." + entry.getKey());
-                returnImage.setImgSize(entry.getValue().length());
-                returnImage.setCode("200");
-
-            } catch (IOException e) {
-                e.printStackTrace();
-                returnImage.setCode("500");
-                System.err.println("上传失败");
+            InputStream fileInputStream = new FileInputStream(entry.getValue());
+            BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(dest));
+            byte[] bs = new byte[1024];
+            int len;
+            while ((len = fileInputStream.read(bs)) != -1) {
+              bos.write(bs, 0, len);
             }
+            bos.flush();
+            bos.close();
+          }
+          returnImage.setCode("200");
+        } catch (Exception e) {
+          e.printStackTrace();
+          returnImage.setCode("500");
+          System.err.println("上传失败");
         }
         return returnImage;
     }
 
-
 }

src/main/java/cn/hellohao/utils/MyVersion.java

@@ -0,0 +1,50 @@
+package cn.hellohao.utils;
+
+/**
+ * @author Hellohao
+ * @version 1.0
+ * @date 2022/7/18 9:49
+ */
+public class MyVersion {
+    /**
+     * 版本号比较
+     *
+     * @param v1
+     * @param v2
+     * @return 0代表相等，1代表左边大，-1代表右边大
+     * Utils.compareVersion("1.0.358_20180820090554","1.0.358_20180820090553")=1
+     */
+    public static int compareVersion(String v1, String v2) {
+        if (v1.equals(v2)) {
+            return 0;
+        }
+        String[] version1Array = v1.split("[._]");
+        String[] version2Array = v2.split("[._]");
+        int index = 0;
+        int minLen = Math.min(version1Array.length, version2Array.length);
+        long diff = 0;
+
+        while (index < minLen
+                && (diff = Long.parseLong(version1Array[index])
+                - Long.parseLong(version2Array[index])) == 0) {
+            index++;
+        }
+        if (diff == 0) {
+            for (int i = index; i < version1Array.length; i++) {
+                if (Long.parseLong(version1Array[i]) > 0) {
+                    return 1;
+                }
+            }
+
+            for (int i = index; i < version2Array.length; i++) {
+                if (Long.parseLong(version2Array[i]) > 0) {
+                    return -1;
+                }
+            }
+            return 0;
+        } else {
+            return diff > 0 ? 1 : -1;
+        }
+    }
+
+}

src/main/java/cn/hellohao/utils/TypeDict.java

@@ -9,67 +9,9 @@ import java.io.File;
 import java.io.IOException;
 
 public class TypeDict {
-/**
- 常用文件的文件头如下：(以前六位为准)
-JPEG (jpg)，文件头：FFD8FF 
-PNG (png)，文件头：89504E47 
-GIF (gif)，文件头：47494638 
-TIFF (tif)，文件头：49492A00 
-Windows Bitmap (bmp)，文件头：424D 
-CAD (dwg)，文件头：41433130 
-Adobe Photoshop (psd)，文件头：38425053 
-Rich Text Format (rtf)，文件头：7B5C727466 
-XML (xml)，文件头：3C3F786D6C 
-HTML (html)，文件头：68746D6C3E 
-Email [thorough only] (eml)，文件头：44656C69766572792D646174653A 
-Outlook Express (dbx)，文件头：CFAD12FEC5FD746F 
-Outlook (pst)，文件头：2142444E 
-MS Word/Excel (xls.or.doc)，文件头：D0CF11E0 
-MS Access (mdb)，文件头：5374616E64617264204A 
-WordPerfect (wpd)，文件头：FF575043 
-Postscript (eps.or.ps)，文件头：252150532D41646F6265 
-Adobe Acrobat (pdf)，文件头：255044462D312E 
-Quicken (qdf)，文件头：AC9EBD8F 
-Windows Password (pwl)，文件头：E3828596 
-ZIP Archive (zip)，文件头：504B0304 
-RAR Archive (rar)，文件头：52617221 
-Wave (wav)，文件头：57415645 
-AVI (avi)，文件头：41564920 
-Real Audio (ram)，文件头：2E7261FD 
-Real Media (rm)，文件头：2E524D46 
-MPEG (mpg)，文件头：000001BA 
-MPEG (mpg)，文件头：000001B3 
-Quicktime (mov)，文件头：6D6F6F76 
-Windows Media (asf)，文件头：3026B2758E66CF11 
-MIDI (mid)，文件头：4D546864 
-*/
-    public static String checkType(String xxxx) {
-        
-        switch (xxxx) {
-        case "FFD8FF": return "jpg";
-        case "89504E": return "png";
-        case "474946": return "jif";
-        case "47494638": return "gif";
-        case "424D": return "bmp";
-        case "424D36": return "bmp";
-        default: return "0000";
-        }
-    }
-
-    public static Boolean checkImgType(File file) {
-        try {
-            // 通过ImageReader来解码这个file并返回一个BufferedImage对象
-            // 如果找不到合适的ImageReader则会返回null，我们可以认为这不是图片文件
-            // 或者在解析过程中报错，也返回false
-            Image image = ImageIO.read(file);
-            return image != null;
-        } catch(IOException ex) {
-            return false;
-        }
-    }
 
     //apache大法
-    public static Msg FileMiME(File file, String suffix){
+    public static Msg FileMiME(File file ){
         final Msg msg = new Msg();
         try {
             Tika tika = new Tika();

src/main/java/cn/hellohao/utils/progress/MyProgress.java

@@ -0,0 +1,62 @@
+package cn.hellohao.utils.progress;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MyProgress {
+    private int delSuccessCount=0;//已经成功的个数
+    private List<String> delErrorImgListt =  new ArrayList<>();//已经失败的图片
+    private int delOCT=0; //控制开关
+    private List<Integer> delSuccessImgList =  new ArrayList<>(); //删除成功的图片
+
+    public void InitializeDelImg(){
+        this.delSuccessCount=0;//已经成功的个数
+        this.delErrorImgListt =  new ArrayList<>();//已经失败的图片
+        this.delOCT=0; //控制开关 0代表false 1代表true
+        this.delSuccessImgList =  new ArrayList<>(); //删除成功的图片
+    }
+
+    public MyProgress() {
+    }
+
+    public MyProgress(int delSuccessCount, List<String> delErrorImgListt, int delOCT, List<Integer> delSuccessImgList) {
+        this.delSuccessCount = delSuccessCount;
+        this.delErrorImgListt = delErrorImgListt;
+        this.delOCT = delOCT;
+        this.delSuccessImgList = delSuccessImgList;
+    }
+
+    public int getDelSuccessCount() {
+        return delSuccessCount;
+    }
+
+    public void setDelSuccessCount(int delSuccessCount) {
+        this.delSuccessCount = delSuccessCount;
+    }
+
+    public List<String> getDelErrorImgListt() {
+        return delErrorImgListt;
+    }
+
+    public void setDelErrorImgListt(List<String> delErrorImgListt) {
+        this.delErrorImgListt = delErrorImgListt;
+    }
+
+    public int getDelOCT() {
+        return delOCT;
+    }
+
+    public void setDelOCT(int delOCT) {
+        this.delOCT = delOCT;
+    }
+
+    public List<Integer> getDelSuccessImgList() {
+        return delSuccessImgList;
+    }
+
+    public void setDelSuccessImgList(List<Integer> delSuccessImgList) {
+        this.delSuccessImgList = delSuccessImgList;
+    }
+
+
+}

src/main/java/cn/hellohao/utils/test/Demo.java

@@ -0,0 +1,66 @@
+package cn.hellohao.utils.test;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+class counts {
+    public static Long i = 5000L;
+}
+//1.创建一个实现了Runnable接口的类
+class Demo implements Runnable {
+    //2.实现类去实现(重写)Runnable中的抽象方法：run()
+    @Override
+    public void run() {
+
+        while (true){
+            try{
+                String uuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
+                HashMap<String, Object> paramMap = new HashMap<>();
+                paramMap.put("email", uuid.substring(0,10)+"@163.com");
+                paramMap.put("pwd", uuid+uuid+uuid);
+                String result1 = HttpUtil.post("http://39.107.115.48/og/v1/user/login/email", paramMap);
+                JSONObject jsonObject = JSONObject.parseObject(result1);
+                System.out.println("执行第"+counts.i+"次：响应代码："+jsonObject.getInteger("c")+"，"+jsonObject.getString("m"));
+                System.out.println("用户UUID："+jsonObject.getJSONObject("d").getJSONObject("user").getString("object_id"));
+                if(jsonObject.getInteger("c")==200){
+                    String uuid2 = UUID.randomUUID().toString().replace("-", "").toLowerCase();
+                    HashMap<String, Object> paramMap2 = new HashMap<>();
+                    paramMap2.put("order_id", uuid2);
+                    paramMap2.put("email", uuid.substring(0,10)+"@163.com");
+                    paramMap2.put("info", "pay&money=永久会员 ¥12 (随功能增多会涨价)");
+                    paramMap2.put("product_id", "beetodo");
+                    paramMap2.put("pay_channel", "unkown");
+                    paramMap2.put("click_pay_time", "unkown");
+                    paramMap2.put("version", "21/1.2.6");
+                    String result2 = HttpUtil.post("http://39.107.115.48/og/v1/user/login/email", paramMap);
+                    JSONObject jsonObject2 = JSONObject.parseObject(result2);
+                    System.out.println("提交订单的："+jsonObject2.getInteger("c"));
+                }
+                counts.i++;
+            }catch (Exception e){
+                e.printStackTrace();
+                System.err.println("报错了");
+            }
+        }
+
+    }
+}
+
+//测试类:
+class ThreadTest {
+    public static void main(String[] args) {
+
+        //同样为了展示多线程效果,我们在main主线程中也遍历输出一下作为对比
+        for (int i = 0; i < 10; i++) {
+            //3.创建实现类的对象
+            Demo d1 = new Demo();
+//4.将此对象作为参数传递到Thread类的构造器中，创建Thread类的对象
+            Thread thread = new Thread(d1);
+            //5.通过Thread类的对象调用start()
+            thread.start();
+        }
+    }
+}

src/main/resources/application.properties

@@ -7,12 +7,12 @@ spring.datasource.url=jdbc:mysql://localhost:3306/tbed?useUnicode=true&character
 #端口
 server.port=8089
 #前端域名需要带协议头http(s)://
-CROS_ALLOWED_ORIGINS=http://localhost:8080
+CROS_ALLOWED_ORIGINS=http://127.0.0.1:8080
 
 
 #下边的配置项不需要修改。
-logging.config=classpath:logback-spring.xml
-logging.file.path=/HellohaoData/tbedlog
+#logging.config=classpath:logback-spring.xml
+#logging.file.path=/HellohaoData/tbedlog
 spring.thymeleaf.suffix=.html
 mybatis.configuration.map-underscore-to-camel-case=true
 mybatis.mapper-locations=classpath:mapper/*.xml
@@ -32,7 +32,6 @@ spring.datasource.druid.filter.config.enabled=false
 spring.datasource.druid.web-stat-filter.enabled=false
 spring.datasource.druid.web-stat-filter.session-stat-enable=false
 spring.datasource.druid.stat-view-servlet.reset-enable=false
-
 spring.datasource.druid.filter.stat.enabled=false
 spring.datasource.druid.filter.wall.enabled=false
 spring.datasource.druid.filter.slf4j.enabled=false
@@ -44,3 +43,4 @@ spring.datasource.druid.stat-view-servlet.login-username=hellohao@dealer
 spring.datasource.druid.stat-view-servlet.login-password=52BNmXPJL0rQQ3CU
 spring.datasource.druid.stat-view-servlet.allow=127.0.0.1
 spring.datasource.druid.web-stat-filter.exclusions=false
+log4j2.formatMsgNoLookups=True

src/main/resources/mapper/AlbumMapper.xml

@@ -63,5 +63,18 @@
         </where>
     </select>
 
+    <update id="updateAlbum" parameterType="cn.hellohao.pojo.Album">
+        UPDATE `album`
+        <set>
+            <if test="albumtitle != null">
+                albumtitle = #{albumtitle},
+            </if>
+            <if test="password != null">
+                password = #{password},
+            </if>
+        </set>
+        WHERE
+        albumkey = #{albumkey}
+    </update>
 
 </mapper>

src/main/resources/mapper/AppClientMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.hellohao.dao.AppClientMapper">
+    <select id="getAppClientData" resultType="cn.hellohao.pojo.AppClient" parameterType="string">
+        select * from appclient where id = #{id}
+    </select>
+
+    <update id="editAppClientData" parameterType="cn.hellohao.pojo.AppClient">
+        UPDATE `appclient`
+        <set>
+            <if test="isuse != null and isuse != ''">
+                isuse = #{isuse},
+            </if>
+            <if test="winpackurl != null">
+                winpackurl = #{winpackurl},
+            </if>
+            <if test="macpackurl != null">
+                macpackurl = #{macpackurl},
+            </if>
+            <if test="appname != null">
+                appname = #{appname},
+            </if>
+            <if test="applogo != null">
+                `applogo` = #{applogo},
+            </if>
+            <if test="appupdate != null">
+                `appupdate` = #{appupdate},
+            </if>
+
+        </set>
+        where id=#{id}
+    </update>
+
+</mapper>

src/main/resources/mapper/GroupMapper.xml

@@ -10,7 +10,6 @@
 <!--        `group`-->
 <!--    </select>-->
 
-
     <select id="grouplist" resultType="cn.hellohao.pojo.Group" parameterType="integer">
         SELECT
         g.id,g.groupname,g.keyid,g.usertype,g.compress,k.storageType,k.keyname
@@ -33,7 +32,7 @@
     </select>
 
     <insert id="addgroup" parameterType="cn.hellohao.pojo.Group">
-        insert into `group` (id,groupname,keyid) values (null,#{groupname},#{keyid})
+        insert into `group` (id,groupname,keyid,usertype,compress) values (null,#{groupname},#{keyid},#{usertype},#{compress})
     </insert>
 
     <select id="GetCountFroUserType" parameterType="integer" resultType="integer">
@@ -49,7 +48,7 @@
     </delete>
 
     <update id="setgroup" parameterType="cn.hellohao.pojo.Group">
-        UPDATE `group` SET groupname=#{groupname},keyid=#{keyid} where id = #{id};
+        UPDATE `group` SET groupname=#{groupname},keyid=#{keyid},usertype=#{usertype},compress=#{compress} where id = #{id};
     </update>
 
     <select id="getGroupFroUserType" parameterType="integer" resultType="cn.hellohao.pojo.Group">

src/main/resources/mapper/ImgMapper.xml

@@ -19,7 +19,8 @@
         a.imguid,
         a.format,
         a.about,
-        a.violation
+        a.violation,
+        a.idname
         FROM
         imgdata a
         LEFT JOIN user b ON a.userid = b.id
@@ -37,23 +38,84 @@
             and
             a.updatetime <= #{stoptime}
         </if>
-
-        <if test="userid != null">
-            <choose>
-                <when test="selecttype != null">
-                    and
-                    a.userid not in (#{userid})
-                </when>
-                <otherwise>
-                    and
-                    a.userid = #{userid}
-                </otherwise>
-            </choose>
+        <if test="violation == 'true'">
+            and
+            a.violation !=""
         </if>
 
-
+        <choose>
+            <when test="userid!=null and userid!=''">
+                and
+                a.userid = #{userid}
+            </when>
+            <otherwise>
+                <if test="username != null and username != ''">
+                    <choose>
+                        <when test="selecttype==1">
+                            and
+                            a.userid in ( SELECT id  from `user` where username LIKE '%${username}%')
+                        </when>
+                        <otherwise>
+                            and
+                            a.userid not in ( SELECT id  from `user` where username LIKE '%${username}%')
+                        </otherwise>
+                    </choose>
+                </if>
+            </otherwise>
+        </choose>
+        <if test="imguid != null">
+            and
+            a.imguid = #{imguid}
+        </if>
+        <if test="idname != null and idname !=''">
+            and idname LIKE '%${idname}%'
+        </if>
         order by a.id desc
     </select>
+
+    <insert  id="insertImgData" parameterType="cn.hellohao.pojo.Images">
+        INSERT INTO imgdata (
+            id,
+            imgname,
+            imgurl,
+            userid,
+            updatetime,
+            sizes,
+            abnormal,
+            `source`,
+            imgtype,
+            explains,
+            md5key,
+            imguid,
+            `format`,
+            about,
+            violation,
+            idname
+        )
+        select * from (
+                          SELECT  NULL id,
+                                  #{imgname} imgname,
+                                  #{imgurl} imgurl,
+                                  #{userid} userid,
+                                  #{updatetime} updatetime,
+                                  #{sizes} sizes,
+                                  #{abnormal} abnormal,
+                                  #{source} `source`,
+                                  #{imgtype} imgtype,
+                                  #{explains} explains,
+                                  #{md5key} md5key,
+                                  #{imguid} imguid,
+                                  #{format} `format`,
+                                  #{about} about,
+                                  null violation,
+                                  #{idname} idname
+                      ) temp_t
+        where
+            IF((select (select checkduplicate from sysconfig where id =1)=1),
+               not exists (select md5key from imgdata img_t where temp_t.md5key = img_t.md5key),true)
+    </insert>
+
+
     <!-- 此用户下总数 -->
     <select id="countimg" parameterType="integer" resultType="integer">
         select count(*) from imgdata where userid = #{userid}
@@ -89,6 +151,9 @@
                  <if test="explains!=null">
                      explains=#{explains}
                  </if>
+                 <if test="idname!=null and idname!=''">
+                     idname=#{idname}
+                 </if>
              </set>
               where imgname=#{imgname}
     </update>

src/main/resources/mapper/KeysMapper.xml

@@ -19,7 +19,7 @@
 
     <!-- 查询对象存储有多少种-->
     <select id="getStorage"  resultType="cn.hellohao.pojo.Keys">
-        SELECT id,storageType,
+        SELECT storageType,id,
                CASE WHEN storageType=1 THEN '网易云'
                     WHEN storageType=2 THEN '阿里云'
                     WHEN storageType=3 THEN '又拍云'
@@ -30,7 +30,7 @@
                     WHEN storageType=8 THEN 'UFile'
                     ELSE  '未知' END AS storageName,
                keyname
-        FROM `keys`  GROUP BY storageType
+        FROM `keys`  GROUP BY storageType,id,storageName,keyname
 
     </select>
 

src/main/resources/mapper/UploadConfigMapper.xml

@@ -40,7 +40,10 @@
                 `usermemory` = #{usermemory},
             </if>
             <if test="blacklist != null">
-                `blacklist` = #{blacklist}
+                `blacklist` = #{blacklist},
+            </if>
+            <if test="userclose != null">
+                `userclose` = #{userclose}
             </if>
 
         </set>

src/main/resources/mapper/UserMapper.xml

@@ -4,8 +4,8 @@
 
     <!-- 用户注册 -->
     <insert id="register" parameterType="cn.hellohao.pojo.User">
-        INSERT INTO user (id, username, PASSWORD, email, birthder, LEVEL,uid,isok,memory,groupid)
-        VALUES (NULL, #{username}, #{password}, #{email}, #{birthder}, #{level},#{uid},#{isok},#{memory},#{groupid}   )
+        INSERT INTO user (id, username, PASSWORD, email, birthder, LEVEL,uid,isok,memory,groupid,token)
+        VALUES (NULL, #{username}, #{password}, #{email}, #{birthder}, #{level},#{uid},#{isok},#{memory},#{groupid},#{token})
     </insert>
     <!--  查询是否有username  -->
     <select id="countusername" parameterType="string" resultType="integer">
@@ -22,7 +22,6 @@
     </select>
     <!--  uid查询用户并修改  -->
     <update id="uiduser" parameterType="cn.hellohao.pojo.User">
-        <!-- UPDATE `user` set username=#{username},`password`=#{password} where email=#{email} -->
         UPDATE `user` set `isok`=1 where uid=#{uid}
     </update>
 
@@ -30,8 +29,6 @@
     <select id="login" parameterType="string" resultType="integer">
         select COUNT(*)
         from user
-<!--        where email = #{email}-->
-<!--        and password = #{password}-->
         <where>
              1=1
             <if test="email != null">
@@ -47,6 +44,15 @@
         </where>
     </select>
 
+    <!-- Token登录 -->
+    <select id="loginByToken" parameterType="string" resultType="cn.hellohao.pojo.User">
+        select *
+        from user
+        <where>
+            token = #{token}
+        </where>
+    </select>
+
     <!-- 查询当前用户:根据邮箱,根据id -->
     <select id="getUsers" parameterType="cn.hellohao.pojo.User" resultType="cn.hellohao.pojo.User">
         SELECT id,
@@ -58,7 +64,8 @@
         uid,
         isok,
         memory,
-        groupid
+        groupid,
+        token
         FROM user
         <where>
             <if test="id != null">
@@ -70,6 +77,9 @@
             <if test="uid != null">
                 and uid = #{uid}
             </if>
+            <if test="token != null">
+                and token = #{token}
+            </if>
         </where>
     </select>
     <!-- 查询当前用户:根据id -->
@@ -83,7 +93,8 @@
                uid,
                isok,
                memory,
-               groupid
+               groupid,
+               token
         FROM user
         WHERE id = #{id}
     </select>
@@ -98,20 +109,20 @@
         uid,
         isok,
         memory,
-        groupid
+        groupid,
+        token
         FROM user
         WHERE uid = #{uid}
     </select>
 
     <!-- 插入图片信息 -->
-    <insert id="insertimg" parameterType="cn.hellohao.pojo.Images">
-        INSERT INTO imgdata (id, imgname, imgurl, userid, updatetime,sizes,abnormal,source,imgtype,md5key,imguid,format,about,violation)
-        VALUES (NULL, #{imgname}, #{imgurl}, #{userid}, #{updatetime},#{sizes},#{abnormal},#{source},#{imgtype},#{md5key},#{imguid},#{format},#{about},null)
-    </insert>
+<!--    <insert id="insertimg" parameterType="cn.hellohao.pojo.Images">-->
+<!--        INSERT INTO imgdata (id, imgname, imgurl, userid, updatetime,sizes,abnormal,source,imgtype,md5key,imguid,format,about,violation)-->
+<!--        VALUES (NULL, #{imgname}, #{imgurl}, #{userid}, #{updatetime},#{sizes},#{abnormal},#{source},#{imgtype},#{md5key},#{imguid},#{format},#{about},null)-->
+<!--    </insert>-->
 
     <!-- 修改资料 -->
     <update id="change" parameterType="cn.hellohao.pojo.User">
-        <!-- UPDATE `user` set username=#{username},`password`=#{password} where email=#{email} -->
         UPDATE `user`
         <set>
             <if test="email != null">
@@ -129,6 +140,9 @@
             <if test="groupid != null">
                 `groupid` = #{groupid}
             </if>
+            <if test="token != null">
+                `token` = #{token},
+            </if>
         </set>
         where uid=#{uid}
     </update>
@@ -157,6 +171,9 @@
             <if test="uid != null">
                 `uid` = #{uid},
             </if>
+            <if test="token != null">
+                `token` = #{token},
+            </if>
         </set>
         where id=#{id}
     </update>
@@ -183,6 +200,7 @@
         isok,
         ceil((memory/1024/1024)) as memory,
         groupid,
+        token,
         (select groupname from `group` where id = groupid) as groupname
         FROM
         user
@@ -203,11 +221,9 @@
     </delete>
 
     <update id="setisok" parameterType="cn.hellohao.pojo.User">
-        <!-- UPDATE `user` set username=#{username},`password`=#{password} where email=#{email} -->
         UPDATE `user` set `isok`=#{isok} where id=#{id}
     </update>
     <update id="setmemory" parameterType="cn.hellohao.pojo.User">
-        <!-- UPDATE `user` set username=#{username},`password`=#{password} where email=#{email} -->
         UPDATE `user` set `memory`=#{memory} where id=#{id}
     </update>
 

src/main/resources/templates/welcome.html

@@ -0,0 +1,64 @@
+<!doctype html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <title>Welcome</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+
+        * {
+            line-height: 1.2;
+            margin: 0;
+        }
+
+        html {
+            color: #888;
+            display: table;
+            font-family: sans-serif;
+            height: 100%;
+            text-align: center;
+            width: 100%;
+        }
+
+        body {
+            display: table-cell;
+            vertical-align: middle;
+            margin: 2em auto;
+        }
+
+        h1 {
+            color: #555;
+            font-size: 2em;
+            font-weight: 400;
+        }
+
+        p {
+            margin: 0 auto;
+            width: 280px;
+        }
+
+        @media only screen and (max-width: 280px) {
+
+            body, p {
+                width: 95%;
+            }
+
+            h1 {
+                font-size: 1.5em;
+                margin: 0 0 0.3em;
+            }
+
+        }
+
+    </style>
+</head>
+<body>
+    <h1 style="font-size: 4.5em;" th:text="'Welcome'"></h1>
+    <br />
+    <h3 style="line-height: 80px;" th:text="${name}"></h3>
+    <p th:text="'服务版本：'+${version}"></p>
+    <p th:text="'来访者IP：'+${ip}"></p>
+    <a style="font-weight: bold; line-height: 80px;" th:href="'http://'+${links}" th:text="${links}"></a>
+</body>
+</html>
+<!-- IE needs 512+ bytes: https://blogs.msdn.microsoft.com/ieinternals/2010/08/18/friendly-http-error-pages/ -->