update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像

疯狂的狮子li

2021-10-20 82f1f5d0cf1b51a5d81915e842e01760f404fa74

 ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -1,57 +1,19 @@
<?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="com.ruoyi.system.mapper.SysLogininforMapper">



   <resultMap type="SysLogininfor" id="SysLogininforResult">

      <id     property="infoId"        column="info_id"           />

      <result property="userName"      column="user_name"         />

      <result property="status"        column="status"            />

      <result property="ipaddr"        column="ipaddr"            />

      <result property="loginLocation" column="login_location"    />

      <result property="browser"       column="browser"           />

      <result property="os"            column="os"                />

      <result property="msg"           column="msg"               />

      <result property="loginTime"     column="login_time"        />

   </resultMap>



   <insert id="insertLogininfor" parameterType="SysLogininfor">

      insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)

      values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())

   </insert>

	
   <select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">

      select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor

      <where>

         <if test="ipaddr != null and ipaddr != ''">

            AND ipaddr like concat('%', #{ipaddr}, '%')

         </if>

         <if test="status != null and status != ''">

            AND status = #{status}

         </if>

         <if test="userName != null and userName != ''">

            AND user_name like concat('%', #{userName}, '%')

         </if>

         <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->

            and date_format(login_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')

         </if>

         <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->

            and date_format(login_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')

         </if>

      </where>

      order by info_id desc

   </select>

	
   <delete id="deleteLogininforByIds" parameterType="Long">

       delete from sys_logininfor where info_id in

       <foreach collection="array" item="infoId" open="(" separator="," close=")">

          #{infoId}

        </foreach> 
    </delete>

    
    <update id="cleanLogininfor">

        truncate table sys_logininfor

    </update>

    
<?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="com.ruoyi.system.mapper.SysLogininforMapper">

    <resultMap type="SysLogininfor" id="SysLogininforResult">
        <id property="infoId" column="info_id"/>
        <result property="userName" column="user_name"/>
        <result property="status" column="status"/>
        <result property="ipaddr" column="ipaddr"/>
        <result property="loginLocation" column="login_location"/>
        <result property="browser" column="browser"/>
        <result property="os" column="os"/>
        <result property="msg" column="msg"/>
        <result property="loginTime" column="login_time"/>
    </resultMap>

</mapper>