github/Tbed
4
0
Fork 0
mirror of https://github.com/Hello-hao/Tbed.git synced 2026-10-21 07:46:32 +00:00
Code Issues Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
hellohao
2022-09-01 00:49:16 +08:00
parent d96096965f
commit 7c5524c1ee
6 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/cn/hellohao/controller/AdminController.java
+19
View File
@@ -150,6 +150,25 @@ public class AdminController {
}
}
@PostMapping(value={"/setImgFileName","/client/setImgFileName"})
@ResponseBody
public Msg setImgFileName(@RequestParam(value = "data", defaultValue = "") String data) {
Msg msg = new Msg();
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() {
src/main/java/cn/hellohao/pojo/Images.java
+12 -1
View File
@@ -36,6 +36,8 @@ public class Images {
private String[] classifuidlist; //类别uid集合
private String classificationuid; //类别uid集合
private String idname;
public Images() {
super();
}
@@ -54,7 +56,7 @@ 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) {
this.id = id;
this.imgname = imgname;
this.imgurl = imgurl;
@@ -85,6 +87,7 @@ public class Images {
this.classifuidlist = classifuidlist;
this.classificationuid = classificationuid;
this.violation = violation;
this.idname = idname;
}
@@ -328,6 +331,14 @@ public class Images {
public void setViolation(String violation) {
this.violation = violation;
}
public String getIdname() {
return idname;
}
public void setIdname(String idname) {
this.idname = idname;
}
}
src/main/java/cn/hellohao/service/impl/UploadServicel.java
+3
View File
@@ -52,6 +52,7 @@ public class UploadServicel {
MultipartFile multipartFile, Integer setday, String imgUrl) {
Msg msg = new Msg();
try{
String imageFileName = "未命名图像";
JSONObject jsonObject = new JSONObject();
UploadConfig uploadConfig = uploadConfigMapper.getUpdateConfig();
String userip = GetIPS.getIpAddr(request);
@@ -65,6 +66,7 @@ public class UploadServicel {
FileInputStream fis = null;
File file =null;
if(imgUrl==null){
imageFileName = multipartFile.getOriginalFilename();
file = SetFiles.changeFile_new(multipartFile);
}else{
Msg imgData = uploadForURL(request, imgUrl);
@@ -172,6 +174,7 @@ public class UploadServicel {
img.setMd5key(md5key);
img.setImguid(imguid);
img.setFormat(fileMiME.getData().toString());
img.setIdname(imageFileName);
userMapper.insertimg(img);
long etime = System.currentTimeMillis();
Print.Normal("上传图片所用总时长：" + String.valueOf(etime - stime) + "ms");
src/main/java/cn/hellohao/utils/FirstRun.java
+14 -20
View File
@@ -32,6 +32,13 @@ public class FirstRun implements InitializingBean {
RunSqlScript.USERNAME = jdbcusername;
RunSqlScript.PASSWORD = jdbcpass;
RunSqlScript.DBURL = jdbcurl;
Integer dataBaseName = RunSqlScript.RunSelectCount("SELECT count(*) FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = 'tbed'");
if(dataBaseName<1){
Print.Normal("无法找到指定数据库，请先创建'tbed'数据库，并导入表结构后再试。");
System.exit(1);
}
Print.Normal("正在校验数据库参数...");
RunSqlScript.RunInsert(dynamic);
RunSqlScript.RunInsert(compressed);
@@ -91,15 +98,14 @@ public class FirstRun implements InitializingBean {
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");
// }
Integer ret7 = RunSqlScript.RunSelectCount(judgeTable+" 'imgdata' and column_name = 'idname'");
if(ret7==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");
@@ -107,7 +113,6 @@ public class FirstRun implements InitializingBean {
clears();
}
//检查表是否存在，后边加'imgdata' and column_name = 'explains' 检查字段是否存在
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
@@ -117,25 +122,14 @@ public class FirstRun implements InitializingBean {
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)";
//添加album表字段userid
private String sql7 = "alter table album add userid int(10)";
//添加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 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');";
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));
private String dynamic = "alter table imgdata row_format=dynamic";
private String compressed = "alter table imgdata row_format=compressed";
src/main/resources/mapper/ImgMapper.xml
+8 -2
View File
@@ -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
@@ -66,7 +67,9 @@
and
a.imguid = #{imguid}
</if>
<if test="idname != null and idname !=''">
and idname LIKE '%${idname}%'
</if>
order by a.id desc
</select>
<!-- 此用户下总数 -->
@@ -104,6 +107,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/UserMapper.xml
+2 -2
View File
@@ -117,8 +117,8 @@
<!-- 插入图片信息 -->
<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 INTO imgdata (id, imgname, imgurl, userid, updatetime,sizes,abnormal,source,imgtype,md5key,imguid,format,about,violation,idname)
VALUES (NULL, #{imgname}, #{imgurl}, #{userid}, #{updatetime},#{sizes},#{abnormal},#{source},#{imgtype},#{md5key},#{imguid},#{format},#{about},null,#{idname})
</insert>
<!-- 修改资料 -->