浏览代码

Merge branch 'dev' of chenweida/jw2.0 into dev

chenweida 7 年之前
父节点
当前提交
12698d3566
共有 56 个文件被更改,包括 67 次插入58 次删除
  1. 4 1
      common/common-request-mapping/readme.MD
  2. 1 1
      common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java
  3. 1 1
      common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseSmsRequestMapping.java
  4. 7 1
      common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseVersionRequestMapping.java
  5. 2 2
      common/common-request-mapping/src/main/java/com/yihu/jw/rm/wx/WechatRequestMapping.java
  6. 1 1
      common/common-request-mapping/src/main/java/com/yihu/jw/rm/wlyy/WlyyRequestMapping.java
  7. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/FunctionController.java
  8. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/ModuleController.java
  9. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/ModuleFunController.java
  10. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/SaasController.java
  11. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WechatConfigController.java
  12. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WxAccessTokenController.java
  13. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WxGraphicMessageController.java
  14. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WxMenuController.java
  15. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WxTemplateController.java
  16. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WechatService.java
  17. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxAccessTokenService.java
  18. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxGraphicMessageService.java
  19. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxMenuService.java
  20. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxTemplateService.java
  21. 2 2
      svr/svr-base/src/main/java/com/yihu/jw/config/SwaggerConfig.java
  22. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/base/FunctionController.java
  23. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/base/ModuleController.java
  24. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/base/SaasController.java
  25. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/GraphicMessageController.java
  26. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/TemplateController.java
  27. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/WechatConfigController.java
  28. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/WechatMenuController.java
  29. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/base/FunctionService.java
  30. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/base/ModuleService.java
  31. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/base/SaasService.java
  32. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/doctorManage/DoctorService.java
  33. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/wechat/GraphicMessageService.java
  34. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/wechat/TemplateService.java
  35. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/wechat/WechatConfigService.java
  36. 1 1
      svr/svr-manage/src/main/java/com/yihu/jw/manage/service/wechat/WechatMenuService.java
  37. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/config/SwaggerConfig.java
  38. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementController.java
  39. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementKpiController.java
  40. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementKpiLogController.java
  41. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyySignFamilyController.java
  42. 1 1
      svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/patient/AdvertisementControlelr.java
  43. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/base/base/FunctionFeign.java
  44. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/base/base/ModuleFeign.java
  45. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/base/base/SaasFeign.java
  46. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/base/version/UserVersionFeign.java
  47. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/base/wx/AccessTokenFeign.java
  48. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/base/wx/GraphicMessageFeign.java
  49. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatFeign.java
  50. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatMenuFeign.java
  51. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatTemplateFeign.java
  52. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyyAgreementFeign.java
  53. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyyAgreementKpiFeign.java
  54. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyyAgreementKpiLogFeign.java
  55. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyySignFamilyFeign.java
  56. 1 1
      web-gateway/src/main/java/com/yihu/jw/feign/wlyy/patient/AdvertisementFeign.java

+ 4 - 1
common/common-request-mapping/readme.MD

@ -1 +1,4 @@
common-request-mapping路径
**
common-request-mapping路径
网关调用微服务的路径统一放在这项目 每个模块都必须是 /svr-{模块名称}/xxx  开头  避免和网关对外的路径冲突
**

+ 1 - 1
common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@ -6,7 +6,7 @@ package com.yihu.jw.rm.base;
 */
public class BaseRequestMapping {
    public static final String api_common = "/svr-bases";
    public static final String api_base_common = "/svr-bases";
    //功能模块常量
    public static class Function{

+ 1 - 1
common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseSmsRequestMapping.java

@ -6,7 +6,7 @@ package com.yihu.jw.rm.base;
 */
public class BaseSmsRequestMapping {
    public static final String api_common="svr-sms";
    public static final String api_common=BaseRequestMapping.api_base_common+"/sms";
    //短信常量
    public static class Sms{
        public static final String message_success_create="sms create success";

+ 7 - 1
common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseVersionRequestMapping.java

@ -5,8 +5,11 @@ package com.yihu.jw.rm.base;
 */
public class BaseVersionRequestMapping {
    public static final String api_common = "/svr-version";
    public static final String api_common = BaseRequestMapping.api_base_common+"/version";
    /**
     * wlyy app版本
     */
    public static class WlyyVersion {
        public static final String api_create = "/wlyyVersion";
        public static final String api_update = "/wlyyVersion";
@ -31,6 +34,9 @@ public class BaseVersionRequestMapping {
    }
    /**
     * 用户版本 用户灰度发布
     */
    public class UserVersion {
        public static final String api_create = "/userVersion";
        public static final String api_update = "/userVersion";

+ 2 - 2
common/common-request-mapping/src/main/java/com/yihu/jw/rm/wx/WechatRequestMapping.java

@ -1,11 +1,11 @@
package com.yihu.jw.rm.wx;
package com.yihu.jw.rm.base;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class WechatRequestMapping {
    public static final String api_common="/svr-wechat";
    public static final String api_common=BaseRequestMapping.api_base_common+"/wechat";
    //微信token模块常量

+ 1 - 1
common/common-request-mapping/src/main/java/com/yihu/jw/rm/wlyy/WlyyRequestMapping.java

@ -5,7 +5,7 @@ package com.yihu.jw.rm.wlyy;
 */
public class WlyyRequestMapping {
    public static final String api_common = "svr-wlyy";
    public static final String api_wlyy_common = "svr-wlyy";
    //协议模块常量
    public static class Agreement {

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/FunctionController.java

@ -25,7 +25,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(value = "功能模块", description = "功能模块接口管理")
public class FunctionController extends EnvelopRestController {
    @Autowired

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/ModuleController.java

@ -24,7 +24,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(value = "模块模块", description = "模块接口管理")
public class ModuleController extends EnvelopRestController {
    @Autowired

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/ModuleFunController.java

@ -16,7 +16,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(value = "模块功能模块", description = "模块功能模块")
public class ModuleFunController extends EnvelopRestController {
    @Autowired

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/base/controller/SaasController.java

@ -23,7 +23,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(value = "Saas配置模块", description = "Saas配置模块接口管理")
public class SaasController extends EnvelopRestController {
    @Autowired

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WechatConfigController.java

@ -6,7 +6,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WxAccessTokenController.java

@ -5,7 +5,7 @@ import com.yihu.jw.business.wx.service.WxAccessTokenService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WxGraphicMessageController.java

@ -6,7 +6,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.base.wx.MWxGraphicMessage;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WxMenuController.java

@ -10,7 +10,7 @@ import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.base.wx.MWxMenu;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WxTemplateController.java

@ -11,7 +11,7 @@ import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.base.wx.MWxTemplate;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WechatService.java

@ -5,7 +5,7 @@ import com.yihu.jw.business.wx.dao.WechatDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxAccessTokenService.java

@ -7,7 +7,7 @@ import com.yihu.jw.business.wx.dao.WxAccessTokenDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import com.yihu.jw.util.HttpUtil;
import org.json.JSONObject;
import org.slf4j.Logger;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxGraphicMessageService.java

@ -5,7 +5,7 @@ import com.yihu.jw.business.wx.dao.WxGraphicMessageDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import com.yihu.jw.util.MessageUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxMenuService.java

@ -7,7 +7,7 @@ import com.yihu.jw.business.wx.dao.WxMenuDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import com.yihu.jw.util.HttpUtil;
import org.json.JSONObject;
import org.slf4j.Logger;

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxTemplateService.java

@ -7,7 +7,7 @@ import com.yihu.jw.business.wx.dao.WxTemplateDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import com.yihu.jw.util.HttpUtil;
import org.json.JSONObject;
import org.slf4j.Logger;

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/config/SwaggerConfig.java

@ -1,7 +1,7 @@
package com.yihu.jw.config;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@ -29,7 +29,7 @@ public class SwaggerConfig {
                .pathMapping("/")
                .select()
                .paths(or(
                         regex("/"+ BaseRequestMapping.api_common+"/.*")
                         regex("/"+ BaseRequestMapping.api_base_common +"/.*")
                        ,regex("/"+ WechatRequestMapping.api_common+"/.*")
                ))
                .build()

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/base/FunctionController.java

@ -21,7 +21,7 @@ import java.util.Map;
 * Created by chenweida on 2017/6/20.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(description = "功能管理")
public class FunctionController {
    @Autowired

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/base/ModuleController.java

@ -21,7 +21,7 @@ import java.util.Map;
 * Created by chenweida on 2017/6/20.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(description = "模块管理")
public class ModuleController {
    @Autowired

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/base/SaasController.java

@ -18,7 +18,7 @@ import java.util.List;
 * Created by Administrator on 2017/6/13 0013.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(description = "saas相关")
public class SaasController {

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/GraphicMessageController.java

@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.manage.service.wechat.GraphicMessageService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxGraphicMessage;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/TemplateController.java

@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.manage.service.wechat.TemplateService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxTemplate;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/WechatConfigController.java

@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.manage.service.wechat.WechatConfigService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/WechatMenuController.java

@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.yihu.jw.manage.service.wechat.WechatMenuService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxMenu;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/base/FunctionService.java

@ -26,7 +26,7 @@ import java.util.UUID;
@Service
public class FunctionService {
    @Value("${spring.gateway}"+ BaseRequestMapping.api_common)
    @Value("${spring.gateway}"+ BaseRequestMapping.api_base_common)
    private String url;
    @Autowired
    private RestTemplate template;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/base/ModuleService.java

@ -24,7 +24,7 @@ import java.util.*;
@Service
public class ModuleService {
    @Value("${spring.gateway}"+ BaseRequestMapping.api_common)
    @Value("${spring.gateway}"+ BaseRequestMapping.api_base_common)
    private String url;
    @Autowired
    private RestTemplate template;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/base/SaasService.java

@ -33,7 +33,7 @@ public class SaasService {
    }
    public List getListNoPage() {
        Envelop envelop = template.getForObject(url +"/"+ BaseRequestMapping.api_common+BaseRequestMapping.Saas.api_getSaassNoPage,Envelop.class);
        Envelop envelop = template.getForObject(url +"/"+ BaseRequestMapping.api_base_common +BaseRequestMapping.Saas.api_getSaassNoPage,Envelop.class);
        List list = envelop.getDetailModelList();
        return list;
    }

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/doctorManage/DoctorService.java

@ -7,7 +7,7 @@ package com.yihu.jw.manage.service.doctorManage;
@Service
public class DoctorService {
    @Value("${spring.gateway}"+ DoctorContants.api_common)
    @Value("${spring.gateway}"+ DoctorContants.api_base_common)
    private String url;
    @Autowired

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/wechat/GraphicMessageService.java

@ -6,7 +6,7 @@ import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.manage.util.RestTemplateUtil;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxGraphicMessage;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/wechat/TemplateService.java

@ -6,7 +6,7 @@ import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.manage.util.RestTemplateUtil;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxTemplate;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/wechat/WechatConfigService.java

@ -6,7 +6,7 @@ import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.manage.util.RestTemplateUtil;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-manage/src/main/java/com/yihu/jw/manage/service/wechat/WechatMenuService.java

@ -6,7 +6,7 @@ import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.manage.util.RestTemplateUtil;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.base.wx.MWxMenu;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/config/SwaggerConfig.java

@ -27,7 +27,7 @@ public class SwaggerConfig {
                .pathMapping("/")
                .select()
                .paths(or(
                        regex("/" + WlyyRequestMapping.api_common + "/.*")
                        regex("/" + WlyyRequestMapping.api_wlyy_common + "/.*")
                ))
                .build()
                .apiInfo(wlyyApiInfo());

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementController.java

@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_common)
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "协议相关操作", description = "协议相关操作")
public class WlyyAgreementController extends EnvelopRestController {

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementKpiController.java

@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_common)
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "套餐指标相关操作", description = "套餐指标相关操作")
public class WlyyAgreementKpiController extends EnvelopRestController {

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementKpiLogController.java

@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_common)
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "套餐指标执行日志相关操作", description = "套餐指标执行日志相关操作")
public class WlyyAgreementKpiLogController extends EnvelopRestController {

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyySignFamilyController.java

@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_common)
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "签约相关操作", description = "签约相关操作")
public class WlyySignFamilyController extends EnvelopRestController {

+ 1 - 1
svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/patient/AdvertisementControlelr.java

@ -23,7 +23,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = WlyyRequestMapping.api_common)
@RequestMapping(value = WlyyRequestMapping.api_wlyy_common)
@Api(value = "广告相关操作", description = "广告相关操作")
public class AdvertisementControlelr extends EnvelopRestController {

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/base/base/FunctionFeign.java

@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
        name = CommonContants.svr_base // name值是eurika的实例名字
        ,fallbackFactory  = FunctionFeignFallbackFactory.class
)
@RequestMapping(value = BaseRequestMapping.api_common)
@RequestMapping(value = BaseRequestMapping.api_base_common)
public interface FunctionFeign {
    @RequestMapping(value = BaseRequestMapping.Function.api_create,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.POST)

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/base/base/ModuleFeign.java

@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
        name = CommonContants.svr_base // name值是eurika的实例名字
        ,fallbackFactory  = ModuleFeignFallbackFactory.class
)
@RequestMapping(value = BaseRequestMapping.api_common)
@RequestMapping(value = BaseRequestMapping.api_base_common)
public interface ModuleFeign {
    @PostMapping(value = BaseRequestMapping.Module.api_create,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/base/base/SaasFeign.java

@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
        name = CommonContants.svr_base // name值是eurika的实例名字
        ,fallbackFactory  = SaasFeignFallbackFactory.class
)
@RequestMapping(value = BaseRequestMapping.api_common)
@RequestMapping(value = BaseRequestMapping.api_base_common)
public interface SaasFeign {
    @GetMapping(value = BaseRequestMapping.Saas.api_getSaassNoPage)

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/base/version/UserVersionFeign.java

@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
        name = CommonContants.svr_base // name值是eurika的实例名字
        ,fallbackFactory  = SaasFeignFallbackFactory.class
)
@RequestMapping(value = BaseRequestMapping.api_common)
@RequestMapping(value = BaseRequestMapping.api_base_common)
public interface UserVersionFeign {
}

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/base/wx/AccessTokenFeign.java

@ -3,7 +3,7 @@ package com.yihu.jw.feign.base.wx;
import com.yihu.jw.feign.fallbackfactory.base.wx.AccessTokenFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/base/wx/GraphicMessageFeign.java

@ -4,7 +4,7 @@ import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.wx.GraphicMessageFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody;

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatFeign.java

@ -4,7 +4,7 @@ import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.wx.WechatFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody;

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatMenuFeign.java

@ -4,7 +4,7 @@ import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.wx.WechatMenuFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatTemplateFeign.java

@ -4,7 +4,7 @@ import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.wx.WechatTemplateFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyyAgreementFeign.java

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
        name = CommonContants.svr_wlyy // name值是eurika的实例名字
        ,fallbackFactory  = WlyyAgreementFeignFallbackFactory.class
)
@RequestMapping(WlyyRequestMapping.api_common)
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
public interface WlyyAgreementFeign {
    @PostMapping(value = WlyyRequestMapping.Agreement.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyyAgreementKpiFeign.java

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
        name = CommonContants.svr_wlyy // name值是eurika的实例名字
        ,fallbackFactory  = WlyyAgreementKpiFeignFallbackFactory.class
)
@RequestMapping(WlyyRequestMapping.api_common)
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
public interface WlyyAgreementKpiFeign {
    @PostMapping(value = WlyyRequestMapping.AgreementKpi.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyyAgreementKpiLogFeign.java

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
        name = CommonContants.svr_wlyy // name值是eurika的实例名字
        ,fallbackFactory  = WlyyAgreementKpiLogFeignFallbackFactory.class
)
@RequestMapping(WlyyRequestMapping.api_common)
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
public interface WlyyAgreementKpiLogFeign {
    @PostMapping(value = WlyyRequestMapping.AgreementKpiLog.api_create)

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyySignFamilyFeign.java

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
        name = CommonContants.svr_wlyy // name值是eurika的实例名字
        ,fallbackFactory  = WlyySignFamilyFeignFallbackFactory.class
)
@RequestMapping(WlyyRequestMapping.api_common)
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
public interface WlyySignFamilyFeign {
    @PostMapping(value = WlyyRequestMapping.SignFamily.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)

+ 1 - 1
web-gateway/src/main/java/com/yihu/jw/feign/wlyy/patient/AdvertisementFeign.java

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
        name = CommonContants.svr_wlyy // name值是eurika的实例名字
        ,fallbackFactory  = AdvertisementFeignFallbackFactory.class
)
@RequestMapping(WlyyRequestMapping.api_common)
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
public interface AdvertisementFeign {
    @PostMapping(value = WlyyRequestMapping.Advertisement.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)