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

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

@@ -73,7 +73,7 @@ public class ZjxlArticleContentController extends BaseController {
        }
    }
    @RequestMapping(value = "/deleteArticleContent", method = RequestMethod.DELETE)
    @RequestMapping(value = "/deleteArticleContent", method = RequestMethod.POST)
    @ApiOperation(value = "删除文章管理")
    public String deleteArticleContent(@ApiParam(name = "id", value = "文章id") @RequestParam(value = "id") String id){
        try {

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

@@ -86,7 +86,7 @@ public class ZjxlBannerCnotroller extends BaseController {
        }
    }
    @RequestMapping(value = "/deleteBannerById", method = RequestMethod.DELETE)
    @RequestMapping(value = "/deleteBannerById", method = RequestMethod.POST)
    @ApiOperation(value = "删除banner")
    public String deleteBannerById(String id){
        try {

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

@@ -74,7 +74,7 @@ public class ZjxlCompanyCaseController extends BaseController {
        }
    }
    @RequestMapping(value = "/deleteCompanyCase", method = RequestMethod.DELETE)
    @RequestMapping(value = "/deleteCompanyCase", method = RequestMethod.POST)
    @ApiOperation(value = "根据id删除案例")
    public String deleteCompanyCase(String id){
        try{

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

@@ -75,7 +75,7 @@ public class ZjxlPartnerController extends BaseController {
        }
    }
    @RequestMapping(value = "/deletePartner", method = RequestMethod.DELETE)
    @RequestMapping(value = "/deletePartner", method = RequestMethod.POST)
    @ApiOperation(value = "删除合作伙伴")
    public String deletePartner(String id){
        try {

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

@@ -67,7 +67,7 @@ public class ZjxlSystemDictController extends BaseController {
        }
    }
    @RequestMapping(value = "/deleteSystemDict", method = RequestMethod.DELETE)
    @RequestMapping(value = "/deleteSystemDict", method = RequestMethod.POST)
    @ApiOperation(value = "删除字典")
    public String deleteSystemDict(@ApiParam(name = "id", value = "systemDictId", required = false) @RequestParam(value = "id", required = false)String id){
        try {

guns-main/src/main/java/cn/stylefeng/guns/zjxlUtil/FastDFSUtil.java

@@ -1,16 +1,21 @@
package cn.stylefeng.guns.zjxlUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.csource.common.MyException;
import org.csource.common.NameValuePair;
import org.csource.fastdfs.*;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetSocketAddress;
import cn.stylefeng.guns.zjxlUtil.FastDFSClientPool;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.csource.common.MyException;
import org.csource.common.NameValuePair;
import org.csource.fastdfs.ClientGlobal;
import org.csource.fastdfs.ProtoCommon;
import org.csource.fastdfs.StorageClient;
import org.csource.fastdfs.StorageClient1;
import org.csource.fastdfs.TrackerServer;
/**
 * FastDFS 客户端工具.
 *
@@ -76,7 +81,7 @@ public class FastDFSUtil {
     *
     * @throws Exception
     */
    public  ObjectNode upload(InputStream in, String fileExtension,
    public static ObjectNode upload(InputStream in, String fileExtension,
                                    String description) throws Exception {
        StorageClient client = FastDFSClientPool.getInstance().getStorageClient();
        try {
@@ -127,7 +132,7 @@ public class FastDFSUtil {
                }
                message.put(FileUrlField, fileURl);
                
                return message;
            } else {
@@ -162,7 +167,7 @@ public class FastDFSUtil {
     *
     * @throws Exception
     */
    public ObjectNode upload(String fileName, String description) throws Exception {
    public static ObjectNode upload(String fileName, String description) throws Exception {
        StorageClient client = FastDFSClientPool.getInstance().getStorageClient();
        try {
            NameValuePair[] meta_list;
@@ -211,7 +216,7 @@ public class FastDFSUtil {
                }
                message.put(FileUrlField, fileUrl);
                
                return message;
            } else {