| @@ -28,11 +28,11 @@ public class WxWeappExtSet implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /**小程序扩展信息*/ | /**小程序扩展信息*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="小程序扩展信息",name="ext") | |||||
| private String ext; | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序扩展信息",name="extJson") | |||||
| private String extJson; | |||||
| /**提交审核列表*/ | /**提交审核列表*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="提交审核列表",name="release") | |||||
| private String release; | |||||
| @io.swagger.annotations.ApiModelProperty(value="提交审核列表",name="releaseJson") | |||||
| private String releaseJson; | |||||
| /**创建时间*/ | /**创建时间*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| @@ -47,8 +47,8 @@ public class WxWeappExtSet implements Serializable { | |||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") | ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") | ||||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | ||||
| ,Ext_ASC("`ext` ASC"),Ext_DESC("`ext` DESC") | |||||
| ,Release_ASC("`release` ASC"),Release_DESC("`release` DESC") | |||||
| ,ExtJson_ASC("`ext_json` ASC"),ExtJson_DESC("`ext_json` DESC") | |||||
| ,ReleaseJson_ASC("`release_json` ASC"),ReleaseJson_DESC("`release_json` DESC") | |||||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | ||||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | ||||
| ; | ; | ||||
| @@ -5,14 +5,14 @@ | |||||
| <id column="id" jdbcType="INTEGER" property="id" /> | <id column="id" jdbcType="INTEGER" property="id" /> | ||||
| <result column="app_id" jdbcType="VARCHAR" property="appId" /> | <result column="app_id" jdbcType="VARCHAR" property="appId" /> | ||||
| <result column="type" jdbcType="INTEGER" property="type" /> | <result column="type" jdbcType="INTEGER" property="type" /> | ||||
| <result column="ext" jdbcType="VARCHAR" property="ext" /> | |||||
| <result column="release" jdbcType="VARCHAR" property="release" /> | |||||
| <result column="ext_json" jdbcType="VARCHAR" property="extJson" /> | |||||
| <result column="release_json" jdbcType="VARCHAR" property="releaseJson" /> | |||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | ||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`app_id`,`type`,`ext`,`release`,`create_date`,`update_date` | |||||
| `id`,`app_id`,`type`,`ext_json`,`release_json`,`create_date`,`update_date` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -267,7 +267,7 @@ public class WxWeappInfoController extends BaseController { | |||||
| // code commit | // code commit | ||||
| try { | try { | ||||
| Gson gson= new GsonBuilder().create(); | Gson gson= new GsonBuilder().create(); | ||||
| WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExt(), new TypeToken<WxMaOpenCommitExtInfo>() { }.getType()); | |||||
| WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExtJson(), new TypeToken<WxMaOpenCommitExtInfo>() { }.getType()); | |||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(extInfo.getExtAppid()); | WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(extInfo.getExtAppid()); | ||||
| logger.info(extInfo.toString()); | logger.info(extInfo.toString()); | ||||
| WxOpenResult openRet = openMaService.codeCommit(templateId, userVersion, userDesc, extInfo); | WxOpenResult openRet = openMaService.codeCommit(templateId, userVersion, userDesc, extInfo); | ||||
| @@ -292,7 +292,7 @@ public class WxWeappInfoController extends BaseController { | |||||
| // 提交审核 | // 提交审核 | ||||
| if(codeCommitStatus) { | if(codeCommitStatus) { | ||||
| try { | try { | ||||
| WxOpenMaSubmitAuditMessage subMessage = JSON.parseObject(extSet.getRelease(), WxOpenMaSubmitAuditMessage.class); | |||||
| WxOpenMaSubmitAuditMessage subMessage = JSON.parseObject(extSet.getReleaseJson(), WxOpenMaSubmitAuditMessage.class); | |||||
| WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); | ||||
| WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); | WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); | ||||
| logger.info(openRet.toString()); | logger.info(openRet.toString()); | ||||