Commit 79553021 authored by 郝聪敏's avatar 郝聪敏

添加prettierrc配置文件

parent 68a2195c
root = true
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
......@@ -15,3 +15,5 @@ selenium-debug.log
*.ntvs*
*.njsproj
*.sln
.eslintcache
\ No newline at end of file
module.exports = {
"printWidth": 200,
"trailingComma": "es5",
"singleQuote": true,
}
\ No newline at end of file
......@@ -6,13 +6,13 @@
<script>
export default {
name: "App"
name: 'App',
};
</script>
<style>
#app {
font-family: "Avenir", Helvetica, Arial, sans-serif;
font-family: 'Avenir', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
/* text-align: center;
......
import axios from "../services/http.service";
import { sapi } from "../config";
import qs from "qs";
import axios from '../services/http.service';
import { sapi } from '../config';
import qs from 'qs';
// 获取服务列表
export function getservicelist() {
return axios.get(`/heimdallr/service/list`);
......@@ -11,33 +11,23 @@ export function getkey(key) {
}
// 获取配置列表
export function getconfigurelist(data) {
return axios.get(
`/heimdallr/config/service/${data.key}/${data.service_name}`
);
return axios.get(`/heimdallr/config/service/${data.key}/${data.service_name}`);
}
// 发布
export function postconfigurelist(data, params) {
return axios.post(
`/heimdallr/config/service/${data.key}/${data.service_name}`,
params,
{
headers: {
"Content-Type": "application/json"
}
}
);
return axios.post(`/heimdallr/config/service/${data.key}/${data.service_name}`, params, {
headers: {
'Content-Type': 'application/json',
},
});
}
// 获取版本
export function getVersionnumber(data) {
return axios.get(
`/heimdallr/config-version/service/${data.key}/${data.service_name}/list`
);
return axios.get(`/heimdallr/config-version/service/${data.key}/${data.service_name}/list`);
}
// 回滚版本
export function rollbacknum(data) {
return axios.get(
`/heimdallr/config-version/service/${data.key}/${data.service_name}/set/${data.version}`
);
return axios.get(`/heimdallr/config-version/service/${data.key}/${data.service_name}/set/${data.version}`);
}
// 获取节点列表
export function getnodelist(data) {
......@@ -45,19 +35,13 @@ export function getnodelist(data) {
}
// 获取节点配置
export function getnodeconfig(data) {
return axios.get(
`/heimdallr/config/node/${data.service_name}/${data.node_id}`
);
return axios.get(`/heimdallr/config/node/${data.service_name}/${data.node_id}`);
}
// 设置节点配置
export function nodeconfig(data, weight) {
return axios.post(
`/heimdallr/config/node/${data.service_name}/${data.node_id}`,
weight,
{
headers: {
"Content-Type": "application/json"
}
}
);
return axios.post(`/heimdallr/config/node/${data.service_name}/${data.node_id}`, weight, {
headers: {
'Content-Type': 'application/json',
},
});
}
import axios from "../services/http.service";
import { sapi } from "../config";
import axios from '../services/http.service';
import { sapi } from '../config';
export function login(data) {
return axios.get(`/heimdallr/login`, {
headers: {
"heimdallr-user": data
}
'heimdallr-user': data,
},
});
}
export function logout() {
......
<template>
<div class="layout">
<Layout class="layout_content">
<Sider
breakpoint="md"
collapsible
:collapsed-width="78"
v-model="isCollapsed"
>
<Sider breakpoint="md" collapsible :collapsed-width="78" v-model="isCollapsed">
<div class="title">
Quantgroup
</div>
<Menu
active-name="1-2"
theme="dark"
width="auto"
:class="menuitemClasses"
>
<Menu active-name="1-2" theme="dark" width="auto" :class="menuitemClasses">
<MenuItem name="1-1">
<Icon type="ios-navigate"></Icon>
<span @click="go">网关配置</span>
......@@ -35,9 +25,7 @@
<Header class="layout-header-bar">
<span class="signout" @click="logOut">退出</span>
</Header>
<Content
:style="{ margin: '20px', background: '#fff', minHeight: '220px' }"
>
<Content :style="{ margin: '20px', background: '#fff', minHeight: '220px' }">
<router-view></router-view>
</Content>
</Layout>
......@@ -45,28 +33,28 @@
</div>
</template>
<script>
import { logout } from "../api/user.api";
import { logout } from '../api/user.api';
export default {
data() {
return {
isCollapsed: false
isCollapsed: false,
};
},
computed: {
menuitemClasses: function() {
return ["menu-item", this.isCollapsed ? "collapsed-menu" : ""];
}
return ['menu-item', this.isCollapsed ? 'collapsed-menu' : ''];
},
},
methods: {
go() {
this.$router.push("/mainconfiguration");
this.$router.push('/mainconfiguration');
},
logOut() {
logout().then(data => {
this.$router.push("/");
this.$router.push('/');
});
}
}
},
},
};
</script>
<style scoped>
......
......@@ -4,20 +4,12 @@
<div class="login">
<Form ref="loginForm" :model="loginForm" :rules="ruleLoginForm">
<FormItem prop="loginName">
<Input
v-model="loginForm.loginName"
type="text"
placeholder="Username"
>
<Input v-model="loginForm.loginName" type="text" placeholder="Username">
<Icon type="ios-person-outline" slot="prepend"></Icon>
</Input>
</FormItem>
<FormItem prop="password">
<Input
type="password"
v-model="loginForm.password"
placeholder="Password"
>
<Input type="password" v-model="loginForm.password" placeholder="Password">
<Icon type="ios-lock-outline" slot="prepend"></Icon>
</Input>
</FormItem>
......@@ -30,14 +22,14 @@
</div>
</template>
<script>
import { login } from "../api/user.api";
import localStorage from "../services/localStorage.service.js";
import { login } from '../api/user.api';
import localStorage from '../services/localStorage.service.js';
export default {
data() {
var that = this;
const validateMenuClassifyId = (rule, value, callback) => {
if (this.status) {
callback(new Error("用户名或密码错误"));
callback(new Error('用户名或密码错误'));
this.status = false;
} else {
callback();
......@@ -45,45 +37,41 @@ export default {
};
return {
loginForm: {
loginName: "",
password: ""
loginName: '',
password: '',
},
error: "",
error: '',
status: false,
ruleLoginForm: {
loginName: [
{ required: true, message: "请输入用户名", trigger: "blur" }
],
loginName: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
password: [
{ required: true, message: "请输入密码", trigger: "blur" },
{ required: true, validator: validateMenuClassifyId, trigger: "blur" }
]
}
{ required: true, message: '请输入密码', trigger: 'blur' },
{ required: true, validator: validateMenuClassifyId, trigger: 'blur' },
],
},
};
},
methods: {
login() {
this.$refs["loginForm"].validate(valid => {
this.$refs['loginForm'].validate(valid => {
if (valid) {
let data = btoa(
`${this.loginForm.loginName}:${this.loginForm.password}`
);
let data = btoa(`${this.loginForm.loginName}:${this.loginForm.password}`);
login(data).then(data => {
if (data.code === 400) {
this.error = data.body;
this.status = true;
this.$refs["loginForm"].validate();
this.$refs['loginForm'].validate();
} else {
this.status = false;
localStorage.set("heimdallr-token", data.body["heimdallr-token"]);
this.$Message.success("登陆成功");
this.$router.push("/mainconfiguration");
localStorage.set('heimdallr-token', data.body['heimdallr-token']);
this.$Message.success('登陆成功');
this.$router.push('/mainconfiguration');
}
});
}
});
}
}
},
},
};
</script>
<style scoped>
......
const sapi = "http://heimdallr-arch.liangkebang.net";
const sapi = 'http://heimdallr-arch.liangkebang.net';
// const sapi = 'http://192.168.29.88:5555'
export { sapi };
module.exports =
process.env.NODE_ENV === "production"
? require("./prod.config.js")
: require("./env.config.js");
module.exports = process.env.NODE_ENV === 'production' ? require('./prod.config.js') : require('./env.config.js');
const sapi = "//api.stantoo.com";
const sapi = '//api.stantoo.com';
export { sapi };
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from "vue";
import App from "./App";
import router from "./router";
import iView from "iview";
import "iview/dist/styles/iview.css";
import Vue from 'vue';
import App from './App';
import router from './router';
import iView from 'iview';
import 'iview/dist/styles/iview.css';
Vue.use(iView);
Vue.config.productionTip = false;
/* eslint-disable no-new */
new Vue({
el: "#app",
el: '#app',
router,
components: { App },
template: "<App/>"
template: '<App/>',
});
import Vue from "vue";
import Router from "vue-router";
import login from "@/components/login";
import home from "@/components/home";
import mainconfiguration from "../pages/mainconfiguration/mainconfiguration.vue";
import Vue from 'vue';
import Router from 'vue-router';
import login from '@/components/login';
import home from '@/components/home';
import mainconfiguration from '../pages/mainconfiguration/mainconfiguration.vue';
Vue.use(Router);
export default new Router({
routes: [
{
path: "/",
name: "login",
component: login
path: '/',
name: 'login',
component: login,
},
{
path: "/home",
name: "home",
path: '/home',
name: 'home',
component: home,
children: [
{
path: "/mainconfiguration",
name: "mainconfiguration",
component: mainconfiguration
}
]
}
]
path: '/mainconfiguration',
name: 'mainconfiguration',
component: mainconfiguration,
},
],
},
],
});
import axios from "axios";
import { Notice } from "iview";
import localStorage from "./localStorage.service";
import axios from 'axios';
import { Notice } from 'iview';
import localStorage from './localStorage.service';
// window.Promise = require('es6-promise').Promise
const config = {
timeout: 600000
timeout: 600000,
// withCredentials: true // 允许携带cookie
};
const instance = axios.create(Object.assign({}, config));
instance._extend = {};
function requestInterceptor(config) {
config.headers["x-requested-with"] = "XMLHttpRequest";
config.headers['x-requested-with'] = 'XMLHttpRequest';
// if (!config.headers['Content-Type']) {
// config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
// }
if (!config.headers["heimdallr-token"]) {
config.headers["heimdallr-token"] =
localStorage.get("heimdallr-token") || "";
if (!config.headers['heimdallr-token']) {
config.headers['heimdallr-token'] = localStorage.get('heimdallr-token') || '';
}
return config;
......@@ -29,10 +28,8 @@ function requestInterceptor(config) {
function responseInterceptor(response) {
if (response.status < 200 || response.status > 300) {
Notice.error({
title: "请求发生错误",
desc:
(response && response.data && response.data.errorMsg) ||
"请联系系统管理员"
title: '请求发生错误',
desc: (response && response.data && response.data.errorMsg) || '请联系系统管理员',
});
return Promise.reject(response && response.data);
}
......@@ -59,13 +56,13 @@ instance.interceptors.request.use(requestInterceptor, error => {
instance.interceptors.response.use(responseInterceptor, error => {
if (error.response && error.response.status === 401) {
window.location.href = window.location.origin + "/login";
window.location.href = window.location.origin + '/login';
}
if (error.message.indexOf("timeout") !== -1) {
if (error.message.indexOf('timeout') !== -1) {
Notice.error({
title: "",
desc: "请求超时"
title: '',
desc: '请求超时',
});
}
// return Promise.reject(error)
......
......@@ -8,10 +8,7 @@ export default {
},
set(key, value) {
let toString = Object.prototype.toString;
if (
toString.call(value) === "[object Array]" ||
toString.call(value) === "[object Object]"
) {
if (toString.call(value) === '[object Array]' || toString.call(value) === '[object Object]') {
value = JSON.stringify(value);
}
return localStorage.setItem(key, value);
......@@ -21,5 +18,5 @@ export default {
},
clear() {
return localStorage.clear();
}
},
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment