移除sqlite支持

648540858
1 parent 5c2d27f7
Showing 4 changed files with 14 additions and 36 deletions
src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java
src/main/resources/application-dev.yml
src/main/resources/application-docker.yml
src/main/resources/wvp.sqlite
@@ -11,12 +11,12 @@ import java.util.List;
 @Repository
 public interface RoleMapper {
-    @Insert("INSERT INTO role (name, authority, createTime, updateTime) VALUES" +
+    @Insert("INSERT INTO user_role (name, authority, createTime, updateTime) VALUES" +
             "('${name}', '${authority}', '${createTime}', '${updateTime}')")
     int add(Role role);
     @Update(value = {" <script>" +
-            "UPDATE role " +
+            "UPDATE user_role " +
             "SET updateTime='${updateTime}' " +
             "<if test=\"name != null\">, name='${name}'</if>" +
             "<if test=\"authority != null\">, authority='${authority}'</if>" +
@@ -24,12 +24,12 @@ public interface RoleMapper {
             " </script>"})
     int update(Role role);
-    @Delete("DELETE FROM role WHERE  id != 1 and id=#{id}")
+    @Delete("DELETE FROM user_role WHERE  id != 1 and id=#{id}")
     int delete(int id);
-    @Select("select * FROM role WHERE id=#{id}")
+    @Select("select * FROM user_role WHERE id=#{id}")
     Role selectById(int id);
-    @Select("select * FROM role")
+    @Select("select * FROM user_role")
     List<Role> selectAll();
 }
@@ -19,23 +19,12 @@ spring:
     # [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置
     datasource:
         # 使用mysql 打开23-28行注释， 删除29-36行
-        # name: wvp
-        # url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true
-        # username:
-        # password:
-        # type: com.alibaba.druid.pool.DruidDataSource
-        # driver-class-name: com.mysql.cj.jdbc.Driver
-        name: eiot
-        url: jdbc:sqlite::resource:wvp.sqlite
+        name: wvp
+        url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true
         username:
         password:
         type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name:  org.sqlite.JDBC
-        journal_mode: WAL
-        synchronous: NORMAL
-        transaction_mode: IMMEDIATE
-        max-active: 1
-        min-idle: 1
+        driver-class-name: com.mysql.cj.jdbc.Driver
 # [可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
 server:
@@ -19,23 +19,12 @@ spring:
     # [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置
     datasource:
         # 使用mysql 打开23-28行注释， 删除29-36行
-        # name: wvp
-        # url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true
-        # username:
-        # password:
-        # type: com.alibaba.druid.pool.DruidDataSource
-        # driver-class-name: com.mysql.cj.jdbc.Driver
-        name: eiot
-        url: jdbc:sqlite::resource:wvp.sqlite
-        username:
-        password:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name:  org.sqlite.JDBC
-        journal_mode: WAL
-        synchronous: NORMAL
-        transaction_mode: IMMEDIATE
-        max-active: 1
-        min-idle: 1
+         name: wvp
+         url: jdbc:mysql://127.0.0.1:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true
+         username: root
+         password: root
+         type: com.alibaba.druid.pool.DruidDataSource
+         driver-class-name: com.mysql.cj.jdbc.Driver
 # [可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
 server: