Просмотр исходного кода

[微信开发平台][修改]:已发布查询

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
16e33cd0e8
7 измененных файлов: 142 добавлений и 31 удалений
  1. +9
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/enums/EnumWeappAuditStatus.java
  3. +38
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumWeappCodeCommitStatus.java
  4. +37
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumWeappReleaseStatus.java
  5. +18
    -4
      mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml
  6. +3
    -5
      mallinkWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java
  7. +33
    -15
      mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java

+ 9
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java Просмотреть файл

@@ -35,20 +35,26 @@ public class WxWeappCodeStatus implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="用户版本描述",name="versionDesc") @io.swagger.annotations.ApiModelProperty(value="用户版本描述",name="versionDesc")
private String versionDesc; private String versionDesc;
/**code提交状态*/ /**code提交状态*/
@io.swagger.annotations.ApiModelProperty(value="code提交状态(0:成功, ...error code)",name="codeStatus")
@io.swagger.annotations.ApiModelProperty(value="code提交状态(0:成功, 1:失败)",name="codeStatus")
private Integer codeStatus; private Integer codeStatus;
@io.swagger.annotations.ApiModelProperty(value="code提交错误码",name="codeErrCode")
private Integer codeErrCode;
/**更新时间*/ /**更新时间*/
@io.swagger.annotations.ApiModelProperty(value="code提交时间",name="codeTime") @io.swagger.annotations.ApiModelProperty(value="code提交时间",name="codeTime")
private Date codeTime; private Date codeTime;
/**审核状态*/ /**审核状态*/
@io.swagger.annotations.ApiModelProperty(value="审核状态((0为审核成功,1为审核失败,2为审核中,3已撤回))",name="auditStatus")
@io.swagger.annotations.ApiModelProperty(value="审核状态(0为审核成功,1为审核失败,2为审核中,3已撤回)",name="auditStatus")
private Integer auditStatus; private Integer auditStatus;
@io.swagger.annotations.ApiModelProperty(value="审核错误码",name="auditErrCode")
private Integer auditErrCode;
/**审核时间*/ /**审核时间*/
@io.swagger.annotations.ApiModelProperty(value="审核时间",name="auditTime") @io.swagger.annotations.ApiModelProperty(value="审核时间",name="auditTime")
private Date auditTime; private Date auditTime;
/**发布状态*/ /**发布状态*/
@io.swagger.annotations.ApiModelProperty(value="发布状态((0为发布成功,...error code))",name="releaseStatus")
@io.swagger.annotations.ApiModelProperty(value="发布状态(0:发布成功, 1:发布失败, 2:发布中)",name="releaseStatus")
private Integer releaseStatus; private Integer releaseStatus;
@io.swagger.annotations.ApiModelProperty(value="发布错误码",name="releaseErrCode")
private Integer releaseErrCode;
/**发布时间*/ /**发布时间*/
@io.swagger.annotations.ApiModelProperty(value="发布时间",name="releaseTime") @io.swagger.annotations.ApiModelProperty(value="发布时间",name="releaseTime")
private Date releaseTime; private Date releaseTime;


mallinkService/src/main/java/com/iformall/enums/EnumAuditStatus.java → mallinkService/src/main/java/com/iformall/enums/EnumWeappAuditStatus.java Просмотреть файл

@@ -3,7 +3,7 @@ package com.iformall.enums;
/** /**
* Created by Stormeye on 2018/08/09. * Created by Stormeye on 2018/08/09.
*/ */
public enum EnumAuditStatus {
public enum EnumWeappAuditStatus {


// 0为审核成功,1为审核失败,2为审核中,3已撤回 // 0为审核成功,1为审核失败,2为审核中,3已撤回
SUCCESS(0, "审核成功"), SUCCESS(0, "审核成功"),
@@ -12,8 +12,8 @@ public enum EnumAuditStatus {
UNDO(3, "已撤回"), UNDO(3, "已撤回"),
; ;


public static EnumAuditStatus getEnum(Integer code) {
for (EnumAuditStatus value : values()) {
public static EnumWeappAuditStatus getEnum(Integer code) {
for (EnumWeappAuditStatus value : values()) {
if (value.getCode().equals(code)) { if (value.getCode().equals(code)) {
return value; return value;
} }
@@ -24,7 +24,7 @@ public enum EnumAuditStatus {
private Integer code; private Integer code;
private String message; private String message;


EnumAuditStatus(Integer code, String message) {
EnumWeappAuditStatus(Integer code, String message) {
this.code = code; this.code = code;
this.message = message; this.message = message;
} }

+ 38
- 0
mallinkService/src/main/java/com/iformall/enums/EnumWeappCodeCommitStatus.java Просмотреть файл

@@ -0,0 +1,38 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumWeappCodeCommitStatus {

// 0: 提交成功, 1: 提交失败, ;

SUCCESS(0, "提交成功"),
FAIL(1, "提交失败")
;

public static EnumWeappCodeCommitStatus getEnum(Integer code) {
for (EnumWeappCodeCommitStatus value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumWeappCodeCommitStatus(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 37
- 0
mallinkService/src/main/java/com/iformall/enums/EnumWeappReleaseStatus.java Просмотреть файл

@@ -0,0 +1,37 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumWeappReleaseStatus {

// 0为发布成功,1为发布失败
SUCCESS(0, "发布成功"),
FAIL(1, "发布失败")
;

public static EnumWeappReleaseStatus getEnum(Integer code) {
for (EnumWeappReleaseStatus value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumWeappReleaseStatus(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 18
- 4
mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml Просмотреть файл

@@ -7,17 +7,24 @@
<result column="type" jdbcType="INTEGER" property="type" /> <result column="type" jdbcType="INTEGER" property="type" />
<result column="user_version" jdbcType="VARCHAR" property="userVersion" /> <result column="user_version" jdbcType="VARCHAR" property="userVersion" />
<result column="code_status" jdbcType="INTEGER" property="codeStatus" /> <result column="code_status" jdbcType="INTEGER" property="codeStatus" />
<result column="code_err_code" jdbcType="INTEGER" property="codeErrCode" />
<result column="code_time" jdbcType="TIMESTAMP" property="codeTime" /> <result column="code_time" jdbcType="TIMESTAMP" property="codeTime" />
<result column="audit_status" jdbcType="INTEGER" property="auditStatus" /> <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
<result column="audit_err_code" jdbcType="INTEGER" property="auditErrCode" />
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" /> <result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
<result column="release_status" jdbcType="INTEGER" property="releaseStatus" /> <result column="release_status" jdbcType="INTEGER" property="releaseStatus" />
<result column="release_err_code" jdbcType="INTEGER" property="releaseErrCode" />
<result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" /> <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`app_id`,`type`,`user_version`,`code_status`,`code_time`,`audit_status`,`audit_time`,`release_status`,`release_time`,`create_time`,`update_time`
`id`,`app_id`,`type`,`user_version`,
`code_status`,`code_err_code`,`code_time`,
`audit_status`,`audit_err_code`,`audit_time`,
`release_status`,`release_err_code`,`release_time`,
`create_time`,`update_time`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -70,10 +77,13 @@
<result column="type" jdbcType="INTEGER" property="type" /> <result column="type" jdbcType="INTEGER" property="type" />
<result column="user_version" jdbcType="VARCHAR" property="userVersion" /> <result column="user_version" jdbcType="VARCHAR" property="userVersion" />
<result column="code_status" jdbcType="INTEGER" property="codeStatus" /> <result column="code_status" jdbcType="INTEGER" property="codeStatus" />
<result column="code_err_code" jdbcType="INTEGER" property="codeErrCode" />
<result column="code_time" jdbcType="TIMESTAMP" property="codeTime" /> <result column="code_time" jdbcType="TIMESTAMP" property="codeTime" />
<result column="audit_status" jdbcType="INTEGER" property="auditStatus" /> <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
<result column="audit_err_code" jdbcType="INTEGER" property="auditErrCode" />
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" /> <result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
<result column="release_status" jdbcType="INTEGER" property="releaseStatus" /> <result column="release_status" jdbcType="INTEGER" property="releaseStatus" />
<result column="release_err_code" jdbcType="INTEGER" property="releaseErrCode" />
<result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" /> <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -81,7 +91,11 @@
</resultMap> </resultMap>


<sql id="allVoColumns"> <sql id="allVoColumns">
c.`id`,c.`app_id`,c.`type`,c.`user_version`,c.`code_status`,c.`code_time`,c.`audit_status`,c.`audit_time`,c.`release_status`,c.`release_time`,c.`create_time`,c.`update_time`,
c.`id`,c.`app_id`,c.`type`,c.`user_version`,
c.`code_status`,c.`code_err_code`,c.`code_time`,
c.`audit_status`,c.`audit_err_code`,c.`audit_time`,
c.`release_status`,c.`release_err_code`,c.`release_time`,
c.`create_time`,c.`update_time`,
a.`name` a.`name`
</sql> </sql>


@@ -103,7 +117,7 @@
and c.`code_status` = #{codeStatus} and c.`code_status` = #{codeStatus}
</if> </if>
<if test=" null != auditStatus "> <if test=" null != auditStatus ">
and c.v`audit_status` = #{auditStatus}
and c.`audit_status` = #{auditStatus}
</if> </if>
<if test=" null != releaseStatus "> <if test=" null != releaseStatus ">
and c.`release_status` = #{releaseStatus} and c.`release_status` = #{releaseStatus}
@@ -129,7 +143,7 @@
<select id="findVoList" parameterType="com.iformall.domain.vo.WxWeappCodeStatusVo" resultMap="VBaseResultMap"> <select id="findVoList" parameterType="com.iformall.domain.vo.WxWeappCodeStatusVo" resultMap="VBaseResultMap">
select <include refid="allVoColumns" /> select <include refid="allVoColumns" />
from wx_weapp_code_status c from wx_weapp_code_status c
left join wx_appinfo a on c.`app_id` = a.app_id
left join wx_appinfo a on c.`app_id` = a.`app_id`
<include refid="dynamicVoWhereConditions" /> <include refid="dynamicVoWhereConditions" />
</select> </select>


+ 3
- 5
mallinkWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java Просмотреть файл

@@ -3,7 +3,7 @@ package com.iformall.controller;
import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.domain.po.WxAuthorizerInfo;
import com.iformall.domain.po.WxComponentVerifyTicket; import com.iformall.domain.po.WxComponentVerifyTicket;
import com.iformall.domain.po.WxWeappCodeStatus; import com.iformall.domain.po.WxWeappCodeStatus;
import com.iformall.enums.EnumAuditStatus;
import com.iformall.enums.EnumWeappAuditStatus;
import com.iformall.enums.EnumWxAuthorizationInfoType; import com.iformall.enums.EnumWxAuthorizationInfoType;
import com.iformall.enums.EnumWxAuthorizationStatus; import com.iformall.enums.EnumWxAuthorizationStatus;
import com.iformall.service.WxAuthorizerInfoService; import com.iformall.service.WxAuthorizerInfoService;
@@ -16,10 +16,8 @@ import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage; import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
import me.chanjar.weixin.open.api.WxOpenMaService;
import me.chanjar.weixin.open.bean.message.WxOpenXmlMessage; import me.chanjar.weixin.open.bean.message.WxOpenXmlMessage;
import me.chanjar.weixin.open.bean.result.WxOpenAuthorizerInfoResult; import me.chanjar.weixin.open.bean.result.WxOpenAuthorizerInfoResult;
import me.chanjar.weixin.open.bean.result.WxOpenMaQueryAuditResult;
import me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult; import me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -270,9 +268,9 @@ public class WechatCalllbackController extends BaseController {
WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId); WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId);
if(codeStatus != null) { if(codeStatus != null) {
if(success) { if(success) {
codeStatus.setAuditStatus(EnumAuditStatus.SUCCESS.getCode());
codeStatus.setAuditStatus(EnumWeappAuditStatus.SUCCESS.getCode());
} else { } else {
codeStatus.setAuditStatus(EnumAuditStatus.FAIL.getCode());
codeStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode());
} }
weappCodeStatusService.updateAuditStatus(codeStatus); weappCodeStatusService.updateAuditStatus(codeStatus);
} }


+ 33
- 15
mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java Просмотреть файл

@@ -15,10 +15,7 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxWeappCodeStatusVo; import com.iformall.domain.vo.WxWeappCodeStatusVo;
import com.iformall.domain.vo.WxWeappInfo; import com.iformall.domain.vo.WxWeappInfo;
import com.iformall.enums.EnumAppType;
import com.iformall.enums.EnumAuditStatus;
import com.iformall.enums.EnumTemplateType;
import com.iformall.enums.EnumWxAuthorizationStatus;
import com.iformall.enums.*;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.service.wechat.WxOpenService; import com.iformall.service.wechat.WxOpenService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -293,13 +290,23 @@ public class WxWeappInfoController extends BaseController {
} }
codeStatus.setUserVersion(userVersion); codeStatus.setUserVersion(userVersion);
codeStatus.setVersionDesc(userDesc); codeStatus.setVersionDesc(userDesc);
codeStatus.setCodeStatus(Integer.valueOf(openRet.getErrcode()));
if(codeCommitStatus) {
codeStatus.setCodeStatus(EnumWeappCodeCommitStatus.SUCCESS.getCode());
} else {
codeStatus.setCodeStatus(EnumWeappCodeCommitStatus.FAIL.getCode());
}
codeStatus.setCodeErrCode(Integer.valueOf(openRet.getErrcode()));
codeStatus.setCodeTime(new Date()); codeStatus.setCodeTime(new Date());
weappCodeStatusService.saveOrUpdate(codeStatus); weappCodeStatusService.saveOrUpdate(codeStatus);
} else { } else {
codeStatus.setUserVersion(userVersion); codeStatus.setUserVersion(userVersion);
codeStatus.setVersionDesc(userDesc); codeStatus.setVersionDesc(userDesc);
codeStatus.setCodeStatus(Integer.valueOf(openRet.getErrcode()));
if(codeCommitStatus) {
codeStatus.setCodeStatus(EnumWeappCodeCommitStatus.SUCCESS.getCode());
} else {
codeStatus.setCodeStatus(EnumWeappCodeCommitStatus.FAIL.getCode());
}
codeStatus.setCodeErrCode(Integer.valueOf(openRet.getErrcode()));
codeStatus.setCodeTime(new Date()); codeStatus.setCodeTime(new Date());
weappCodeStatusService.updateCodeCommitStatus(codeStatus); weappCodeStatusService.updateCodeCommitStatus(codeStatus);
} }
@@ -317,10 +324,12 @@ public class WxWeappInfoController extends BaseController {
WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage);
logger.info(openRet.toString()); logger.info(openRet.toString());
if(openRet.isSuccess()) { if(openRet.isSuccess()) {
codeStatus.setAuditStatus(EnumAuditStatus.AUDITING.getCode());
codeStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode());
codeStatus.setAuditErrCode(Integer.valueOf(openRet.getErrcode()));
weappCodeStatusService.updateAuditStatus(codeStatus); weappCodeStatusService.updateAuditStatus(codeStatus);
} else { } else {
codeStatus.setAuditStatus(Integer.valueOf(openRet.getErrcode()));
codeStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode());
codeStatus.setAuditErrCode(Integer.valueOf(openRet.getErrcode()));
weappCodeStatusService.updateAuditStatus(codeStatus); weappCodeStatusService.updateAuditStatus(codeStatus);
} }
} catch (WxErrorException e) { } catch (WxErrorException e) {
@@ -348,19 +357,19 @@ public class WxWeappInfoController extends BaseController {
// 审核状态,其中0为审核成功,1为审核失败,2为审核中,3已撤回 // 审核状态,其中0为审核成功,1为审核失败,2为审核中,3已撤回
switch (openResult.getStatus().intValue()) { switch (openResult.getStatus().intValue()) {
case 0: case 0:
codeStatus.setAuditStatus(EnumAuditStatus.SUCCESS.getCode());
codeStatus.setAuditStatus(EnumWeappAuditStatus.SUCCESS.getCode());
break; break;
case 1: case 1:
codeStatus.setAuditStatus(EnumAuditStatus.FAIL.getCode());
codeStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode());
break; break;
case 2: case 2:
codeStatus.setAuditStatus(EnumAuditStatus.AUDITING.getCode());
codeStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode());
break; break;
case 3: case 3:
codeStatus.setAuditStatus(EnumAuditStatus.UNDO.getCode());
codeStatus.setAuditStatus(EnumWeappAuditStatus.UNDO.getCode());
break; break;
default: default:
codeStatus.setAuditStatus(EnumAuditStatus.AUDITING.getCode());
codeStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode());
break; break;
} }
weappCodeStatusService.updateAuditStatus(codeStatus); weappCodeStatusService.updateAuditStatus(codeStatus);
@@ -387,7 +396,7 @@ public class WxWeappInfoController extends BaseController {
if(openResult.isSuccess()) { if(openResult.isSuccess()) {
WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId); WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId);
if(codeStatus != null) { if(codeStatus != null) {
codeStatus.setAuditStatus(EnumAuditStatus.UNDO.getCode());
codeStatus.setAuditStatus(EnumWeappAuditStatus.UNDO.getCode());
weappCodeStatusService.updateAuditStatus(codeStatus); weappCodeStatusService.updateAuditStatus(codeStatus);
} }
} }
@@ -408,10 +417,19 @@ public class WxWeappInfoController extends BaseController {
try { try {
WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId);
WxOpenResult openRet = openMaService.releaesAudited(); WxOpenResult openRet = openMaService.releaesAudited();
boolean releaseSuccess = false;
if(openRet.isSuccess()) {
releaseSuccess = true;
}
logger.info(openRet.toString()); logger.info(openRet.toString());
WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId); WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId);
if(codeStatus != null) { if(codeStatus != null) {
codeStatus.setReleaseStatus(Integer.valueOf(openRet.getErrcode()));
if(releaseSuccess) {
codeStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode());
} else {
codeStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode());
}
codeStatus.setReleaseErrCode(Integer.valueOf(openRet.getErrcode()));
weappCodeStatusService.updateReleaseStatus(codeStatus); weappCodeStatusService.updateReleaseStatus(codeStatus);
} }
} catch (WxErrorException e) { } catch (WxErrorException e) {


Загрузка…
Отмена
Сохранить