From aac89defa88c7f25d2fd8f481ff2fa2377acd73d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 05 一月 2026 13:30:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/web/AuthController.java | 6 +++---
src/main/java/com/zy/system/timer/LicenseTimer.java | 2 +-
pom.xml | 13 ++++++++++---
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4e61b50..ce8a2be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<relativePath/>
</parent>
<groupId>com.zy</groupId>
- <artifactId>asrs</artifactId>t
+ <artifactId>asrs</artifactId>
<version>1.1.1</version>
<packaging>war</packaging>
@@ -30,7 +30,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -40,10 +39,18 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>cn.cool</groupId>-->
+<!-- <artifactId>framework</artifactId>-->
+<!-- <version>${cool.version}</version>-->
+<!-- </dependency>-->
+ <!-- 浣跨敤鏈湴 JAR 瑙ｅ喅缂哄け鐨� cn.cool:framework:jar:3.2.0 -->
<dependency>
<groupId>cn.cool</groupId>
<artifactId>framework</artifactId>
- <version>${cool.version}</version>
+ <version>3.2.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/version/lib/framework-3.2.0.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index cc00686..99ecdc6 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -138,9 +138,9 @@
resourceWrapper = new EntityWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort");
} else {
// 婵�娲荤爜楠岃瘉
- if (!SystemProperties.SYSTEM_ACTIVATION) {
- return R.ok();
- }
+ if (!SystemProperties.SYSTEM_ACTIVATION) {
+ return R.ok();
+ }
oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
// 鑾峰彇褰撳墠鐢ㄦ埛鐨勬墍鏈変簩绾ц彍鍗�
user = userService.selectById(getUserId());
diff --git a/src/main/java/com/zy/system/timer/LicenseTimer.java b/src/main/java/com/zy/system/timer/LicenseTimer.java
index a56a24c..1f0190d 100644
--- a/src/main/java/com/zy/system/timer/LicenseTimer.java
+++ b/src/main/java/com/zy/system/timer/LicenseTimer.java
@@ -7,7 +7,7 @@
@Component
public class LicenseTimer {
- private static boolean SYSTEM_SUPPORT = false;//绯荤粺婵�娲荤姸鎬侊紝榛樿鍏抽棴
+ private static boolean SYSTEM_SUPPORT = true;//绯荤粺婵�娲荤姸鎬侊紝榛樿鍏抽棴
private static int LICENSE_DAYS = 0;//璁稿彲璇佸ぉ鏁�
--
Gitblit v1.9.1