Merge remote-tracking branch 'origin/api' into api

935090232@qq.com

2021-01-06 7b9cb4464cf7a6db758214c5681b0ecdf01e3db4

 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java

@@ -2,12 +2,11 @@

import com.alibaba.fastjson.JSONObject;
import com.matrix.component.redis.RedisClient;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.UUIDUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.authority.AppAuthorityManager;
import com.matrix.system.app.dto.LoginDto;
import com.matrix.system.app.dto.PwdResetDto;
import com.matrix.system.app.dto.SmsCodeDto;
@@ -53,7 +52,7 @@
    private SysShopInfoService sysShopInfoService;

    @Autowired
    private DefaultAuthorityManager authorityManager;
    private AppAuthorityManager authorityManager;

    @Autowired
    private RedisClient redisClient;
@@ -94,6 +93,7 @@
        userInfoVo.setPhoto(user.getSuPhoto());

        AjaxResult result = AjaxResult.buildSuccessInstance("登陆成功");
        authorityManager.initUserPower(result,user);
        result.putInMap("user", userInfoVo);
        result.putInMap("token", token);
        return result;