fix stat, property, delete token bug

7a7eba7e · ruanshudong · 48df5abe · 7a7eba7e · 7a7eba7e · 7a7eba7e
Commit 7a7eba7e authored 3 years ago by ruanshudong
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 40 additions and 14 deletions
+40 -14
--- a/app/dao/db/db_tars_models/t_server_patchs.js
+++ b/app/dao/db/db_tars_models/t_server_patchs.js
@@ -34,7 +34,7 @@ module.exports = function(sequelize, DataTypes) {
 			defaultValue: ''
 		},
 		tgz: {
-			type: DataTypes.TEXT,
+			type: DataTypes.STRING(255),
 			allowNull: true
 		},
 		update_text: {

--- a/app/service/admin/AdminService.js
+++ b/app/service/admin/AdminService.js
@@ -15,7 +15,13 @@
 */


-const { configFPrx, adminRegPrx, client } = require('../../../rpc');
+const {
+    configFPrx,
+    adminRegPrx,
+    client,
+
+} = require('../../../rpc');
+const {adminRegStruct} = require('../../../rpc/struct');
 const registry = require("@tars/registry");
 const TarsStream = require('@tars/stream');
 const crypto = require("crypto")
@@ -138,6 +144,8 @@ AdminService.addTask = async(req) => {
    taskReq.taskNo = req.taskNo;
    taskReq.serial = req.serial;
    taskReq.userName = req.userName;
+    taskReq.isElegant = req.isElegant;
+    taskReq.eachNum = req.eachNum;
    req.taskItemReq.forEach((obj) => {
        let taskItemReq = new adminRegStruct.TaskItemReq();
        taskItemReq.taskNo = obj.taskNo || '';
@@ -159,6 +167,8 @@ AdminService.addTask = async(req) => {
        hashCode: util.getHashNumber(taskReq.taskNo)
    });

+    console.log(ret);
+
    return ret.__return;
 };


--- a/client/dist/auth.html
+++ b/client/dist/auth.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.917f69ac.css rel=preload as=style><link href=/static/css/chunk-common.c72fc57e.css rel=preload as=style><link href=/static/css/chunk-vendors.ff034728.css rel=preload as=style><link href=/static/js/auth.a0c5035e.js rel=preload as=script><link href=/static/js/chunk-common.142e0eef.js rel=preload as=script><link href=/static/js/chunk-vendors.38bb0d05.js rel=preload as=script><link href=/static/css/chunk-vendors.ff034728.css rel=stylesheet><link href=/static/css/chunk-common.c72fc57e.css rel=stylesheet><link href=/static/css/auth.917f69ac.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.38bb0d05.js></script><script src=/static/js/chunk-common.142e0eef.js></script><script src=/static/js/auth.a0c5035e.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.917f69ac.css rel=preload as=style><link href=/static/css/chunk-common.c72fc57e.css rel=preload as=style><link href=/static/css/chunk-vendors.ff034728.css rel=preload as=style><link href=/static/js/auth.51408c64.js rel=preload as=script><link href=/static/js/chunk-common.142e0eef.js rel=preload as=script><link href=/static/js/chunk-vendors.38bb0d05.js rel=preload as=script><link href=/static/css/chunk-vendors.ff034728.css rel=stylesheet><link href=/static/css/chunk-common.c72fc57e.css rel=stylesheet><link href=/static/css/auth.917f69ac.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.38bb0d05.js></script><script src=/static/js/chunk-common.142e0eef.js></script><script src=/static/js/auth.51408c64.js></script></body></html>
\ No newline at end of file
--- a/client/dist/k8s.html
+++ b/client/dist/k8s.html
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>TarsK8s</title><link href=/static/css/chunk-common.c72fc57e.css rel=preload as=style><link href=/static/css/chunk-vendors.ff034728.css rel=preload as=style><link href=/static/css/k8s.c1c2b2e2.css rel=preload as=style><link href=/static/js/chunk-common.142e0eef.js rel=preload as=script><link href=/static/js/chunk-vendors.38bb0d05.js rel=preload as=script><link href=/static/js/k8s.acf184d5.js rel=preload as=script><link href=/static/css/chunk-vendors.ff034728.css rel=stylesheet><link href=/static/css/chunk-common.c72fc57e.css rel=stylesheet><link href=/static/css/k8s.c1c2b2e2.css rel=stylesheet></head><body><noscript><strong>We're sorry but TarsK8s doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.38bb0d05.js></script><script src=/static/js/chunk-common.142e0eef.js></script><script src=/static/js/k8s.acf184d5.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>TarsK8s</title><link href=/static/css/chunk-common.c72fc57e.css rel=preload as=style><link href=/static/css/chunk-vendors.ff034728.css rel=preload as=style><link href=/static/css/k8s.c1c2b2e2.css rel=preload as=style><link href=/static/js/chunk-common.142e0eef.js rel=preload as=script><link href=/static/js/chunk-vendors.38bb0d05.js rel=preload as=script><link href=/static/js/k8s.55a4f981.js rel=preload as=script><link href=/static/css/chunk-vendors.ff034728.css rel=stylesheet><link href=/static/css/chunk-common.c72fc57e.css rel=stylesheet><link href=/static/css/k8s.c1c2b2e2.css rel=stylesheet></head><body><noscript><strong>We're sorry but TarsK8s doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.38bb0d05.js></script><script src=/static/js/chunk-common.142e0eef.js></script><script src=/static/js/k8s.55a4f981.js></script></body></html>
\ No newline at end of file
--- a/client/dist/static/js/auth.a0c5035e.js
+++ b/client/dist/static/js/auth.a0c5035e.js
--- a/client/dist/static/js/k8s.acf184d5.js
+++ b/client/dist/static/js/k8s.acf184d5.js
--- a/client/src/k8sApp.vue
+++ b/client/src/k8sApp.vue
@@ -30,7 +30,7 @@
    mounted(){
      Axios.create({baseURL: '/'})({
        method: 'get',
-        url: '/web_version'
+        url: '/k8s_version'
      }).then((response)=>{
        this.web_version = response.data
      })

--- a/client/src/sso/auth/pages/tokenManage.vue
+++ b/client/src/sso/auth/pages/tokenManage.vue
@@ -169,7 +169,7 @@ export default {
        var ids = [];
        this.tokenListShow.forEach((auth)=>{
            if(auth.isChecked === true){
-              ids.push(auth.token);
+              ids.push(auth.id);
            }
        });
        if(!ids.length){

--- a/index/controller/page/PageController.js
+++ b/index/controller/page/PageController.js
@@ -19,7 +19,6 @@ const captcha = require('svg-captcha')
 const PageController = {}
 const package = require("../../../package.json")
 const WebConf = require("../../../config/webConf");
-
 PageController.index = async (ctx) => {

    if (WebConf.enable && WebConf.show) {
@@ -32,7 +31,23 @@ PageController.index = async (ctx) => {
 };

 PageController.version = async (ctx) => {
-	ctx.body = package.version
+
+    let version = package.version;
+    if (!WebConf.isEnableK8s()) {
+        const AdminService = require('../../../app/service/admin/AdminService');
+
+        version = {
+            webVersion: package.version,
+            frameworkVersion: await AdminService.getVersion()
+        }
+    }
+    ctx.body = version
+};
+
+PageController.k8s_version = async (ctx) => {
+
+    let version = package.version;
+    ctx.body = version
 };

 PageController.captcha = async (ctx) => {

--- a/index/index.js
+++ b/index/index.js
@@ -13,6 +13,7 @@ const pageApiConf = [
    //首页
    ['get', '/', PageController.index],
    ['get', '/web_version', PageController.version],
+    ['get', '/k8s_version', PageController.k8s_version],
    ['get', '/captcha', PageController.captcha],
 ];


--- a/index/service/monitor/MonitorPropertyService.js
+++ b/index/service/monitor/MonitorPropertyService.js
@@ -47,7 +47,7 @@ async function callRpc(params, the) {
 		endshowtime = params.endshowtime || '2360';
 	let req = new monitorQueryStruct.MonitorQueryReq();
 	req.uid = uuid.v1()
-	req.dataid = "tars_property_1"
+	req.dataid = "tars_property"
 	req.indexs.readFromObject(['value'])

 	req.date = date;

--- a/index/service/monitor/MonitorStatService.js
+++ b/index/service/monitor/MonitorStatService.js
@@ -54,7 +54,7 @@ async function callRpc(params, the) {

 	let req = new monitorQueryStruct.MonitorQueryReq();
 	req.uid = uuid.v1()
-	req.dataid = "tars_stat_md"
+	req.dataid = "tars_stat"
 	req.indexs.readFromObject(['succ_count', 'timeout_count', 'exce_count', 'total_time'])
 	req.date = date;
 	req.tflag1 = startshowtime;
@@ -85,7 +85,7 @@ async function callRpc(params, the) {

 	let rsp = data.rsp

-	// console.log(rsp);
+	console.log(rsp);
 	let map = new Map()

 	if (data.__return != 0 || rsp.ret != 0) {

--- a/package.json
+++ b/package.json
 {
    "name": "Tars-Web",
-    "version": "2.5.0",
+    "version": "2.4.18",
    "private": true,
    "scripts": {
        "start": "node bin/www",