diff --git a/skywalking-network/src/main/proto/Spans.proto b/skywalking-network/src/main/proto/Spans.proto index e10480784..2734b6776 100644 --- a/skywalking-network/src/main/proto/Spans.proto +++ b/skywalking-network/src/main/proto/Spans.proto @@ -11,8 +11,8 @@ message AckSpan { int32 statusCode = 5; string exceptionStack = 6; string viewpointId = 7; - string userId = 8; - string applicationId = 9; + string username = 8; + string applicationCode = 9; int32 routeKey = 10; } @@ -26,8 +26,8 @@ message RequestSpan { string spanTypeDesc = 6; string callType = 7; uint32 spanType = 8; - string applicationId = 9; - string userId = 10; + string applicationCode = 9; + string username = 10; string businessKey = 11; int32 processNo = 13; string address = 14; @@ -35,11 +35,11 @@ message RequestSpan { int32 routeKey = 15; } -message TraceId{ +message TraceId { repeated int64 segments = 1; } -message Span{ +message Span { TraceId traceId = 1; string levelId = 2; // parentLevelId + "." + levelId string viewpoint = 3; @@ -50,8 +50,8 @@ message Span{ string spanTypeDesc = 8; string callType = 9; int32 spanType = 10; - string applicationId = 11; - string userId = 12; + string applicationCode = 11; + string username = 12; string businessKey = 13; int32 processNo = 14; string address = 15; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java index eb68e7ea5..e02b1b9f6 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Config.java @@ -3,7 +3,7 @@ package com.a.eye.skywalking.conf; public class Config { public static class SkyWalking { - public static String USER_ID = ""; + public static String USERNAME = ""; public static String APPLICATION_CODE = ""; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/ConfigInitializer.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/ConfigInitializer.java index d48ecaebb..48c118345 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/ConfigInitializer.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/ConfigInitializer.java @@ -34,12 +34,12 @@ public class ConfigInitializer { logger.error("Failed to read the config file, sky-walking api run in default config.", e); } } - Config.SkyWalking.USER_ID = System.getProperty("userId"); + Config.SkyWalking.USERNAME = System.getProperty("username"); Config.SkyWalking.APPLICATION_CODE = System.getProperty("applicationCode"); Config.SkyWalking.SERVERS = System.getProperty("servers"); - if(StringUtil.isEmpty(Config.SkyWalking.USER_ID)){ - throw new ExceptionInInitializerError("'-DuserId=' is missing."); + if(StringUtil.isEmpty(Config.SkyWalking.USERNAME)){ + throw new ExceptionInInitializerError("'-Dusername=' is missing."); } if(StringUtil.isEmpty(Config.SkyWalking.APPLICATION_CODE)){ throw new ExceptionInInitializerError("'-DapplicationCode=' is missing."); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Span.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Span.java index 31de4ca47..12825daa1 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Span.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Span.java @@ -61,27 +61,27 @@ public class Span { /** * 应用编码 */ - private String applicationId; + private String applicationCode; /** * 归属用户 */ - private String userId; + private String username; private String viewPointId; - private int routeKey; + private int routeKey; - public Span(TraceId traceId, String applicationId, String userId) { + public Span(TraceId traceId, String applicationCode, String username) { this.traceId = traceId; - this.applicationId = applicationId; - this.userId = userId; + this.applicationCode = applicationCode; + this.username = username; this.parentLevel = ""; } - public Span(TraceId traceId, String parentLevel, int levelId, String applicationId, String userId) { + public Span(TraceId traceId, String parentLevel, int levelId, String applicationCode, String username) { this.traceId = traceId; this.parentLevel = parentLevel; this.levelId = levelId; - this.applicationId = applicationId; - this.userId = userId; + this.applicationCode = applicationCode; + this.username = username; } public TraceId getTraceId() { @@ -172,20 +172,20 @@ public class Span { this.businessKey = businessKey; } - public String getApplicationId() { - return applicationId; + public String getApplicationCode() { + return applicationCode; } - public void setApplicationId(String applicationId) { - this.applicationId = applicationId; + public void setApplicationCode(String applicationCode) { + this.applicationCode = applicationCode; } - public String getUserId() { - return userId; + public String getUsername() { + return username; } - public void setUserId(String userId) { - this.userId = userId; + public void setUsername(String username) { + this.username = username; } public void setViewPointId(String viewPointId) { @@ -197,15 +197,15 @@ public class Span { } public RequestSpan.Builder buildRequestSpan(RequestSpan.Builder builder) { - builder.setTraceId(this.traceId).setParentLevel(this.parentLevel).setLevelId(this.levelId).setSpanType(this.spanType).setApplicationId(this.applicationId) - .setUserId(this.userId).setRouteKey(routeKey); + builder.setTraceId(this.traceId).setParentLevel(this.parentLevel).setLevelId(this.levelId).setSpanType(this.spanType).setApplicationCode(this.applicationCode) + .setUsername(this.username).setRouteKey(routeKey); return builder; } public AckSpan.Builder buildAckSpan(AckSpan.Builder builder){ builder.setTraceId(this.traceId).setParentLevel(this.parentLevel).setLevelId(this.levelId) .setCost(System.currentTimeMillis() - this.startDate).setStatusCode(this.statusCode) - .setExceptionStack(this.exceptionStack).setUserId(this.userId).setApplicationId(this.applicationId) + .setExceptionStack(this.exceptionStack).setUsername(this.username).setApplicationCode(this.applicationCode) .setViewpointId(this.viewPointId).setRouteKey(routeKey); return builder; } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java index 7370f4fdc..6d4523001 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java @@ -28,7 +28,7 @@ public final class ContextGenerator { public static Span generateSpanFromContextData(ContextData context, Identification id) { Span spanData = CurrentThreadSpanStack.peek(); if (context != null && context.getTraceId() != null && spanData == null) { - spanData = new Span(context.getTraceId(), context.getParentLevel(), context.getLevelId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID); + spanData = new Span(context.getTraceId(), context.getParentLevel(), context.getLevelId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USERNAME); } else { spanData = getSpanFromThreadLocal(id); } @@ -44,14 +44,14 @@ public final class ContextGenerator { int routeKey; if (parentSpan == null) { // 不存在，新创建一个Context - span = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID); + span = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USERNAME); routeKey = RoutingKeyGenerator.generate(id.getViewPoint()); } else { // 根据ParentContextData的TraceId和RPCID // LevelId是由SpanNode类的nextSubSpanLevelId字段进行初始化的. // 所以在这里不需要初始化 - span = new Span(parentSpan.getTraceId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID); + span = new Span(parentSpan.getTraceId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USERNAME); if (!StringUtil.isEmpty(parentSpan.getParentLevel())) { span.setParentLevel(parentSpan.getParentLevel() + "." + parentSpan.getLevelId()); } else { diff --git a/skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.auth b/skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.auth deleted file mode 100644 index 074398a71..000000000 --- a/skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.auth +++ /dev/null @@ -1,54 +0,0 @@ -#skyWalking用户ID -skywalking.user_id=123 -#skyWalking应用编码 -skywalking.application_code=test -#skywalking auth的环境变量名字 -skywalking.auth_system_env_name=SKYWALKING_RUN -#skywalking数据编码 -skywalking.charset=UTF-8 -skywalking.auth_override=true - -#是否打印数据 -buriedpoint.printf=false -#埋点异常的最大长度 -buriedpoint.max_exception_stack_length=4000 -#业务字段的最大长度 -buriedpoint.businesskey_max_length=300 -#过滤异常 -buriedpoint.exclusive_exceptions=java.lang.RuntimeException - -#最大发送者的连接数阀比例 -sender.connect_percent=100 -#发送服务端配置 -sender.servers_addr=127.0.0.1:34000 -#最大发送的副本数量 -sender.max_copy_num=2 -#发送的最大长度 -sender.max_send_length=20000 -#当没有Sender时,尝试获取sender的等待周期 -sender.retry_get_sender_wait_interval=2000 - - - - -#最大消费线程数 -consumer.max_consumer=0 -#消费者最大等待时间 -consumer.max_wait_time=5 -#发送失败等待时间 -consumer.consumer_fail_retry_wait_interval=50 - -#每个Buffer的最大个数 -buffer.buffer_max_size=18000 -#Buffer池的最大长度 -buffer.pool_size=5 - -#发送检查线程检查周期 -senderchecker.check_polling_time=200 - -#自定义本地方法插件是否开启 -plugin.customlocalmethodinterceptorplugin.is_enable=true -#自定义插件拦截的包前缀 -plugin.customlocalmethodinterceptorplugin.package_prefix=test.com.ai.test.* -#自定义插件是否记录入参 -plugin.customlocalmethodinterceptorplugin.record_param_enable=false diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/log4j2.xml b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/log4j2.xml deleted file mode 100644 index 4e2af7485..000000000 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/log4j2.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth deleted file mode 100644 index 17f4abd0d..000000000 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth +++ /dev/null @@ -1,44 +0,0 @@ -#skyWalking用户ID -skywalking.user_id=123 -#skyWalking应用编码 -skywalking.application_code=test -#skywalking auth的环境变量名字 -skywalking.auth_system_env_name=SKYWALKING_RUN -#skywalking数据编码 -skywalking.charset=UTF-8 -skywalking.auth_override=true -#是否打印数据 -buriedpoint.printf=true -#埋点异常的最大长度 -buriedpoint.max_exception_stack_length=4000 -#业务字段的最大长度 -buriedpoint.businesskey_max_length=300 -#过滤异常 -buriedpoint.exclusive_exceptions=java.lang.RuntimeException - -#最大发送者的连接数阀比例 -sender.connect_percent=100 -#发送服务端配置 -sender.servers_addr=127.0.0.1:34000 -#最大发送的副本数量 -sender.max_copy_num=2 -#发送的最大长度 -sender.max_send_length=20000 -#当没有Sender时,尝试获取sender的等待周期 -sender.retry_get_sender_wait_interval=2000 - -#最大消费线程数 -consumer.max_consumer=0 -#消费者最大等待时间 -consumer.max_wait_time=5 -#发送失败等待时间 -consumer.consumer_fail_retry_wait_interval=50 - -#每个Buffer的最大个数 -buffer.buffer_max_size=18000 -#Buffer池的最大长度 -buffer.pool_size=5 - -#发送检查线程检查周期 -senderchecker.check_polling_time=200 - diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/RequestSpanData.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/RequestSpanData.java index 84b8ea3a1..0a9d81ff3 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/RequestSpanData.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/RequestSpanData.java @@ -49,8 +49,8 @@ public class RequestSpanData extends AbstractSpanData { return requestSpan.getAddress(); } - public String getApplicationId() { - return requestSpan.getApplicationId(); + public String getApplicationCode() { + return requestSpan.getApplicationCode(); } public int getProcessNo() { diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/SpanDataHelper.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/SpanDataHelper.java index d2bbd747f..c1f5cab03 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/SpanDataHelper.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/spandata/SpanDataHelper.java @@ -44,7 +44,7 @@ public class SpanDataHelper { private Span mergeSpan(RequestSpanData requestSpanData, AckSpanData ackSpanData) { Span.Builder builder = Span.newBuilder().setAddress(requestSpanData.getAddress()) - .setApplicationId(requestSpanData.getApplicationId()).setBusinessKey(requestSpanData.getBusinessKey()) + .setApplicationCode(requestSpanData.getApplicationCode()).setBusinessKey(requestSpanData.getBusinessKey()) .setCallType(requestSpanData.getCallType()).setCost(ackSpanData.getCost()); if (ackSpanData.getExceptionStack() != null && ackSpanData.getExceptionStack().length() > 0) { builder = builder.setExceptionStack(ackSpanData.getExceptionStack()); diff --git a/skywalking-webui/pom.xml b/skywalking-webui/pom.xml index 331389abb..0ab294bf0 100644 --- a/skywalking-webui/pom.xml +++ b/skywalking-webui/pom.xml @@ -67,16 +67,6 @@ 1.2.7 - - org.apache.logging.log4j - log4j-core - 2.2 - - - org.apache.logging.log4j - log4j-1.2-api - 2.2 - javax.servlet javax.servlet-api diff --git a/skywalking-webui/src/main/java/com/a/eye/skywalking/web/controller/UserMaintainController.java b/skywalking-webui/src/main/java/com/a/eye/skywalking/web/controller/UserMaintainController.java index 948342b5d..39fce58be 100644 --- a/skywalking-webui/src/main/java/com/a/eye/skywalking/web/controller/UserMaintainController.java +++ b/skywalking-webui/src/main/java/com/a/eye/skywalking/web/controller/UserMaintainController.java @@ -50,7 +50,7 @@ public class UserMaintainController extends BaseController { return result.toJSONString(); } - logger.info("The userId[{}] has been login", dbLoginInfo.getUid()); + logger.info("The username[{}] has been login", dbLoginInfo.getUid()); result.put("code", "200"); result.put("message", "Login success"); // diff --git a/skywalking-webui/src/main/java/com/a/eye/skywalking/web/dao/impl/ApplicationsMaintainDao.java b/skywalking-webui/src/main/java/com/a/eye/skywalking/web/dao/impl/ApplicationsMaintainDao.java index 74cf60613..e23341324 100644 --- a/skywalking-webui/src/main/java/com/a/eye/skywalking/web/dao/impl/ApplicationsMaintainDao.java +++ b/skywalking-webui/src/main/java/com/a/eye/skywalking/web/dao/impl/ApplicationsMaintainDao.java @@ -26,7 +26,7 @@ public class ApplicationsMaintainDao implements IApplicationsMaintainDao { @Override public ApplicationInfo loadApplication(String applicationId, String uid) throws SQLException { - String sqlQuery = "select a.app_id,a.uid,a.app_code,a.create_time,a.sts,a.app_desc,a.update_time from application_info a where a.app_id = ? and a.uid = ? and a.sts= 'A'"; + String sqlQuery = "select a.app_id,a.uid,a.app_code,a.create_time,a.sts,a.update_time from application_info a where a.app_id = ? and a.uid = ? and a.sts= 'A'"; Connection connection = dbConnectUtil.getConnection(); ApplicationInfo application = null; try { @@ -41,7 +41,6 @@ public class ApplicationsMaintainDao implements IApplicationsMaintainDao { application.setAppCode(resultSet.getString("app_code")); application.setCreateTime(resultSet.getTimestamp("create_time")); application.setSts(resultSet.getString("sts")); - application.setAppDesc(resultSet.getString("app_desc")); application.setUpdateTime(resultSet.getTimestamp("update_time")); } } catch (Exception e) { @@ -55,7 +54,7 @@ public class ApplicationsMaintainDao implements IApplicationsMaintainDao { @Override public void saveApplication(ApplicationInfo application) throws SQLException { - final String sql = "insert into application_info(uid,app_code,create_time,sts,update_time,app_desc) values(?,?,?,?,?,?)"; + final String sql = "insert into application_info(uid,app_code,create_time,sts,update_time) values(?,?,?,?,?)"; Connection connection = dbConnectUtil.getConnection(); int key = -1; try { @@ -66,7 +65,6 @@ public class ApplicationsMaintainDao implements IApplicationsMaintainDao { pstmt.setTimestamp(++i, application.getCreateTime()); pstmt.setString(++i, application.getSts()); pstmt.setTimestamp(++i, application.getUpdateTime()); - pstmt.setString(++i, application.getAppDesc()); pstmt.executeUpdate(); ResultSet results = pstmt.getGeneratedKeys(); @@ -88,15 +86,14 @@ public class ApplicationsMaintainDao implements IApplicationsMaintainDao { @Override public void modifyApplication(Application application) throws SQLException { - String sqlQuery = "update application_info set app_desc=?, update_time=? where app_id=? and uid = ? and sts= 'A'"; + String sqlQuery = "update application_info set update_time=? where app_id=? and uid = ? and sts= 'A'"; Connection connection = dbConnectUtil.getConnection(); try { PreparedStatement pstmt = connection.prepareStatement(sqlQuery); - pstmt.setString(1, application.getAppDesc()); - pstmt.setTimestamp(2, application.getUpdateTime()); - pstmt.setString(3, application.getAppId()); - pstmt.setString(4, application.getUId()); + pstmt.setTimestamp(1, application.getUpdateTime()); + pstmt.setString(2, application.getAppId()); + pstmt.setString(3, application.getUId()); pstmt.executeUpdate(); } catch (Exception e) { diff --git a/skywalking-webui/src/main/java/com/a/eye/skywalking/web/dto/FullSpan.java b/skywalking-webui/src/main/java/com/a/eye/skywalking/web/dto/FullSpan.java index 06079212f..dcc633d70 100644 --- a/skywalking-webui/src/main/java/com/a/eye/skywalking/web/dto/FullSpan.java +++ b/skywalking-webui/src/main/java/com/a/eye/skywalking/web/dto/FullSpan.java @@ -18,7 +18,7 @@ public class FullSpan { protected String exceptionStack; protected byte statusCode = 0; protected String spanTypeDesc; - protected String userId; + protected String username; protected long startDate; protected String spanType; protected String address = ""; @@ -35,11 +35,11 @@ public class FullSpan { } this.traceId = traceId.substring(0, traceId.length() - 1); this.levelId = span.getLevelId(); - this.applicationId = span.getApplicationId(); + this.applicationId = span.getApplicationCode(); this.callType = span.getCallType(); this.businessKey = span.getBusinessKey(); this.spanTypeDesc = span.getSpanTypeDesc(); - this.userId = span.getUserId(); + this.username = span.getUsername(); this.startDate = span.getStarttime(); this.viewPointId = span.getViewpoint(); this.spanType = span.getSpanType() + ""; @@ -103,12 +103,12 @@ public class FullSpan { this.spanTypeDesc = spanTypeDesc; } - public String getUserId() { - return userId; + public String getUsername() { + return username; } - public void setUserId(String userId) { - this.userId = userId; + public void setUsername(String username) { + this.username = username; } public long getStartDate() { diff --git a/skywalking-webui/src/main/java/com/a/eye/skywalking/web/entity/Application.java b/skywalking-webui/src/main/java/com/a/eye/skywalking/web/entity/Application.java index c22257b8e..d06313830 100644 --- a/skywalking-webui/src/main/java/com/a/eye/skywalking/web/entity/Application.java +++ b/skywalking-webui/src/main/java/com/a/eye/skywalking/web/entity/Application.java @@ -16,7 +16,6 @@ public class Application { private Timestamp createTime; private ConfigArgs configArgs; - private String appDesc; public Application(String applicationId) { this.appId = applicationId; @@ -79,12 +78,4 @@ public class Application { } return updateTime; } - - public String getAppDesc() { - return appDesc; - } - - public void setAppDesc(String appDesc) { - this.appDesc = appDesc; - } } diff --git a/skywalking-webui/src/main/resources/jdbc.properties b/skywalking-webui/src/main/resources/jdbc.properties index de394648b..2a1ebe9ac 100644 --- a/skywalking-webui/src/main/resources/jdbc.properties +++ b/skywalking-webui/src/main/resources/jdbc.properties @@ -1,5 +1,5 @@ jdbc.driverClassName=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://10.1.241.20:31306/sw_db +jdbc.url=jdbc:mysql://localhost:3306/sw_db jdbc.username=sw_dbusr jdbc.password=sw_dbusr jdbc.maxTotal=200 diff --git a/skywalking-webui/src/main/resources/spring/springmvc-servlet.xml b/skywalking-webui/src/main/resources/spring/springmvc-servlet.xml index 94a8b4d6a..109e67c7e 100644 --- a/skywalking-webui/src/main/resources/spring/springmvc-servlet.xml +++ b/skywalking-webui/src/main/resources/spring/springmvc-servlet.xml @@ -47,7 +47,6 @@ classpath:jdbc.properties - classpath:config.properties diff --git a/skywalking-webui/src/main/sql/table.mysql b/skywalking-webui/src/main/sql/table.mysql index 7025d5cf8..c00ea508d 100644 --- a/skywalking-webui/src/main/sql/table.mysql +++ b/skywalking-webui/src/main/sql/table.mysql @@ -29,32 +29,6 @@ CREATE TABLE IF NOT EXISTS `user_info` ( ENGINE = InnoDB; --- ----------------------------------------------------- --- Table `user_info_ext` --- ----------------------------------------------------- -DROP TABLE IF EXISTS `user_info_ext` ; - -CREATE TABLE IF NOT EXISTS `user_info_ext` ( - `eid` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `uid` INT NOT NULL, - `email` VARCHAR(200) NULL, - `create_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`eid`)) -ENGINE = InnoDB; - - --- ----------------------------------------------------- --- Table `login_log` --- ----------------------------------------------------- -DROP TABLE IF EXISTS `login_log` ; - -CREATE TABLE IF NOT EXISTS `login_log` ( - `log_id` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `uid` INT NOT NULL, - `login_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`log_id`)) -ENGINE = InnoDB; - -- ----------------------------------------------------- -- Table `application_info` @@ -67,30 +41,11 @@ CREATE TABLE IF NOT EXISTS `application_info` ( `app_code` VARCHAR(200) NOT NULL, `create_time` DATETIME NULL, `sts` VARCHAR(2) NULL, + `update_time` DATETIME NULL, PRIMARY KEY (`app_id`)) ENGINE = InnoDB; --- ----------------------------------------------------- --- Table `data_info` --- ----------------------------------------------------- -DROP TABLE IF EXISTS `data_info` ; - -CREATE TABLE IF NOT EXISTS `data_info` ( - `did` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `tab_info` VARCHAR(45) NOT NULL, - `col_info` VARCHAR(45) NOT NULL, - `code` VARCHAR(45) NOT NULL, - `word` VARCHAR(45) NOT NULL, - `code_desc` VARCHAR(200) NULL, - `order_id` INT UNSIGNED NULL, - `create_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, - `sts` VARCHAR(2) NULL, - `modify_time` DATETIME NULL DEFAULT CURRENT_TIMESTAMP, - `parent_did` INT UNSIGNED NULL, - PRIMARY KEY (`did`)) -ENGINE = InnoDB; - -- ----------------------------------------------------- -- Table `alarm_rule` @@ -141,21 +96,6 @@ CREATE TABLE IF NOT EXISTS `exclude_rule` ( ENGINE = InnoDB; --- ----------------------------------------------------- --- Table `email_expression` --- ----------------------------------------------------- -DROP TABLE IF EXISTS `email_expression` ; - -CREATE TABLE IF NOT EXISTS `email_expression` ( - `tid` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `expr_name` VARCHAR(100) NOT NULL, - `expr_val` VARCHAR(100) NOT NULL, - `create_time` DATETIME NULL, - `sts` VARCHAR(2) NULL, - PRIMARY KEY (`tid`)) -ENGINE = InnoDB; - - -- ----------------------------------------------------- -- Table `system_config` -- ----------------------------------------------------- @@ -175,30 +115,3 @@ CREATE TABLE IF NOT EXISTS `system_config` ( ENGINE = InnoDB; --- ----------------------------------------------------- --- Table `app_auth_info` --- ----------------------------------------------------- -DROP TABLE IF EXISTS `app_auth_info` ; - -CREATE TABLE IF NOT EXISTS `app_auth_info` ( - `info_id` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `app_id` VARCHAR(45) NOT NULL, - `auth_json` VARCHAR(3000) NOT NULL, - `create_time` DATETIME NULL, - `sts` VARCHAR(45) NULL, - `modify_time` DATETIME NULL, - PRIMARY KEY (`info_id`)) -ENGINE = InnoDB; - - -SET SQL_MODE=@OLD_SQL_MODE; -SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; -SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; - - -# alter table since 2016-4-8 -ALTER TABLE `application_info` -ADD COLUMN `update_time` DATETIME NULL AFTER `sts`, -ADD COLUMN `app_desc` VARCHAR(1024) NULL AFTER `update_time`; - - diff --git a/skywalking-webui/src/main/webapp/pages/anls-result/analysisResult.ftl b/skywalking-webui/src/main/webapp/pages/anls-result/analysisResult.ftl deleted file mode 100644 index d56883938..000000000 --- a/skywalking-webui/src/main/webapp/pages/anls-result/analysisResult.ftl +++ /dev/null @@ -1,219 +0,0 @@ -<#macro analysisResult> - - - -<#macro analysisResultTableTmpl> - - - - -<#macro viewPointPickUp> - - - -<#macro typicalCallChainTrees> - - - -<#macro typicalCallChainCheckBox> - - - -<#macro typicalCallChainTreeTable> - - - -<#macro typicalCallTreeViewPointPickUp> - - - diff --git a/skywalking-webui/src/main/webapp/pages/anls-result/analysisSearchResult.ftl b/skywalking-webui/src/main/webapp/pages/anls-result/analysisSearchResult.ftl deleted file mode 100644 index ce4acf004..000000000 --- a/skywalking-webui/src/main/webapp/pages/anls-result/analysisSearchResult.ftl +++ /dev/null @@ -1,58 +0,0 @@ -<#macro anlyResultTmpl> - - - -<#macro anlyResultDisplayTmpl> - - - -<#macro pageInfoTmpl> - - \ No newline at end of file diff --git a/skywalking-webui/src/main/webapp/pages/common/commons.ftl b/skywalking-webui/src/main/webapp/pages/common/commons.ftl index 61ea15b4d..9d1dd97c2 100644 --- a/skywalking-webui/src/main/webapp/pages/common/commons.ftl +++ b/skywalking-webui/src/main/webapp/pages/common/commons.ftl @@ -20,7 +20,7 @@
- +
@@ -33,11 +33,11 @@ <#else> diff --git a/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl b/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl index 5209f96ae..ea38d8f7b 100644 --- a/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl +++ b/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl @@ -30,7 +30,7 @@
  • 调用类型：{{>spanTypeName}}
  • 花费时间：{{>cost}}毫秒
  • 业务字段：{{>businessKey}}
    • -
  • 应用Code：{{>applicationId}}
    • +
  • 应用Code：{{>applicationCode}}
  • 主机信息：{{>address}}}
  • 调用进程号：{{>processNo}}
  • 异常堆栈： @@ -121,7 +121,7 @@
  • 调用时间：{{>startDate}}
  • 花费时间：{{>cost}}毫秒
  • 业务字段：{{>businessKey}}
    • -
  • 应用Code：{{>applicationId}}
    • +
  • 应用Code：{{>applicationCode}}
  • 主机信息：{{>address}}}
  • 调用进程号：{{>processNo}}
  • 异常堆栈： @@ -180,4 +180,4 @@ - \ No newline at end of file + diff --git a/skywalking-webui/src/main/webapp/pages/index.ftl b/skywalking-webui/src/main/webapp/pages/index.ftl index f438b929d..a3a7a7066 100644 --- a/skywalking-webui/src/main/webapp/pages/index.ftl +++ b/skywalking-webui/src/main/webapp/pages/index.ftl @@ -29,11 +29,11 @@ @@ -62,7 +62,7 @@
    - 搜索 + Search
    diff --git a/skywalking-webui/src/main/webapp/pages/main.ftl b/skywalking-webui/src/main/webapp/pages/main.ftl index f9a88d42f..5744f47b9 100644 --- a/skywalking-webui/src/main/webapp/pages/main.ftl +++ b/skywalking-webui/src/main/webapp/pages/main.ftl @@ -1,9 +1,6 @@ <#import "./common/commons.ftl" as common> <#import "./common/traceInfo.ftl" as traceInfo> <#import "./usr/applications/applicationMaintain.ftl" as applicationMaintain> -<#import "./usr/authfile/auth.ftl" as auth> -<#import "anls-result/analysisSearchResult.ftl" as anlySearchResult> -<#import "anls-result/analysisResult.ftl" as anlyResult> @@ -39,17 +36,6 @@ <@applicationMaintain.addApplication/> <@applicationMaintain.createglobalConfig/> <@applicationMaintain.modifyApplication/> -<@auth.downloadAuth/> -<@anlySearchResult.anlyResultTmpl/> -<@anlySearchResult.anlyResultDisplayTmpl/> -<@anlySearchResult.pageInfoTmpl/> -<@anlyResult.analysisResult/> -<@anlyResult.analysisResultTableTmpl/> -<@anlyResult.typicalCallChainTrees/> -<@anlyResult.typicalCallChainTreeTable/> -<@anlyResult.typicalCallChainCheckBox/> -<@anlyResult.viewPointPickUp/> -<@anlyResult.typicalCallTreeViewPointPickUp/>
    @@ -82,31 +68,6 @@ return; } - if (loadType == "showAnlySearchResult") { - var template = $.templates("#anlyResultPanelTmpl"); - var htmlOutput = template.render({}); - $("#mainPanel").empty(); - $("#mainPanel").html(htmlOutput); - var searchKey = $("#searchKey").val(); - var index = searchKey.indexOf(':'); - if (index != -1) { - searchKey = searchKey.substr(index + 1); - } - toSearchAnlyResult(searchKey); - return; - } - - if (loadType == "showAnalysisResult") { - var searchKey = $("#searchKey").val(); - var index = searchKey.indexOf(':'); - if (index != -1) { - searchKey = searchKey.substr(index + 1); - } - viewResolver = new AnalysisResultViewResolver({baseUrl: "${_base}", treeId: searchKey}); - viewResolver.loadMainPage(); - return; - } - if (loadType == "applicationList") { loadAllApplications(); return; @@ -139,16 +100,6 @@ return; } - if (loadType == "downloadAuthFile") { - var template = $.templates("#downloadAuthFileTmpl"); - var htmlOutput = template.render({applicationCode: param}); - $("#mainPanel").empty(); - $("#mainPanel").html(htmlOutput); - toDownloadAuthFile(); - return; - } - - $("#mainPanel").empty(); } diff --git a/skywalking-webui/src/main/webapp/pages/usr/authfile/auth.ftl b/skywalking-webui/src/main/webapp/pages/usr/authfile/auth.ftl deleted file mode 100644 index 5b4866f19..000000000 --- a/skywalking-webui/src/main/webapp/pages/usr/authfile/auth.ftl +++ /dev/null @@ -1,55 +0,0 @@ -<#macro downloadAuth> - - \ No newline at end of file