微信公众号-上线正式环境

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.1</version>
+        <version>2.6.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.caimei365</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.2.0</version>
+            <version>2.2.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>

src/main/java/com/caimei365/manager/config/security/AuthenticationEntryPointImpl.java

@@ -31,8 +31,9 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint {
         log.debug("预认证入口被调用。拒绝访问，AuthenticationException={}", exception.getMessage());
         // 没有权限，返回403
         // response.sendError(403, "Access Denied");
-        ResponseJson<Void> errorJson = ResponseJson.error(-99, "访问失败，需要身份认证", null);
+        request.setCharacterEncoding("UTF-8");
         response.setCharacterEncoding("UTF-8");
+        ResponseJson<Void> errorJson = ResponseJson.error(-99, "访问失败，需要身份认证", null);
         response.getWriter().write(JSON.toJSONString(errorJson));
     }
 

src/main/java/com/caimei365/manager/config/security/SecurityConfig.java

@@ -1,6 +1,5 @@
 package com.caimei365.manager.config.security;
 
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
@@ -12,13 +11,8 @@ import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.access.channel.ChannelProcessingFilter;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
 import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Collections;
 
 /**
  * SpringSecurity配置类

src/main/resources/config/beta/application-beta.yml

@@ -16,6 +16,24 @@ spring:
       connection-timeout: 30000
       connection-test-query: SELECT 1
   #数据源连接--end
+  redis:
+    host: 172.31.165.27
+    port: 6379
+    password: 6#xsI%b4o@5c3RoE
+    #Redis数据库索引（默认为0）
+    database: 0
+    #连接池最大连接数（使用负值表示没有限制）
+    jedis:
+      pool:
+        max-active: 50
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 3000
+        #连接池中的最大空闲连接
+        max-idle: 20
+        #连接池中的最小空闲连接
+        min-idle: 2
+    #连接超时时间（毫秒）
+    timeout: 5000
 
 #日志配置
 logging:

src/main/resources/config/dev/application-dev.yml

@@ -16,7 +16,23 @@ spring:
       connection-timeout: 30000
       connection-test-query: SELECT 1
   #数据源连接--end
-
+  redis:
+    host: 192.168.2.100
+    port: 6379
+    #password: 123456
+    #Redis数据库索引（默认为0）
+    database: 0
+    jedis:
+      pool:
+        max-active: 50
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1
+        #连接池中的最大空闲连接
+        max-idle: 20
+        #连接池中的最小空闲连接
+        min-idle: 2
+    #连接超时时间（毫秒）
+    timeout: 5000
 
 #日志配置
 logging:

src/main/resources/config/prod/application-prod.yml

@@ -16,6 +16,26 @@ spring:
       connection-timeout: 30000
       connection-test-query: SELECT 1
   #数据源连接--end
+  #Redis连接--start
+  redis:
+    host: 172.31.165.23
+    port: 6379
+    #password: 6#xsI%b4o@5c3RoE
+    #Redis数据库索引（默认为0）
+    database: 0
+    #连接池最大连接数（使用负值表示没有限制）
+    jedis:
+      pool:
+        max-active: 50
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 3000
+        #连接池中的最大空闲连接
+        max-idle: 20
+        #连接池中的最小空闲连接
+        min-idle: 2
+    #连接超时时间（毫秒）
+    timeout: 5000
+  #Redis连接--end
 
 #日志配置
 logging:

src/main/resources/mapper/SystemDao.xml

@@ -3,29 +3,29 @@
 <mapper namespace="com.caimei365.manager.dao.SystemDao">
     <select id="findByUsername" resultType="com.caimei365.manager.entity.sys.SysUser">
         SELECT id, username, PASSWORD, avatar, fullName, phone, login_flag AS loginFlag, del_flag AS delFlag
-        FROM sys_user WHERE login_flag=0 AND username=#{username}
+        FROM system_user WHERE login_flag=0 AND username=#{username}
     </select>
     <select id="getUserIdByUsername" resultType="java.lang.Integer">
-        SELECT id FROM sys_user WHERE username=#{username}
+        SELECT id FROM system_user WHERE username=#{username}
     </select>
     <select id="getRoleNamesByUserId" resultType="java.lang.String">
-        SELECT DISTINCT r.role_name FROM sys_role r
-            LEFT JOIN sys_role_user ru ON r.id = ru.role_id
+        SELECT DISTINCT r.role_name FROM system_role r
+            LEFT JOIN system_role_user ru ON r.id = ru.role_id
         WHERE ru.user_id = #{userId}
     </select>
     <select id="getRoleIdsByUserId" resultType="java.lang.String">
-        SELECT DISTINCT r.id FROM sys_role r
-            LEFT JOIN sys_role_user ru ON r.id = ru.role_id
+        SELECT DISTINCT r.id FROM system_role r
+            LEFT JOIN system_role_user ru ON r.id = ru.role_id
         WHERE ru.user_id = #{userId}
     </select>
 <!--    <select id="getRoleIdsByUsername" resultType="java.lang.Integer">-->
-<!--        SELECT DISTINCT ru.role_id FROM sys_role_user ru-->
-<!--        LEFT JOIN sys_user u ON ru.user_id = u.id-->
+<!--        SELECT DISTINCT ru.role_id FROM system_role_user ru-->
+<!--        LEFT JOIN system_user u ON ru.user_id = u.id-->
 <!--        WHERE u.username=#{username}-->
 <!--    </select>-->
     <select id="getUserList" resultType="com.caimei365.manager.entity.sys.SysUser">
         SELECT u.id, u.username, u.avatar, u.fullName, u.phone, u.create_time AS createTime ,u.update_time AS updateTime, login_flag AS loginFlag, del_flag AS delFlag
-        FROM sys_user u
+        FROM system_user u
         WHERE u.del_flag = 0
         <if test="username != null and username != ''">
             AND u.username=#{username}
@@ -36,15 +36,15 @@
     </select>
     <select id="getUser" resultType="com.caimei365.manager.entity.sys.SysUser">
         SELECT u.id, u.username, u.avatar, u.fullName, u.phone, u.create_time AS createTime ,u.update_time AS updateTime, login_flag AS loginFlag, del_flag AS delFlag
-        FROM sys_user u
+        FROM system_user u
         WHERE u.id = #{id}
     </select>
     <insert id="insertSysUser" keyProperty="id" keyColumn="id" useGeneratedKeys="true">
-        INSERT INTO sys_user(username, password, avatar, fullName, phone, create_time)
+        INSERT INTO system_user(username, password, avatar, fullName, phone, create_time)
         VALUES(#{username}, #{password}, #{avatar}, #{fullName}, #{phone}, NOW())
     </insert>
     <update id="updateSysUser">
-        UPDATE sys_user SET username=#{username},
+        UPDATE system_user SET username=#{username},
         <if test="password != null and password != ''">
             password=#{password},
         </if>
@@ -52,56 +52,56 @@
         WHERE id = #{id}
     </update>
     <update id="deleteSysUser">
-        UPDATE sys_user SET del_flag=1, update_time=NOW() WHERE id = #{id}
+        UPDATE system_user SET del_flag=1, update_time=NOW() WHERE id = #{id}
     </update>
     <insert id="insertUserRoleRelation">
-        INSERT INTO sys_role_user(user_id, role_id) VALUES(#{userId}, #{roleId})
+        INSERT INTO system_role_user(user_id, role_id) VALUES(#{userId}, #{roleId})
     </insert>
     <delete id="deleteUserRoleRelation">
-        DELETE FROM sys_role_user WHERE user_id = #{userId}
+        DELETE FROM system_role_user WHERE user_id = #{userId}
     </delete>
     <select id="getRoleListByUserId" resultType="com.caimei365.manager.entity.sys.SysRole">
         SELECT DISTINCT r.id, r.role_name AS roleName, r.role_desc AS roleDesc, r.create_time AS createTime, r.update_time AS updateTime, del_flag AS delFlag
-        FROM sys_role r
-        LEFT JOIN sys_role_user ru ON r.id = ru.role_id
+        FROM system_role r
+        LEFT JOIN system_role_user ru ON r.id = ru.role_id
         WHERE ru.user_id = #{userId} AND r.del_flag = 0
     </select>
     <select id="getRoleList" resultType="com.caimei365.manager.entity.sys.SysRole">
         SELECT  r.id, r.role_name AS roleName, r.role_desc AS roleDesc, r.create_time AS createTime, r.update_time AS updateTime, del_flag AS delFlag
-        FROM sys_role r WHERE r.del_flag = 0
+        FROM system_role r WHERE r.del_flag = 0
     </select>
     <select id="getRole" resultType="com.caimei365.manager.entity.sys.SysRole">
         SELECT  r.id, r.role_name AS roleName, r.role_desc AS roleDesc, r.create_time AS createTime, r.update_time AS updateTime, del_flag AS delFlag
-        FROM sys_role r WHERE r.id = #{id}
+        FROM system_role r WHERE r.id = #{id}
     </select>
     <select id="getRoleByRoleName" resultType="com.caimei365.manager.entity.sys.SysRole">
         SELECT  r.id, r.role_name AS roleName, r.role_desc AS roleDesc, r.create_time AS createTime, r.update_time AS updateTime, del_flag AS delFlag
-        FROM sys_role r WHERE r.role_name = #{roleName}
+        FROM system_role r WHERE r.role_name = #{roleName}
     </select>
     <insert id="insertRole" keyProperty="id" keyColumn="id" useGeneratedKeys="true">
-        INSERT INTO sys_role(role_name, role_desc, create_time)
+        INSERT INTO system_role(role_name, role_desc, create_time)
         VALUES (#{roleName}, #{roleDesc}, NOW())
     </insert>
     <select id="getMenuIdsByRoleId" resultType="java.lang.String">
-        SELECT DISTINCT menu_id FROM sys_role_menu WHERE role_id = #{roleId}
+        SELECT DISTINCT menu_id FROM system_role_menu WHERE role_id = #{roleId}
     </select>
     <insert id="insertRoleMenuRelation">
-        INSERT INTO sys_role_menu(role_id, menu_id) VALUES(#{roleId}, #{menuId})
+        INSERT INTO system_role_menu(role_id, menu_id) VALUES(#{roleId}, #{menuId})
     </insert>
     <delete id="deleteRoleMenuRelation">
-        DELETE FROM sys_role_menu WHERE role_id = #{roleId}
+        DELETE FROM system_role_menu WHERE role_id = #{roleId}
     </delete>
     <update id="updateRole">
-        UPDATE sys_role SET role_name=#{roleName}, role_desc=#{roleDesc}, del_flag=#{delFlag}, update_time=NOW()
+        UPDATE system_role SET role_name=#{roleName}, role_desc=#{roleDesc}, del_flag=#{delFlag}, update_time=NOW()
         WHERE id = #{id}
     </update>
     <update id="deleteRole">
-        UPDATE sys_role SET del_flag=1, update_time=NOW() WHERE id = #{id}
+        UPDATE system_role SET del_flag=1, update_time=NOW() WHERE id = #{id}
     </update>
     <select id="getMenusByRoleIds" resultType="com.caimei365.manager.entity.sys.SysMenu">
         SELECT m.id, m.title , m.name, m.icon, m.parent_id AS parentId, m.hidden, m.status, m.sort, m.create_time AS createTime, del_flag AS delFlag
-        FROM sys_menu m
-        LEFT JOIN sys_role_menu rm ON m.id = rm.menu_id
+        FROM system_menu m
+        LEFT JOIN system_role_menu rm ON m.id = rm.menu_id
         WHERE m.del_flag = 0 AND m.status = 0 AND rm.role_id IN
         <foreach item="roleId" collection="roleIds" open="(" separator="," close=")">
             #{roleId}
@@ -110,8 +110,8 @@
     </select>
     <select id="getMenuList" resultType="com.caimei365.manager.entity.sys.SysMenu">
         SELECT m.id, m.title , m.name, m.icon, m.parent_id AS parentId, m.status, m.hidden, m.sort, m.create_time AS createTime, del_flag AS delFlag,
-        (SELECT COUNT(*) FROM sys_menu WHERE parent_id=m.id) AS childCount
-        FROM sys_menu m
+        (SELECT COUNT(*) FROM system_menu WHERE parent_id=m.id) AS childCount
+        FROM system_menu m
         WHERE m.del_flag = 0
         <if test="parentId != null or parentId == 0">
             AND m.parent_id = #{parentId}
@@ -123,23 +123,23 @@
     </select>
     <select id="getMenu" resultType="com.caimei365.manager.entity.sys.SysMenu">
         SELECT m.id, m.title , m.name, m.icon, m.parent_id AS parentId, m.hidden, m.status, m.sort, m.create_time AS createTime, del_flag AS delFlag
-        FROM sys_menu m
+        FROM system_menu m
         WHERE m.id = #{id}
     </select>
     <select id="getMenuByName" resultType="com.caimei365.manager.entity.sys.SysMenu">
         SELECT m.id, m.title , m.name, m.icon, m.parent_id AS parentId, m.hidden, m.status, m.sort, m.create_time AS createTime, del_flag AS delFlag
-        FROM sys_menu m
+        FROM system_menu m
         WHERE m.name = #{name}
     </select>
     <update id="updateMenu">
-        UPDATE sys_menu SET title=#{title}, name=#{name}, icon=#{icon}, parent_id=#{parentId}, hidden=#{hidden}, status=#{status}, sort=#{sort}, del_flag=#{delFlag}, update_time=NOW()
+        UPDATE system_menu SET title=#{title}, name=#{name}, icon=#{icon}, parent_id=#{parentId}, hidden=#{hidden}, status=#{status}, sort=#{sort}, del_flag=#{delFlag}, update_time=NOW()
         WHERE id = #{id}
     </update>
     <insert id="insertMenu" keyProperty="id" keyColumn="id" useGeneratedKeys="true">
-        INSERT INTO sys_menu(title, name, icon, parent_id, hidden, status, sort, create_time)
+        INSERT INTO system_menu(title, name, icon, parent_id, hidden, status, sort, create_time)
         VALUES (#{title}, #{name}, #{icon}, #{parentId}, #{hidden}, #{status}, #{sort}, NOW())
     </insert>
     <update id="deleteMenu">
-        UPDATE sys_menu SET del_flag=1, update_time=NOW() WHERE id = #{id}
+        UPDATE system_menu SET del_flag=1, update_time=NOW() WHERE id = #{id}
     </update>
 </mapper>