Browse Source

fix bug

master
lin 2 years ago
parent
commit
0a05adfb20
3 changed files with 16 additions and 8 deletions
  1. +9
    -7
      gptCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  2. +5
    -1
      gptService/src/main/java/com/iformall/domain/po/WxCUser.java
  3. +2
    -0
      gptService/src/main/java/com/iformall/utils/SysConfigConstant.java

+ 9
- 7
gptCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -21,6 +21,8 @@ import com.iformall.utils.Constant;
import com.iformall.utils.IPUtil;
import com.iformall.utils.MaUtil;
import com.iformall.utils.RedisCacheUtils;
import com.iformall.utils.SysConfigConstant;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@@ -221,14 +223,14 @@ public class WxUserGrantController extends BaseController {
user.setIsValid(EnumYesOrNo.YES.getCode());
}
}
WxAppinfo wxAppinfo = WxAppInfoCache.getCacheAppInfo(objectCommonRedisTemplate, user.getTenantId());
if (null == wxAppinfo) {
wxAppinfo = wxAppinfoServie.getCAppInfo(user);
if (null != wxAppinfo) {
WxAppInfoCache.cacheApp(objectCommonRedisTemplate, wxAppinfo);
}
SysConfig promot = sysConfigService.getByKey(SysConfigConstant.promotContentCount, user);
if (null != promot) {
user.setPromotContentCount(Integer.parseInt(promot.getConfigItemValue()));
}
SysConfig completion = sysConfigService.getByKey(SysConfigConstant.completionContentCount, user);
if (null != completion) {
user.setCompletionContentCount(Integer.parseInt(completion.getConfigItemValue()));
}
user.setSecret(wxAppinfo.getSecret());
return new ResultData(user);
}



+ 5
- 1
gptService/src/main/java/com/iformall/domain/po/WxCUser.java View File

@@ -36,6 +36,10 @@ public class WxCUser extends TenantEntity {
private Integer isMember;
@TableField(exist = false)
private Integer isValid;
@io.swagger.annotations.ApiModelProperty(value="上下文提交问题的条数",name="promotContentCount")
@TableField(exist = false)
private String secret;
private Integer promotContentCount;
@io.swagger.annotations.ApiModelProperty(value="上下文答案的条数",name="completionContentCount")
@TableField(exist = false)
private Integer completionContentCount;
}

+ 2
- 0
gptService/src/main/java/com/iformall/utils/SysConfigConstant.java View File

@@ -8,5 +8,7 @@ public class SysConfigConstant {
public static final String expired_days = "expiredDays";
public static final String says_content_length = "saysContentLength";
public static final String freeDays="freeDays";
public static final String promotContentCount="promotContentCount";
public static final String completionContentCount="completionContentCount";

}

Loading…
Cancel
Save