fix: remove the directory prefix oceanbase-, configure the datasour…

…ce in the sample with real connection info
oceanbase · May 10, 2024 · f32d0f6 · f32d0f6
1 parent 8df911d
commit f32d0f6
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 32 deletions.
diff --git 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 → java/mybatis/README-CN.md b/java/oceanbase-mybatis/README-CN.md → java/mybatis/README-CN.md
@@ -37,9 +37,9 @@
       <transactionManager type="JDBC"/>
       <dataSource type="POOLED">
         <property name="driver" value="com.mysql.cj.jdbc.Driver"/>
-        <property name="url" value="jdbc:mysql://host:port/dbName?useUnicode=true&amp;characterEncoding=utf-8&amp;useServerPrepStmts=false&amp;useCursorFetch=true"/>
-        <property name="username" value="*****"/>
-        <property name="password" value="*****"/>
+        <property name="url" value="jdbc:mysql://localhost:2881/test?useUnicode=true&amp;characterEncoding=utf-8&amp;useServerPrepStmts=false&amp;useCursorFetch=true"/>
+        <property name="username" value="username=root@test"/>
+        <property name="password" value=""/>
       </dataSource>
     </environment>
   </environments>

diff --git a/java/oceanbase-mybatis/README.md → java/mybatis/README.md b/java/oceanbase-mybatis/README.md → java/mybatis/README.md
@@ -37,9 +37,9 @@ Since OceanBase supports MySQL mode and Oracle mode, the MySQL driver can be use
       <transactionManager type="JDBC"/>
       <dataSource type="POOLED">
         <property name="driver" value="com.mysql.cj.jdbc.Driver"/>
-        <property name="url" value="jdbc:mysql://host:port/dbName?useUnicode=true&amp;characterEncoding=utf-8&amp;useServerPrepStmts=false&amp;useCursorFetch=true"/>
-        <property name="username" value="*****"/>
-        <property name="password" value="*****"/>
+        <property name="url" value="jdbc:mysql://localhost:2881/test?useUnicode=true&amp;characterEncoding=utf-8&amp;useServerPrepStmts=false&amp;useCursorFetch=true"/>
+        <property name="username" value="username=root@test"/>
+        <property name="password" value=""/>
       </dataSource>
     </environment>
   </environments>

diff --git a/java/oceanbase-mybatis/pom.xml → java/mybatis/pom.xml b/java/oceanbase-mybatis/pom.xml → java/mybatis/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.oceanbase.samples</groupId>
-  <artifactId>oceanbase-mybatis</artifactId>
+  <artifactId>mybatis</artifactId>
   <version>1.0-SNAPSHOT</version>
 
   <name>oceanbase-mysql</name>

diff --git a/java/oceanbase-mybatis/run.sh → java/mybatis/run.sh b/java/oceanbase-mybatis/run.sh → java/mybatis/run.sh
diff --git a/...eanbase/samples/OceanBaseMyBatisTest.java → ...eanbase/samples/OceanBaseMyBatisTest.java b/...eanbase/samples/OceanBaseMyBatisTest.java → ...eanbase/samples/OceanBaseMyBatisTest.java
diff --git a/...va/com/oceanbase/samples/entity/User.java → ...va/com/oceanbase/samples/entity/User.java b/...va/com/oceanbase/samples/entity/User.java → ...va/com/oceanbase/samples/entity/User.java
diff --git a/.../oceanbase/samples/mapper/UserMapper.java → .../oceanbase/samples/mapper/UserMapper.java b/.../oceanbase/samples/mapper/UserMapper.java → .../oceanbase/samples/mapper/UserMapper.java
diff --git a/...mybatis/src/main/resources/UserMapper.xml → ...mybatis/src/main/resources/UserMapper.xml b/...mybatis/src/main/resources/UserMapper.xml → ...mybatis/src/main/resources/UserMapper.xml
diff --git a/...tis/src/main/resources/mybatis-config.xml → ...tis/src/main/resources/mybatis-config.xml b/...tis/src/main/resources/mybatis-config.xml → ...tis/src/main/resources/mybatis-config.xml
@@ -8,9 +8,9 @@
       <transactionManager type="JDBC"/>
       <dataSource type="POOLED">
         <property name="driver" value="com.mysql.cj.jdbc.Driver"/>
-        <property name="url" value="jdbc:mysql://host:port/dbName?useUnicode=true&amp;characterEncoding=utf-8&amp;useServerPrepStmts=false&amp;useCursorFetch=true"/>
-        <property name="username" value="*****"/>
-        <property name="password" value="*****"/>
+        <property name="url" value="jdbc:mysql://localhost:2881/test?useUnicode=true&amp;characterEncoding=utf-8&amp;useServerPrepStmts=false&amp;useCursorFetch=true"/>
+        <property name="username" value="username=root@test"/>
+        <property name="password" value=""/>
       </dataSource>
     </environment>
   </environments>

diff --git a/...anbase-spring-boot-mysql-jpa/README-CN.md → java/spring-boot-mysql-jpa/README-CN.md b/...anbase-spring-boot-mysql-jpa/README-CN.md → java/spring-boot-mysql-jpa/README-CN.md
@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.oceanbase.samples</groupId>
-  <artifactId>oceanbase-spring-boot-mysql-jpa</artifactId>
+  <artifactId>spring-boot-mysql-jpa</artifactId>
   <version>1.0-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework.boot</groupId>
@@ -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/...oceanbase-spring-boot-mysql-jpa/README.md → java/spring-boot-mysql-jpa/README.md b/...oceanbase-spring-boot-mysql-jpa/README.md → 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
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.oceanbase.samples</groupId>
-  <artifactId>oceanbase-spring-boot-mysql-jpa</artifactId>
+  <artifactId>spring-boot-mysql-jpa</artifactId>
   <version>1.0-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework.boot</groupId>
@@ -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 → java/spring-boot-mysql-jpa/pom.xml b/java/oceanbase-spring-boot-mysql-jpa/pom.xml → java/spring-boot-mysql-jpa/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.oceanbase.samples</groupId>
-  <artifactId>oceanbase-spring-boot-mysql-jpa</artifactId>
+  <artifactId>spring-boot-mysql-jpa</artifactId>
   <version>1.0-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework.boot</groupId>

diff --git a/java/oceanbase-spring-boot-mysql-jpa/run.sh → java/spring-boot-mysql-jpa/run.sh b/java/oceanbase-spring-boot-mysql-jpa/run.sh → java/spring-boot-mysql-jpa/run.sh
diff --git a/...amples/HelloOceanBaseBootApplication.java → ...amples/HelloOceanBaseBootApplication.java b/...amples/HelloOceanBaseBootApplication.java → ...amples/HelloOceanBaseBootApplication.java
diff --git a/...se/samples/controller/TestController.java → ...se/samples/controller/TestController.java b/...se/samples/controller/TestController.java → ...se/samples/controller/TestController.java
diff --git a/.../oceanbase/samples/entity/TestEntity.java → .../oceanbase/samples/entity/TestEntity.java b/.../oceanbase/samples/entity/TestEntity.java → .../oceanbase/samples/entity/TestEntity.java
diff --git a/...ples/repository/TestEntityRepository.java → ...ples/repository/TestEntityRepository.java b/...ples/repository/TestEntityRepository.java → ...ples/repository/TestEntityRepository.java
diff --git a/...ql-jpa/src/main/resources/application.yml → ...ql-jpa/src/main/resources/application.yml b/...ql-jpa/src/main/resources/application.yml → ...ql-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 → java/spring-jdbc/README-CN.md b/java/oceanbase-spring-jdbc/README-CN.md → java/spring-jdbc/README-CN.md
@@ -38,10 +38,10 @@ public class OceanBaseSpringJdbcApplicationTest {
 
   static {
     Map<String, String> map = new HashMap<String, String>();
-    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 → java/spring-jdbc/README.md b/java/oceanbase-spring-jdbc/README.md → java/spring-jdbc/README.md
@@ -41,10 +41,10 @@ public class OceanBaseSpringJdbcApplicationTest {
 
   static {
     Map<String, String> map = new HashMap<String, String>();
-    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 → java/spring-jdbc/pom.xml b/java/oceanbase-spring-jdbc/pom.xml → java/spring-jdbc/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.oceanbase.samples</groupId>
-  <artifactId>oceanbase-spring-jdbc</artifactId>
+  <artifactId>spring-jdbc</artifactId>
   <version>1.0-SNAPSHOT</version>
 
   <name>oceanbase-spring-jdbc</name>

diff --git a/java/oceanbase-spring-jdbc/run.sh → java/spring-jdbc/run.sh b/java/oceanbase-spring-jdbc/run.sh → java/spring-jdbc/run.sh
diff --git a/...s/OceanBaseSpringJdbcApplicationTest.java → ...s/OceanBaseSpringJdbcApplicationTest.java b/...s/OceanBaseSpringJdbcApplicationTest.java → ...s/OceanBaseSpringJdbcApplicationTest.java