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

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 = "/bases";
    public static final String api_common = "/svr-bases";
    //功能模块常量
    public static class Function{

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="sms";
    public static final String api_common="svr-sms";
    //短信常量
    public static class Sms{
        public static final String message_success_create="sms create success";

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

@@ -5,7 +5,8 @@ package com.yihu.jw.rm.base;
 */
public class BaseVersionRequestMapping {
    public static final String api_common = "/version";
    public static final String api_common = "/svr-version";
    public static class WlyyVersion {
        public static final String api_create = "/wlyyVersion";
        public static final String api_update = "/wlyyVersion";

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 = "wlyy";
    public static final String api_common = "svr-wlyy";
    //协议模块常量
    public static class Agreement {

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

@@ -5,7 +5,7 @@ package com.yihu.jw.rm.wx;
 */
public class WechatRequestMapping {
    public static final String api_common="/wechat";
    public static final String api_common="/svr-wechat";
    //微信token模块常量

web-gateway/src/main/java/com/yihu/jw/commnon/base/base/BaseContants.java

@@ -5,43 +5,45 @@ package com.yihu.jw.commnon.base.base;
 * 基础模块的静态变量
 */
public class BaseContants {
    public static final String api_common = "/bases";
    public static final String api_function = api_common+"/function";
    public static final String api_module = api_common+"/module";
    public static final String api_moduleFun = api_common+"/moduleFun";
    public static final String api_saas = api_common+"/saas";
    //功能模块常量
    public static class Function{
        public static final String api_create="/function";
        public static final String api_update="/function";
        public static final String api_delete="/function/{id}";
        public static final String api_getById="/function/{id}";
        public static final String api_getListNoPage="/function/listNoPage";
        public static final String api_getList="/function/list";
        public static final String api_getChildren="/function/children/{id}";
        public static final String api_create="/";
        public static final String api_update="/";
        public static final String api_delete="/{id}";
        public static final String api_getById="/{id}";
        public static final String api_getListNoPage="/listNoPage";
        public static final String api_getList="/list";
        public static final String api_getChildren="/children/{id}";
    }
    //模块常量
    public static class Module{
        public static final String api_create="/module";
        public static final String api_update="/module";
        public static final String api_delete="/module/{id}";
        public static final String api_getById="/module/{id}";
        public static final String api_getListNoPage="/module/listNoPage";
        public static final String api_getList="/module/list";
        public static final String api_getChildren="/module/children/{id}";
        public static final String api_create="/";
        public static final String api_update="/";
        public static final String api_delete="/{id}";
        public static final String api_getById="/{id}";
        public static final String api_getListNoPage="/listNoPage";
        public static final String api_getList="/list";
        public static final String api_getChildren="/children/{id}";
    }
    public static class ModuleFun{
        public static final String api_getExistFun = "/moduleFun/existFunc/{id}";
        public static final String api_changeFun="/moduleFun/changeFun";
        public static final String api_getExistFun = "/existFunc/{id}";
        public static final String api_changeFun="/changeFun";
    }
    //saas常量
    public static class Saas{
        public static final String api_common="/saas";
        public static final String api_create="/create";
        public static final String api_update="/update";
        public static final String api_delete="/delete";
        public static final String api_create="/";
        public static final String api_update="/";
        public static final String api_delete="/{id}";
        public static final String api_getSaassNoPage="/getSaassNoPage";
    }

web-gateway/src/main/java/com/yihu/jw/config/SwaggerConfig.java

@@ -18,7 +18,7 @@ import static springfox.documentation.builders.PathSelectors.regex;
@Configuration
@EnableSwagger2
@ComponentScan("com.yihu.jw.**")
@ComponentScan("com.yihu.jw.controller.**")
public class SwaggerConfig {
    public static final String base_API = "base";
    public static final String wlyy_API = "wlyy";

web-gateway/src/main/java/com/yihu/jw/controller/DemoController.java

@@ -59,7 +59,7 @@ public class DemoController {
        return Envelop.getSuccess("请求成功");
    }
    @GetMapping("/hello")
    @GetMapping("/hello2")
    @ResponseBody
    public String hello2(String id) throws Exception {
        System.out.println("haha2.........");

web-gateway/src/main/java/com/yihu/jw/controller/base/base/FunctionController.java

@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 */
@RestController
@RequestMapping(BaseContants.api_common)
@RequestMapping(BaseContants.api_function)
@Api(value = "功能管理", description = "功能管理")
public class FunctionController extends EnvelopRestController {

web-gateway/src/main/java/com/yihu/jw/controller/base/base/ModuleController.java

@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 */
@RestController
@RequestMapping( BaseContants.api_common)
@RequestMapping( BaseContants.api_module)
@Api(value = "模块管理", description = "模块相关接口管理")
public class ModuleController extends EnvelopRestController {

web-gateway/src/main/java/com/yihu/jw/controller/base/base/SaasController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(BaseContants.api_common)
@RequestMapping(BaseContants.api_saas)
@Api(description = "saas相关")
public class SaasController {

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

@@ -17,13 +17,13 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping(value = BaseRequestMapping.api_common)
public interface FunctionFeign {
    @PostMapping(value = BaseRequestMapping.Function.api_create,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = BaseRequestMapping.Function.api_create,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.POST)
    Envelop create(@RequestBody String jsonData) throws JiWeiException;
    @PutMapping(value =  BaseRequestMapping.Function.api_update,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value =  BaseRequestMapping.Function.api_update,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,method = RequestMethod.PUT)
    Envelop update(@RequestBody String jsonData) throws JiWeiException;
    @DeleteMapping(value =BaseRequestMapping.Function.api_delete)
    @RequestMapping(value =  BaseRequestMapping.Function.api_delete,method = RequestMethod.DELETE)
    Envelop delete(@PathVariable(value = "ids", required = true) String ids, @RequestParam(value = "userId") String userId, @RequestParam(value = "userName") String userName) throws JiWeiException;
    @GetMapping(value = BaseRequestMapping.Function.api_getById)