Merge branch 'master' of http://192.168.1.220:10080/Amoy2/guns-separation

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlBannerCnotroller.java

@@ -18,10 +18,7 @@ import io.swagger.annotations.ApiParam;
import org.ini4j.spi.RegEscapeTool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@@ -42,10 +39,10 @@ public class ZjxlBannerCnotroller extends BaseController {
    @Autowired
    private ZjxlBannerService bannerService;
//    @Autowired
//    FastDFSUtil fastDFSUtil;
//    @Value("${fastDFS.fastdfs_file_url}")
//    private String fastdfs_file_url;
    @Autowired(required = false)
    FastDFSUtil fastDFSUtil;
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    @RequestMapping(value = "/findBannerById", method = RequestMethod.GET)
    @ApiOperation(value = "查看banner列表")
@@ -106,52 +103,52 @@ public class ZjxlBannerCnotroller extends BaseController {
        }
    }
//    /**
//     * 聊天附件上传
//     *
//     * @return
//     * @throws IOException
//     * @throws IllegalStateException
//     */
//    @RequestMapping(value = "/file", method = RequestMethod.POST)
//    @ApiOperation(value = "单文件上传")
//    public ResultOneModel<UploadModel> uploadFile(
//            @ApiParam(value = "文件", required = true) @RequestParam(value = "file", required = true) MultipartFile file
//    ) {
//        try {
//            UploadModel uploadModel = fileUpload(file);
//            return new ResultOneModel<UploadModel>(uploadModel);
//        } catch (Exception e) {
//            return new ResultOneModel(BaseResultModel.statusEm.file_upload_error.getCode(), BaseResultModel.statusEm.file_upload_error.getMessage() + "," + e.getMessage(), new JSONObject());
//        }
//    }
//
//    @RequestMapping(value = "/finfBannerCompanyCaseById", method = RequestMethod.GET)
//    @ApiOperation(value = "两表查询，把结果放一个实体类返回(测试)")
//    public List<BannerCompanyCaseRet> finfBannerCompanyCaseById(String id){
//       return bannerService.finfBannerCompanyCaseById(id);
//    }
//
//    /**
//     * 文件上传到fastDfs
//     *
//     * @param mf
//     * @return
//     */
//    private UploadModel fileUpload(MultipartFile mf) throws Exception {
//        UploadModel uploadModel = new UploadModel();
//        // 得到文件的完整名称  xxx.txt
//        String fullName = mf.getOriginalFilename();
//        //得到文件类型
//        String fileType = fullName.substring(fullName.lastIndexOf(".") + 1).toLowerCase();
//        String fileName = fullName.substring(0, fullName.lastIndexOf("."));
//        //上传到fastdfs
//        ObjectNode objectNode = fastDFSUtil.upload(mf.getInputStream(), fileType, "");
//        //解析返回的objectNode
//        uploadModel.setFileName(fileName);
//        uploadModel.setFileType(fileType);
//        uploadModel.setFullUri(objectNode.get("fid").toString().replaceAll("\"", ""));
//        uploadModel.setFullUrl(fastdfs_file_url + objectNode.get("fid").toString().replaceAll("\"", ""));
//        return uploadModel;
//    }
    /**
     * 聊天附件上传
     *
     * @return
     * @throws IOException
     * @throws IllegalStateException
     */
    @RequestMapping(value = "/file", method = RequestMethod.POST)
    @ApiOperation(value = "单文件上传")
    public ResultOneModel<UploadModel> uploadFile(
            @ApiParam(value = "文件", required = true) @RequestParam(value = "file", required = true) MultipartFile file
    ) {
        try {
            UploadModel uploadModel = fileUpload(file);
            return new ResultOneModel<UploadModel>(uploadModel);
        } catch (Exception e) {
            return new ResultOneModel(BaseResultModel.statusEm.file_upload_error.getCode(), BaseResultModel.statusEm.file_upload_error.getMessage() + "," + e.getMessage(), new JSONObject());
        }
    }
    @RequestMapping(value = "/finfBannerCompanyCaseById", method = RequestMethod.GET)
    @ApiOperation(value = "两表查询，把结果放一个实体类返回(测试)")
    public List<BannerCompanyCaseRet> finfBannerCompanyCaseById(String id){
       return bannerService.finfBannerCompanyCaseById(id);
    }
    /**
     * 文件上传到fastDfs
     *
     * @param mf
     * @return
     */
    private UploadModel fileUpload(MultipartFile mf) throws Exception {
        UploadModel uploadModel = new UploadModel();
        // 得到文件的完整名称  xxx.txt
        String fullName = mf.getOriginalFilename();
        //得到文件类型
        String fileType = fullName.substring(fullName.lastIndexOf(".") + 1).toLowerCase();
        String fileName = fullName.substring(0, fullName.lastIndexOf("."));
        //上传到fastdfs
        ObjectNode objectNode = fastDFSUtil.upload(mf.getInputStream(), fileType, "");
        //解析返回的objectNode
        uploadModel.setFileName(fileName);
        uploadModel.setFileType(fileType);
        uploadModel.setFullUri(objectNode.get("fid").toString().replaceAll("\"", ""));
        uploadModel.setFullUrl(fastdfs_file_url + objectNode.get("fid").toString().replaceAll("\"", ""));
        return uploadModel;
    }
}

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlBannerService.java

@@ -41,7 +41,7 @@ public class ZjxlBannerService extends BaseService {
        if (StringUtils.isNotEmpty(name)){
            sql += " AND banner_name LIKE '%"+name+"%'";
        }
        sql += " group by banner_sort desc limit "+page+" , "+pagesize+" ";
        sql += " ORDER BY banner_sort DESC LIMIT "+page+" , "+pagesize+" ";
        List<ZjxlBanner> bannerList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ZjxlBanner.class));
       return bannerList;
    }

guns-main/src/main/resources/config/fdfs_client.conf

@@ -0,0 +1,16 @@
connect_timeout = 2
network_timeout = 30
charset = ISO8859-1
http.tracker_http_port = 80
http.anti_steal_token = no
http.secret_key = FastDFS1234567890
#-------------开发环境---------------#
#tracker_server = 172.19.103.54:22122
#-------------测试环境---------------#
tracker_server = 172.19.103.54:22122
#-------------正式环境---------------#
#tracker_server = 192.168.120.172:22122