Merge remote-tracking branch 'origin/master'

log-manager-ui/admin/package.json

@@ -4,6 +4,7 @@
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",
+    "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build": "vue-cli-service build",
     "test": "vue-cli-service build --mode test",
     "yibin": "vue-cli-service build --mode yibin",

log-manager-ui/admin/src/router.js

@@ -18,6 +18,10 @@ Router.prototype.push = function push(location, onResolve, onReject) {
 
 const router = new Router({
     routes: [
+        {
+            path: '/index',
+            redirect: '/access/log/list'
+        },
         builder('/authentication', 'login/authentication'),
         builder('/login', 'login/login'),
         builder('/go', 'codeGen/index'),

log-manager-ui/admin/src/views/biz/log/list.vue

@@ -63,18 +63,18 @@
                             label: "设备Id",
                             fuzzy: true
                         },
-                        {
-                            name: "eventTopic",
-                            type: "text",
-                            label: "记录埋点的事件主题",
-                            fuzzy: true
-                        },
-                        {
-                            name: "eventTopicName",
-                            type: "text",
-                            label: "记录埋点中文名称",
-                            fuzzy: true
-                        },
+                        // {
+                        //     name: "eventTopic",
+                        //     type: "text",
+                        //     label: "记录埋点的事件主题",
+                        //     fuzzy: true
+                        // },
+                        // {
+                        //     name: "eventTopicName",
+                        //     type: "text",
+                        //     label: "记录埋点中文名称",
+                        //     fuzzy: true
+                        // },
 
                       {
                         name: "createTimeStart",

log-manager-ui/admin/src/views/operate/log/list.vue

@@ -83,7 +83,7 @@
 
                         {label: "日志标签", prop: "requestUrl"},
                       {label: "内容", prop: "operType",formatter: this.formatter},
-                        {label: "消息内容", prop: "content",tooltip:"true"},
+                        {label: "操作内容", prop: "content",tooltip:"true"},
 
                         {label: "操作IP地址", prop: "ip"},
 

log-manager-ui/admin/vue.config.js

@@ -8,7 +8,8 @@ module.exports = {
     hot: true, //自动保存
     proxy: {
       "/logservice": {
-        target: "http://112.19.80.237:11092",
+        // target: "http://112.19.80.237:11092",
+        target: "http://192.168.0.98:11092",
         // target: 'http://127.0.0.1:18225',
         changeOrigin: true,
         secure: false,