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

common/common-entity/src/main/java/com/yihu/jw/base/version/BaseUserVersion.java

@@ -1,8 +1,12 @@
package com.yihu.jw.base.version;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -10,17 +14,17 @@ import javax.persistence.Table;
/**
 * BaseUserVersion entity. @author MyEclipse Persistence Tools
 * 灰度发布表 用户在这个表有数据 说明是属于灰度发布的用户 没有数据就说明没有
 */
@Entity
@Table(name = "base_user_version")
public class BaseUserVersion  extends IdEntityWithOperation implements java.io.Serializable {
public class BaseUserVersion  extends IdEntity implements java.io.Serializable {
	// Fields
	private String saasId;
	private String userCode;
	private String version;
	private Integer status;
	// Constructors
@@ -56,14 +60,39 @@ public class BaseUserVersion  extends IdEntityWithOperation implements java.io.S
		this.version = version;
	}
	@Column(name = "status")
	public Integer getStatus() {
		return this.status;
	@CreatedDate
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)
	protected Date createTime;
	@CreatedBy
	@Column(name = "create_user",updatable = false)
	protected String createUser;
	@CreatedBy
	@Column(name = "create_user_name",updatable = false)
	protected String createUserName;
	public Date getCreateTime() {
		return createTime;
	}
	public void setStatus(Integer status) {
		this.status = status;
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	public String getCreateUser() {
		return createUser;
	}
	public void setCreateUser(String createUser) {
		this.createUser = createUser;
	}
	public String getCreateUserName() {
		return createUserName;
	}
	public void setCreateUserName(String createUserName) {
		this.createUserName = createUserName;
	}
}

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

@@ -6,71 +6,6 @@ package com.yihu.jw.rm.base;
public class BaseVersionRequestMapping {
    public static final String api_common = "/version";
    public static class BaseServerVersion {
        public static final String message_success_create = "ServerVersion create success";
        public static final String message_success_update = "ServerVersion update success";
        public static final String message_success_find = "ServerVersion find success";
        public static final String message_success_find_BaseServerVersions = "ServerVersions find success";
        public static final String message_success_delete = "ServerVersion delete success";
        public static final String message_fail_name_exist = "ServerVersion name exist";
        public static final String message_fail_name_is_null = "ServerVersion is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String api_create = "/serverVersion";
        public static final String api_update = "/serverVersion";
        public static final String api_delete = "/serverVersion/{ids}";
        public static final String api_getById = "/serverVersion/{id}";
        public static final String api_getList="/serverVersion/list";
        public static final String api_getListNoPage="/serverVersion/listNoPage";
    }
    public static class BaseServerUrlVersion {
        public static final String message_success_create = "ServerUrlVersion create success";
        public static final String message_success_update = "ServerUrlVersion update success";
        public static final String message_success_find = "ServerUrlVersion find success";
        public static final String message_success_find_BaseServerUrlVersions = "ServerUrlVersion find success";
        public static final String message_success_delete = "ServerUrlVersion delete success";
        public static final String message_fail_name_exist = "ServerUrlVersion name exist";
        public static final String message_fail_name_is_null = "ServerUrlVersion is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String api_create = "/serverUrl";
        public static final String api_update = "/serverUrl";
        public static final String api_delete = "/serverUrl/{ids}";
        public static final String api_getById = "/serverUrl/{id}";
        public static final String api_getList="/serverUrl/list";
        public static final String api_getListNoPage="/serverUrl/listNoPage";
    }
    public static class BaseServerVersionLog {
        public static final String message_success_create = "BaseServerVersionLog create success";
        public static final String message_success_update = "BaseServerVersionLog update success";
        public static final String message_success_find = "BaseServerVersionLog find success";
        public static final String message_success_find_BaseServerVersionLog = "BaseServerVersionLog find success";
        public static final String message_success_delete = "BaseServerVersionLog delete success";
        public static final String message_fail_name_is_null = "ServerVersion is null";
        public static final String message_fail_id_is_null = "id is null";
        public static final String message_fail_id_no_exist = "id no exist";
        public static final String api_create = "/serverVersionLog";
        public static final String api_update = "/serverVersionLog";
        public static final String api_delete = "/serverVersionLog/{ids}";
        public static final String api_getById = "/serverVersionLog/{id}";
        public static final String api_getList="/serverVersionLog/list";
        public static final String api_getListNoPage="/serverVersionLog/listNoPage";
    }
    public static class WlyyVersion {
        public static final String message_success_create = "WlyyVersion create success";
        public static final String message_success_update = "WlyyVersion update success";
@@ -93,19 +28,17 @@ public class BaseVersionRequestMapping {
    }
    public class UserUrlVersion {
        public static final String api_create = "/userUrlVersion";
        public static final String api_update = "/userUrlVersion";
        public static final String api_delete = "/userUrlVersion/{ids}";
        public static final String api_getById = "/userUrlVersion/{id}";
        public static final String api_getList="/userUrlVersion/list";
        public static final String api_getListNoPage="/userUrlVersion/listNoPage";
        public static final String api_changeUserVersion="/userUrlVersion/userVersion";
    public class UserVersion {
        public static final String api_create = "/userVersion";
        public static final String api_delete = "/userVersion/{ids}";
        public static final String api_getById = "/userVersion/{id}";
        public static final String api_getList="/userVersion/list";
        public static final String api_getListNoPage="/userVersion/listNoPage";
        public static final String message_success_create="userUrlVersion create success";
        public static final String message_success_create="userVersion create success";
        public static final String message_success_update="update UserVersion success";
        public static final String message_success_delete="userUrlVersion delete success";
        public static final String message_success_find="userUrlVersion find success";
        public static final String message_success_delete="userVersion delete success";
        public static final String message_success_find="userVersion find success";
                ;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/business/version/controller/UserVersionController.java

@@ -1,7 +1,54 @@
package com.yihu.jw.business.version.controller;
import com.yihu.jw.base.sms.BaseSms;
import com.yihu.jw.base.version.BaseUserVersion;
import com.yihu.jw.business.version.service.UserVersionService;
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.base.BaseSmsRequestMapping;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import io.swagger.annotations.Api;
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 chenweida on 2017/11/10.
 */
public class UserVersionController {
@RestController
@RequestMapping(BaseVersionRequestMapping.api_common)
@Api(description = "灰度发布,用户版本信息")
public class UserVersionController extends EnvelopRestController {
    @Autowired
    private UserVersionService userVersionService;
    @PostMapping(value = BaseVersionRequestMapping.UserVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "给用户添加灰度发布版本信息", notes = "给用户添加灰度发布版本信息")
    public Envelop createUserVersion(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseUserVersion baseUserVersion = toEntity(jsonData, BaseUserVersion.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_create, userVersionService.createUserVersion(baseUserVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @DeleteMapping(value = BaseVersionRequestMapping.UserVersion.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除用户灰度发布版本信息", notes = "删除用户灰度发布版本信息")
    public Envelop deleteUserVersion(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id) {
        try {
            userVersionService.deleteUserVersion(id);
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_delete);
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/business/version/service/UserVersionService.java

@@ -1,7 +1,26 @@
package com.yihu.jw.business.version.service;
import com.yihu.jw.base.version.BaseUserVersion;
import com.yihu.jw.business.version.dao.UserVersionDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
 * Created by chenweida on 2017/11/10.
 */
@Service
public class UserVersionService {
    @Autowired
    private UserVersionDao userVersionDao;
    @Transactional
    public BaseUserVersion createUserVersion(BaseUserVersion baseUserVersion) {
        return userVersionDao.save(baseUserVersion);
    }
    @Transactional
    public void deleteUserVersion(String id) {
        userVersionDao.delete(id);
    }
}

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

@@ -45,7 +45,7 @@ public class WxAccessTokenService extends BaseJpaService<WxAccessToken, WxAccess
            //根据wechatCode查找出appid和appSecret
            WxWechat wxWechat = wechatDao.findById(wechatId);
            if(wxWechat==null){
                throw new ApiException(WechatRequestMapping.WxConfig.message_fail_wxWechat_is_no_exist, ExceptionCode.common_error_params_id);
                throw new ApiException(WechatRequestMapping.WxConfig.message_fail_wxWechat_is_no_exist, ExceptionCode.common_error_params_code);
            }
            List<WxAccessToken> wxAccessTokens =  wxAccessTokenDao.getWxAccessTokenById(wechatId);
            if(wxAccessTokens!=null&&wxAccessTokens.size()>0){
@@ -64,10 +64,10 @@ public class WxAccessTokenService extends BaseJpaService<WxAccessToken, WxAccess
            appId = wxWechat.getAppId();
            appSecret = wxWechat.getAppSecret();
            if (StringUtils.isEmpty(appId)){
                throw new ApiException(WechatRequestMapping.WxConfig.message_fail_appId_is_null, ExceptionCode.common_error_params_id);
                throw new ApiException(WechatRequestMapping.WxConfig.message_fail_appId_is_null, ExceptionCode.common_error_params_code);
            }
            if (StringUtils.isEmpty(appSecret)){
                throw new ApiException(WechatRequestMapping.WxConfig.message_fail_appSecret_is_null, ExceptionCode.common_error_params_id);
                throw new ApiException(WechatRequestMapping.WxConfig.message_fail_appSecret_is_null, ExceptionCode.common_error_params_code);
            }
            String params = "grant_type=client_credential&appid=" + appId + "&secret=" + appSecret;
            String result = HttpUtil.sendGet(token_url, params);

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/version/UserUrlVersionController.java

@@ -28,7 +28,7 @@ public class UserUrlVersionController {
    private UserUrlVersionService userUrlVersionService;
    @GetMapping(BaseVersionRequestMapping.UserUrlVersion.api_getListNoPage)
    @GetMapping(BaseVersionRequestMapping.UserVersion.api_getListNoPage)
    @ApiOperation(value = "获取后台用户版本列表")
    public List getListNoPage(@ApiParam(name = "saasId", value = "saasId", required = false) @RequestParam(required = false, name = "saasId") String saasId,
                              @ApiParam(name = "bsvCode", value = "bsvCode", required = false) @RequestParam(required = false, name = "bsvCode") String bsvCode) {
@@ -46,11 +46,4 @@ public class UserUrlVersionController {
    }
    @GetMapping(BaseVersionRequestMapping.UserUrlVersion.api_changeUserVersion)
    @ApiOperation(value = "更改后台用户版本")
    public Envelop changeUserVersion(@RequestParam(value="serverCode") String serverCode,@RequestParam(value="userCodes")String userCodes,@RequestParam(value="userCode")String userCode,@RequestParam(value="saasId")String saasId){
        Envelop envelop = userUrlVersionService.changeUserVersion(serverCode,userCodes,userCode,saasId);
        return envelop;
    }
}