From 08468edd452df50429f67ebcc6ee08799fddea5e Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 25 Jan 2022 16:36:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4sqlite=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/storager/dao/RoleMapper.java | 10 ++++---- src/main/resources/application-dev.yml | 17 +++---------- src/main/resources/application-docker.yml | 23 +++++------------- src/main/resources/wvp.sqlite | Bin 155648 -> 0 bytes 4 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 src/main/resources/wvp.sqlite diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java index be20a695..66a60b95 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/RoleMapper.java @@ -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 = {" "}) 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 selectAll(); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 7829ca45..1051d967 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -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: diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index 56efb463..2f6992fe 100644 --- a/src/main/resources/application-docker.yml +++ b/src/main/resources/application-docker.yml @@ -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: diff --git a/src/main/resources/wvp.sqlite b/src/main/resources/wvp.sqlite deleted file mode 100644 index b317a623274c6972febb10380337293be1a03e68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155648 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