更换了oss 的bucket

README.md

@@ -28,5 +28,8 @@
     外网映射：
     http://face3d.4dage.com:8100/
     
+    部署注意：
+    需要配置静态资源路径
+    
     
 # 不删除oss物理文件的原因是，下载管理有历史记录，删除了，跟显示有冲突。

museum_application/src/main/resources/application-uat.properties

@@ -0,0 +1,63 @@
+
+#DB
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.druid.url=jdbc:mysql://localhost:3306/sh_museum_cms?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.username=root
+spring.datasource.druid.password=4dkk2020%
+
+
+# \u521D\u59CB\u8FDE\u63A5\u6570
+spring.datasource.druid.initial-size=5
+# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
+spring.datasource.druid.min-idle=10
+# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
+spring.datasource.druid.max-active=20
+# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+spring.datasource.druid.max-wait=60000
+# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+spring.datasource.druid.min-evictable-idle-time-millis=30000
+# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+spring.datasource.druid.max-evictable-idle-time-millis=90000
+# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
+spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=false
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.web-stat-filter.enabled=true
+spring.datasource.druid.stat-view-servlet.enabled=true
+
+
+# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
+spring.redis.timeout=3000ms
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
+spring.redis.jedis.pool.max-idle=8
+#\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F0\u3002
+spring.redis.jedis.pool.min-idle=0
+# \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
+spring.redis.jedis.pool.max-active=8
+# \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
+spring.redis.jedis.pool.max-wait=-1ms
+
+
+#log
+logging.path=/root/user/sh_museum_cms_log
+logging.config=classpath:logback-spring.xml
+logging.level.com.museum=debug
+
+# \u4E0A\u4F20\u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84
+output.file.path=/root/user/sh_museum_data/
+server.domain =http://47.101.158.255:8080/downfile/
+
+oss.file.path=sh_museum/
+oss.domain=http://shlmuseum.oss-cn-shanghai.aliyuncs.com/
+
+
+

museum_common/src/main/java/com/museum/common/util/AliyunOssUtil.java

@@ -7,6 +7,8 @@ import com.aliyun.oss.model.ObjectListing;
 import com.aliyun.oss.model.PutObjectResult;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.io.*;
 import java.util.Date;
@@ -20,11 +22,13 @@ import java.util.Map;
 @Slf4j
 public class AliyunOssUtil {
 
-
-    private static final String END_POINT = "http://oss-cn-shenzhen.aliyuncs.com";
+	// 注意换了bucket,要注意对应的区域
+    private static final String END_POINT = "http://oss-cn-shanghai.aliyuncs.com";
+	private static final String BUCKET_NAME = "shlmuseum";
 	private static final String ACCESS_KEY_ID = "LTAIUrvuHqj8pvry";
 	private static final String ACCESS_KEY_SECREY = "JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4";
-	private static final String BUCKET_NAME = "4dkankan";
+
+
 
 	// 加载对象
 	private static OSSClient ossClient = new OSSClient(END_POINT, ACCESS_KEY_ID, ACCESS_KEY_SECREY);
@@ -128,7 +132,7 @@ public class AliyunOssUtil {
 
 		HashMap<String, String> map = new HashMap<>();
 //		map.put("F:\\test\\aa.jpg", "kanfang/test/aa.jpg");
-		map.put("F:\\test\\oss\\floor.json", "kanfang/test/faa.json");
+		map.put("F:\\test\\22.jpg", "sh_museum/22.jpg");
 		uploadMulFiles(map);
 
 //		deleteFile("kanfang/test/aa.jpg");
@@ -225,8 +229,8 @@ public class AliyunOssUtil {
 
 	/**
 	 * 生成图片
-	 * @param inputFilePath
-	 * @param savePath
+	 * @param
+	 * @param
 	 */
 //	public static void writeFile(String inputFilePath, String savePath){
 //		try {

museum_common/src/main/java/com/museum/common/util/FileUtils.java

@@ -33,6 +33,7 @@ public class FileUtils {
 
         String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
         savePath = savePath + time + File.separator;
+        log.info("savePath: {}", savePath);
         FileUtil.mkdir(time);
 
         ArrayList<Map<String, String>> list = new ArrayList<>();

museum_dao/src/main/java/com/museum/dao/DownloadMapper.java

@@ -3,6 +3,7 @@ package com.museum.dao;
 
 import com.museum.dao.Provide.DownloadProvider;
 import com.museum.domain.entity.DownloadEntity;
+import com.museum.domain.request.DownloadPageRequest;
 import com.museum.domain.request.PageRequest;
 import com.museum.domain.response.DownloadResponse;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,7 +19,7 @@ import java.util.List;
 public interface DownloadMapper extends IBaseMapper<DownloadEntity, Long> {
 
     @SelectProvider(type = DownloadProvider.class, method = "findBySearchKey")
-    List<DownloadResponse> search(PageRequest param, Long applyId, Long auditId);
+    List<DownloadResponse> search(DownloadPageRequest param, Long applyId, Long auditId);
 
     @Select("select z.id, z.name, z.reason, z.create_time, z.type, u.user_name, z.file_ids, z.status from tb_download z " +
             "left join tb_user u on z.apply_id = u.id " +

museum_dao/src/main/java/com/museum/dao/Provide/DownloadProvider.java

@@ -1,5 +1,6 @@
 package com.museum.dao.Provide;
 
+import com.museum.domain.request.DownloadPageRequest;
 import com.museum.domain.request.PageRequest;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
@@ -11,7 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 @Log4j2
 public class DownloadProvider {
 
-    public String findBySearchKey(PageRequest param, Long applyId, Long auditId){
+    public String findBySearchKey(DownloadPageRequest param, Long applyId, Long auditId){
         StringBuffer sql = new StringBuffer(
                 "select z.id, z.name, z.reason, z.create_time, z.type, u.user_name, z.file_ids, z.status from tb_download z " +
                         "left join tb_user u on z.apply_id = u.id " +
@@ -31,6 +32,16 @@ public class DownloadProvider {
             sql.append(" or ( z.name like '%").append(searchKey).append("%' ))");
         }
 
+        Integer status = param.getStatus();
+        if (status != null) {
+            sql.append(" and z.status = ").append(status);
+        }
+
+        String type = param.getType();
+        if (StringUtils.isNotBlank(type)) {
+            sql.append(" and z.type = '").append(type).append("'");
+        }
+
         sql.append(" order by z.create_time desc");
         log.info("sql: {}", sql.toString());
         return sql.toString();

museum_dao/src/main/java/com/museum/dao/Provide/MessageProvider.java

@@ -28,6 +28,7 @@ public class MessageProvider {
             sql.append(" and (");
             sql.append(" message like '%").append(searchKey).append("%'");
             sql.append(" or phone like '%").append(searchKey).append("%'");
+            sql.append(" or user_name like '%").append(searchKey).append("%'");
             sql.append( ")");
         }
 

museum_domain/src/main/java/com/museum/domain/request/DownloadPageRequest.java

@@ -0,0 +1,24 @@
+package com.museum.domain.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 部件下载信息
+ */
+@Data
+public class DownloadPageRequest extends PageRequest implements Serializable {
+
+    private static final long serialVersionUID = -5191928184589231778L;
+
+
+    @ApiModelProperty(value = "模块名称，part:部件， building：建筑物")
+    private String type;
+
+    @ApiModelProperty(value = "状态,1:申请中，2:同意，3:驳回")
+    private Integer status;
+
+
+}

museum_service/src/main/java/com/museum/service/DownloadService.java

@@ -2,6 +2,7 @@ package com.museum.service;
 
 
 import com.museum.domain.entity.DownloadEntity;
+import com.museum.domain.request.DownloadPageRequest;
 import com.museum.domain.request.PageRequest;
 import com.museum.domain.response.DownloadResponse;
 
@@ -14,9 +15,8 @@ import java.util.List;
 public interface DownloadService extends IBaseService<DownloadEntity, Long> {
 
 
-//    List<PartDownloadResponse> search(PageRequest param);
 
-    List<DownloadResponse> search(PageRequest param, Long applyId, Long auditId);
+    List<DownloadResponse> search(DownloadPageRequest param, Long applyId, Long auditId);
 
     DownloadResponse rFindById(Long id);
 }

museum_service/src/main/java/com/museum/service/impl/DownloadServiceImpl.java

@@ -3,6 +3,7 @@ package com.museum.service.impl;
 import com.museum.dao.DownloadMapper;
 import com.museum.dao.IBaseMapper;
 import com.museum.domain.entity.DownloadEntity;
+import com.museum.domain.request.DownloadPageRequest;
 import com.museum.domain.request.PageRequest;
 import com.museum.domain.response.DownloadResponse;
 import com.museum.service.DownloadService;
@@ -29,7 +30,7 @@ public class DownloadServiceImpl extends IBaseServiceImpl<DownloadEntity, Long>
 
 
     @Override
-    public List<DownloadResponse> search(PageRequest param, Long applyId, Long auditId) {
+    public List<DownloadResponse> search(DownloadPageRequest param, Long applyId, Long auditId) {
         return entityMapper.search(param, applyId, auditId);
     }
 

museum_web/src/main/java/com/museum/web/controller/BaseController.java

@@ -94,8 +94,6 @@ public class BaseController {
             pageSize = 10;
         }
 
-        // orderBy：字段名称
-//        PageHelper.startPage(pageNum, pageSize, "create_time desc");
         PageHelper.startPage(pageNum, pageSize);
     }
 

museum_web/src/main/java/com/museum/web/controller/CommonController.java

@@ -48,8 +48,6 @@ import java.util.*;
 @Api(tags = "共用接口")
 @RestController
 @RequestMapping("manage/common")
-//@RequestMapping("/common")
-//@Transactional
 public class CommonController extends BaseController {
 
 
@@ -89,6 +87,7 @@ public class CommonController extends BaseController {
         }
 
         // 删除本地服务器物理文件，用删除目录的方式
+        log.info("delete filePath: {}", OUT_PATH + dir);
         FileUtil.del(OUT_PATH + dir);
 
         return Result.success(resultMap);

museum_web/src/main/java/com/museum/web/controller/DownloadController.java

@@ -11,6 +11,7 @@ import com.museum.common.util.Result;
 import com.museum.domain.entity.FileEntity;
 import com.museum.domain.entity.DownloadEntity;
 import com.museum.domain.entity.UserEntity;
+import com.museum.domain.request.DownloadPageRequest;
 import com.museum.domain.request.PageRequest;
 import com.museum.domain.request.DownloadRequest;
 import com.museum.domain.response.DownloadResponse;
@@ -62,7 +63,7 @@ public class DownloadController extends BaseController {
 
     @ApiOperation("列表")
     @PostMapping("list")
-    public Result<DownloadResponse> list(@Valid @RequestBody PageRequest param) {
+    public Result<DownloadResponse> list(@Valid @RequestBody DownloadPageRequest param) {
         startPage(param);
         Long userId = getTokenUserId();
         String userRole = getTokenUserRole();
@@ -180,6 +181,10 @@ public class DownloadController extends BaseController {
         String domainUrl = SERVER_DOMAIN + time + ".zip";
         log.info("domainUrl: {}", domainUrl);
 
+
+        // 4. 删除没压缩的文件
+        FileUtil.del(OUT_PATH + time);
+
         return Result.success(domainUrl);
     }
 
@@ -188,7 +193,9 @@ public class DownloadController extends BaseController {
 
 //        InputStream stream = URLUtil.getStream(new URL("http://4dkankan.oss-cn-shenzhen.aliyuncs.com/sh_museum/image/20200609_114844672_0.jpg"));
 //        FileUtil.writeFromStream(stream, "F:\\test\\sh_museum_cms\\aa1.jpg");
-        ZipUtil.zip("F:\\test\\sh_museum_cms\\20200512_175734309\\", "F:\\test\\sh_museum_cms\\20200512_175734309.zip");
+//        ZipUtil.zip("F:\\test\\sh_museum_cms\\20200512_175734309\\", "F:\\test\\sh_museum_cms\\20200512_175734309.zip");
+
+        FileUtil.del("F:\\test\\sh_museum_cms\\20200606_173123584");
 
     }
 

museum_web/src/main/java/com/museum/web/controller/IndexController.java

@@ -116,7 +116,7 @@ public class IndexController extends BaseController {
     }
 
 
-    @GetMapping("test")
+    @GetMapping("/test/test")
     public String test(){
         return LocalDateTime.now().toString();
     }