diff --git a/gptCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/gptCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index b39fd88..eafe27f 100755 --- a/gptCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/gptCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -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); } diff --git a/gptService/src/main/java/com/iformall/domain/po/WxCUser.java b/gptService/src/main/java/com/iformall/domain/po/WxCUser.java index f1193e3..1c1bef6 100644 --- a/gptService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/gptService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -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; } diff --git a/gptService/src/main/java/com/iformall/utils/SysConfigConstant.java b/gptService/src/main/java/com/iformall/utils/SysConfigConstant.java index 8aeefef..ede9ba4 100644 --- a/gptService/src/main/java/com/iformall/utils/SysConfigConstant.java +++ b/gptService/src/main/java/com/iformall/utils/SysConfigConstant.java @@ -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"; }