refactor: extend the id column in the hera_app_role table to the bigint type

ozhera-app/app-api/src/main/java/org/apache/ozhera/app/api/service/HeraAppService.java

@@ -63,7 +63,7 @@ public interface HeraAppService {
 
     Long getAppCount();
 
-    Integer delRoleById(Integer id);
+    Integer delRoleById(Long id);
 
     Integer addRole(HeraAppRoleModel roleModel);
 

ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/HeraAppRoleDao.java

@@ -37,7 +37,7 @@ public class HeraAppRoleDao {
     @Resource
     private HeraAppRoleMapper heraAppRoleMapper;
 
-    public Integer delById(Integer id){
+    public Integer delById(Long id){
         if(id == null){
             log.error("HeraAppRoleDao.delById invalid param,id is null");
         }

ozhera-app/app-service/src/main/java/org/apache/ozhera/app/dao/mapper/HeraAppRoleMapper.java

@@ -33,15 +33,15 @@ public interface HeraAppRoleMapper extends BaseMapper<HeraAppRole> {
 
     int deleteByExample(HeraAppRoleExample example);
 
-    int deleteByPrimaryKey(Integer id);
+    int deleteByPrimaryKey(Long id);
 
     int insert(HeraAppRole record);
 
     int insertSelective(HeraAppRole record);
 
     List<HeraAppRole> selectByExample(HeraAppRoleExample example);
 
-    HeraAppRole selectByPrimaryKey(Integer id);
+    HeraAppRole selectByPrimaryKey(Long id);
 
     int updateByExampleSelective(@Param("record") HeraAppRole record, @Param("example") HeraAppRoleExample example);
 

ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppRole.java

@@ -31,7 +31,7 @@
 @TableName("hera_app_role")
 public class HeraAppRole {
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     private String appId;
 
@@ -47,11 +47,11 @@ public class HeraAppRole {
 
     private Date updateTime;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -112,7 +112,7 @@ public void setUpdateTime(Date updateTime) {
     }
 
     public enum Column {
-        id("id", "id", "INTEGER", false),
+        id("id", "id", "LONG", false),
         appId("app_id", "appId", "VARCHAR", false),
         appPlatform("app_platform", "appPlatform", "INTEGER", false),
         user("user", "user", "VARCHAR", false),

ozhera-app/app-service/src/main/java/org/apache/ozhera/app/model/HeraAppRoleExample.java

@@ -153,52 +153,52 @@ public Criteria andIdIsNotNull() {
             return (Criteria) this;
         }
 
-        public Criteria andIdEqualTo(Integer value) {
+        public Criteria andIdEqualTo(Long value) {
             addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotEqualTo(Integer value) {
+        public Criteria andIdNotEqualTo(Long value) {
             addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThan(Integer value) {
+        public Criteria andIdGreaterThan(Long value) {
             addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
             addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThan(Integer value) {
+        public Criteria andIdLessThan(Long value) {
             addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
+        public Criteria andIdLessThanOrEqualTo(Long value) {
             addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdIn(List<Integer> values) {
+        public Criteria andIdIn(List<Long> values) {
             addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotIn(List<Integer> values) {
+        public Criteria andIdNotIn(List<Long> values) {
             addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdBetween(Integer value1, Integer value2) {
+        public Criteria andIdBetween(Long value1, Long value2) {
             addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andIdNotBetween(Long value1, Long value2) {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }

ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/HeraAppRoleService.java

@@ -41,7 +41,7 @@ public class HeraAppRoleService {
     @Autowired
     HeraAppRoleDao dao;
 
-    public Integer delById(Integer id){
+    public Integer delById(Long id){
         return dao.delById(id);
     }
 

ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/impl/HeraAppServiceImpl.java

@@ -311,7 +311,7 @@ public Long getAppCount() {
     }
 
     @Override
-    public Integer delRoleById(Integer id) {
+    public Integer delRoleById(Long id) {
         return roleService.delById(id);
     }
 

ozhera-app/app-service/src/main/java/org/apache/ozhera/app/service/mq/RocketMqHeraAppConsumer.java

@@ -79,6 +79,10 @@ public class RocketMqHeraAppConsumer {
     @NacosValue(value = "${rocketmq.sk}", autoRefreshed = true)
     private String sk;
 
+    //默认为空，根据需要配置
+    @NacosValue(value = "${stop.mq:false}", autoRefreshed = true)
+    private Boolean stopMq;
+
     private DefaultMQPushConsumer heraAppMQPushConsumer;
 
     @Autowired
@@ -208,6 +212,11 @@ private HeraAppBaseInfo matchExistHeraApp(HeraAppBaseInfo heraAppBaseInfo){
 
     private void saveOrUpdateHeraAppRole(List<String> members, String appId, Integer platFormType) {
 
+        if(stopMq){
+            log.info("Mq consumer stop ...");
+            return;
+        }
+
         log.info("RocketMqHeraAppConsumer#saveOrUpdateHeraAppRole appId:{},platFormType:{},members:{}", appId, platFormType, members);
         if (CollectionUtils.isEmpty(members)) {
             return;

ozhera-app/app-service/src/main/resources/mapper/HeraAppRoleMapper.xml

@@ -22,7 +22,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.apache.ozhera.app.dao.mapper.HeraAppRoleMapper">
   <resultMap id="BaseResultMap" type="org.apache.ozhera.app.model.HeraAppRole">
-    <id column="id" jdbcType="INTEGER" property="id" />
+    <id column="id" jdbcType="BIGINT" property="id" />
     <result column="app_id" jdbcType="VARCHAR" property="appId" />
     <result column="app_platform" jdbcType="INTEGER" property="appPlatform" />
     <result column="user" jdbcType="VARCHAR" property="user" />
@@ -109,15 +109,15 @@
       limit #{offset} , #{limit}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from hera_app_role
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from hera_app_role
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </delete>
   <delete id="deleteByExample" parameterType="org.apache.ozhera.app.model.HeraAppRoleExample">
     delete from hera_app_role
@@ -126,7 +126,7 @@
     </if>
   </delete>
   <insert id="insert" parameterType="org.apache.ozhera.app.model.HeraAppRole">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into hera_app_role (app_id, app_platform, user, 
@@ -137,7 +137,7 @@
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="org.apache.ozhera.app.model.HeraAppRole">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into hera_app_role
@@ -198,7 +198,7 @@
     update hera_app_role
     <set>
       <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
+        id = #{record.id,jdbcType=BIGINT},
       </if>
       <if test="record.appId != null">
         app_id = #{record.appId,jdbcType=VARCHAR},
@@ -228,7 +228,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update hera_app_role
-    set id = #{record.id,jdbcType=INTEGER},
+    set id = #{record.id,jdbcType=BIGINT},
       app_id = #{record.appId,jdbcType=VARCHAR},
       app_platform = #{record.appPlatform,jdbcType=INTEGER},
       user = #{record.user,jdbcType=VARCHAR},
@@ -265,7 +265,7 @@
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="org.apache.ozhera.app.model.HeraAppRole">
     update hera_app_role
@@ -276,7 +276,7 @@
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </update>
   <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
     insert into hera_app_role

ozhera-monitor/ozhera-monitor-server/src/main/java/org/apache/ozhera/monitor/controller/AppMonitorController.java

@@ -130,7 +130,7 @@ public Result addHeraRole(HeraAppRoleModel role) {
 
     @ResponseBody
     @GetMapping("/mimonitor/delHeraRole")
-    public Result delHeraRole(Integer id) {
+    public Result delHeraRole(Long id) {
 
         return heraBaseInfoService.delRole(id);
 

ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/HeraBaseInfoService.java

@@ -34,7 +34,7 @@ public interface HeraBaseInfoService {
 
     Result addRole(HeraAppRoleModel model);
 
-    Result delRole(Integer id);
+    Result delRole(Long id);
 
     Result queryRole(HeraAppRoleModel model, Integer pageNo, Integer pageCount);
 

ozhera-monitor/ozhera-monitor-service/src/main/java/org/apache/ozhera/monitor/service/impl/HeraBaseInfoServiceImpl.java

@@ -89,7 +89,7 @@ public Result addRole(HeraAppRoleModel model) {
     }
 
     @Override
-    public Result delRole(Integer id) {
+    public Result delRole(Long id) {
 
         Integer i = hearAppService.delRoleById(id);
         if (i.intValue() > 0) {