Merge remote-tracking branch 'origin/main'

controllePlatform/tro-web/README.md

@@ -1,5 +1,5 @@
 # 项目名称
-全链路压测，英文名：ForceCop
+全链路压测，英文名：Takin
 # 项目简介
 压测是指模拟超大负荷量测试软件系统在处于峰值时如何操作，例如模拟真实的软件和硬件环境和非正常的超多用户负荷，测试软件系统在长时间运行时的可靠性和响应时间。本公司产品在此基础之上引入了全链路压测概念，可以在生产环境对系统全链路进行全方位的压测，找出系统的性能风险问题和瓶颈水平，帮助测试人员提升系统稳定性
 ## 三个原则
@@ -41,14 +41,6 @@ sudo vim /etc/hosts
 
 ## 项目本地启动
 
-- idea配置 VM options配置如下
- ```
-//tro-web.dylib：这个包可以询问同学～
--agentpath:/Users/xxxx/shulie/tro-web.dylib
--Xmx600m
--Xms600m
--Xmn600m
- ```
 # 更新日志
 
 - 4.2.3 版本更新一览
@@ -78,8 +70,6 @@ sudo vim /etc/hosts
         - 优化链路展示形式，增加链路拓扑展示更直观了解链路调用情况；
         - 新增系统概览页面，登录后用户看到的页面信息更聚焦；
         - 新增入口规则优化，支持restful风格入口识别。
-    - 代码混淆保机密：
-        - 对所有代码进行了代码混淆，防止反编译，保障产品知识产权。
     - 规划saas版本内容：
         - 梳理saas版本改造内容，助力云压测版本产品推出市场
 

controllePlatform/tro/README-CN.md

@@ -0,0 +1,4 @@
+**tro**
+
+目标将tro-web和tro-cloud共享的代码提取到下面使用的模块中，减少代码冗余建设；
+

controllePlatform/tro/README.md

@@ -1,3 +1,4 @@
-tro
+**tro**
+
+The code shared by tro-web and tro-cloud is extracted into the module used below
 
-test

controllePlatform/tro/pom.xml

@@ -43,7 +43,6 @@
         <spring.boot.version>2.1.5.RELEASE</spring.boot.version>
         <curator.version>1.3.3</curator.version>
         <hutool.version>5.5.9</hutool.version>
-
         <zookeeper.version>3.4.13</zookeeper.version>
     </properties>
 
@@ -88,8 +87,7 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- zk客户端框架 -->
-
+            <!-- zk library -->
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
@@ -130,7 +128,7 @@
     <build>
         <pluginManagement>
             <plugins>
-                <!-- 设置编译版本为1.8 -->
+                <!-- compile jdk 1.8 -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>

controllePlatform/tro/tro-command-channel/README.md

@@ -1,10 +1,10 @@
-**命令传输通道**
+**tro-common-channel**
 
-****发送端实现示例****
+****ServerChannel use example****
 
 ```
 
-        # zk配置命令参数
+        # zk 配置参数对象
         ZkClientConfig config = new ZkClientConfig();
         config.setZkServers("192.168.1.101:2181,192.168.1.102:2181,192.168.1.103:2181");
 
@@ -37,7 +37,7 @@
 
 ```
 
-****接收端示例****
+****ClientChannel use example****
 
 ```
 
@@ -67,7 +67,7 @@ import io.shulie.tro.channel.bean.CommandPacket;
 import io.shulie.tro.channel.protocal.ChannelProtocol;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: JSONChannelProtocol
  * @date: 2020/12/30 9:17 上午
  * @description:
@@ -103,7 +103,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandHandler
  * @date: 2020/12/29 11:29 下午
  * @description: 定义命令处理

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/ClientChannel.java

@@ -9,7 +9,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: ServerChannelClient
  * @date: 2020/12/29 10:52 下午
  * @description: 服务端命令发送工具类

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/CommandListener.java

@@ -3,7 +3,7 @@
 import io.shulie.tro.channel.bean.CommandPacket;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandListener
  * @date: 2020/12/29 10:52 下午
  * @description: 命令处理工具类

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/CommandRegistry.java

@@ -4,7 +4,7 @@
 import io.shulie.tro.channel.type.Command;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandRegistry
  * @date: 2020/12/29 10:52 下午
  * @description: 命令注册中心

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/ServerChannel.java

@@ -4,7 +4,7 @@
 import io.shulie.tro.channel.protocal.ChannelProtocol;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: ServerChannelClient
  * @date: 2020/12/29 10:52 下午
  * @description: 服务端命令发送工具类

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/bean/CommandCommon.java

@@ -3,7 +3,7 @@
 import java.util.Map;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandCommon
  * @date: 2020/12/30 7:59 上午
  * @description:

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/bean/CommandPacket.java

@@ -1,7 +1,7 @@
 package io.shulie.tro.channel.bean;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandPacket
  * @date: 2020/12/29 10:20 下午
  * @description: 命令传输对象包

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/bean/CommandRespType.java

@@ -1,7 +1,7 @@
 package io.shulie.tro.channel.bean;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandRespType
  * @date: 2020/12/29 10:20 下午
  * @description: 命令响应类型

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/bean/CommandResponse.java

@@ -4,7 +4,7 @@
 import io.shulie.tro.channel.utils.ThrowableUtils;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandPacket
  * @date: 2020/12/29 10:20 下午
  * @description: 命令传输对象包

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/bean/CommandSend.java

@@ -1,7 +1,7 @@
 package io.shulie.tro.channel.bean;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandPacket
  * @date: 2020/12/29 10:20 下午
  * @description: 命令传输对象包

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/bean/CommandStatus.java

@@ -1,7 +1,7 @@
 package io.shulie.tro.channel.bean;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandStatus
  * @date: 2020/12/29 10:20 下午
  * @description: 命令下发状态

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/bean/Constants.java

@@ -1,7 +1,7 @@
 package io.shulie.tro.channel.bean;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: Constants
  * @date: 2020/12/29 10:20 下午
  * @description: 常量对象

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/bean/HeartBeat.java

@@ -1,7 +1,7 @@
 package io.shulie.tro.channel.bean;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: Constants
  * @date: 2020/12/29 10:20 下午
  * @description:

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/exception/ChannelException.java

@@ -1,7 +1,7 @@
 package io.shulie.tro.channel.exception;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: ChannelException
  * @date: 2020/12/29 10:17 下午
  * @description:

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/handler/CommandHandler.java

@@ -4,7 +4,7 @@
 import io.shulie.tro.channel.bean.CommandResponse;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CommandHandler
  * @date: 2020/12/29 11:29 下午
  * @description: 定义命令处理

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/impl/DefaultCommandRegistry.java

@@ -6,7 +6,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: DefaultCommandRegistry
  * @date: 2020/12/29 11:42 下午
  * @description:

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/impl/ServerCommandListener.java

@@ -4,7 +4,7 @@
 import io.shulie.tro.channel.bean.CommandPacket;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: ServerCommandListener
  * @date: 2020/12/30 8:44 上午
  * @description:

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/protocal/ChannelProtocol.java

@@ -3,8 +3,8 @@
 import io.shulie.tro.channel.bean.CommandPacket;
 
 /**
- * @author: Hengyu
- * @className: ChannelProtocal
+ * @author: HengYu
+ * @className: ChannelProtocol
  * @date: 2020/12/30 9:14 上午
  * @description:
  */

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/protocal/JsonChannelProtocol.java

@@ -5,7 +5,7 @@
 import io.shulie.tro.channel.bean.CommandPacket;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: JSONChannelProtocol
  * @date: 2020/12/30 9:17 上午
  * @description:

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/DefaultClientChannel.java

@@ -28,7 +28,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: ZkServerChannel
  * @date: 2020/12/30 7:50 上午
  * @description: zk server

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/DefaultServerChannel.java

@@ -13,7 +13,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: ZkServerChannel
  * @date: 2020/12/30 7:50 上午
  * @description: zk server

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/NetflixCuratorZkClientFactory.java

@@ -13,8 +13,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @Description CuratorZkClient 实例工厂
- * @Author guohz
+ * @Description CuratorZkClientFactory
+ * @author: HengYu
  * @mail [email protected]
  * @Date 2020/12/29 20:11
  */

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/Stoppable.java

@@ -2,7 +2,7 @@
 
 /**
  * @Description
- * @Author guohz
+ * @author: HengYu
  * @mail [email protected]
  * @Date 2020/12/29 20:11
  */

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/ZkChildListener.java

@@ -4,7 +4,7 @@
 import com.netflix.curator.framework.recipes.cache.PathChildrenCacheEvent;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: ZkChildListener
  * @date: 2021/1/7 2:43 下午
  * @description:

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/ZkClient.java

@@ -8,7 +8,7 @@
 
 /**
  * @Description ZooKeeper 客户端实现封装
- * @Author guohz
+ * @author: HengYu
  * @mail [email protected]
  * @Date 2020/12/29 20:11
  */

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/ZkClientConfig.java

@@ -1,8 +1,8 @@
 package io.shulie.tro.channel.router.zk;
 
 /**
- * @Description ZooKeeper 配置对象
- * @Author guohz
+ * @Description ZooKeeper 配置参数对象
+ * @author: HengYu
  * @mail [email protected]
  * @Date 2020/12/29 20:11
  */

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/ZkHeartbeatNode.java

@@ -4,7 +4,7 @@
 /**
  * 通过 zk 维持心跳的节点，如果成功在 zk 上注册节点，则表示存活，否则不存活。
  *
- * @author pamirs
+ * @author: HengYu
  */
 public interface ZkHeartbeatNode extends Lifecycle {
 

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/ZkNodeCache.java

@@ -5,7 +5,7 @@
 /**
  * 监视 ZooKeeper 节点的更新，并把内容缓存在内存中。
  * 创建方式：{@link ZkClient#createZkNodeCache(String, boolean)}
- * @author pamirs
+ * @author: HengYu
  */
 public interface ZkNodeCache extends Lifecycle {
 

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/ZkNodeStat.java

@@ -3,7 +3,7 @@
 /**
  * Zk node status
  * 创建方式：{@link ZkClient#createZkNodeCache(String, boolean)}
- * @author pamirs
+ * @author: HengYu
  */
 public class ZkNodeStat {
 

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/ZkPathChildrenCache.java

@@ -4,9 +4,7 @@
 
 /**
  * 监视 ZooKeeper 节点的子节点的增加、删除更新，并把内容缓存在内存中。
- * 创建方式：{@link ZkClient#createPathChildrenCache(String)}
- *
- * @author pamirs
+ * @author: HengYu
  */
 public interface ZkPathChildrenCache extends Lifecycle {
 

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/ZkPathHeartbeat.java

@@ -9,7 +9,7 @@
 import java.util.concurrent.*;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: ZkClientHeartbeat
  * @date: 2020/12/29 10:52 下午
  * @description: clint heartbeats

controllePlatform/tro/tro-command-channel/src/main/java/io/shulie/tro/channel/router/zk/bean/CreateMode.java

@@ -1,7 +1,7 @@
 package io.shulie.tro.channel.router.zk.bean;
 
 /**
- * @author: Hengyu
+ * @author: HengYu
  * @className: CreateMode
  * @date: 2020/12/29 10:20 下午
  * @description: 定义了 znode 节点的创建模式