Merge branch 'dev' of http://192.168.1.220:10080/chenweida/jw2.0 into dev

Conflicts:
	common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/BaseContants.java

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/BaseContants.java

@@ -5,6 +5,8 @@ package com.yihu.jw.restmodel.base;
 * 基础模块的静态变量
 */
public class BaseContants {
    //功能模块常量
    public static class Function{
        public static final String message_success_create="function create success";
@@ -18,17 +20,18 @@ public class BaseContants {
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_name_is_null="function is null";
        public static final String message_fail_id_is_null="id is null";
        public static final String message_fail_code_no_exist="code no exist";
        public static final String message_fail_wechatCode_is_null="wechatCode is null";
        public static final String message_fail_code_no_exist="code no exist";
        public static final String api_common="function";
        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_getByCode="getByCode";
        public static final String api_getFunctions="getFunctions";
        public static final String api_getFunctionsNoPage="getFunctionsNoPage";
        public static final String api_getFunctionsNoPage="getFunctionsNoPage";
    }
    //模块常量
@@ -103,5 +106,41 @@ public class BaseContants {
        public static final String api_common="wxMenu";
        public static final String api_create="create";
        public static final String api_get="get";
        public static final String api_delete="delete";
        public static final String api_getById="getById";
        public static final String api_update="update";
        public static final String message_fail_wechatCode_is_null="wechatCode is null";
        public static final String message_fail_wxMenuName_is_null="wxMenuName is null";
        public static final String message_fail_code_is_null="wechatCode is null";
        public static final String message_fail_name_is_null="weChatMenuName is null";
        public static final String message_fail_id_is_null="id is null";
        public static final String message_fail_id_no_exist="id is null";
        public static final String message_success_update="wxMenu update success";
        public static final String message_success_delete="wxMenu delete success";
        public static final String message_success_find="wxMenu success find";
    }
    public static class WxTemplate {
        public static final String api_common="wxTemplate";
        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_getByCode="getByCode";
        public static final String message_success_create="wxTemplate create success";
        public static final String message_success_update="wxTemplate update success";
        public static final String message_success_find="wxTemplate find success";
        public static final String message_success_find_functions="wxTemplate find success";
        public static final String message_success_delete="wxTemplate delete success";
        public static final String message_fail_name_exist="wxTemplate name exist";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_name_is_null="wxTemplate is null";
        public static final String message_fail_id_is_null="id is null";
        public static final String message_fail_code_no_exist="code no exist";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/common/Envelop.java

@@ -1,7 +1,5 @@
package com.yihu.jw.restmodel.common;
import com.yihu.jw.restmodel.base.MFunction;
import java.io.Serializable;
import java.util.List;

svr-configuration/src/main/resources/application.yml

@@ -2,6 +2,17 @@ server:
  port: 1221
eureka:
  client:
    healthcheck:
      enabled: true #启动监控检查
  instance:
    #eurika使用IP不使用host
    prefer-ip-address: true
    #定制化在eurika中显示的名称
    ##instance-id: ${spring.application.name}:${spring.application.instance_id:${server.port}}
    instance-id: 127.0.0.1:${server.port}
---
spring:

svr-configuration/src/main/resources/bootstrap.yml

@@ -17,8 +17,9 @@ spring:
      failFast: true ##启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: http://192.168.1.220:10080/chenweida/jw.config.git
          #uri: http://192.168.1.220:10080/chenweida/jw.config.git
          #uri: http://192.168.116.100:10080/chenweida/mini.jw.config.git
          uri: http://192.168.1.220:10080/chenyongxing/jw.config.git
        default-label: master

svr-lib-parent-pom/pom.xml

@@ -43,7 +43,7 @@
        <version.mysql>5.1.38</version.mysql>
        <version.jackson>2.8.1</version.jackson>
        <version.myCommon>1.0.0</version.myCommon>
        <version.spring>5.0.0.M5</version.spring>
        <version.spring>4.3.8.RELEASE</version.spring>
        <version.spring-data-jpa>2.0.0.M2</version.spring-data-jpa>
        <version.zipkin>1.24.0</version.zipkin>
        <version.hibernate>5.0.12.Final</version.hibernate>

svr/svr-base/pom.xml

@@ -38,6 +38,10 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-autoconfigure</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -79,10 +83,6 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
@@ -96,9 +96,5 @@
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
        </dependency>
    </dependencies>
</project>

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

@@ -0,0 +1,75 @@
package com.yihu.jw.wx.controller;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.wx.model.WxMenu;
import com.yihu.jw.wx.model.WxTemplate;
import com.yihu.jw.wx.service.WxTemplateService;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
/**
 * Created by Administrator on 2017/5/19 0019.
 */
public class WxTemplateController extends EnvelopRestController {
    @Autowired
    private WxTemplateService wxTemplateService;
    @PostMapping(value = BaseContants.WxTemplate.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建微信模版", notes = "创建微信模版")
    public Envelop createWxTemplate(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxTemplate WxTemplate = toEntity(jsonData, WxTemplate.class);
            return Envelop.getSuccess(BaseContants.WxTemplate.message_success_create, wxTemplateService.createWxMenu(WxTemplate));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @PutMapping(value = BaseContants.WxTemplate.api_update, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "修改微信模版", notes = "修改微信模版")
    public Envelop updateWxTemplate(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxTemplate WxTemplate = toEntity(jsonData, WxTemplate.class);
            return Envelop.getSuccess(BaseContants.WxTemplate.message_success_update, WxTemplateService.updateWxTemplate(WxTemplate));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseContants.WxTemplate.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除微信模版", notes = "删除微信模版")
    public Envelop deleteWxTemplate(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) Integer id) {
        try {
            WxTemplateService.deleteWxTemplate(id);
            return Envelop.getSuccess(BaseContants.WxTemplate.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseContants.WxTemplate.api_getById, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "根据id查找微信菜单", notes = "根据id查找微信菜单")
    public Envelop findById(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) Integer id
    ) {
        try {
            return Envelop.getSuccess(BaseContants.WxTemplate.message_success_find, WxTemplateService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/wx/dao/WxMenuDao.java

@@ -1,12 +1,15 @@
package com.yihu.jw.wx.dao;
import com.yihu.jw.wx.model.WxAccessToken;
import com.yihu.jw.wx.model.WxMenu;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/5/19 0019.
 */
public interface WxMenuDao extends PagingAndSortingRepository<WxAccessToken, Long>, JpaSpecificationExecutor<WxAccessToken> {
public interface WxMenuDao  extends PagingAndSortingRepository<WxMenu, Long>, JpaSpecificationExecutor<WxMenu> {
    @Query("from WxMenu m where m.id = ?1")
    WxMenu findById(Integer id);
}

svr/svr-base/src/main/java/com/yihu/jw/wx/model/WxMenu.java

@@ -1,7 +1,7 @@
package com.yihu.jw.wx.model;// default package
import java.util.Date;
import javax.persistence.*;
import java.util.Date;
/**
 * 微信 菜单表
@@ -24,7 +24,15 @@ public class WxMenu implements java.io.Serializable {
	private Date createTime;//创建时间
	private String createUser;//创建人
	private String remark;//备注
	private Integer status; //状态 -1 已删除 0可用
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	// Constructors
	/** default constructor */
@@ -36,11 +44,7 @@ public class WxMenu implements java.io.Serializable {
		this.id = id;
	}
	/** full constructor */
	public WxMenu(Integer id, String wechatCode, String supMenucode,
			String type, String name, Integer sort, String url,
			String updateUser, Date updateTime, Date createTime,
			String createUser, String remark) {
	public WxMenu(Integer id, String wechatCode, String supMenucode, String type, String name, Integer sort, String url, String updateUser, Date updateTime, Date createTime, String createUser, String remark, Integer status) {
		this.id = id;
		this.wechatCode = wechatCode;
		this.supMenucode = supMenucode;
@@ -53,6 +57,7 @@ public class WxMenu implements java.io.Serializable {
		this.createTime = createTime;
		this.createUser = createUser;
		this.remark = remark;
		this.status = status;
	}
	// Property accessors

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

@@ -0,0 +1,33 @@
package com.yihu.jw.wx.service;
import com.yihu.jw.base.model.Function;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import com.yihu.jw.wx.model.WxTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
/**
 * Created by Administrator on 2017/5/19 0019.
 */
public class WxTemplateService {
    @Autowired
    private WxTemplateDao wxTemplateDao;
    public WxTemplate createWxMenu(WxTemplate wxTemplate) {
        if (StringUtils.isEmpty(wxTemplate.getCode())) {
            throw new ApiException(BaseContants.WxTemplate.message_fail_code_is_null, CommonContants.common_error_params_code);
        }
        if (StringUtils.isEmpty(wxTemplate.getWechatCode())) {
            throw new ApiException(BaseContants.Function.message_fail_wechatCode_is_null, CommonContants.common_error_params_code);
        }
        Function functionTmp = functionDao.findByName(wxTemplate.getName());
        if (functionTmp != null) {
            throw new ApiException(BaseContants.Function.message_fail_name_exist, CommonContants.common_error_params_code);
        }
        return functionDao.save(wxTemplate);
    }
}

web-gateway/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
  #从发现服务里面取配置服务的信息
  cloud:
    config:
      failFast: true ##启动快速失败 即链接不到配置服务就启动失败
      failFast: false ##启动快速失败 即链接不到配置服务就启动失败
      username: jw
      password: jkzl
      discovery: