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

Sb upgrade #85

Closed
wants to merge 3 commits into from
Closed

Sb upgrade #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d640f45
基本改造完成
Feb 21, 2022
bb1ebfa
OK
Feb 21, 2022
bdb678b
OK
Feb 21, 2022
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
180 changes: 20 additions & 160 deletions zebra-admin-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,200 +1,60 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>zebra-all</artifactId>
<groupId>com.dianping.zebra</groupId>
<version>2.9.2-SNAPSHOT</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.9</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.dianping.zebra</groupId>
<artifactId>zebra-admin-web</artifactId>
<packaging>war</packaging>

<properties>
<fastjson>1.2.29</fastjson>
</properties>

<version>2.9.2-SNAPSHOT</version>
<name>zebra-admin-web</name>
<!--<url>http://maven.apache.org</url>-->
<dependencies>
<!-- spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.2.2</version>
</dependency>

<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.4.2</version>
</dependency>

<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
<version>1.3.1</version>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>

<dependency>
<groupId>com.dianping.zebra</groupId>
<artifactId>zebra-client</artifactId>
<version>2.9.2-SNAPSHOT</version>
</dependency>

<!-- test -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.6</version>
</dependency>

<!-- database -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.40</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>7.0.61</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
<version>7.0.61</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java7</artifactId>
<version>2.4.11</version>
</dependency>

<!-- log -->

<!-- other -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.4</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.12</version>
<version>1.2.29</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.7</version>
</dependency>

<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
<scope>compile</scope>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<warName>${project.artifactId}-${project.version}</warName>
<warSourceExcludes>app/**</warSourceExcludes>
<webResources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<targetPath>WEB-INF/classes</targetPath>
</resource>
<resource>
<directory>src/main/webapp/pack</directory>
<filtering>false</filtering>
<!--<includes>-->
<!--<include>WEB-INF/web.xml</include>-->
<!--</includes>-->
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>7</source>
<target>7</target>
</configuration>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Expand Down
12 changes: 12 additions & 0 deletions zebra-admin-web/src/main/java/com/dianping/zebra/administrator/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.dianping.zebra.administrator;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
public class Application {

public static void main(String... args) {
SpringApplication.run(Application.class, args);
}
}
31 changes: 31 additions & 0 deletions zebra-admin-web/src/main/java/com/dianping/zebra/administrator/config/DAOConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.dianping.zebra.administrator.config;

import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.mapper.MapperScannerConfigurer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;

import javax.sql.DataSource;
import java.io.IOException;

@Configuration
public class DAOConfig {

@Bean
public SqlSessionFactoryBean zebraAdminSqlSessionFactory(DataSource dataSource) throws IOException {
SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean();
sqlSessionFactoryBean.setDataSource(dataSource);
sqlSessionFactoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/*.xml"));
sqlSessionFactoryBean.setTypeAliasesPackage("com.dianping.zebra.administrator.entity");
return sqlSessionFactoryBean;
}

@Bean
public MapperScannerConfigurer mapperScannerConfigurer() {
MapperScannerConfigurer mapperScannerConfigurer = new MapperScannerConfigurer();
mapperScannerConfigurer.setBasePackage("com.dianping.zebra.administrator.mapper");
mapperScannerConfigurer.setSqlSessionFactoryBeanName("zebraAdminSqlSessionFactory");
return mapperScannerConfigurer;
}
}
4 changes: 2 additions & 2 deletions .../zebra/administrator/GlobalConstants.java → .../administrator/constant/SystemConsts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.dianping.zebra.administrator;
package com.dianping.zebra.administrator.constant;

public class GlobalConstants {
public class SystemConsts {

public static final String DEFAULR_CHARSET = "UTF-8";

Expand Down
10 changes: 5 additions & 5 deletions ...eb/src/main/java/com/dianping/zebra/administrator/controller/group/JdbcrefController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.dianping.zebra.administrator.controller.group;

import com.dianping.zebra.administrator.config.ZookeeperService;
import com.dianping.zebra.administrator.zookeeper.ZookeeperService;
import com.dianping.zebra.administrator.controller.AbstractController;
import com.dianping.zebra.administrator.dao.JdbcrefMapper;
import com.dianping.zebra.administrator.mapper.JdbcrefMapper;
import com.dianping.zebra.administrator.dto.ResultDto;
import com.dianping.zebra.administrator.dto.jdbcref.*;
import com.dianping.zebra.administrator.entity.DsConfigEntity;
Expand All @@ -21,15 +21,15 @@

import java.util.*;

import static com.dianping.zebra.administrator.GlobalConstants.DS_CONFIG_PATTERN;
import static com.dianping.zebra.administrator.GlobalConstants.GROUP_CONFIG_NAME_PATTERN;
import static com.dianping.zebra.administrator.constant.SystemConsts.DS_CONFIG_PATTERN;
import static com.dianping.zebra.administrator.constant.SystemConsts.GROUP_CONFIG_NAME_PATTERN;

/**
* @author Created by tong.xin on 18/3/7.
*/

@RestController
@RequestMapping(value = "jdbcref")
@RequestMapping(value = "/i/jdbcref")
public class JdbcrefController extends AbstractController {
@Autowired
private JdbcrefMapper jdbcrefDao;
Expand Down
15 changes: 5 additions & 10 deletions ...-web/src/main/java/com/dianping/zebra/administrator/controller/shard/ShardController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
package com.dianping.zebra.administrator.controller.shard;

import com.alibaba.fastjson.JSON;
import com.dianping.zebra.administrator.GlobalConstants;
import com.dianping.zebra.administrator.config.ZookeeperService;
import com.dianping.zebra.administrator.constant.SystemConsts;
import com.dianping.zebra.administrator.zookeeper.ZookeeperService;
import com.dianping.zebra.administrator.controller.AbstractController;
import com.dianping.zebra.administrator.dao.ShardMapper;
import com.dianping.zebra.administrator.mapper.ShardMapper;
import com.dianping.zebra.administrator.dto.ResultDto;
import com.dianping.zebra.administrator.dto.shard.ShardConfigDto;
import com.dianping.zebra.administrator.dto.shard.ShardDto;
import com.dianping.zebra.administrator.dto.shard.ShardOverviewDto;
import com.dianping.zebra.administrator.dto.shard.TableShardConfigDto;
import com.dianping.zebra.administrator.entity.ShardConfig;
import com.dianping.zebra.administrator.entity.ShardEntity;
import com.dianping.zebra.administrator.entity.TableShardConfig;
import com.dianping.zebra.administrator.service.ShardService;
import com.dianping.zebra.administrator.service.ZookeeperConfigService;
import com.dianping.zebra.administrator.util.JaxbUtils;
import com.dianping.zebra.shard.config.RouterRuleConfig;
import com.dianping.zebra.shard.config.TableShardRuleConfig;
import com.dianping.zebra.shard.util.ShardRuleParser;
import com.dianping.zebra.util.StringUtils;
import com.dianping.zebra.util.json.JsonObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

Expand All @@ -34,7 +29,7 @@
*/

@RestController
@RequestMapping(value = "shard")
@RequestMapping(value = "/i/shard")
public class ShardController extends AbstractController {
@Autowired
private ShardMapper shardDao;
Expand Down Expand Up @@ -98,7 +93,7 @@ private boolean filterDtos(String ruleName, String shardFilter) {
public ShardConfigDto findRuleName(@RequestParam String env, @RequestParam String ruleName) throws Exception {
ShardConfigDto result = new ShardConfigDto();
RouterRuleConfig shardConfig = null;
String key = String.format(GlobalConstants.SHARD_CONFIG_NAME_PATTERN, ruleName);
String key = String.format(SystemConsts.SHARD_CONFIG_NAME_PATTERN, ruleName);
String host = zkconfigService.getZKHostByName(env);
byte[] data = ZookeeperService.getConfig(host, key);
if (data != null) {
Expand Down
2 changes: 1 addition & 1 deletion ...om/dianping/zebra/administrator/controller/zookeeperConfig/ZookeeperConfigController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

@RestController
@RequestMapping(value = "zkConfig")
@RequestMapping(value = "/i/zkConfig")
public class ZookeeperConfigController extends AbstractController {

@Autowired
Expand Down
2 changes: 1 addition & 1 deletion ...ebra/administrator/dao/JdbcrefMapper.java → ...a/administrator/mapper/JdbcrefMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dianping.zebra.administrator.dao;
package com.dianping.zebra.administrator.mapper;

import com.dianping.zebra.administrator.entity.JdbcrefEntity;
import org.apache.ibatis.annotations.Param;
Expand Down
2 changes: 1 addition & 1 deletion .../zebra/administrator/dao/ShardMapper.java → ...bra/administrator/mapper/ShardMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dianping.zebra.administrator.dao;
package com.dianping.zebra.administrator.mapper;

import com.dianping.zebra.administrator.entity.ShardEntity;
import org.apache.ibatis.annotations.Param;
Expand Down
2 changes: 1 addition & 1 deletion ...inistrator/dao/ZookeeperConfigMapper.java → ...strator/mapper/ZookeeperConfigMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dianping.zebra.administrator.dao;
package com.dianping.zebra.administrator.mapper;

import com.dianping.zebra.administrator.entity.ZookeeperConfigEntity;
import org.apache.ibatis.annotations.Param;
Expand Down
Loading