| @@ -35,20 +35,26 @@ public class WxWeappCodeStatus implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="用户版本描述",name="versionDesc") | |||
| private String versionDesc; | |||
| /**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; | |||
| @io.swagger.annotations.ApiModelProperty(value="code提交错误码",name="codeErrCode") | |||
| private Integer codeErrCode; | |||
| /**更新时间*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="code提交时间",name="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; | |||
| @io.swagger.annotations.ApiModelProperty(value="审核错误码",name="auditErrCode") | |||
| private Integer auditErrCode; | |||
| /**审核时间*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="审核时间",name="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; | |||
| @io.swagger.annotations.ApiModelProperty(value="发布错误码",name="releaseErrCode") | |||
| private Integer releaseErrCode; | |||
| /**发布时间*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="发布时间",name="releaseTime") | |||
| private Date releaseTime; | |||
| @@ -3,7 +3,7 @@ package com.iformall.enums; | |||
| /** | |||
| * Created by Stormeye on 2018/08/09. | |||
| */ | |||
| public enum EnumAuditStatus { | |||
| public enum EnumWeappAuditStatus { | |||
| // 0为审核成功,1为审核失败,2为审核中,3已撤回 | |||
| SUCCESS(0, "审核成功"), | |||
| @@ -12,8 +12,8 @@ public enum EnumAuditStatus { | |||
| 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)) { | |||
| return value; | |||
| } | |||
| @@ -24,7 +24,7 @@ public enum EnumAuditStatus { | |||
| private Integer code; | |||
| private String message; | |||
| EnumAuditStatus(Integer code, String message) { | |||
| EnumWeappAuditStatus(Integer code, String message) { | |||
| this.code = code; | |||
| this.message = message; | |||
| } | |||
| @@ -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; | |||
| } | |||
| } | |||
| @@ -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; | |||
| } | |||
| } | |||
| @@ -7,17 +7,24 @@ | |||
| <result column="type" jdbcType="INTEGER" property="type" /> | |||
| <result column="user_version" jdbcType="VARCHAR" property="userVersion" /> | |||
| <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="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="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="create_time" jdbcType="TIMESTAMP" property="createTime" /> | |||
| <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> | |||
| </resultMap> | |||
| <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 id="dynamicWhereConditions"> | |||
| @@ -70,10 +77,13 @@ | |||
| <result column="type" jdbcType="INTEGER" property="type" /> | |||
| <result column="user_version" jdbcType="VARCHAR" property="userVersion" /> | |||
| <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="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="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="create_time" jdbcType="TIMESTAMP" property="createTime" /> | |||
| <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> | |||
| @@ -81,7 +91,11 @@ | |||
| </resultMap> | |||
| <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` | |||
| </sql> | |||
| @@ -103,7 +117,7 @@ | |||
| and c.`code_status` = #{codeStatus} | |||
| </if> | |||
| <if test=" null != auditStatus "> | |||
| and c.v`audit_status` = #{auditStatus} | |||
| and c.`audit_status` = #{auditStatus} | |||
| </if> | |||
| <if test=" null != releaseStatus "> | |||
| and c.`release_status` = #{releaseStatus} | |||
| @@ -129,7 +143,7 @@ | |||
| <select id="findVoList" parameterType="com.iformall.domain.vo.WxWeappCodeStatusVo" resultMap="VBaseResultMap"> | |||
| select <include refid="allVoColumns" /> | |||
| 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" /> | |||
| </select> | |||
| @@ -3,7 +3,7 @@ package com.iformall.controller; | |||
| import com.iformall.domain.po.WxAuthorizerInfo; | |||
| import com.iformall.domain.po.WxComponentVerifyTicket; | |||
| 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.EnumWxAuthorizationStatus; | |||
| 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.message.WxMpXmlMessage; | |||
| 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.result.WxOpenAuthorizerInfoResult; | |||
| import me.chanjar.weixin.open.bean.result.WxOpenMaQueryAuditResult; | |||
| import me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult; | |||
| import org.apache.commons.lang3.StringUtils; | |||
| import org.slf4j.Logger; | |||
| @@ -270,9 +268,9 @@ public class WechatCalllbackController extends BaseController { | |||
| WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId); | |||
| if(codeStatus != null) { | |||
| if(success) { | |||
| codeStatus.setAuditStatus(EnumAuditStatus.SUCCESS.getCode()); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.SUCCESS.getCode()); | |||
| } else { | |||
| codeStatus.setAuditStatus(EnumAuditStatus.FAIL.getCode()); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode()); | |||
| } | |||
| weappCodeStatusService.updateAuditStatus(codeStatus); | |||
| } | |||
| @@ -15,10 +15,7 @@ import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.*; | |||
| import com.iformall.domain.vo.WxWeappCodeStatusVo; | |||
| 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.wechat.WxOpenService; | |||
| import io.swagger.annotations.Api; | |||
| @@ -293,13 +290,23 @@ public class WxWeappInfoController extends BaseController { | |||
| } | |||
| codeStatus.setUserVersion(userVersion); | |||
| 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()); | |||
| weappCodeStatusService.saveOrUpdate(codeStatus); | |||
| } else { | |||
| codeStatus.setUserVersion(userVersion); | |||
| 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()); | |||
| weappCodeStatusService.updateCodeCommitStatus(codeStatus); | |||
| } | |||
| @@ -317,10 +324,12 @@ public class WxWeappInfoController extends BaseController { | |||
| WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); | |||
| logger.info(openRet.toString()); | |||
| if(openRet.isSuccess()) { | |||
| codeStatus.setAuditStatus(EnumAuditStatus.AUDITING.getCode()); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); | |||
| codeStatus.setAuditErrCode(Integer.valueOf(openRet.getErrcode())); | |||
| weappCodeStatusService.updateAuditStatus(codeStatus); | |||
| } else { | |||
| codeStatus.setAuditStatus(Integer.valueOf(openRet.getErrcode())); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode()); | |||
| codeStatus.setAuditErrCode(Integer.valueOf(openRet.getErrcode())); | |||
| weappCodeStatusService.updateAuditStatus(codeStatus); | |||
| } | |||
| } catch (WxErrorException e) { | |||
| @@ -348,19 +357,19 @@ public class WxWeappInfoController extends BaseController { | |||
| // 审核状态,其中0为审核成功,1为审核失败,2为审核中,3已撤回 | |||
| switch (openResult.getStatus().intValue()) { | |||
| case 0: | |||
| codeStatus.setAuditStatus(EnumAuditStatus.SUCCESS.getCode()); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.SUCCESS.getCode()); | |||
| break; | |||
| case 1: | |||
| codeStatus.setAuditStatus(EnumAuditStatus.FAIL.getCode()); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode()); | |||
| break; | |||
| case 2: | |||
| codeStatus.setAuditStatus(EnumAuditStatus.AUDITING.getCode()); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); | |||
| break; | |||
| case 3: | |||
| codeStatus.setAuditStatus(EnumAuditStatus.UNDO.getCode()); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.UNDO.getCode()); | |||
| break; | |||
| default: | |||
| codeStatus.setAuditStatus(EnumAuditStatus.AUDITING.getCode()); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); | |||
| break; | |||
| } | |||
| weappCodeStatusService.updateAuditStatus(codeStatus); | |||
| @@ -387,7 +396,7 @@ public class WxWeappInfoController extends BaseController { | |||
| if(openResult.isSuccess()) { | |||
| WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId); | |||
| if(codeStatus != null) { | |||
| codeStatus.setAuditStatus(EnumAuditStatus.UNDO.getCode()); | |||
| codeStatus.setAuditStatus(EnumWeappAuditStatus.UNDO.getCode()); | |||
| weappCodeStatusService.updateAuditStatus(codeStatus); | |||
| } | |||
| } | |||
| @@ -408,10 +417,19 @@ public class WxWeappInfoController extends BaseController { | |||
| try { | |||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | |||
| WxOpenResult openRet = openMaService.releaesAudited(); | |||
| boolean releaseSuccess = false; | |||
| if(openRet.isSuccess()) { | |||
| releaseSuccess = true; | |||
| } | |||
| logger.info(openRet.toString()); | |||
| WxWeappCodeStatus codeStatus = weappCodeStatusService.getByAppId(appId); | |||
| 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); | |||
| } | |||
| } catch (WxErrorException e) { | |||