Browse Source

微调配置

huwhois 4 years ago
parent
commit
7446bd474b

+ 2 - 1
.gitignore

@ -30,4 +30,5 @@ hs_err_pid*
30 30
*.ctxt
31 31
32 32
# src/main/resources/application-dev-bak.yml -----> application-dev.yml  
33
src/main/resources/application-dev.yml
33
src/main/resources/application-dev.yml
34
src/main/resources/application.yml

+ 4 - 2
src/main/java/io/renren/modules/admin/service/impl/MemberServiceImpl.java

@ -26,8 +26,10 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
26 26
    @Override
27 27
    public PageUtils queryPage(Map<String, Object> params) {
28 28
        String key = params.containsKey("key") ? (String) params.get("key") : null;
29
        IPage<MemberEntity> page = this.page(new Query<MemberEntity>().getPage(params), new QueryWrapper<MemberEntity>()
30
                .like(StringUtils.isNotBlank(key), "truename", key).or().like(StringUtils.isNotBlank(key), "phone", key)
29
        IPage<MemberEntity> page = this.page(new Query<MemberEntity>().getPage(params),
30
                new QueryWrapper<MemberEntity>().like(StringUtils.isNotBlank(key), "truename", key).or()
31
                        .like(StringUtils.isNotBlank(key), "phone", key).or()
32
                        .like(StringUtils.isNotBlank(key), "organization", key)
31 33
32 34
        );
33 35

+ 1 - 1
src/main/resources/application.yml

@ -70,7 +70,7 @@ renren:
70 70
  # APP模块,是通过jwt认证的,如果要使用APP模块,则需要修改【加密秘钥】
71 71
  jwt:
72 72
    # 加密秘钥
73
    secret: f4e2e52034348f86b67cde581c0f9eb5[www.renren.io]
73
    secret: b94b2a1da0e5c1448f3a176dcd1e1e46[www.ecorr.org]
74 74
    # token有效时长,7天,单位秒
75 75
    expire: 604800
76 76
    header: token