Compare commits

...

2 Commits

Author SHA1 Message Date
easonzhu
d7002d4495 修改包名 2025-02-20 13:42:53 +08:00
easonzhu
1aecc2ffe3 修改包名 2025-02-20 13:42:19 +08:00
807 changed files with 3318 additions and 3295 deletions

View File

@ -172,7 +172,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.upchina.startup.Main</mainClass>
<mainClass>com.startup.Main</mainClass>
</configuration>
</plugin>
</plugins>
@ -186,7 +186,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.upchina.startup.Main</mainClass>
<mainClass>com.startup.Main</mainClass>
<layout>ZIP</layout>
<includes>
<include>

View File

@ -1,7 +1,7 @@
package com.upchina.advisor.constant;
package com.advisor.constant;
import com.upchina.common.handler.BizException;
import com.upchina.common.result.ResponseStatus;
import com.common.handler.BizException;
import com.common.result.ResponseStatus;
import java.util.Arrays;
import java.util.Optional;

View File

@ -1,4 +1,4 @@
package com.upchina.advisor.constant;
package com.advisor.constant;
public enum FollowChannel {

View File

@ -1,4 +1,4 @@
package com.upchina.advisor.constant;
package com.advisor.constant;
public enum FollowOption {

View File

@ -1,22 +1,22 @@
package com.upchina.advisor.controller;
package com.advisor.controller;
import com.upchina.advisor.query.*;
import com.upchina.advisor.service.AdvisorInfoService;
import com.upchina.advisor.vo.AdvisorBasicVO;
import com.upchina.advisor.vo.AdvisorInfoAdminVO;
import com.upchina.advisor.vo.AdvisorInfoAppVO;
import com.upchina.common.annotation.Auth;
import com.upchina.common.annotation.Operation;
import com.upchina.common.constant.AccessRole;
import com.upchina.common.constant.ProductType;
import com.upchina.common.handler.BizException;
import com.upchina.common.result.AppPager;
import com.upchina.common.result.CommonResult;
import com.upchina.common.result.Pager;
import com.upchina.common.result.ResponseStatus;
import com.upchina.common.vo.BackendUserVO;
import com.upchina.common.vo.CountVO;
import com.upchina.common.vo.FrontUserVO;
import com.advisor.query.*;
import com.advisor.service.AdvisorInfoService;
import com.advisor.vo.AdvisorBasicVO;
import com.advisor.vo.AdvisorInfoAdminVO;
import com.advisor.vo.AdvisorInfoAppVO;
import com.common.annotation.Auth;
import com.common.annotation.Operation;
import com.common.constant.AccessRole;
import com.common.constant.ProductType;
import com.common.handler.BizException;
import com.common.result.AppPager;
import com.common.result.CommonResult;
import com.common.result.Pager;
import com.common.result.ResponseStatus;
import com.common.vo.BackendUserVO;
import com.common.vo.CountVO;
import com.common.vo.FrontUserVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

View File

@ -1,4 +1,4 @@
package com.upchina.advisor.entity;
package com.advisor.entity;
import java.io.Serializable;

View File

@ -1,4 +1,4 @@
package com.upchina.advisor.entity;
package com.advisor.entity;
import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -1,4 +1,4 @@
package com.upchina.advisor.entity;
package com.advisor.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -1,4 +1,4 @@
package com.upchina.advisor.entity;
package com.advisor.entity;
import com.google.common.collect.ComparisonChain;

View File

@ -1,4 +1,4 @@
package com.upchina.advisor.entity;
package com.advisor.entity;
import com.google.common.collect.ComparisonChain;

View File

@ -1,4 +1,4 @@
package com.upchina.advisor.entity;
package com.advisor.entity;
import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -1,7 +1,7 @@
package com.upchina.advisor.mapper;
package com.advisor.mapper;
import com.advisor.entity.AdvisorFollow;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.upchina.advisor.entity.AdvisorFollow;
/**
* <p>

View File

@ -1,8 +1,8 @@
package com.upchina.advisor.mapper;
package com.advisor.mapper;
import com.advisor.entity.AdvisorInfo;
import com.advisor.entity.AdvisorSortEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.upchina.advisor.entity.AdvisorInfo;
import com.upchina.advisor.entity.AdvisorSortEntity;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

View File

@ -1,8 +1,8 @@
package com.upchina.advisor.mapper;
package com.advisor.mapper;
import com.upchina.advisor.entity.AdvisorTagRel;
import com.upchina.common.entity.Tag;
import com.upchina.common.mapper.EasyBaseMapper;
import com.advisor.entity.AdvisorTagRel;
import com.common.entity.Tag;
import com.common.mapper.EasyBaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

View File

@ -1,6 +1,6 @@
package com.upchina.advisor.query;
package com.advisor.query;
import com.upchina.advisor.entity.AdvisorFollow;
import com.advisor.entity.AdvisorFollow;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.Max;

View File

@ -1,4 +1,4 @@
package com.upchina.advisor.query;
package com.advisor.query;
import io.swagger.annotations.ApiModelProperty;

View File

@ -1,6 +1,6 @@
package com.upchina.advisor.query;
package com.advisor.query;
import com.upchina.common.query.PageQuery;
import com.common.query.PageQuery;
import io.swagger.annotations.ApiModelProperty;
public class ListAdvisorInfoQuery extends PageQuery {

View File

@ -1,7 +1,7 @@
package com.upchina.advisor.query;
package com.advisor.query;
import com.upchina.advisor.entity.AdvisorInfo;
import com.upchina.advisor.entity.AdvisorTagRel;
import com.advisor.entity.AdvisorInfo;
import com.advisor.entity.AdvisorTagRel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.Max;

View File

@ -1,8 +1,8 @@
package com.upchina.advisor.query;
package com.advisor.query;
import com.upchina.advisor.constant.AdvisorInfoStatus;
import com.upchina.advisor.entity.AdvisorInfo;
import com.upchina.common.validation.IntArrayValidator;
import com.advisor.constant.AdvisorInfoStatus;
import com.advisor.entity.AdvisorInfo;
import com.common.validation.IntArrayValidator;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.Min;

View File

@ -1,47 +1,47 @@
package com.upchina.advisor.service;
package com.advisor.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.advisor.constant.AdvisorInfoStatus;
import com.advisor.constant.FollowChannel;
import com.advisor.constant.FollowOption;
import com.advisor.entity.*;
import com.advisor.mapper.AdvisorFollowMapper;
import com.advisor.mapper.AdvisorInfoMapper;
import com.advisor.mapper.AdvisorTagRelMapper;
import com.advisor.query.*;
import com.advisor.vo.AdvisorBasicVO;
import com.advisor.vo.AdvisorInfoAdminVO;
import com.advisor.vo.AdvisorInfoAppVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.common.constant.AdvertPosition;
import com.common.constant.IsOrNot;
import com.common.constant.ProductType;
import com.common.entity.Tag;
import com.common.handler.BizException;
import com.common.result.AppPager;
import com.common.result.Pager;
import com.common.result.ResponseStatus;
import com.common.service.AdvertService;
import com.common.service.CacheService;
import com.common.service.RecommendService;
import com.common.service.SensitiveWordService;
import com.common.state.StateMachine;
import com.common.vo.BackendUserVO;
import com.common.vo.CountVO;
import com.common.vo.FrontUserVO;
import com.google.common.collect.ImmutableSet;
import com.hazelcast.core.HazelcastInstance;
import com.upchina.advisor.constant.AdvisorInfoStatus;
import com.upchina.advisor.constant.FollowChannel;
import com.upchina.advisor.constant.FollowOption;
import com.upchina.advisor.entity.*;
import com.upchina.advisor.mapper.AdvisorFollowMapper;
import com.upchina.advisor.mapper.AdvisorInfoMapper;
import com.upchina.advisor.mapper.AdvisorTagRelMapper;
import com.upchina.advisor.query.*;
import com.upchina.advisor.vo.AdvisorBasicVO;
import com.upchina.advisor.vo.AdvisorInfoAdminVO;
import com.upchina.advisor.vo.AdvisorInfoAppVO;
import com.upchina.common.constant.AdvertPosition;
import com.upchina.common.constant.IsOrNot;
import com.upchina.common.constant.ProductType;
import com.upchina.common.entity.Tag;
import com.upchina.common.handler.BizException;
import com.upchina.common.result.AppPager;
import com.upchina.common.result.Pager;
import com.upchina.common.result.ResponseStatus;
import com.upchina.common.service.AdvertService;
import com.upchina.common.service.CacheService;
import com.upchina.common.service.RecommendService;
import com.upchina.common.service.SensitiveWordService;
import com.upchina.common.state.StateMachine;
import com.upchina.common.vo.BackendUserVO;
import com.upchina.common.vo.CountVO;
import com.upchina.common.vo.FrontUserVO;
import com.upchina.rbac.constant.DeptType;
import com.upchina.rbac.entity.Dept;
import com.upchina.rbac.entity.UserDept;
import com.upchina.rbac.entity.UserLogin;
import com.upchina.rbac.entity.UsersRoles;
import com.upchina.rbac.mapper.UsersRolesMapper;
import com.upchina.rbac.service.DeptService;
import com.upchina.rbac.service.UserService;
import com.rbac.constant.DeptType;
import com.rbac.entity.Dept;
import com.rbac.entity.UserDept;
import com.rbac.entity.UserLogin;
import com.rbac.entity.UsersRoles;
import com.rbac.mapper.UsersRolesMapper;
import com.rbac.service.DeptService;
import com.rbac.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@ -53,8 +53,8 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import static com.upchina.common.config.cache.CacheKey.ADVISOR_INFO;
import static com.upchina.common.config.cache.CacheKey.AdvisorInfoKey;
import static com.common.config.cache.CacheKey.ADVISOR_INFO;
import static com.common.config.cache.CacheKey.AdvisorInfoKey;
@Service
public class AdvisorInfoService {

View File

@ -1,6 +1,6 @@
package com.upchina.advisor.vo;
package com.advisor.vo;
import com.upchina.advisor.entity.AdvisorBasic;
import com.advisor.entity.AdvisorBasic;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;

View File

@ -1,9 +1,9 @@
package com.upchina.advisor.vo;
package com.advisor.vo;
import com.upchina.advisor.entity.AdvisorInfo;
import com.upchina.common.entity.Tag;
import com.upchina.common.vo.TagVO;
import com.upchina.rbac.entity.UserLogin;
import com.advisor.entity.AdvisorInfo;
import com.common.entity.Tag;
import com.common.vo.TagVO;
import com.rbac.entity.UserLogin;
import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime;

View File

@ -1,7 +1,7 @@
package com.upchina.advisor.vo;
package com.advisor.vo;
import com.upchina.advisor.entity.AdvisorInfo;
import com.upchina.common.entity.Tag;
import com.advisor.entity.AdvisorInfo;
import com.common.entity.Tag;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;

View File

@ -1,4 +1,4 @@
package com.upchina.app.constants;
package com.app.constants;
// 订单状态 新订单180已开通220已停用/已退款90已过期80已取消70关闭权限但未退款230
public enum AppOrderStatus {

View File

@ -1,9 +1,9 @@
package com.upchina.app.controller;
package com.app.controller;
import com.upchina.common.query.AppUserInfoQuery;
import com.upchina.common.result.CommonResult;
import com.upchina.common.service.AppUserService;
import com.upchina.common.vo.AppCUserInfoVO;
import com.common.query.AppUserInfoQuery;
import com.common.result.CommonResult;
import com.common.service.AppUserService;
import com.common.vo.AppCUserInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;

View File

@ -1,4 +1,4 @@
package com.upchina.app.entity;
package com.app.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.upchina.app.entity;
package com.app.entity;
import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -1,7 +1,7 @@
package com.upchina.app.mapper;
package com.app.mapper;
import com.app.entity.AppOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.upchina.app.entity.AppOrder;
/**
* <p>

View File

@ -1,7 +1,7 @@
package com.upchina.app.mapper;
package com.app.mapper;
import com.app.entity.AppRels;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.upchina.app.entity.AppRels;
/**
* <p>

View File

@ -1,4 +1,4 @@
package com.upchina.app.service;
package com.app.service;
import org.springframework.stereotype.Service;

View File

@ -1,20 +1,20 @@
package com.upchina.app.service;
package com.app.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.app.constants.AppOrderStatus;
import com.app.entity.AppOrder;
import com.app.mapper.AppOrderMapper;
import com.app.vo.OrderStatCollect;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.common.constant.IsOrNot;
import com.common.constant.ProductType;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Table;
import com.upchina.app.constants.AppOrderStatus;
import com.upchina.app.entity.AppOrder;
import com.upchina.app.mapper.AppOrderMapper;
import com.upchina.app.vo.OrderStatCollect;
import com.upchina.common.constant.IsOrNot;
import com.upchina.common.constant.ProductType;
import com.upchina.video.vo.statistic.VideoLiveProductSaleVO;
import com.video.vo.statistic.VideoLiveProductSaleVO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

View File

@ -1,7 +1,7 @@
package com.upchina.app.service;
package com.app.service;
import com.upchina.app.entity.AppOrder;
import com.upchina.app.mapper.AppOrderMapper;
import com.app.entity.AppOrder;
import com.app.mapper.AppOrderMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

View File

@ -1,8 +1,8 @@
package com.upchina.app.vo;
package com.app.vo;
import cn.hutool.core.date.DatePattern;
import com.upchina.advisor.entity.AdvisorBasic;
import com.upchina.video.entity.VideoLive;
import com.advisor.entity.AdvisorBasic;
import com.video.entity.VideoLive;
import java.io.Serializable;

View File

@ -1,4 +1,4 @@
package com.upchina.app.vo;
package com.app.vo;
import java.io.Serializable;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.upchina.app.vo;
package com.app.vo;
import java.io.Serializable;
import java.math.BigDecimal;

View File

@ -1,12 +1,12 @@
package com.upchina.business.service;
package com.business.service;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.json.JSONUtil;
import com.upchina.business.vo.*;
import com.upchina.common.handler.BizException;
import com.upchina.common.result.ResponseStatus;
import com.upchina.common.util.logger.LoggerUtil;
import com.business.vo.*;
import com.common.handler.BizException;
import com.common.result.ResponseStatus;
import com.common.util.logger.LoggerUtil;
import org.springframework.stereotype.Service;
import java.nio.charset.StandardCharsets;

View File

@ -1,4 +1,4 @@
package com.upchina.business.vo;
package com.business.vo;
public class BusinessLoginRspVO extends BusinessVO {

View File

@ -1,4 +1,4 @@
package com.upchina.business.vo;
package com.business.vo;
public class BusinessLoginVO {

View File

@ -1,4 +1,4 @@
package com.upchina.business.vo;
package com.business.vo;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.upchina.business.vo;
package com.business.vo;
public class BusinessModuleVO {

View File

@ -1,4 +1,4 @@
package com.upchina.business.vo;
package com.business.vo;
public class BusinessUserRspVO extends BusinessVO {

View File

@ -1,4 +1,4 @@
package com.upchina.business.vo;
package com.business.vo;
// {"id":3326,"userId":545138,"username":"sz545138","state":0,"email":"","mobile":"","umid":"","nickName":"sz545138","headPicUrl":"https://oss.ceniu.sztg.com/CRM2/HeadPic/16.jpg?t=20250215115612","regChannel":0,"regIp":"120.238.224.24","regExt":"","clientExt":"","remark":"","createTime":"2025-02-15 11:56:12","updateTime":"2025-02-15 11:56:56","userBindList":[],"userBusinessChannelList":[],"userModuleList":[]}
public class BusinessUserVO {

View File

@ -1,4 +1,4 @@
package com.upchina.business.vo;
package com.business.vo;
public class BusinessVO {

View File

@ -1,6 +1,6 @@
package com.upchina.common.annotation;
package com.common.annotation;
import com.upchina.common.constant.AccessRole;
import com.common.constant.AccessRole;
import java.lang.annotation.*;

View File

@ -1,6 +1,6 @@
package com.upchina.common.annotation;
package com.common.annotation;
import com.upchina.common.constant.ProductType;
import com.common.constant.ProductType;
import java.lang.annotation.*;

View File

@ -1,9 +1,9 @@
package com.upchina.common.aspect;
package com.common.aspect;
import com.upchina.common.annotation.Auth;
import com.upchina.common.constant.AccessRole;
import com.upchina.common.vo.BackendUserVO;
import com.upchina.rbac.service.AuthService;
import com.common.annotation.Auth;
import com.common.constant.AccessRole;
import com.common.vo.BackendUserVO;
import com.rbac.service.AuthService;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@ -24,7 +24,7 @@ public class AuthAspect {
@Resource
AuthService authService;
@Pointcut("@annotation(com.upchina.common.annotation.Auth)")
@Pointcut("@annotation(com.common.annotation.Auth)")
private void pointcut() {
}

View File

@ -1,15 +1,15 @@
package com.upchina.common.aspect;
package com.common.aspect;
import com.alibaba.fastjson.JSONObject;
import com.upchina.common.annotation.Operation;
import com.upchina.common.constant.ProductType;
import com.upchina.common.entity.OperationLog;
import com.upchina.common.handler.BizException;
import com.upchina.common.result.CommonResult;
import com.upchina.common.result.ResponseStatus;
import com.upchina.common.service.OperationLogService;
import com.upchina.common.vo.BackendUserVO;
import com.upchina.common.vo.InsertIdVO;
import com.common.annotation.Operation;
import com.common.constant.ProductType;
import com.common.entity.OperationLog;
import com.common.handler.BizException;
import com.common.result.CommonResult;
import com.common.result.ResponseStatus;
import com.common.service.OperationLogService;
import com.common.vo.BackendUserVO;
import com.common.vo.InsertIdVO;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@ -34,7 +34,7 @@ public class OperationLogAspect {
@Resource
private OperationLogService operationLogService;
@Pointcut("@annotation(com.upchina.common.annotation.Operation)")
@Pointcut("@annotation(com.common.annotation.Operation)")
private void pointcut() {
}

View File

@ -1,7 +1,7 @@
package com.upchina.common.aspect;
package com.common.aspect;
import com.upchina.common.util.RequestIdUtil;
import com.upchina.common.util.logger.LoggerUtil;
import com.common.util.RequestIdUtil;
import com.common.util.logger.LoggerUtil;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;

View File

@ -1,8 +1,8 @@
package com.upchina.common.aspect;
package com.common.aspect;
import com.alibaba.fastjson.JSONObject;
import com.upchina.common.util.RequestIdUtil;
import com.upchina.common.util.logger.LoggerUtil;
import com.common.util.RequestIdUtil;
import com.common.util.logger.LoggerUtil;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.*;

View File

@ -1,13 +1,13 @@
package com.upchina.common.aspect;
package com.common.aspect;
import com.alibaba.fastjson.JSONObject;
import com.auth0.jwt.exceptions.TokenExpiredException;
import com.upchina.common.handler.BizException;
import com.upchina.common.result.ResponseStatus;
import com.upchina.common.util.RequestIdUtil;
import com.upchina.common.util.logger.LoggerUtil;
import com.upchina.common.vo.BackendUserVO;
import com.upchina.common.vo.FrontUserVO;
import com.common.handler.BizException;
import com.common.result.ResponseStatus;
import com.common.util.RequestIdUtil;
import com.common.util.logger.LoggerUtil;
import com.common.vo.BackendUserVO;
import com.common.vo.FrontUserVO;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterThrowing;
import org.aspectj.lang.annotation.Aspect;

View File

@ -1,4 +1,4 @@
package com.upchina.common.config;
package com.common.config;
import org.csource.common.MyException;
import org.csource.fastdfs.*;

View File

@ -1,4 +1,4 @@
package com.upchina.common.config;
package com.common.config;
import com.alibaba.fastjson.parser.ParserConfig;
import com.alibaba.fastjson.serializer.SerializerFeature;

View File

@ -1,4 +1,4 @@
package com.upchina.common.config;
package com.common.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;

View File

@ -1,7 +1,7 @@
package com.upchina.common.config;
package com.common.config;
import com.upchina.common.vo.BackendUserVO;
import com.upchina.common.vo.FrontUserVO;
import com.common.vo.BackendUserVO;
import com.common.vo.FrontUserVO;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.annotations.ApiIgnore;
@ -9,7 +9,6 @@ import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
@ -31,7 +30,7 @@ public class Swagger3Config {
.apiInfo(apiInfo())
.enable(true)
.select()
.apis(RequestHandlerSelectors.basePackage("com.upchina")) //扫描该包下的所有需要在Swagger中展示的API@ApiIgnore注解标注的除外
.apis(RequestHandlerSelectors.basePackage("com")) //扫描该包下的所有需要在Swagger中展示的API@ApiIgnore注解标注的除外
.paths(PathSelectors.any())
.build()
.ignoredParameterTypes(HttpSession.class, HttpServletRequest.class, HttpServletResponse.class, FrontUserVO.class, BackendUserVO.class)
@ -43,8 +42,6 @@ public class Swagger3Config {
return new ApiInfoBuilder()
.title("私域直播-投顾平台数据API")
.description("投顾平台数据API")
.termsOfServiceUrl("https://www.upchina.com/")
.contact(new Contact("", "", "martinyuan@upchina.com"))
.version("1.0")
.build();
}

View File

@ -1,4 +1,4 @@
package com.upchina.common.config;
package com.common.config;
import com.tencentcloudapi.common.Credential;
import com.tencentcloudapi.common.profile.ClientProfile;

View File

@ -1,4 +1,4 @@
package com.upchina.common.config;
package com.common.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;

View File

@ -1,6 +1,6 @@
package com.upchina.common.config;
package com.common.config;
import com.upchina.common.util.UpDes;
import com.common.util.UpDes;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

View File

@ -1,7 +1,7 @@
package com.upchina.common.config;
package com.common.config;
import com.upchina.common.handler.WebSocketErrorHandler;
import com.upchina.common.interceptor.WebSocketAuthChannelInterceptor;
import com.common.handler.WebSocketErrorHandler;
import com.common.interceptor.WebSocketAuthChannelInterceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.messaging.simp.config.ChannelRegistration;

View File

@ -1,11 +1,11 @@
package com.upchina.common.config.cache;
package com.common.config.cache;
import com.hazelcast.config.InMemoryFormat;
import java.util.HashMap;
import java.util.Map;
import static com.upchina.common.config.cache.CacheKey.*;
import static com.common.config.cache.CacheKey.*;
public class CacheConfig {

View File

@ -1,4 +1,4 @@
package com.upchina.common.config.cache;
package com.common.config.cache;
import java.io.Serializable;

View File

@ -1,8 +1,9 @@
package com.upchina.common.config.cache;
package com.common.config.cache;
import com.hazelcast.config.*;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.sql.SqlService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -21,7 +22,7 @@ public class HazelcastConfiguration {
private Integer serverPort;
@Bean
public Config hazelCastConfig() {
public HazelcastInstance hazelcastInstance() {
List<String> memberList = Arrays.asList(members.split(","));
Config config = new Config();
// hazelcast作为缓存服务端监听的端口
@ -70,11 +71,36 @@ public class HazelcastConfiguration {
.setMaxSizePolicy(MaxSizePolicy.ENTRY_COUNT)
.setSize(100000))
));
return config;
HazelcastInstance instance = Hazelcast.newHazelcastInstance(config);
createMapping(instance);
createIndex(instance);
return instance;
}
@Bean
public HazelcastInstance hazelcastInstance() {
return Hazelcast.newHazelcastInstance(this.hazelCastConfig());
private static void createMapping(HazelcastInstance instance) {
SqlService sqlService = instance.getSql();
sqlService.execute("CREATE OR REPLACE MAPPING " + CacheKey.VIDEO_ONLINE_USER + " TYPE IMap OPTIONS (" +
"'keyFormat' = 'varchar'," +
"'valueFormat' = 'java'," +
"'valueJavaClass' = 'com.entity.common.OnlineUser'" +
")");
sqlService.execute("CREATE OR REPLACE MAPPING " + CacheKey.GROUP_ONLINE_USER + " TYPE IMap OPTIONS (" +
"'keyFormat' = 'varchar'," +
"'valueFormat' = 'java'," +
"'valueJavaClass' = 'com.entity.common.OnlineUser'" +
")");
}
private static void createIndex(HazelcastInstance instance) {
IndexConfig videoIndexConfig = new IndexConfig()
.setName("idx_" + CacheKey.VIDEO_ONLINE_USER)
.setType(IndexType.HASH)
.addAttribute("productId");
instance.getMap(CacheKey.VIDEO_ONLINE_USER).addIndex(videoIndexConfig);
IndexConfig groupIndexConfig = new IndexConfig()
.setName("idx_" + CacheKey.GROUP_ONLINE_USER)
.setType(IndexType.HASH)
.addAttribute("productId");
instance.getMap(CacheKey.GROUP_ONLINE_USER).addIndex(groupIndexConfig);
}
}

View File

@ -1,4 +1,4 @@
package com.upchina.common.config.mybatis;
package com.common.config.mybatis;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;

View File

@ -1,4 +1,4 @@
package com.upchina.common.config.mybatis;
package com.common.config.mybatis;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
@ -8,7 +8,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
@MapperScan("com.upchina")
@MapperScan("com")
public class MybatisPlusConfig {
@Bean

View File

@ -1,4 +1,4 @@
package com.upchina.common.config.mybatis;
package com.common.config.mybatis;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.IdType;

View File

@ -1,4 +1,4 @@
package com.upchina.common.config.mybatis;
package com.common.config.mybatis;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
/**
* 能调用的角色

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum AddOrSub {

View File

@ -1,7 +1,7 @@
package com.upchina.common.constant;
package com.common.constant;
import com.upchina.common.handler.BizException;
import com.upchina.common.result.ResponseStatus;
import com.common.handler.BizException;
import com.common.result.ResponseStatus;
import java.util.Arrays;
import java.util.Optional;

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
// 登录方式 1:用户名密码 2:token
public enum AppLoginType {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum ClientType {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
// 范围类型 1产品 2产品类型 3全局
public enum CommentBlackScope {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum CommentBlackStatus {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum CommentBlackType {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum CommentUserType {
// 客户

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum IsActive {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum IsDisplay {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum IsFollow {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum IsFree {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum IsLike {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
import java.util.Arrays;

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum IsRecommend {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum IsSub {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum ListColumnType {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum Market {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum OrderBy {

View File

@ -1,7 +1,7 @@
package com.upchina.common.constant;
package com.common.constant;
import com.upchina.common.handler.BizException;
import com.upchina.common.result.ResponseStatus;
import com.common.handler.BizException;
import com.common.result.ResponseStatus;
import java.util.Arrays;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum RecommendOption {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
import java.util.Arrays;

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum ScheduleLogResult {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum SimUserType {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum ThirdPartyProductStatus {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum UserStatus {

View File

@ -1,4 +1,4 @@
package com.upchina.common.constant;
package com.common.constant;
public enum UserType {

View File

@ -1,17 +1,17 @@
package com.upchina.common.controller;
package com.common.controller;
import com.upchina.common.annotation.Auth;
import com.upchina.common.constant.AccessRole;
import com.upchina.common.query.ListAdvertQuery;
import com.upchina.common.query.OnlyIdQuery;
import com.upchina.common.query.SaveAdvertQuery;
import com.upchina.common.query.UpdateAdvertQuery;
import com.upchina.common.result.CommonResult;
import com.upchina.common.result.Pager;
import com.upchina.common.service.AdvertService;
import com.upchina.common.vo.AdvertAppVO;
import com.upchina.common.vo.AdvertVO;
import com.upchina.common.vo.BackendUserVO;
import com.common.annotation.Auth;
import com.common.constant.AccessRole;
import com.common.query.ListAdvertQuery;
import com.common.query.OnlyIdQuery;
import com.common.query.SaveAdvertQuery;
import com.common.query.UpdateAdvertQuery;
import com.common.result.CommonResult;
import com.common.result.Pager;
import com.common.service.AdvertService;
import com.common.vo.AdvertAppVO;
import com.common.vo.AdvertVO;
import com.common.vo.BackendUserVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

View File

@ -1,13 +1,13 @@
package com.upchina.common.controller;
package com.common.controller;
import com.upchina.common.query.AddCommentBlackQuery;
import com.upchina.common.query.CommentBlackQuery;
import com.upchina.common.query.RemoveCommentBlackQuery;
import com.upchina.common.result.CommonResult;
import com.upchina.common.result.Pager;
import com.upchina.common.service.CommentBlackService;
import com.upchina.common.vo.BackendUserVO;
import com.upchina.common.vo.CommentBlackVO;
import com.common.query.AddCommentBlackQuery;
import com.common.query.CommentBlackQuery;
import com.common.query.RemoveCommentBlackQuery;
import com.common.result.CommonResult;
import com.common.result.Pager;
import com.common.service.CommentBlackService;
import com.common.vo.BackendUserVO;
import com.common.vo.CommentBlackVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;

View File

@ -1,19 +1,19 @@
package com.upchina.common.controller;
package com.common.controller;
import cn.hutool.core.util.StrUtil;
import com.upchina.common.annotation.Auth;
import com.upchina.common.constant.AccessRole;
import com.upchina.common.handler.BizException;
import com.upchina.common.query.*;
import com.upchina.common.result.AppPager;
import com.upchina.common.result.CommonResult;
import com.upchina.common.result.Pager;
import com.upchina.common.result.ResponseStatus;
import com.upchina.common.service.CommentService;
import com.upchina.common.vo.BackendUserVO;
import com.upchina.common.vo.CommentAppVO;
import com.upchina.common.vo.CommentVO;
import com.upchina.common.vo.FrontUserVO;
import com.common.annotation.Auth;
import com.common.constant.AccessRole;
import com.common.handler.BizException;
import com.common.query.*;
import com.common.result.AppPager;
import com.common.result.CommonResult;
import com.common.result.Pager;
import com.common.result.ResponseStatus;
import com.common.service.CommentService;
import com.common.vo.BackendUserVO;
import com.common.vo.CommentAppVO;
import com.common.vo.CommentVO;
import com.common.vo.FrontUserVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

View File

@ -1,11 +1,11 @@
package com.upchina.common.controller;
package com.common.controller;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.util.StrUtil;
import com.upchina.common.result.CommonResult;
import com.upchina.common.util.CodecUtil;
import com.upchina.common.vo.UploadVO;
import com.common.result.CommonResult;
import com.common.util.CodecUtil;
import com.common.vo.UploadVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

View File

@ -1,8 +1,8 @@
package com.upchina.common.controller;
package com.common.controller;
import com.upchina.common.result.CommonResult;
import com.upchina.common.service.GlobalConfigService;
import com.upchina.common.vo.WebSocketConfigVO;
import com.common.result.CommonResult;
import com.common.service.GlobalConfigService;
import com.common.vo.WebSocketConfigVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

View File

@ -1,10 +1,10 @@
package com.upchina.common.controller;
package com.common.controller;
import com.upchina.common.query.OperationLogQuery;
import com.upchina.common.result.CommonResult;
import com.upchina.common.result.Pager;
import com.upchina.common.service.OperationLogService;
import com.upchina.common.vo.OperationLogVO;
import com.common.query.OperationLogQuery;
import com.common.result.CommonResult;
import com.common.result.Pager;
import com.common.service.OperationLogService;
import com.common.vo.OperationLogVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

View File

@ -1,16 +1,16 @@
package com.upchina.common.controller;
package com.common.controller;
import com.upchina.common.annotation.Auth;
import com.upchina.common.constant.AccessRole;
import com.upchina.common.query.ListRecommendQuery;
import com.upchina.common.query.OnlyIdQuery;
import com.upchina.common.query.SaveRecommendQuery;
import com.upchina.common.query.UpdateRecommendQuery;
import com.upchina.common.result.CommonResult;
import com.upchina.common.result.Pager;
import com.upchina.common.service.RecommendService;
import com.upchina.common.vo.BackendUserVO;
import com.upchina.common.vo.RecommendVO;
import com.common.annotation.Auth;
import com.common.constant.AccessRole;
import com.common.query.ListRecommendQuery;
import com.common.query.OnlyIdQuery;
import com.common.query.SaveRecommendQuery;
import com.common.query.UpdateRecommendQuery;
import com.common.result.CommonResult;
import com.common.result.Pager;
import com.common.service.RecommendService;
import com.common.vo.BackendUserVO;
import com.common.vo.RecommendVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

Some files were not shown because too many files have changed in this diff Show More