--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/publishing/PublishingController.java

@@ -57,8 +57,8 @@ public class PublishingController {
 		}
 		publishing.setCreateTime(new Date());
 		publishing.setId(UUIDUtil.getUUID());
-		publishing=service.queryByName(publishing.getName(),null);
-		if(publishing!=null){
+		Integer nameCount = service.queryByName(publishing.getName(),null);
+		if(nameCount>0){
 			throw new BaseException(ResponseCodeEnum.REPEST);
 		}
 		if (!service.insert(publishing)) {
@@ -86,8 +86,8 @@ public class PublishingController {
 		Publishing publishing = new Publishing();
 		BeanUtils.copyProperties(form, publishing);
 		
-		publishing=service.queryByName(publishing.getName(),publishing.getId());
-		if(publishing!=null){
+		Integer nameCount = service.queryByName(publishing.getName(),publishing.getId());
+		if(nameCount>0){
 			throw new BaseException(ResponseCodeEnum.REPEST);
 		}
 		if (!service.updateByPrimaryKeySelective(publishing)) {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/publishing/PublishingMapper.java

@@ -32,5 +32,5 @@ public interface PublishingMapper extends BaseMapper<Publishing>{
 			+ "SELECT count(*) FROM res_publishing WHERE name = #{name}"
 			+ " and id !=#{id}"
 			+ "</script>")
-	Publishing queryByName(@Param("name")String name,@Param("id") String id);
+	Integer queryByName(@Param("name")String name,@Param("id") String id);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/publishing/PublishingService.java

@@ -26,5 +26,5 @@ public interface PublishingService extends BaseService<Publishing, Integer>{
 	 * @author rjc
 	 * @date: 2019年4月30日 上午10:52:26
 	 */
-	Publishing queryByName(String name,String id);
+	Integer queryByName(String name,String id);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/publishing/PublishingServiceImpl.java

@@ -41,7 +41,7 @@ public class PublishingServiceImpl extends BaseServiceImpl<Publishing, Integer>
 	}
 
 	@Override
-	public Publishing queryByName(String name, String id) {
+	public Integer queryByName(String name, String id) {
 		// TODO Auto-generated method stub
 		return mapper.queryByName(name,id);
 	}

com.zrqx.resource/src/main/java/com/zrqx/resource/commons/config/Swagger2Config.java

 package com.zrqx.resource.commons.config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
 import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.Contact;
+import springfox.documentation.service.Parameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -44,13 +50,24 @@ public class Swagger2Config {
 
     @Bean
     public Docket createRestApi() {
+    	//添加head参数start
+    	ParameterBuilder tokenPar = new ParameterBuilder();
+    	List<Parameter> pars = new ArrayList<Parameter>();
+    	tokenPar.name("y-token").description("y令牌").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
+    	pars.add(tokenPar.build());
+    	tokenPar.name("x-token").description("x令牌").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
+    	pars.add(tokenPar.build());
+    	//添加head参数end
+    	
+    	
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
                 //为当前包路径
                 .apis(RequestHandlerSelectors.basePackage("com.zrqx"))
                 .paths(PathSelectors.any())
-                .build();
+                .build()
+        		.globalOperationParameters(pars);
     }
     //构建 api文档的详细信息函数
     private ApiInfo apiInfo() {