From 1561500e0e99e9674ac5ae381e56347c5521ac5b Mon Sep 17 00:00:00 2001
From: tianyaleixiaowu <272551766@qq.com>
Date: Mon, 18 May 2020 14:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!4=20:?=
=?UTF-8?q?=20=E5=BA=94=E7=94=A8=E5=88=9D=E6=AC=A1=E6=8E=A5=E5=85=A5?=
=?UTF-8?q?=E6=97=B6=E5=BA=94=E7=94=A8=E4=BF=A1=E6=81=AF=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dashboard/src/main/resources/db.sql | 13 ----
worker/pom.xml | 21 -------
.../hotkey/worker/mapper/AppInfoMapper.java | 20 ------
.../hotkey/worker/mapper/AppInfoMapper.xml | 55 ----------------
.../platform/hotkey/worker/model/AppInfo.java | 63 -------------------
.../netty/client/ClientChangeListener.java | 13 ----
worker/src/main/resources/application.yml | 8 ---
7 files changed, 193 deletions(-)
delete mode 100644 worker/src/main/java/com/jd/platform/hotkey/worker/mapper/AppInfoMapper.java
delete mode 100644 worker/src/main/java/com/jd/platform/hotkey/worker/mapper/AppInfoMapper.xml
diff --git a/dashboard/src/main/resources/db.sql b/dashboard/src/main/resources/db.sql
index 3e714b4..c6c89a7 100644
--- a/dashboard/src/main/resources/db.sql
+++ b/dashboard/src/main/resources/db.sql
@@ -105,16 +105,3 @@ CREATE TABLE `hk_key_timely` (
-- ----------------------------
INSERT INTO `hk_key_timely` VALUES (1, 'testk1', 'testv1', '/jd/hotkeys/test/', 'test', 60000, 1212121);
--INSERT INTO `hk_key_timely` VALUES (2, 'testk2', 'testv2', '/jd/hotkeys/test/', 'test', 10000, 123443345);
-
-
-DROP TABLE IF EXISTS `hk_app_info`;
-CREATE TABLE `hk_app_info` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `app_name` varchar(60) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '应用名称',
- `principal_name` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '负责人',
- `principal_phone` varchar(11) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '负责人手机号',
- `app_desc` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '应用描述',
- `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建/接入时间',
- PRIMARY KEY (`id`) USING BTREE,
- UNIQUE INDEX `uniq_key`(`app_name`) USING BTREE COMMENT '唯一索引'
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Compact;
diff --git a/worker/pom.xml b/worker/pom.xml
index 39ed1ae..1b94d65 100644
--- a/worker/pom.xml
+++ b/worker/pom.xml
@@ -49,16 +49,6 @@
-
- mysql
- mysql-connector-java
-
-
-
- org.mybatis.spring.boot
- mybatis-spring-boot-starter
- 2.1.2
-
@@ -69,17 +59,6 @@
spring-boot-maven-plugin
-
-
-
-
- src/main/java
-
- **/*.xml
-
- true
-
-
diff --git a/worker/src/main/java/com/jd/platform/hotkey/worker/mapper/AppInfoMapper.java b/worker/src/main/java/com/jd/platform/hotkey/worker/mapper/AppInfoMapper.java
deleted file mode 100644
index 3f50fab..0000000
--- a/worker/src/main/java/com/jd/platform/hotkey/worker/mapper/AppInfoMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.jd.platform.hotkey.worker.mapper;
-
-import com.jd.platform.hotkey.worker.model.AppInfo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Options;
-
-/**
- * AppInfoMapper
- *
- * @author longhuashen
- * @since 2020-05-18
- */
-@Mapper
-public interface AppInfoMapper {
-
- @Options(useGeneratedKeys = true)
- int insertSelective(AppInfo appInfo);
-
- AppInfo findByAppName(String appName);
-}
\ No newline at end of file
diff --git a/worker/src/main/java/com/jd/platform/hotkey/worker/mapper/AppInfoMapper.xml b/worker/src/main/java/com/jd/platform/hotkey/worker/mapper/AppInfoMapper.xml
deleted file mode 100644
index cb6cae6..0000000
--- a/worker/src/main/java/com/jd/platform/hotkey/worker/mapper/AppInfoMapper.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
- insert ignore into hk_app_info
-
-
- id,
-
-
- app_name,
-
-
- principal_name,
-
-
- principal_phone,
-
-
- app_desc,
-
-
- create_time,
-
-
-
-
- #{id,jdbcType=INTEGER},
-
-
- #{appName,jdbcType=VARCHAR},
-
-
- #{principalName,jdbcType=VARCHAR},
-
-
- #{principalPhone,jdbcType=VARCHAR},
-
-
- #{appDesc,jdbcType=VARCHAR},
-
-
- #{createTime,jdbcType=TIMESTAMP},
-
-
-
-
-
-
\ No newline at end of file
diff --git a/worker/src/main/java/com/jd/platform/hotkey/worker/model/AppInfo.java b/worker/src/main/java/com/jd/platform/hotkey/worker/model/AppInfo.java
index 35e0bbd..4e106a3 100644
--- a/worker/src/main/java/com/jd/platform/hotkey/worker/model/AppInfo.java
+++ b/worker/src/main/java/com/jd/platform/hotkey/worker/model/AppInfo.java
@@ -2,7 +2,6 @@ package com.jd.platform.hotkey.worker.model;
import io.netty.channel.ChannelHandlerContext;
-import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -20,28 +19,6 @@ public class AppInfo {
*/
private Map map = new ConcurrentHashMap<>();
- private Long id;
-
- /**
- * 应用负责人
- */
- private String principalName;
-
- /**
- * 负责人联系电话
- */
- private String principalPhone;
-
- /**
- * 应用描述
- */
- private String appDesc;
-
- /**
- * 应用创建/接入时间
- */
- private Date createTime;
-
@Override
public String toString() {
return "AppInfo{" +
@@ -65,44 +42,4 @@ public class AppInfo {
public void setMap(Map map) {
this.map = map;
}
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getPrincipalName() {
- return principalName;
- }
-
- public void setPrincipalName(String principalName) {
- this.principalName = principalName;
- }
-
- public String getPrincipalPhone() {
- return principalPhone;
- }
-
- public void setPrincipalPhone(String principalPhone) {
- this.principalPhone = principalPhone;
- }
-
- public String getAppDesc() {
- return appDesc;
- }
-
- public void setAppDesc(String appDesc) {
- this.appDesc = appDesc;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
}
diff --git a/worker/src/main/java/com/jd/platform/hotkey/worker/netty/client/ClientChangeListener.java b/worker/src/main/java/com/jd/platform/hotkey/worker/netty/client/ClientChangeListener.java
index 3b60613..daca0c9 100644
--- a/worker/src/main/java/com/jd/platform/hotkey/worker/netty/client/ClientChangeListener.java
+++ b/worker/src/main/java/com/jd/platform/hotkey/worker/netty/client/ClientChangeListener.java
@@ -1,14 +1,11 @@
package com.jd.platform.hotkey.worker.netty.client;
-import com.jd.platform.hotkey.worker.mapper.AppInfoMapper;
import com.jd.platform.hotkey.worker.model.AppInfo;
import com.jd.platform.hotkey.worker.netty.holder.ClientInfoHolder;
import io.netty.channel.ChannelHandlerContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.util.Date;
import java.util.Map;
/**
@@ -25,9 +22,6 @@ public class ClientChangeListener implements IClientChangeListener {
private static final String NEW_CLIENT_JOIN = "new client join";
private static final String CLIENT_LOSE = "client removed";
- @Autowired
- private AppInfoMapper appInfoMapper;
-
/**
* 客户端新增
*/
@@ -48,13 +42,6 @@ public class ClientChangeListener implements IClientChangeListener {
appInfo.setAppName(appName);
ClientInfoHolder.apps.add(appInfo);
appInfo.getMap().put(ip, ctx);
-
- AppInfo dbAppInfo = appInfoMapper.findByAppName(appName);
- if (dbAppInfo == null) {
- //记录app信息
- appInfo.setCreateTime(new Date());
- appInfoMapper.insertSelective(appInfo);
- }
}
logger.info(NEW_CLIENT_JOIN);
diff --git a/worker/src/main/resources/application.yml b/worker/src/main/resources/application.yml
index 640a640..f60d403 100644
--- a/worker/src/main/resources/application.yml
+++ b/worker/src/main/resources/application.yml
@@ -8,13 +8,5 @@ etcd:
spring:
aop:
proxy-target-class: true
- datasource:
- username: root
- password: JRTEST
- url: jdbc:mysql://172.24.7.182:3306/test1?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
- driver-class-name: com.mysql.cj.jdbc.Driver
-mybatis:
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
server:
port: 8080
\ No newline at end of file
--
Gitee