From f32d0f6e009036cb4a5881d3005a4f9b14f1cfe9 Mon Sep 17 00:00:00 2001 From: BrucePang Date: Fri, 10 May 2024 22:44:18 +0800 Subject: [PATCH] fix: remove the directory prefix `oceanbase-`, configure the datasource in the sample with real connection info --- .github/workflows/ci.yml | 6 +++--- java/{oceanbase-mybatis => mybatis}/README-CN.md | 6 +++--- java/{oceanbase-mybatis => mybatis}/README.md | 6 +++--- java/{oceanbase-mybatis => mybatis}/pom.xml | 2 +- java/{oceanbase-mybatis => mybatis}/run.sh | 0 .../java/com/oceanbase/samples/OceanBaseMyBatisTest.java | 0 .../src/main/java/com/oceanbase/samples/entity/User.java | 0 .../java/com/oceanbase/samples/mapper/UserMapper.java | 0 .../src/main/resources/UserMapper.xml | 0 .../src/main/resources/mybatis-config.xml | 6 +++--- .../README-CN.md | 8 ++++---- .../README.md | 8 ++++---- .../pom.xml | 2 +- .../run.sh | 0 .../oceanbase/samples/HelloOceanBaseBootApplication.java | 0 .../com/oceanbase/samples/controller/TestController.java | 0 .../java/com/oceanbase/samples/entity/TestEntity.java | 0 .../samples/repository/TestEntityRepository.java | 0 .../src/main/resources/application.yml | 6 +++--- java/{oceanbase-spring-jdbc => spring-jdbc}/README-CN.md | 6 +++--- java/{oceanbase-spring-jdbc => spring-jdbc}/README.md | 6 +++--- java/{oceanbase-spring-jdbc => spring-jdbc}/pom.xml | 2 +- java/{oceanbase-spring-jdbc => spring-jdbc}/run.sh | 0 .../samples/OceanBaseSpringJdbcApplicationTest.java | 0 24 files changed, 32 insertions(+), 32 deletions(-) rename java/{oceanbase-mybatis => mybatis}/README-CN.md (96%) rename java/{oceanbase-mybatis => mybatis}/README.md (96%) rename java/{oceanbase-mybatis => mybatis}/pom.xml (96%) rename java/{oceanbase-mybatis => mybatis}/run.sh (100%) rename java/{oceanbase-mybatis => mybatis}/src/main/java/com/oceanbase/samples/OceanBaseMyBatisTest.java (100%) rename java/{oceanbase-mybatis => mybatis}/src/main/java/com/oceanbase/samples/entity/User.java (100%) rename java/{oceanbase-mybatis => mybatis}/src/main/java/com/oceanbase/samples/mapper/UserMapper.java (100%) rename java/{oceanbase-mybatis => mybatis}/src/main/resources/UserMapper.xml (100%) rename java/{oceanbase-mybatis => mybatis}/src/main/resources/mybatis-config.xml (67%) rename java/{oceanbase-spring-boot-mysql-jpa => spring-boot-mysql-jpa}/README-CN.md (97%) rename java/{oceanbase-spring-boot-mysql-jpa => spring-boot-mysql-jpa}/README.md (97%) rename java/{oceanbase-spring-boot-mysql-jpa => spring-boot-mysql-jpa}/pom.xml (96%) rename java/{oceanbase-spring-boot-mysql-jpa => spring-boot-mysql-jpa}/run.sh (100%) rename java/{oceanbase-spring-boot-mysql-jpa => spring-boot-mysql-jpa}/src/main/java/com/oceanbase/samples/HelloOceanBaseBootApplication.java (100%) rename java/{oceanbase-spring-boot-mysql-jpa => spring-boot-mysql-jpa}/src/main/java/com/oceanbase/samples/controller/TestController.java (100%) rename java/{oceanbase-spring-boot-mysql-jpa => spring-boot-mysql-jpa}/src/main/java/com/oceanbase/samples/entity/TestEntity.java (100%) rename java/{oceanbase-spring-boot-mysql-jpa => spring-boot-mysql-jpa}/src/main/java/com/oceanbase/samples/repository/TestEntityRepository.java (100%) rename java/{oceanbase-spring-boot-mysql-jpa => spring-boot-mysql-jpa}/src/main/resources/application.yml (64%) rename java/{oceanbase-spring-jdbc => spring-jdbc}/README-CN.md (97%) rename java/{oceanbase-spring-jdbc => spring-jdbc}/README.md (97%) rename java/{oceanbase-spring-jdbc => spring-jdbc}/pom.xml (96%) rename java/{oceanbase-spring-jdbc => spring-jdbc}/run.sh (100%) rename java/{oceanbase-spring-jdbc => spring-jdbc}/src/test/java/com/oceanbase/samples/OceanBaseSpringJdbcApplicationTest.java (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 703287f..2c8cdda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,11 +27,11 @@ jobs: with_oceanbase_container: false - name: 'pymysql' language: 'python' - - name: 'oceanbase-spring-boot-mysql-jpa' + - name: 'spring-boot-mysql-jpa' language: 'java' - - name: 'oceanbase-mybatis' + - name: 'mybatis' language: 'java' - - name: 'oceanbase-spring-jdbc' + - name: 'spring-jdbc' language: 'java' uses: ./.github/workflows/basic-ci.yml with: diff --git a/java/oceanbase-mybatis/README-CN.md b/java/mybatis/README-CN.md similarity index 96% rename from java/oceanbase-mybatis/README-CN.md rename to java/mybatis/README-CN.md index 71bc501..de236d5 100644 --- a/java/oceanbase-mybatis/README-CN.md +++ b/java/mybatis/README-CN.md @@ -37,9 +37,9 @@ - - - + + + diff --git a/java/oceanbase-mybatis/README.md b/java/mybatis/README.md similarity index 96% rename from java/oceanbase-mybatis/README.md rename to java/mybatis/README.md index 0ff667d..8fa2984 100644 --- a/java/oceanbase-mybatis/README.md +++ b/java/mybatis/README.md @@ -37,9 +37,9 @@ Since OceanBase supports MySQL mode and Oracle mode, the MySQL driver can be use - - - + + + diff --git a/java/oceanbase-mybatis/pom.xml b/java/mybatis/pom.xml similarity index 96% rename from java/oceanbase-mybatis/pom.xml rename to java/mybatis/pom.xml index 0a8b55f..8f97d7b 100644 --- a/java/oceanbase-mybatis/pom.xml +++ b/java/mybatis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oceanbase.samples - oceanbase-mybatis + mybatis 1.0-SNAPSHOT oceanbase-mysql diff --git a/java/oceanbase-mybatis/run.sh b/java/mybatis/run.sh similarity index 100% rename from java/oceanbase-mybatis/run.sh rename to java/mybatis/run.sh diff --git a/java/oceanbase-mybatis/src/main/java/com/oceanbase/samples/OceanBaseMyBatisTest.java b/java/mybatis/src/main/java/com/oceanbase/samples/OceanBaseMyBatisTest.java similarity index 100% rename from java/oceanbase-mybatis/src/main/java/com/oceanbase/samples/OceanBaseMyBatisTest.java rename to java/mybatis/src/main/java/com/oceanbase/samples/OceanBaseMyBatisTest.java diff --git a/java/oceanbase-mybatis/src/main/java/com/oceanbase/samples/entity/User.java b/java/mybatis/src/main/java/com/oceanbase/samples/entity/User.java similarity index 100% rename from java/oceanbase-mybatis/src/main/java/com/oceanbase/samples/entity/User.java rename to java/mybatis/src/main/java/com/oceanbase/samples/entity/User.java diff --git a/java/oceanbase-mybatis/src/main/java/com/oceanbase/samples/mapper/UserMapper.java b/java/mybatis/src/main/java/com/oceanbase/samples/mapper/UserMapper.java similarity index 100% rename from java/oceanbase-mybatis/src/main/java/com/oceanbase/samples/mapper/UserMapper.java rename to java/mybatis/src/main/java/com/oceanbase/samples/mapper/UserMapper.java diff --git a/java/oceanbase-mybatis/src/main/resources/UserMapper.xml b/java/mybatis/src/main/resources/UserMapper.xml similarity index 100% rename from java/oceanbase-mybatis/src/main/resources/UserMapper.xml rename to java/mybatis/src/main/resources/UserMapper.xml diff --git a/java/oceanbase-mybatis/src/main/resources/mybatis-config.xml b/java/mybatis/src/main/resources/mybatis-config.xml similarity index 67% rename from java/oceanbase-mybatis/src/main/resources/mybatis-config.xml rename to java/mybatis/src/main/resources/mybatis-config.xml index 73a487f..4a278ad 100644 --- a/java/oceanbase-mybatis/src/main/resources/mybatis-config.xml +++ b/java/mybatis/src/main/resources/mybatis-config.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/java/oceanbase-spring-boot-mysql-jpa/README-CN.md b/java/spring-boot-mysql-jpa/README-CN.md similarity index 97% rename from java/oceanbase-spring-boot-mysql-jpa/README-CN.md rename to java/spring-boot-mysql-jpa/README-CN.md index 6124426..1bcaf09 100644 --- a/java/oceanbase-spring-boot-mysql-jpa/README-CN.md +++ b/java/spring-boot-mysql-jpa/README-CN.md @@ -14,7 +14,7 @@ 4.0.0 com.oceanbase.samples - oceanbase-spring-boot-mysql-jpa + spring-boot-mysql-jpa 1.0-SNAPSHOT org.springframework.boot @@ -75,9 +75,9 @@ spring: show-sql: true datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://host:port/test?characterEncoding=UTF-8 - username: ***** - password: ***** + url: jdbc:mysql://localhost:2881/test?characterEncoding=UTF-8 + username: root@test + password: #spring.jpa.hibernate.ddl-auto=update jackson: serialization: diff --git a/java/oceanbase-spring-boot-mysql-jpa/README.md b/java/spring-boot-mysql-jpa/README.md similarity index 97% rename from java/oceanbase-spring-boot-mysql-jpa/README.md rename to java/spring-boot-mysql-jpa/README.md index 78e8390..0684d5a 100644 --- a/java/oceanbase-spring-boot-mysql-jpa/README.md +++ b/java/spring-boot-mysql-jpa/README.md @@ -15,7 +15,7 @@ Since OceanBase supports MySQL mode and Oracle mode, you can use the MySQL drive 4.0.0 com.oceanbase.samples - oceanbase-spring-boot-mysql-jpa + spring-boot-mysql-jpa 1.0-SNAPSHOT org.springframework.boot @@ -76,9 +76,9 @@ spring: show-sql: true datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://host:port/test?characterEncoding=UTF-8 - username: ***** - password: ***** + url: jdbc:mysql://localhost:2881/test?characterEncoding=UTF-8 + username: root@sys + password: #spring.jpa.hibernate.ddl-auto=update jackson: serialization: diff --git a/java/oceanbase-spring-boot-mysql-jpa/pom.xml b/java/spring-boot-mysql-jpa/pom.xml similarity index 96% rename from java/oceanbase-spring-boot-mysql-jpa/pom.xml rename to java/spring-boot-mysql-jpa/pom.xml index a37aaab..ea27286 100644 --- a/java/oceanbase-spring-boot-mysql-jpa/pom.xml +++ b/java/spring-boot-mysql-jpa/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oceanbase.samples - oceanbase-spring-boot-mysql-jpa + spring-boot-mysql-jpa 1.0-SNAPSHOT org.springframework.boot diff --git a/java/oceanbase-spring-boot-mysql-jpa/run.sh b/java/spring-boot-mysql-jpa/run.sh similarity index 100% rename from java/oceanbase-spring-boot-mysql-jpa/run.sh rename to java/spring-boot-mysql-jpa/run.sh diff --git a/java/oceanbase-spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/HelloOceanBaseBootApplication.java b/java/spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/HelloOceanBaseBootApplication.java similarity index 100% rename from java/oceanbase-spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/HelloOceanBaseBootApplication.java rename to java/spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/HelloOceanBaseBootApplication.java diff --git a/java/oceanbase-spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/controller/TestController.java b/java/spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/controller/TestController.java similarity index 100% rename from java/oceanbase-spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/controller/TestController.java rename to java/spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/controller/TestController.java diff --git a/java/oceanbase-spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/entity/TestEntity.java b/java/spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/entity/TestEntity.java similarity index 100% rename from java/oceanbase-spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/entity/TestEntity.java rename to java/spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/entity/TestEntity.java diff --git a/java/oceanbase-spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/repository/TestEntityRepository.java b/java/spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/repository/TestEntityRepository.java similarity index 100% rename from java/oceanbase-spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/repository/TestEntityRepository.java rename to java/spring-boot-mysql-jpa/src/main/java/com/oceanbase/samples/repository/TestEntityRepository.java diff --git a/java/oceanbase-spring-boot-mysql-jpa/src/main/resources/application.yml b/java/spring-boot-mysql-jpa/src/main/resources/application.yml similarity index 64% rename from java/oceanbase-spring-boot-mysql-jpa/src/main/resources/application.yml rename to java/spring-boot-mysql-jpa/src/main/resources/application.yml index b7e199f..bd4369c 100644 --- a/java/oceanbase-spring-boot-mysql-jpa/src/main/resources/application.yml +++ b/java/spring-boot-mysql-jpa/src/main/resources/application.yml @@ -6,9 +6,9 @@ spring: show-sql: true datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://host:port/dbname?characterEncoding=UTF-8 - username: ***** # your username - password: ***** # your password + url: jdbc:mysql://localhost:2881/test?characterEncoding=UTF-8 + username: root@test + password: #spring.jpa.hibernate.ddl-auto=update jackson: serialization: diff --git a/java/oceanbase-spring-jdbc/README-CN.md b/java/spring-jdbc/README-CN.md similarity index 97% rename from java/oceanbase-spring-jdbc/README-CN.md rename to java/spring-jdbc/README-CN.md index beb88f0..ef4cf23 100644 --- a/java/oceanbase-spring-jdbc/README-CN.md +++ b/java/spring-jdbc/README-CN.md @@ -38,10 +38,10 @@ public class OceanBaseSpringJdbcApplicationTest { static { Map map = new HashMap(); - map.put("url", "jdbc:mysql://host:port/dbName"); + map.put("url", "jdbc:mysql://localhost:2881/test"); map.put("driverClassName", "com.mysql.cj.jdbc.Driver"); - map.put("username", "*****"); - map.put("password", "*****"); + map.put("username", "root@test"); + map.put("password", ""); try { Class.forName(map.get("driverClassName")); jdbcTemplate = new JdbcTemplate(DruidDataSourceFactory.createDataSource(map)); diff --git a/java/oceanbase-spring-jdbc/README.md b/java/spring-jdbc/README.md similarity index 97% rename from java/oceanbase-spring-jdbc/README.md rename to java/spring-jdbc/README.md index 83bd515..144f457 100644 --- a/java/oceanbase-spring-jdbc/README.md +++ b/java/spring-jdbc/README.md @@ -41,10 +41,10 @@ public class OceanBaseSpringJdbcApplicationTest { static { Map map = new HashMap(); - map.put("url", "jdbc:mysql://host:port/dbName"); + map.put("url", "jdbc:mysql://localhost:2881/test"); map.put("driverClassName", "com.mysql.cj.jdbc.Driver"); - map.put("username", "*****"); - map.put("password", "*****"); + map.put("username", "root@test"); + map.put("password", ""); try { Class.forName(map.get("driverClassName")); jdbcTemplate = new JdbcTemplate(DruidDataSourceFactory.createDataSource(map)); diff --git a/java/oceanbase-spring-jdbc/pom.xml b/java/spring-jdbc/pom.xml similarity index 96% rename from java/oceanbase-spring-jdbc/pom.xml rename to java/spring-jdbc/pom.xml index 57ae0e4..d5a79c8 100644 --- a/java/oceanbase-spring-jdbc/pom.xml +++ b/java/spring-jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oceanbase.samples - oceanbase-spring-jdbc + spring-jdbc 1.0-SNAPSHOT oceanbase-spring-jdbc diff --git a/java/oceanbase-spring-jdbc/run.sh b/java/spring-jdbc/run.sh similarity index 100% rename from java/oceanbase-spring-jdbc/run.sh rename to java/spring-jdbc/run.sh diff --git a/java/oceanbase-spring-jdbc/src/test/java/com/oceanbase/samples/OceanBaseSpringJdbcApplicationTest.java b/java/spring-jdbc/src/test/java/com/oceanbase/samples/OceanBaseSpringJdbcApplicationTest.java similarity index 100% rename from java/oceanbase-spring-jdbc/src/test/java/com/oceanbase/samples/OceanBaseSpringJdbcApplicationTest.java rename to java/spring-jdbc/src/test/java/com/oceanbase/samples/OceanBaseSpringJdbcApplicationTest.java