diff --git a/.gitignore b/.gitignore index 549e00a..842e0c3 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,7 @@ build/ ### VS Code ### .vscode/ + + +### logs ### +/logs/ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7409f08..711937c 100644 --- a/pom.xml +++ b/pom.xml @@ -31,11 +31,6 @@ mybatis-spring-boot-starter 2.2.2 - - - com.zaxxer - HikariCP - com.alibaba diff --git a/suu-service/src/main/resources/mappers/UserMappers.xml b/suu-service/src/main/resources/mappers/UserMappers.xml index d932694..df939fc 100644 --- a/suu-service/src/main/resources/mappers/UserMappers.xml +++ b/suu-service/src/main/resources/mappers/UserMappers.xml @@ -2,24 +2,20 @@ - + - id,user_isli as userIsli,username,institution_code as institutionCode,agency_type as agencyType, - cert_type as certType,idNumber,cell_phone as cellPhone,bank_account as bankAccount, - legals_name as legalsName,legals_type as legalsType,legals_idnum as legalsIdnum, - legals_phone as legalsPhone,bank_card_type as bankCardType,bank_type as bankType, - bank_name as bankName,bank_username as bankUsername,bank_userid as bankUserid, - bank_userphone as bankUserphone,bank_address as bankAddress,attest_status as attestStatus, - registertime,attesttime + id,username,idnum,nickname,email,mobile,password,salt,avatar, + gender,birthday,grade,nclass,nation,addr, + jh1name,jh1idnum,jh1mobile,jh2name,jh2idnum,jh2mobile - `user` + `suu_user` - + SELECT * FROM + WHERE 1 + LIMIT 12 diff --git a/suu-start/src/main/java/com/xtmis/suu/config/HikariConfig.java b/suu-start/src/main/java/com/xtmis/suu/config/HikariConfig.java deleted file mode 100644 index 0091383..0000000 --- a/suu-start/src/main/java/com/xtmis/suu/config/HikariConfig.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.xtmis.suu.config; - -import com.zaxxer.hikari.HikariDataSource; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.sql.DataSource; - -@Configuration -@ConfigurationProperties(prefix = "spring.datasource") -public class HikariConfig { - private String url; - private String username; - private String password; - private String driverClassName; - - @Bean - public DataSource hikariDataSource(){ - HikariDataSource dataSource = new HikariDataSource(); - dataSource.setJdbcUrl(url); - dataSource.setUsername(username); - dataSource.setPassword(password); - dataSource.setDriverClassName(driverClassName); - return dataSource; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getDriverClassName() { - return driverClassName; - } - - public void setDriverClassName(String driverClassName) { - this.driverClassName = driverClassName; - } -}