Browse Source

update

release_toaliyun_real
xhxu 4 years ago
parent
commit
37cf380a0a
4 changed files with 15 additions and 2 deletions
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
  3. +10
    -2
      mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml
  4. +1
    -0
      mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java View File

@@ -297,6 +297,7 @@ public class WxProjectConfigController extends BaseController {
wxAuthorizerInfo.setTenantId(wxAppinfo.getTenantId());
wxAuthorizerInfo.setType(wxAppinfo.getType());
wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId());
wxAuthorizerInfo.setPlat(wxAppinfo.getPlat());
if(wxAuthorizerInfo.getAuthorizationStatus() == null){
wxAuthorizerInfo.setAuthorizationStatus(0);//授权状态,0为已授权,1为已取消授权


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java View File

@@ -71,5 +71,8 @@ public class WxAuthorizerInfo extends BaseTenantEntity {
private Date accessTokenExpire;
@io.swagger.annotations.ApiModelProperty(value="是否启用(0:启用,1禁用)",name="enable")
private Integer enable;

@io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat")
private Integer plat;
}

+ 10
- 2
mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml View File

@@ -31,6 +31,7 @@
<result column="access_token_expire" jdbcType="TIMESTAMP" property="accessTokenExpire"/>
<!-- <result column="group_support" jdbcType="INTEGER" property="groupSupport"/>-->
<result column="enable" jdbcType="INTEGER" property="enable"/>
<result column="plat" jdbcType="INTEGER" property="plat"/>
</resultMap>

<sql id="allColumns">
@@ -38,7 +39,7 @@
`base_status`, `base_time`, `domain_status`, `domain_time`, `webdomain_status`, `webdomain_time`, `template_status`, `template_time`,
`current_version`,`current_desc`,`release_time`,
`open_appid`,`bind_open_time`,`refresh_token`,
`access_token`,`access_token_expire`,`enable`
`access_token`,`access_token_expire`,`enable`,`plat`
</sql>

<sql id="dynamicWhereConditions">
@@ -119,6 +120,9 @@
<if test=" null != enable ">
and `enable` = #{enable}
</if>
<if test=" null != plat ">
and `plat` = #{plat}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -212,6 +216,7 @@
<result column="release_time" jdbcType="TIMESTAMP" property="releaseTime"/>
<result column="open_appid" jdbcType="VARCHAR" property="openAppid"/>
<result column="bind_open_time" jdbcType="TIMESTAMP" property="bindOpenTime"/>
<result column="plat" jdbcType="INTEGER" property="plat"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
</resultMap>

@@ -223,7 +228,7 @@
ai.`webdomain_status`,ai.`webdomain_time`,
ai.`template_status`,ai.`template_time`,
ai.`current_version`,ai.`current_desc`,ai.`release_time`,
ai.`open_appid`,ai.`bind_open_time`,
ai.`open_appid`,ai.`bind_open_time`,ai.`plat`,
a.`name`
</sql>

@@ -280,6 +285,9 @@
<if test=" null != openAppid ">
and ai.`open_appid` = #{openAppid}
</if>
<if test=" null != plat ">
and ai.`plat` = #{plat}
</if>
<if test=" null != ids ">
and ai.id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


+ 1
- 0
mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java View File

@@ -297,6 +297,7 @@ public class WxProjectConfigController extends BaseController {
wxAuthorizerInfo.setTenantId(wxAppinfo.getTenantId());
wxAuthorizerInfo.setType(wxAppinfo.getType());
wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId());
wxAuthorizerInfo.setPlat(wxAppinfo.getPlat());
if(wxAuthorizerInfo.getAuthorizationStatus() == null){
wxAuthorizerInfo.setAuthorizationStatus(0);//授权状态,0为已授权,1为已取消授权


Loading…
Cancel
Save