8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 20:15:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

合并3.3.0企业版改动

Browse Source
This commit is contained in:
zengqiao
2023-02-24 17:49:26 +08:00
parent cca7246281
commit a82d7f594e
137 changed files with 591 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
km-rest/pom.xml
View File

@@ -39,11 +39,6 @@
<artifactId>km-monitor</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.xiaojukeji.kafka</groupId>
<artifactId>km-license</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.xiaojukeji.kafka</groupId>
<artifactId>km-core</artifactId>

10
km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/enterprise/rebalance/ClusterBalanceController.java
View File

@@ -3,16 +3,16 @@ package com.xiaojukeji.know.streaming.km.rest.api.v3.enterprise.rebalance;
import com.didiglobal.logi.security.util.HttpRequestUtil;
import com.xiaojukeji.know.streaming.km.common.annotations.enterprise.EnterpriseLoadReBalance;
import com.xiaojukeji.know.streaming.km.common.enterprise.rebalance.bean.dto.ClusterBalanceOverviewDTO;
import com.xiaojukeji.know.streaming.km.common.enterprise.rebalance.bean.dto.ClusterBalancePreviewDTO;
import com.xiaojukeji.know.streaming.km.common.enterprise.rebalance.bean.dto.ClusterBalanceStrategyDTO;
import com.xiaojukeji.know.streaming.km.rebalance.common.bean.dto.ClusterBalanceOverviewDTO;
import com.xiaojukeji.know.streaming.km.rebalance.common.bean.dto.ClusterBalancePreviewDTO;
import com.xiaojukeji.know.streaming.km.rebalance.common.bean.dto.ClusterBalanceStrategyDTO;
import com.xiaojukeji.know.streaming.km.common.bean.dto.pagination.PaginationBaseDTO;
import com.xiaojukeji.know.streaming.km.common.bean.entity.result.PaginationResult;
import com.xiaojukeji.know.streaming.km.common.bean.entity.result.Result;
import com.xiaojukeji.know.streaming.km.common.constant.ApiPrefix;
import com.xiaojukeji.know.streaming.km.common.constant.Constant;
import com.xiaojukeji.know.streaming.km.common.enterprise.rebalance.bean.vo.*;
import com.xiaojukeji.know.streaming.km.core.enterprise.rebalance.service.ClusterBalanceService;
import com.xiaojukeji.know.streaming.km.rebalance.common.bean.vo.*;
import com.xiaojukeji.know.streaming.km.rebalance.core.service.ClusterBalanceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

21
km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/api/v3/license/LicenseController.java Normal file
View File

@@ -0,0 +1,21 @@
package com.xiaojukeji.know.streaming.km.rest.api.v3.license;
import com.xiaojukeji.know.streaming.km.common.bean.entity.result.Result;
import com.xiaojukeji.know.streaming.km.common.constant.ApiPrefix;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
/**
* @author didi
*/
@RestController
@RequestMapping(ApiPrefix.API_V3_PREFIX)
public class LicenseController {
@GetMapping(value = "license")
@ResponseBody
public Result<Void> check() {
return Result.buildSuc();
}
}

2
km-rest/src/main/java/com/xiaojukeji/know/streaming/km/rest/config/DataSourceConfig.java
View File

@@ -24,7 +24,7 @@ import javax.sql.DataSource;
* @date 20/3/17
*/
@Configuration
@MapperScan("com.xiaojukeji.know.streaming.km.persistence.mysql")
@MapperScan({"com.xiaojukeji.know.streaming.km.persistence.mysql", "com.xiaojukeji.know.streaming.km.rebalance.persistence"})
public class DataSourceConfig {
@Bean(name = "dataSource")
@ConfigurationProperties(prefix = "spring.datasource.know-streaming")

7
km-rest/src/main/resources/application.yml
View File

@@ -119,10 +119,3 @@ management:
enabled: true
tags:
application: know-streaming
# license相关配置
license:
app-name: know-streaming
server: http://127.0.0.1:8778
signature: 1234567890
token: license-builtin-token

2
km-rest/src/main/resources/logback-spring.xml
View File

@@ -219,7 +219,7 @@
<logger name="com.github.miemiedev.mybatis.paginator" level="INFO" additivity="false" />
<root level="debug">
<appender-ref ref="CONSOLE" />
<!-- <appender-ref ref="CONSOLE" />-->
<appender-ref ref="DEBUG_FILE" />
<appender-ref ref="INFO_FILE" />
<appender-ref ref="WARN_FILE" />