Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/SwaggerConfig.java

@@ -93,6 +93,7 @@ public class SwaggerConfig {
                        regex("/manage_util/.*"),
                        regex("/common/.*"),
                        regex("/hospitals/.*"),
                        regex("/index/.*"),
                        regex("/upload/.*"),
                        regex("/weixin/.*"),
                        regex("/wx/.*"),

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/security/WebSecurityConfig.java

@@ -5,6 +5,7 @@ package com.yihu.wlyy.config.security;
        import org.springframework.context.annotation.Configuration;
        import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
        import org.springframework.security.config.annotation.web.builders.HttpSecurity;
        import org.springframework.security.config.annotation.web.builders.WebSecurity;
        import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
        import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -20,6 +21,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
    @Value("${security.basic.password}")
    String password;
    protected void configure(HttpSecurity http) throws Exception {
        http.authorizeRequests()
                .antMatchers("/swagger-ui.html").authenticated()

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/BaseController.java

@@ -3,6 +3,8 @@ package com.yihu.wlyy.web;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.entity.IdEntity;
import com.yihu.wlyy.util.DateUtil;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -16,6 +18,13 @@ import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.util.*;
@ApiResponses(value = {
        @ApiResponse(code = 200, message = "返回的json里的status是200，成功"),
        @ApiResponse(code = 403, message = "返回的json里的status是403，该操作没有权限"),
        @ApiResponse(code = 997, message = "返回的json里的status是997，重新登陆"),
        @ApiResponse(code = 998, message = "返回的json里的status是998，登录超时，请重新登录"),
        @ApiResponse(code = 999, message = "返回的json里的status是999，帐号在别处登录，请重新登录")
})
public class BaseController {
    private static Logger logger = LoggerFactory.getLogger(BaseController.class);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/system/SystemDictController.java

@@ -3,9 +3,8 @@ package com.yihu.wlyy.web.common.system;
import com.yihu.wlyy.entity.dict.SystemDict;
import com.yihu.wlyy.service.system.SystemDictService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.yihu.wlyy.web.manager.Index;
import io.swagger.annotations.*;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,4 +48,13 @@ public class SystemDictController extends BaseController {
            return error(-1, "验证码检查失败！");
        }
    }
    @RequestMapping(value = "/test",method = RequestMethod.GET)
    @ApiOperation("测试方法")
    @ResponseBody
    public Index index(
            @ApiParam(name="name",required = false,value = "参数") @RequestParam(required = false,name = "name") String name
    ) {
        return new Index();
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/manager/Index.java

@@ -0,0 +1,24 @@
package com.yihu.wlyy.web.manager;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by chenweida on 2017/8/12.
 */
@ApiModel("index实体类")
public class Index {
    @ApiModelProperty(value = "名称",required =false,access = "response")
    private String name;
    @ApiModelProperty(value = "名称",required =false,access = "response")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}