From 870423422823df0473270aa4ec077d2e0bf2fb02 Mon Sep 17 00:00:00 2001
From: "1340691923@qq.com" <1340691923@qq.com>
Date: Fri, 25 Feb 2022 11:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=A6=E6=83=85=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cmd/init_app/mysql/bi.sql | 2 +-
cmd/main/main.go | 71 -------------------
.../user-analysis/components/UserInfoRes.vue | 10 +--
3 files changed, 6 insertions(+), 77 deletions(-)
delete mode 100644 cmd/main/main.go
diff --git a/cmd/init_app/mysql/bi.sql b/cmd/init_app/mysql/bi.sql
index f49c9b9..71a6163 100644
--- a/cmd/init_app/mysql/bi.sql
+++ b/cmd/init_app/mysql/bi.sql
@@ -72,7 +72,7 @@ CREATE TABLE `gm_role` (
`create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
-INSERT INTO `gm_role` VALUES (1, 'admin', '超级管理员', '[{\"path\":\"/behavior-analysis\",\"component\":\"layout\",\"redirect\":\"/behavior-analysis/index\",\"alwaysShow\":false,\"meta\":{\"title\":\"行为分析\",\"icon\":\"el-icon-link\"},\"children\":[{\"path\":\"event/:id\",\"component\":\"views/behavior-analysis/event\",\"name\":\"event\",\"meta\":{\"title\":\"事件分析\",\"dynamic\":true,\"icon\":\"el-icon-data-line\"}},{\"path\":\"retention/:id\",\"component\":\"views/behavior-analysis/retention\",\"name\":\"retention\",\"meta\":{\"title\":\"留存分析\",\"dynamic\":true,\"icon\":\"el-icon-data-analysis\"}},{\"path\":\"funnel/:id\",\"component\":\"views/behavior-analysis/funnel\",\"name\":\"funnel\",\"meta\":{\"title\":\"漏斗分析\",\"dynamic\":true,\"icon\":\"el-icon-data-board\"}},{\"path\":\"trace/:id\",\"component\":\"views/behavior-analysis/trace\",\"name\":\"trace\",\"meta\":{\"title\":\"路径分析\",\"dynamic\":true,\"icon\":\"el-icon-bicycle\"}}]},{\"path\":\"/user-analysis\",\"component\":\"layout\",\"redirect\":\"/user-analysis/attr\",\"alwaysShow\":false,\"meta\":{\"title\":\"用户分析\",\"icon\":\"el-icon-pie-chart\"},\"children\":[{\"path\":\"/user-analysis/attr/:id\",\"component\":\"views/user-analysis/index\",\"name\":\"attr\",\"meta\":{\"title\":\"用户属性分析\",\"dynamic\":true,\"icon\":\"el-icon-pie-chart\"}}]},{\"path\":\"/manager\",\"component\":\"layout\",\"redirect\":\"/manager/event\",\"alwaysShow\":false,\"meta\":{\"title\":\"数据管理\",\"icon\":\"el-icon-edit\"},\"children\":[{\"path\":\"event\",\"component\":\"views/manager/event\",\"name\":\"event\",\"meta\":{\"title\":\"事件管理\",\"icon\":\"el-icon-s-management\"}},{\"path\":\"log\",\"component\":\"views/manager/log\",\"name\":\"log\",\"meta\":{\"title\":\"埋点管理\",\"icon\":\"el-icon-notebook-1\"}}]},{\"path\":\"/permission\",\"component\":\"layout\",\"redirect\":\"/permission/role\",\"alwaysShow\":true,\"meta\":{\"title\":\"权限\",\"icon\":\"el-icon-user-solid\"},\"children\":[{\"path\":\"role\",\"component\":\"views/permission/role\",\"name\":\"RolePermission\",\"meta\":{\"title\":\"角色管理\",\"icon\":\"el-icon-s-check\"}},{\"path\":\"user\",\"component\":\"views/permission/user\",\"name\":\"user\",\"meta\":{\"title\":\"用户管理\",\"icon\":\"el-icon-user\"}},{\"path\":\"operater_log\",\"component\":\"views/permission/operater_log\",\"name\":\"operater_log\",\"meta\":{\"title\":\"操作日志列表\",\"icon\":\"el-icon-s-order\"}}]},{\"path\":\"/app\",\"component\":\"layout\",\"children\":[{\"path\":\"/app/app\",\"component\":\"views/app/index\",\"name\":\"index\",\"meta\":{\"title\":\"应用管理\",\"icon\":\"el-icon-s-goods\"}}]}]', '2022-01-07 14:56:23', '2022-01-07 14:56:23');
+INSERT INTO `gm_role` VALUES (1, 'admin', '超级管理员', '[{\"path\":\"/behavior-analysis\",\"component\":\"layout\",\"redirect\":\"/behavior-analysis/index\",\"alwaysShow\":false,\"meta\":{\"title\":\"行为分析\",\"icon\":\"el-icon-link\"},\"children\":[{\"path\":\"event/:id\",\"component\":\"views/behavior-analysis/event\",\"name\":\"event\",\"meta\":{\"title\":\"事件分析\",\"dynamic\":true,\"icon\":\"el-icon-data-line\"}},{\"path\":\"retention/:id\",\"component\":\"views/behavior-analysis/retention\",\"name\":\"retention\",\"meta\":{\"title\":\"留存分析\",\"dynamic\":true,\"icon\":\"el-icon-data-analysis\"}},{\"path\":\"funnel/:id\",\"component\":\"views/behavior-analysis/funnel\",\"name\":\"funnel\",\"meta\":{\"title\":\"漏斗分析\",\"dynamic\":true,\"icon\":\"el-icon-data-board\"}},{\"path\":\"trace/:id\",\"component\":\"views/behavior-analysis/trace\",\"name\":\"trace\",\"meta\":{\"title\":\"智能路径分析\",\"dynamic\":true,\"icon\":\"el-icon-bicycle\"}}]},{\"path\":\"/user-analysis\",\"component\":\"layout\",\"redirect\":\"/user-analysis/attr\",\"alwaysShow\":false,\"meta\":{\"title\":\"用户分析\",\"icon\":\"el-icon-pie-chart\"},\"children\":[{\"path\":\"attr/:id\",\"component\":\"views/user-analysis/index\",\"name\":\"attr\",\"meta\":{\"title\":\"用户属性分析\",\"dynamic\":true,\"icon\":\"el-icon-s-custom\"}},{\"path\":\"group\",\"component\":\"views/user-analysis/group\",\"name\":\"group\",\"meta\":{\"title\":\"用户分群\",\"icon\":\"el-icon-user\"}},{\"isInside\":true,\"path\":\"user_list\",\"component\":\"views/user-analysis/user_list\",\"name\":\"user_list\",\"meta\":{\"title\":\"用户列表\",\"icon\":\"el-icon-user-solid\"}},{\"isInside\":true,\"path\":\"user_info/:uid/:index\",\"component\":\"views/user-analysis/user_info\",\"name\":\"user_info\",\"meta\":{\"title\":\"用户事件详情\",\"dynamic\":true,\"icon\":\"el-icon-s-custom\"}}]},{\"path\":\"/manager\",\"component\":\"layout\",\"redirect\":\"/manager/event\",\"alwaysShow\":false,\"meta\":{\"title\":\"数据管理\",\"icon\":\"el-icon-edit\"},\"children\":[{\"path\":\"event\",\"component\":\"views/manager/event\",\"name\":\"event\",\"meta\":{\"title\":\"事件管理\",\"icon\":\"el-icon-s-management\"}},{\"path\":\"log\",\"component\":\"views/manager/log\",\"name\":\"log\",\"meta\":{\"title\":\"埋点管理\",\"icon\":\"el-icon-notebook-1\"}}]},{\"path\":\"/permission\",\"component\":\"layout\",\"redirect\":\"/permission/role\",\"alwaysShow\":true,\"meta\":{\"title\":\"权限\",\"icon\":\"el-icon-user-solid\"},\"children\":[{\"path\":\"role\",\"component\":\"views/permission/role\",\"name\":\"RolePermission\",\"meta\":{\"title\":\"角色管理\",\"icon\":\"el-icon-s-check\"}},{\"path\":\"user\",\"component\":\"views/permission/user\",\"name\":\"user\",\"meta\":{\"title\":\"用户管理\",\"icon\":\"el-icon-user\"}},{\"path\":\"operater_log\",\"component\":\"views/permission/operater_log\",\"name\":\"operater_log\",\"meta\":{\"title\":\"操作日志列表\",\"icon\":\"el-icon-s-order\"}}]},{\"path\":\"/app\",\"component\":\"layout\",\"children\":[{\"path\":\"/app/app\",\"component\":\"views/app/index\",\"name\":\"index\",\"meta\":{\"title\":\"应用管理\",\"icon\":\"el-icon-s-goods\"}}]}]', '2022-02-24 21:03:07', '2022-01-07 14:56:23');
DROP TABLE IF EXISTS `gm_user`;
CREATE TABLE `gm_user` (
`id` int(11) NOT NULL AUTO_INCREMENT,
diff --git a/cmd/main/main.go b/cmd/main/main.go
deleted file mode 100644
index 0836c5f..0000000
--- a/cmd/main/main.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package main
-
-import (
- "flag"
- "fmt"
- "github.com/1340691923/xwl_bi/application"
- "log"
- "time"
-)
-
-var (
- configFileDir string
- configFileName string
- configFileExt string
-)
-
-func init() {
- flag.StringVar(&configFileDir, "configFileDir", "config", "配置文件夹名")
- flag.StringVar(&configFileName, "configFileName", "config", "配置文件名")
- flag.StringVar(&configFileExt, "configFileExt", "json", "配置文件后缀")
- flag.Parse()
-}
-
-func init(){
- app := application.NewApp(
- "init_app",
- application.WithConfigFileDir(configFileDir),
- application.WithConfigFileName(configFileName),
- application.WithConfigFileExt(configFileExt),
- application.RegisterInitFnObserver(application.InitLogs),
- application.RegisterInitFnObserver(application.InitRedisPool),
- )
-
- err := app.InitConfig().
- NotifyInitFnObservers().
- Error()
-
- if err != nil {
- log.Println(fmt.Sprintf("初始化失败%s",err.Error()))
- panic(err)
- }
-}
-
-func main(){
- chExit := make(chan int,1)
- go func() {
- time.Sleep(1 * time.Second)
- chExit <- 1
- time.Sleep(5 * time.Second)
- close(chExit)
- }()
-
- for {
- select {
- case v, ok := <-chExit:
- if !ok {
- fmt.Println("close channel 2", v)
- goto EXIT2
- }
-
- fmt.Println("ch2 val =", v)
- }
- }
-
- EXIT2:
- fmt.Println("exit testSelectFor2")
- select {
- default:
-
- }
-}
\ No newline at end of file
diff --git a/vue/src/views/user-analysis/components/UserInfoRes.vue b/vue/src/views/user-analysis/components/UserInfoRes.vue
index 2cc71be..c7002e2 100644
--- a/vue/src/views/user-analysis/components/UserInfoRes.vue
+++ b/vue/src/views/user-analysis/components/UserInfoRes.vue
@@ -107,11 +107,7 @@
加载更多
-
+