Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[common] optimize common aviator configuration #327

Merged
merged 1 commit into from
Oct 6, 2022
Merged

[common] optimize common aviator configuration #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions alerter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,6 @@
<artifactId>springdoc-openapi-ui</artifactId>
<scope>provided</scope>
</dependency>
<!-- 表达式计算 -->
<dependency>
<groupId>com.googlecode.aviator</groupId>
<artifactId>aviator</artifactId>
<version>5.2.7</version>
</dependency>
<!-- feign -->
<dependency>
<groupId>org.springframework.cloud</groupId>
Expand Down
1 change: 0 additions & 1 deletion alerter/src/main/resources/META-INF/spring.factories
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ com.usthe.alert.service.impl.AlertServiceImpl,\
com.usthe.alert.controller.AlertDefineController,\
com.usthe.alert.AlerterWorkerPool,\
com.usthe.alert.AlerterProperties,\
com.usthe.alert.AlerterConfiguration,\
com.usthe.alert.calculate.CalculateAlarm,\
com.usthe.alert.controller.AlertsController,\
com.usthe.alert.controller.AlertDefinesController
5 changes: 0 additions & 5 deletions collector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,6 @@
<artifactId>gson</artifactId>
<version>2.8.8</version>
</dependency>
<dependency>
<groupId>com.googlecode.aviator</groupId>
<artifactId>aviator</artifactId>
<version>5.2.7</version>
</dependency>
<!--collect-->
<!-- mysql -->
<dependency>
Expand Down
6 changes: 6 additions & 0 deletions common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@
<version>0.5.11</version>
<scope>provided</scope>
</dependency>
<!-- 表达式计算 -->
<dependency>
<groupId>com.googlecode.aviator</groupId>
<artifactId>aviator</artifactId>
<version>5.2.7</version>
</dependency>
<!-- 工具依赖 -->
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...com/usthe/alert/AlerterConfiguration.java → ...e/common/config/AviatorConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.usthe.alert;
package com.usthe.common.config;

import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.lexer.token.OperatorType;
Expand All @@ -33,7 +33,7 @@
*/
@Configuration
@Slf4j
public class AlerterConfiguration {
public class AviatorConfiguration {

private static final int AVIATOR_LRU_CACHE_SIZE = 1024;

Expand Down
1 change: 1 addition & 0 deletions common/src/main/resources/META-INF/spring.factories
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.usthe.common.config.CommonProperties,\
com.usthe.common.config.CommonConfig,\
com.usthe.common.config.AviatorConfiguration,\
com.usthe.common.queue.impl.InMemoryCommonDataQueue,\
com.usthe.common.support.SpringContextHolder