修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格

RuoYi

2021-09-18 d24e551894e04a557adbcfffddd5cf0966f38e2f

 src/main/resources/vm/xml/mapper.xml.vm

@@ -12,12 +12,12 @@
#if($table.sub)



    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">

        <collection property="${subclassName}List" notNullColumn="${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />

        <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />

    </resultMap>



    <resultMap type="${subClassName}" id="${subClassName}Result">

#foreach ($column in $subTable.columns)

        <result property="${column.javaField}"    column="${column.columnName}"    />

        <result property="${column.javaField}"    column="sub_${column.columnName}"    />

#end

    </resultMap>

#end

@@ -58,13 +58,13 @@
        </where>

    </select>

    

    <select id="select${ClassName}ById" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">

    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">

#if($table.crud || $table.tree)

        <include refid="select${ClassName}Vo"/>

        where ${pkColumn.columnName} = #{${pkColumn.javaField}}

#elseif($table.sub)

        select#foreach($column in $columns) a.$column.columnName#if($velocityCount != $columns.size()),#end#end,

           #foreach($column in $subTable.columns) b.$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end

           #foreach($column in $subTable.columns) b.$column.columnName as sub_$column.columnName#if($velocityCount != $subTable.columns.size()),#end#end



        from ${tableName} a

        left join ${subTableName} b on b.${subTableFkName} = a.${pkColumn.columnName}

@@ -102,11 +102,11 @@
        where ${pkColumn.columnName} = #{${pkColumn.javaField}}

    </update>



    <delete id="delete${ClassName}ById" parameterType="${pkColumn.javaType}">

    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">

        delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}

    </delete>



    <delete id="delete${ClassName}ByIds" parameterType="String">

    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">

        delete from ${tableName} where ${pkColumn.columnName} in 

        <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">

            #{${pkColumn.javaField}}

@@ -121,7 +121,7 @@
        </foreach>

    </delete>



    <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="Long">

    <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">

        delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}

    </delete>