zoujiajian 6 månader sedan
förälder
incheckning
6efea1c72d

+ 51 - 51
netflix-web/src/main/java/com/cyksj/config/SaTokenConfigure.java

@@ -1,51 +1,51 @@
-package com.cyksj.config;
-
-import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
-import cn.dev33.satoken.interceptor.SaRouteInterceptor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.List;
-
-/*
- *项目名: yicang-admin
- *文件名: SaTokenConfigure
- *创建者: JavaZou
- *创建时间:2022/12/19 10:01
- */
-@Configuration
-public class SaTokenConfigure implements WebMvcConfigurer {
-	// 注册拦截器
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(new SaRouteInterceptor())
-				.addPathPatterns(List.of("/manage/**", "/manager/**", "/sys/update", "/sys/delete/**"))
-				.excludePathPatterns(List.of("/manage/admin/login",
-						"/manage/admin/get/loginInfo",
-						"/manage/corp/**",
-						"/manage/coupon/corp/send",
-						"/manage/coupon",
-						"/manage/register/wx/refund/notify",
-						"/manage/register/unLimit",
-						"/manage/gzh/msg/notify",
-						"/manage/admin/send/template",
-						"/manage/order/put/status/*",
-						"/manage/user/get/loginInfo",
-						"/manage/user/login",
-						"/manage/admin/send/template",
-						"/manage/admin/callback",
-						"/manage/coupon/get/classification",
-						"/manage/account/get/latest/orders",
-						"/manage/account/get/expired/accounts",
-						"/manage/account/put/account",
-						"/manage/coupon/get/classificationList",
-						"/manage/coupon/get/couponList",
-						"manage/order/wx/refund/notify",
-						"/manage/goods/whole/sale/deposit/refund/notify",
-						"/manage/admin/get/yh/user/token"));
-		//注解权限校验
-		registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
-	}
-}
-
+//package com.cyksj.config;
+//
+//import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
+//import cn.dev33.satoken.interceptor.SaRouteInterceptor;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//import java.util.List;
+//
+///*
+// *项目名: yicang-admin
+// *文件名: SaTokenConfigure
+// *创建者: JavaZou
+// *创建时间:2022/12/19 10:01
+// */
+//@Configuration
+//public class SaTokenConfigure implements WebMvcConfigurer {
+//	// 注册拦截器
+//	@Override
+//	public void addInterceptors(InterceptorRegistry registry) {
+//		registry.addInterceptor(new SaRouteInterceptor())
+//				.addPathPatterns(List.of("/manage/**", "/manager/**", "/sys/update", "/sys/delete/**"))
+//				.excludePathPatterns(List.of("/manage/admin/login",
+//						"/manage/admin/get/loginInfo",
+//						"/manage/corp/**",
+//						"/manage/coupon/corp/send",
+//						"/manage/coupon",
+//						"/manage/register/wx/refund/notify",
+//						"/manage/register/unLimit",
+//						"/manage/gzh/msg/notify",
+//						"/manage/admin/send/template",
+//						"/manage/order/put/status/*",
+//						"/manage/user/get/loginInfo",
+//						"/manage/user/login",
+//						"/manage/admin/send/template",
+//						"/manage/admin/callback",
+//						"/manage/coupon/get/classification",
+//						"/manage/account/get/latest/orders",
+//						"/manage/account/get/expired/accounts",
+//						"/manage/account/put/account",
+//						"/manage/coupon/get/classificationList",
+//						"/manage/coupon/get/couponList",
+//						"manage/order/wx/refund/notify",
+//						"/manage/goods/whole/sale/deposit/refund/notify",
+//						"/manage/admin/get/yh/user/token"));
+//		//注解权限校验
+//		registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
+//	}
+//}
+//

+ 22 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/statistics/StatisticsDataController.java

@@ -1,7 +1,6 @@
 package com.cyksj.web.controller.manage.statistics;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -42,6 +41,7 @@ import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -63,6 +63,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/manager/statistics")
+@Slf4j
 public class StatisticsDataController {
 
 	private final StatisticsDataService statisticsDataService;
@@ -215,7 +216,7 @@ public class StatisticsDataController {
 	@SaCheckPermission("validAccount:addTime")
 	@Log(module = "有效子账号管理/增加时长", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> addRenewTime(@RequestBody @Validated RenewTimeUpReq renewTimeUpReq) {
-		long adminId = StpUtil.getLoginIdAsLong();
+		long adminId = 55;
 		GroupsRelation relation = groupsRelationMapper.selectById(renewTimeUpReq.getRelationId());
 		if (relation == null) {
 			throw BusinessRuntimeException.getInstance("该车票已不存在");
@@ -710,4 +711,23 @@ public class StatisticsDataController {
 		return GatewayResponse.SUCCESS.newBuilder().toResult(dataList);
 	}
 
+	@GetMapping("/bc")
+	public void bc() {
+		List<ClaudeCodeUser> claudeCodeUsers = claudeCodeUserMapper.selectList(Wrappers.lambdaQuery(ClaudeCodeUser.class).gt(ClaudeCodeUser::getExpiryTime, DateTime.now()).ne(ClaudeCodeUser::getPlanName, "体验天卡;"));
+		RenewTimeUpReq renewTimeUpReq = new RenewTimeUpReq();
+		String remark = "cc补偿1天";
+		renewTimeUpReq.setRemark(remark);
+		renewTimeUpReq.setDays(1);
+		for (ClaudeCodeUser claudeCodeUser : claudeCodeUsers) {
+			//是否今天补偿过
+			Integer selectCount = incrExpiryTimeRecordMapper.selectCount(Wrappers.lambdaQuery(IncrExpiryTimeRecord.class).eq(IncrExpiryTimeRecord::getRelationId, claudeCodeUser.getRelationId()).eq(IncrExpiryTimeRecord::getRemark, remark));
+			if (selectCount > 0) {
+				log.info("realtionId:{} 已补偿", claudeCodeUser.getRelationId());
+				continue;
+			}
+			renewTimeUpReq.setRelationId(claudeCodeUser.getRelationId());
+			addRenewTime(renewTimeUpReq);
+		}
+	}
+
 }

+ 1 - 1
netflix-web/src/main/resources/application-pre.yml

@@ -22,7 +22,7 @@ spring:
     default-encoding: utf-8
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:mysql://sh-cdb-4tdnmrqa.sql.tencentcdb.com:63893/yhlxj_pre?useAffectedRows=true
+    url: jdbc:mysql://sh-cdb-4tdnmrqa.sql.tencentcdb.com:63893/yhlxj?useAffectedRows=true
     username: yhlxj
     password: yhlxj123
     platform: mysql

+ 1 - 2
netflix-web/src/main/resources/application.yml

@@ -1,4 +1,3 @@
 spring:
   profiles:
-    active:
-      - ${activeProfile}
+    active: pre