新增postgresql适配

pom.xml

@@ -244,6 +244,7 @@
             <!--        </dependency>-->
         </dependencies>
 
+
     </dependencyManagement>
 
     <dependencies>

server/zyjblogs-oauth/src/main/resources/mapper/user/UserMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.zyjblogs.server.user.mapper.UserMapper">
-    <select id="findUserByname" resultType="cn.zyjblogs.server.user.po.UserPo">
-        select *
-        from user
-        where deleted = 0
-        and username like CONCAT('%', #{username}, '%')
-        <if test="tenantId != null and tenantId != '' ">
-            and tenant_id = #{tenantId}
-        </if>
-    </select>
-
-</mapper>

server/zyjblogs-rbac/src/main/resources/mapper/mysql/user/UserMapper.xml

@@ -33,28 +33,5 @@
         </if>
         order by create_time desc
     </select>
-    <select id="findPage" resultType="cn.zyjblogs.server.user.vo.UserVo" databaseId="postgresql">
-        select * from users
-        where deleted = 0
-        <if test="userPageDto.username != null and userPageDto.username!='' ">
-            and username concat('%',#{userPageDto.username},'%')
-        </if>
-        <if test="userPageDto.name != null and userPageDto.name!='' ">
-            and name concat('%',#{name},'%')
-        </if>
-        <if test="userPageDto.phone != null and userPageDto.phone!='' ">
-            and phone concat('%',#{phone},'%')
-        </if>
-        <if test="userPageDto.email != null and userPageDto.email!='' ">
-            and email concat('%',#{email},'%')
-        </if>
-        <if test="userPageDto.email != null ">
-            and status = #{userPageDto.status}
-        </if>
-        <if test="tenantId != null and tenantId != '' ">
-            and tenant_id = #{tenantId}
-        </if>
-        order by create_time desc
-    </select>
 
 </mapper>

server/zyjblogs-rbac/src/main/resources/mapper/postgresql/role/RoleMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.zyjblogs.server.role.mapper.RoleMapper">
+    <select id="findPage" resultType="cn.zyjblogs.server.role.vo.RoleVo">
+        select * from role
+        where deleted = 0
+        <if test="rolePageDto.username != null and rolePageDto.username!='' ">
+            and name concat('%',#{rolePageDto.name},'%')
+        </if>
+        <if test="rolePageDto.email != null ">
+            and status = #{rolePageDto.status}
+        </if>
+        <if test="tenantId != null and tenantId != '' ">
+            and tenant_id = #{tenantId}
+        </if>
+        order by create_time desc
+    </select>
+
+
+</mapper>

server/zyjblogs-rbac/src/main/resources/mapper/postgresql/user/UserMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.zyjblogs.server.user.mapper.UserMapper">
+    <select id="findUserByname" resultType="cn.zyjblogs.server.user.po.UserPo">
+        select *
+        from users
+        where deleted = 0
+        and username like CONCAT('%', #{username}, '%')
+        <if test="tenantId != null and tenantId != '' ">
+            and tenant_id = #{tenantId}
+        </if>
+    </select>
+    <select id="findPage" resultType="cn.zyjblogs.server.user.vo.UserVo">
+        select * from users
+        where deleted = 0
+        <if test="userPageDto.username != null and userPageDto.username!='' ">
+            and username concat('%',#{userPageDto.username},'%')
+        </if>
+        <if test="userPageDto.name != null and userPageDto.name!='' ">
+            and name concat('%',#{name},'%')
+        </if>
+        <if test="userPageDto.phone != null and userPageDto.phone!='' ">
+            and phone concat('%',#{phone},'%')
+        </if>
+        <if test="userPageDto.email != null and userPageDto.email!='' ">
+            and email concat('%',#{email},'%')
+        </if>
+        <if test="userPageDto.email != null ">
+            and status = #{userPageDto.status}
+        </if>
+        <if test="tenantId != null and tenantId != '' ">
+            and tenant_id = #{tenantId}
+        </if>
+        order by create_time desc
+    </select>
+
+</mapper>

stater/zyjblogs-oauth-spring-boot-starter/pom.xml

@@ -44,6 +44,7 @@
             <groupId>org.springframework.security.oauth.boot</groupId>
             <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>