Merge branches 'online' and 'test' of http://gogs.efunbox.cn:/wangys/efunbox-manage into online

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/repository/CostTypeRepository.java

@@ -9,4 +9,6 @@ import java.util.List;
 public interface CostTypeRepository extends BasicRepository<CostType> {
 
     List<CostType> findByStatusOrderBySortDesc(BaseStatusEnum status);
+
+    CostType findByName(String name);
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/repository/ProjectRepository.java

@@ -12,5 +12,7 @@ public interface ProjectRepository extends BasicRepository<Project> {
 
     List<Project> findByStatusOrderBySortDesc(BaseStatusEnum status);
 
+    Project findByName(String name);
+
     Project findById(String id);
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/CostTypeServiceImpl.java

@@ -37,6 +37,9 @@ public class CostTypeServiceImpl implements CostTypeService {
         if(costType == null){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
+        if(Objects.nonNull(costTypeRepository.findByName(costType.getName()))){
+            return ApiResult.error(ApiCode.REPETITION_ERROR);
+        }
         costType = costTypeRepository.save(costType);
         if(Objects.nonNull(costType)){
             return ApiResult.ok(costType);
@@ -49,6 +52,9 @@ public class CostTypeServiceImpl implements CostTypeService {
         if(costType == null){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
+        if(Objects.nonNull(costTypeRepository.findByName(costType.getName()))){
+            return ApiResult.error(ApiCode.REPETITION_ERROR);
+        }
         costType = costTypeRepository.update(costType);
         if(Objects.nonNull(costType)){
             return ApiResult.ok(costType);

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ManageServiceImpl.java

@@ -54,22 +54,22 @@ public class ManageServiceImpl implements ManageService {
             public Predicate toPredicate(Root<Manage> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
 
                 List<Predicate> predicates = new ArrayList<>();
-                if(Objects.nonNull(manageVO.getToProjectId()) && 0 == manageVO.getToProjectId()){
+                if(Objects.nonNull(manageVO.getToProjectId()) && 0 != manageVO.getToProjectId()){
                     predicates.add(criteriaBuilder.equal(root.get("toProjectId"), manageVO.getToProjectId()));
                 }
-                if(Objects.nonNull(manageVO.getToDeptId()) && 0 == manageVO.getToDeptId()){
+                if(Objects.nonNull(manageVO.getToDeptId()) && 0 != manageVO.getToDeptId()){
                     predicates.add(criteriaBuilder.equal(root.get("toDeptId"), manageVO.getToProjectId()));
                 }
-                if(Objects.nonNull(manageVO.getProductId()) && 0 == manageVO.getProductId()){
+                if(Objects.nonNull(manageVO.getProductId()) && 0 != manageVO.getProductId()){
                     predicates.add(criteriaBuilder.equal(root.get("productId"), manageVO.getProductId()));
                 }
-                if(Objects.nonNull(manageVO.getProductId()) && 0 == manageVO.getProductId()){
-                    predicates.add(criteriaBuilder.equal(root.get("projectId"), manageVO.getProductId()));
+                if(Objects.nonNull(manageVO.getProjectId()) && 0 != manageVO.getProjectId()){
+                    predicates.add(criteriaBuilder.equal(root.get("projectId"), manageVO.getProjectId()));
                 }
                 if(Objects.nonNull(manageVO.getType())){
                     predicates.add(criteriaBuilder.equal(root.get("type"), manageVO.getType()));
                 }
-                if(Objects.nonNull(manageVO.getCostTypeId()) && 0 == manageVO.getCostTypeId()){
+                if(Objects.nonNull(manageVO.getCostTypeId()) && 0 != manageVO.getCostTypeId()){
                     predicates.add(criteriaBuilder.equal(root.get("costTypeId"), manageVO.getCostTypeId()));
                 }
                 if(Objects.nonNull(manageVO.getIncomeStatus())){

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ProjectServiceImpl.java

@@ -40,6 +40,9 @@ public class ProjectServiceImpl implements ProjectService {
         if(project ==null){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
+        if(Objects.nonNull(projectRepository.findByName(project.getName()))){
+            return ApiResult.error(ApiCode.REPETITION_ERROR);
+        }
         project = projectRepository.save(project);
         if(Objects.nonNull(project)){
             return ApiResult.ok(project);
@@ -52,6 +55,9 @@ public class ProjectServiceImpl implements ProjectService {
         if(project ==null){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
+        if(Objects.nonNull(projectRepository.findByName(project.getName()))){
+            return ApiResult.error(ApiCode.REPETITION_ERROR);
+        }
         project = projectRepository.update(project);
         if(Objects.nonNull(project)){
             return ApiResult.ok(project);

efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/assist/aspect/OperationLogAspect.java

@@ -3,9 +3,7 @@ package cn.efunbox.manage.base.assist.aspect;
 import cn.efunbox.manage.base.assist.async.AsyncOperationLogHandler;
 import cn.efunbox.manage.base.entity.User;
 import cn.efunbox.manage.base.repository.UserRepository;
-import cn.efunbox.manage.common.utils.Constants;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.json.JSONObject;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -18,7 +16,6 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Objects;
 
 @Slf4j
 @Aspect
@@ -28,9 +25,8 @@ public class OperationLogAspect {
 
     @Autowired
     AsyncOperationLogHandler asyncOperationLogHandler;
-
     @Autowired
-    private RedisTemplate<String,String> redisTemplate;
+    RedisTemplate redisTemplate;
 
     @Autowired
     UserRepository userRepository;
@@ -48,13 +44,15 @@ public class OperationLogAspect {
 
             //如果是 增删改 才记录入库
             if(request.getMethod().equals("POST")|| request.getMethod().equals("PUT")|| request.getMethod().equals("DELETE")|| request.getMethod().equals("TRACE")|| request.getMethod().equals("PATCH")){
-                String token = request.getHeader("X-Token");
-                if (StringUtils.isEmpty(token)) {
-                    log.error("user token is null !");
+//                String token = request.getHeader("X-Token");
+                String uid = request.getHeader("uid");
+                if (StringUtils.isEmpty(uid)) {
+                    log.error("user uid is null !");
                     return;
                 }
-                User loginUser = (User)JSONObject.toBean(JSONObject.fromObject(redisTemplate.opsForValue().get(Constants.EFUNBOX_ADMIN_TOKEN_PREFIX + token)), User.class);
-//                User loginUser = (User) ;
+
+//                User loginUser = (User) redisTemplate.opsForValue().get(token);
+                User loginUser = userRepository.findById(uid);
 
 
                 request.setAttribute("userInfo",loginUser);

manage-common/src/main/java/cn/efunbox/manage/common/configuration/FrontConfiguration.java

@@ -59,9 +59,9 @@ public class FrontConfiguration extends WebMvcConfigurerAdapter implements Envir
 
 		registry.addInterceptor(allowOriginInterceptor);
 		registry.addInterceptor(adminInterceptor)
-				.addPathPatterns("/cms/**")
-				.excludePathPatterns("/cms/login")
-				.excludePathPatterns("/cms/logout");
+				.addPathPatterns("/**")
+				.excludePathPatterns("/user/login")
+				.excludePathPatterns("/user/logout");
 	}
 
     @Override

manage-common/src/main/java/cn/efunbox/manage/common/intercepter/AdminInterceptor.java

@@ -33,19 +33,19 @@ public class AdminInterceptor implements HandlerInterceptor {
             return false;
         }
         ServletOutputStream out = response.getOutputStream();
-        String token = request.getHeader("token");
+        String token = request.getHeader("uid");
         if (StringUtils.isBlank(token)) {
             ApiResult invalidTokenResult = ApiResult.error(ApiCode.INVALID_TOKEN);
             out.write(JSONObject.toJSONString(invalidTokenResult).getBytes("UTF-8"));
             return false;
         }
-        String user = redisTemplate.opsForValue().get(Constants.EFUNBOX_ADMIN_TOKEN_PREFIX + token);
-        if (StringUtils.isBlank(user)) {
-            ApiResult invalidTokenResult = ApiResult.error(ApiCode.INVALID_TOKEN);
-            out.write(JSONObject.toJSONString(invalidTokenResult).getBytes("UTF-8"));
-            return false;
-        }
-        redisTemplate.expire(Constants.EFUNBOX_ADMIN_TOKEN_PREFIX + token, 30, TimeUnit.MINUTES);
+//        String user = redisTemplate.opsForValue().get(Constants.EFUNBOX_ADMIN_TOKEN_PREFIX + token);
+//        if (StringUtils.isBlank(user)) {
+//            ApiResult invalidTokenResult = ApiResult.error(ApiCode.INVALID_TOKEN);
+//            out.write(JSONObject.toJSONString(invalidTokenResult).getBytes("UTF-8"));
+//            return false;
+//        }
+//        redisTemplate.expire(Constants.EFUNBOX_ADMIN_TOKEN_PREFIX + token, 30, TimeUnit.MINUTES);
         return true;
     }
 

manage-common/src/main/java/cn/efunbox/manage/common/result/ApiCode.java

@@ -19,7 +19,7 @@ public class ApiCode extends AbstractApiCode {
     public static final int _C_UNAUTHORIZED = 401;
     public static final ApiCode UNAUTHORIZED = new ApiCode("未认证", _C_UNAUTHORIZED);
     public static final int _C_INVALID_TOKEN = 402;
-    public static final ApiCode INVALID_TOKEN = new ApiCode("无效的Token", _C_INVALID_TOKEN);
+    public static final ApiCode INVALID_TOKEN = new ApiCode("无效的用户id", _C_INVALID_TOKEN);
     public static final int _C_ACCESS_DENIED = 403;
     public static final ApiCode ACCESS_DENIED = new ApiCode("访问被拒绝", _C_ACCESS_DENIED);
     public static final int _C_SIGNATURE_ERROR = 510;
@@ -59,36 +59,8 @@ public class ApiCode extends AbstractApiCode {
     public final static ApiCode DEVICE_ERROR = new ApiCode("没有相关deviceCode信息", _C_DEVICE_ERROR);
     public final static int _C_DATA_ERROR = 701;
     public final static ApiCode DATA_ERROR = new ApiCode("数据异常", _C_DATA_ERROR);
-
-    public final static int _C_UNIONID_ERROR = 703;
-    public final static ApiCode UNIONID_ERROR = new ApiCode(" unionId为空", _C_UNIONID_ERROR);
-
-    public final static int _C_AWARD_ERROR = 706;
-    public final static ApiCode AWARD_ERROR = new ApiCode("自己不能打赏自己", _C_AWARD_ERROR);
-
-    public final static int _C_VIDEO_ERROR = 707;
-    public final static ApiCode VIDEO_ERROR = new ApiCode("视频地址错误", _C_VIDEO_ERROR);
-
-    public final static int _C_BUY_TIME_ERROR = 708;
-    public final static ApiCode BUY_TIME_ERROR = new ApiCode("购买时长不能超过12个月", _C_BUY_TIME_ERROR);
-
-    public final static int _C_JOINED_GROUP_ERROR = 801;
-    public final static ApiCode JOINED_GROUP_ERROR = new ApiCode("你已参加过当前团购", _C_JOINED_GROUP_ERROR);
-
-    public final static int _C_GROUP_STATUS_ERROR = 802;
-    public final static ApiCode GROUP_STATUS_ERROR = new ApiCode("当前团购已关闭", _C_GROUP_STATUS_ERROR);
-
-    public final static int _C_GROUP_EXIST_ERROR = 803;
-    public final static ApiCode GROUP_EXIST_ERROR = new ApiCode("您有未完成的团正在进行中", _C_GROUP_EXIST_ERROR);
-
-    public final static int _C_GROUP_HEADCOUNT_ERROR = 804;
-    public final static ApiCode GROUP_HEADCOUNT_ERROR = new ApiCode("此团参加人数已达上限", _C_GROUP_HEADCOUNT_ERROR);
-
-    public final static int _C_GROUP_CREATE_ERROR = 805;
-    public final static ApiCode GROUP_CREATE_ERROR = new ApiCode("您已购买过当前课文", _C_GROUP_CREATE_ERROR);
-
-    public final static int _C_JOIN_SHARE_ERROR = 806;
-    public final static ApiCode JOIN_SHARE_ERROR = new ApiCode("您当前没有助力资格", _C_JOIN_SHARE_ERROR);
+    public final static int _C_REPETITION_ERROR = 703;
+    public final static ApiCode REPETITION_ERROR = new ApiCode("名称重复", _C_REPETITION_ERROR);
 
     protected ApiCode(String message, int code) {
         super(code, message);