aa
jiangping
2024-08-07 a9eccf12bba4075ecb6ffe9650826ce6127bbe82
aa
已修改3个文件
20 ■■■■■ 文件已修改
server/admin/src/main/java/com/doumee/api/business/PushController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/ScheduleTool.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/admin/src/main/java/com/doumee/api/business/PushController.java
@@ -18,6 +18,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,7 @@
 */
@Api(tags = "对外【IAM、PAD端】推送提供接口")
@RestController
@Slf4j
@RequestMapping("/push")
public class PushController extends BaseController {
    @Autowired
@@ -56,9 +58,11 @@
            zbomIAMService.updateShopInfo(token,uuid,timestamp,shopList);
            r  = ApiResponse.successIam("操作成功");
        }catch (BusinessException e){
            log.error("【IAM】组织信息更新推送===失败:"+e.getMessage());
            success = Constants.ONE;
            r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"操作失败"));
        }catch (Exception e){
            log.error("【IAM】组织信息更新推送===失败:"+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
            r = ApiResponse.failed("操作失败");
@@ -80,9 +84,11 @@
            zbomIAMService.updateUserInfo(token,uuid,timestamp,upateUserModel);
            r  = ApiResponse.successIam("操作成功");
        }catch (BusinessException e){
            log.error("【IAM】人员账号信息更新推送===失败:"+e.getMessage());
              success = Constants.ONE;
            r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"操作失败"));
        }catch (Exception e){
            log.error("【IAM】人员账号信息更新推送===失败:"+e.getMessage());
            success = Constants.ONE;
            e.getMessage();
            r = ApiResponse.failed("操作失败");
@@ -104,9 +110,11 @@
            zbomIAMService.updateRoleInfo(token,uuid,timestamp,upateModel);
            r  = ApiResponse.successIam("操作成功");
        }catch (BusinessException e){
            log.error("【IAM】角色信息更新推送===失败:"+e.getMessage());
              success = Constants.ONE;
            r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"操作失败"));
        }catch (Exception e){
            log.error("【IAM】角色信息更新推送===失败:"+e.getMessage());
            success = Constants.ONE;
            e.getMessage();
            r = ApiResponse.failed("操作失败");
@@ -144,6 +152,7 @@
            InputStream inputStream = usersService.getQrCode(generateQRCodeRequest);
            ImageIO.write(ImageIO.read(inputStream),"png",response.getOutputStream());
        }catch (Exception e){
            log.error("生成消费者C端小程序码===失败:"+e.getMessage());
            e.printStackTrace();
        }
    }
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -336,7 +336,6 @@
    public AccountResponse testLogin(String openid){
            String openId = openid;
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
            if (member == null) {
                member = new Member();
                member.setNickname("微信用户"+ CodeVerifyUtils.createVerificationCode(4));
@@ -577,7 +576,7 @@
    }
    public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
    public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
        ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new  ZTUserInfoUpdateRequest();
        ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
        String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
@@ -605,7 +604,7 @@
        ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
        return ztUserGetTokenResponse;
    }
    public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
    public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
        ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new  ZTUserInfoUpdateRequest();
        ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
        String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
server/web/src/main/java/com/doumee/api/ScheduleTool.java
@@ -34,11 +34,10 @@
 * @date 2021-10-10 14:40:35
 * https://www.bejson.com/othertools/cron/  cron 表达式生成地址
 */
//@Component
//@EnableScheduling
@Component
@EnableScheduling
@Slf4j
public class ScheduleTool {
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
@@ -49,7 +48,6 @@
     */
    @Value("${debug_model}")
    private Boolean timing;