Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleControllerApi.java
#	src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java
#	src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleControllerApi.java
#	src/main/resources/mappers/StaticRuleMapper.xml
#	src/test/java/com/realtime/protection/server/rule/dynamic/DynamicRuleServiceTest.java
#	src/test/java/com/realtime/protection/server/rule/staticrule/StaticRuleServiceTest.java

src/main/resources/mappers/DynamicRuleMapper.xml

@@ -4,40 +4,38 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.realtime.protection.server.rule.dynamicrule.DynamicRuleMapper">
 
-<!--    useGeneratedKeys="true": 这个属性指定了是否要获取数据库生成的主键。如果设置为true，MyBatis会使用JDBC的getGeneratedKeys方法来获取由数据库自动生成的主键。-->
-<!--    keyProperty="id": 这个属性指定了要将生成的主键赋值给哪个属性。在这个例子中，生成的主键将被赋值给名为id的属性。-->
+    <!--    useGeneratedKeys="true": 这个属性指定了是否要获取数据库生成的主键。如果设置为true，MyBatis会使用JDBC的getGeneratedKeys方法来获取由数据库自动生成的主键。-->
+    <!--    keyProperty="id": 这个属性指定了要将生成的主键赋值给哪个属性。在这个例子中，生成的主键将被赋值给名为id的属性。-->
     <insert id="newDynamicRule" useGeneratedKeys="true" keyProperty="dynamicRuleId">
 
         insert into t_dynamic_rule
-            (dynamic_rule_name,
-               create_time, modify_time, dynamic_rule_create_username,
-               dynamic_rule_create_depart, template_id, dynamic_rule_protect_level,
-               dynamic_rule_priority, dynamic_rule_range,
-               dynamic_rule_frequency, dynamic_rule_create_user_id)
-        values
-            (#{object.dynamicRuleName},
-            #{object.dynamicRuleCreateTime},#{object.dynamicRuleModifyTime},
-            #{object.dynamicRuleCreateUsername},#{object.dynamicRuleCreateDepart},
-            #{object.templateId}, #{object.dynamicRuleProtectLevel},
-            #{object.dynamicRulePriority}, #{object.dynamicRuleRange},
-            #{object.dynamicRuleFrequency},
-            #{object.dynamicRuleCreateUserId})
+        (dynamic_rule_name,
+         create_time, modify_time, dynamic_rule_create_username,
+         dynamic_rule_create_depart, template_id, dynamic_rule_protect_level,
+         dynamic_rule_priority, dynamic_rule_range,
+         dynamic_rule_frequency, dynamic_rule_create_user_id)
+        values (#{object.dynamicRuleName},
+                #{object.dynamicRuleCreateTime}, #{object.dynamicRuleModifyTime},
+                #{object.dynamicRuleCreateUsername}, #{object.dynamicRuleCreateDepart},
+                #{object.templateId}, #{object.dynamicRuleProtectLevel},
+                #{object.dynamicRulePriority}, #{object.dynamicRuleRange},
+                #{object.dynamicRuleFrequency},
+                #{object.dynamicRuleCreateUserId})
 
     </insert>
 
     <insert id="newDynamicRulProtectObjectConcat">
-        insert into
-            t_protect_object_dynamic_rule_conn(dynamic_rule_id, protect_object_id)
+        insert into t_protect_object_dynamic_rule_conn(dynamic_rule_id, protect_object_id)
         values (#{dynamicRuleId}, #{protectObjectId})
     </insert>
 
     <insert id="newDynamicRules">
         insert into t_dynamic_rule
-            (dynamic_rule_name,
-               create_time, modify_time, dynamic_rule_create_username,
-               dynamic_rule_create_depart, template_id, dynamic_rule_protect_level,
-               dynamic_rule_priority, dynamic_rule_range,
-               dynamic_rule_frequency, dynamic_rule_create_user_id
+        (dynamic_rule_name,
+        create_time, modify_time, dynamic_rule_create_username,
+        dynamic_rule_create_depart, template_id, dynamic_rule_protect_level,
+        dynamic_rule_priority, dynamic_rule_range,
+        dynamic_rule_frequency, dynamic_rule_create_user_id
         )
         values
         <foreach collection="dynamicRuleObjects" item="object" separator=",">
@@ -61,18 +59,20 @@
 
 
     <!--    join删除-->
-<!--    #         delete t_dynamic_rule, t_protect_object_dynamic_rule_conn-->
-<!--    #         from t_dynamic_rule-->
-<!--    #         inner join  t_protect_object_dynamic_rule_conn-->
-<!--    #             on t_dynamic_rule.dynamic_rule_id = t_protect_object_dynamic_rule_conn.dynamic_rule_id-->
-<!--    #         where t_dynamic_rule.dynamic_rule_id = #{dynamicRuleId}-->
+    <!--    #         delete t_dynamic_rule, t_protect_object_dynamic_rule_conn-->
+    <!--    #         from t_dynamic_rule-->
+    <!--    #         inner join  t_protect_object_dynamic_rule_conn-->
+    <!--    #             on t_dynamic_rule.dynamic_rule_id = t_protect_object_dynamic_rule_conn.dynamic_rule_id-->
+    <!--    #         where t_dynamic_rule.dynamic_rule_id = #{dynamicRuleId}-->
     <delete id="deleteDynamicRuleObject">
-        delete from t_dynamic_rule
+        delete
+        from t_dynamic_rule
         where dynamic_rule_id = #{dynamicRuleId}
     </delete>
-<!--    用于update时删去之前的关联-->
+    <!--    用于update时删去之前的关联-->
     <delete id="deleteDynamicRuleProtectObjectConcat">
-        delete from t_protect_object_dynamic_rule_conn
+        delete
+        from t_protect_object_dynamic_rule_conn
         where dynamic_rule_id = #{dynamicRuleId}
     </delete>
 
@@ -88,19 +88,22 @@
     <update id="updateDynamicRuleObject">
         update t_dynamic_rule
         set
-            <if test="object.dynamicRuleName != null"> dynamic_rule_name = #{object.dynamicRuleName},</if>
-            <if test="object.dynamicRuleModifyTime != null"> modify_time = #{object.dynamicRuleModifyTime},</if>
-            <if test="object.templateId != null"> template_id = #{object.templateId},</if>
-            <if test="object.dynamicRuleProtectLevel != null"> dynamic_rule_protect_level = #{object.dynamicRuleProtectLevel},</if>
-            <if test="object.dynamicRulePriority != null"> dynamic_rule_priority = #{object.dynamicRulePriority},</if>
-            <if test="object.dynamicRuleRange != null"> dynamic_rule_range = #{object.dynamicRuleRange},</if>
-            <if test="object.dynamicRuleFrequency != null"> dynamic_rule_frequency = #{object.dynamicRuleFrequency}</if>
+        <if test="object.dynamicRuleName != null">dynamic_rule_name = #{object.dynamicRuleName},</if>
+        <if test="object.dynamicRuleModifyTime != null">modify_time = #{object.dynamicRuleModifyTime},</if>
+        <if test="object.templateId != null">template_id = #{object.templateId},</if>
+        <if test="object.dynamicRuleProtectLevel != null">dynamic_rule_protect_level =
+            #{object.dynamicRuleProtectLevel},
+        </if>
+        <if test="object.dynamicRulePriority != null">dynamic_rule_priority = #{object.dynamicRulePriority},</if>
+        <if test="object.dynamicRuleRange != null">dynamic_rule_range = #{object.dynamicRuleRange},</if>
+        <if test="object.dynamicRuleFrequency != null">dynamic_rule_frequency = #{object.dynamicRuleFrequency}</if>
         where
-            dynamic_rule_id = #{dynamicRuleId}
+        dynamic_rule_id = #{dynamicRuleId}
     </update>
 
 
-    <resultMap id="dynamicRuleMap" type="com.realtime.protection.configuration.entity.rule.dynamicrule.DynamicRuleObject">
+    <resultMap id="dynamicRuleMap"
+               type="com.realtime.protection.configuration.entity.rule.dynamicrule.DynamicRuleObject">
         <id column="dynamic_rule_id" property="dynamicRuleId"/>
         <result column="dynamic_rule_name" property="dynamicRuleName"/>
         <result column="create_time" property="dynamicRuleCreateTime"/>
@@ -133,7 +136,7 @@
 
     <select id="queryDynamicRuleById" resultMap="dynamicRuleMap">
         select *
-            from t_dynamic_rule dynamicRule
+        from t_dynamic_rule dynamicRule
         where dynamicRule.dynamic_rule_id = #{dynamicRuleId}
 
     </select>
@@ -152,10 +155,10 @@
     <select id="queryProtectObjectByRuleId"
             resultMap="protectObjectMap">
         select t_protect_object.*
-            from t_protect_object
-            inner join t_protect_object_dynamic_rule_conn
-                on t_protect_object.protect_object_id = t_protect_object_dynamic_rule_conn.protect_object_id
-            where t_protect_object_dynamic_rule_conn.dynamic_rule_id = #{dynamicRuleId}
+        from t_protect_object
+                 inner join t_protect_object_dynamic_rule_conn
+                            on t_protect_object.protect_object_id = t_protect_object_dynamic_rule_conn.protect_object_id
+        where t_protect_object_dynamic_rule_conn.dynamic_rule_id = #{dynamicRuleId}
     </select>
 
     <select id="queryDynamicRuleObject"
@@ -193,8 +196,8 @@
     <select id="queryTemplateByRuleId" resultMap="templateMap">
         select *
         from t_strategy_template
-        inner join t_dynamic_rule
-            on t_strategy_template.strategy_template_id = t_dynamic_rule.template_id
+                 inner join t_dynamic_rule
+                            on t_strategy_template.strategy_template_id = t_dynamic_rule.template_id
         where t_dynamic_rule.dynamic_rule_id = #{dynamicRuleId}
     </select>
     <select id="queryProtectObjectById" resultType="java.lang.Boolean">