Skip to content

hrs_app_h5 / bill

Go to a project
Commit ee10a91b by lishengfu
Options

Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/hrs_app_h5/bill

parents 5c0e1ce0 1d7b38fd
Inline Side-by-side
Showing with 608 additions and 42 deletions
.env 0 → 100644
File mode changed
.env.development 0 → 100644
VUE_APP_OIDC_CONFIG = '{ "authority": "http://192.168.1.156:5000", "client_id": "teamix-team-manager-web-mobile", "client_secret": "123456", "redirect_uri": "http://10.10.11.31:8080/callback.html", "response_type": "id_token token", "scope": "workapps.client api.workapps.user api.workapps.org api.workapps.open openid","post_logout_redirect_uri":"http://10.10.11.31:8080", "silent_redirect_uri": "http://10.10.11.31:8080/silentrenew.html", "automaticSilentRenew": true,"accessTokenExpiringNotificationTime":60,"filterProtocolClaims":true,"loadUserInfo":true }'
VUE_APP_ORG_API_BASEURL = 'http://192.168.1.161:7771'
#VUE_APP_ORG_API_BASEURL = 'http://10.10.11.31:63766'
VUE_APP_UPLOADAPI_BASEURL = 'http://192.168.1.161:8080'
VUE_APP_WORKSTATIONAPI_BASEURL = 'http://channel.jinsehuaqin.com:8090'
VUE_APP_USERAPI_BASEURL = 'http://192.168.1.161:8090'
VUE_APP_REDIRECT_HTTPS = false
VUE_APP_PUBLIC_DIR='/'
\ No newline at end of file
.env.production 0 → 100644
VUE_APP_OIDC_CONFIG = '{ "authority": "https://passport.teammix.com", "client_id": "teamix-team-manager-web-mobile", "client_secret": "123456", "redirect_uri": "https://mbase.teammix.com/callback.html", "response_type": "id_token token", "scope": "workapps.client api.workapps.user api.workapps.org api.workapps.open openid","post_logout_redirect_uri":"https://mbase.teammix.com", "silent_redirect_uri": "https://mbase.teammix.com/silentrenew.html", "automaticSilentRenew": true,"accessTokenExpiringNotificationTime":60,"filterProtocolClaims":true,"loadUserInfo":true }'
VUE_APP_API_BASEURL = ''
VUE_APP_PUBLIC_DIR='/'
\ No newline at end of file
babel.config.js
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
'@vue/app'
],
plugins: [
['import', {
......
package-lock.json
......@@ -4834,7 +4834,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
......@@ -4855,12 +4856,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -4875,17 +4878,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -5002,7 +5008,8 @@
"inherits": {
"version": "2.0.4",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -5014,6 +5021,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -5028,6 +5036,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -5035,12 +5044,14 @@
"minimist": {
"version": "1.2.5",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -5059,6 +5070,7 @@
"version": "0.5.3",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "^1.2.5"
}
......@@ -5120,7 +5132,8 @@
"npm-normalize-package-bin": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.8",
......@@ -5148,7 +5161,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -5160,6 +5174,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -5237,7 +5252,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -5273,6 +5289,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -5292,6 +5309,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -5335,12 +5353,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
......
src/api/Token/index.js
import api from "../index";
import Mgr from "../../assets/js/SecurityService";
import { GetCommonPms } from "@js/CommonPms.js";
import qs from "qs";
const oidc_config = JSON.parse(process.env.VUE_APP_OIDC_CONFIG)
const urls=`${oidc_config.authority}/connect/token`
let mgr = new Mgr();
let token;
mgr.getAcessToken().then(res => {
token = res;
});
let header = {
"Content-type": "application/x-www-form-urlencoded"
}
export default {
GetToken(id) {
let pms = {
client_id: oidc_config.client_id,
client_secret: oidc_config.client_secret,
grant_type: "company",
scope: "api.workapps.user api.workapps.org",
comid: id,
token: token
};
var commonPms = GetCommonPms();
return api.post(`${urls.token}?${commonPms}`, qs.stringify(pms), header);
}
};
\ No newline at end of file
src/api/http.js 0 → 100644
import axios from "axios";
import { Toast } from 'vant'
let baseUrl = process.env.VUE_APP_ORG_API_BASEURL;
// 创建 axios 实例
let http = axios.create({
timeout: 60000,
baseURL: baseUrl
});
// request拦截器
http.interceptors.request.use(
(config) => {
return config;
},
(error) => {
return Promise.reject(error);
}
);
// 添加响应拦截器
http.interceptors.response.use(
(response) => {
Toast.clear();
if(response.error==400){
Toast('授权失败！');
}
let { data } = response;
if (!data.errcode) {
return data;
}
if (data.errcode != 0) {
Toast(data.errmsg);
return Promise.reject(new Error(data.errmsg));
} else {
return data;
}
},
(error) => {
Toast.clear();
let info = {};
let { status } = error.response;
info = {
code: status,
data: "",
msg: "系统出现未知错误"
};
console.log(info);
return info;
}
);
/**
* 创建统一封装过的 axios 实例
* @return {AxiosInstance}
*/
export default function () {
return http;
}
src/api/index.js
import axios from "./axios";
import store from "../store/index";
import http from "./http";
import Mgr from "../assets/js/SecurityService";
const instance = axios();
const instance = http();
const api = {
get(url, params, headers) {
let options = {};
......@@ -54,29 +53,6 @@ const api = {
};
function getCompanyHeader(){
const accessToken = store.getters.getCompanyToken;
const Authorization =`Bearer ${accessToken}`;
return { Authorization }
}
//mgr.getAcessToken
/**
* 带companyToken的请求
*/
export const companyApi = {
companyId:() => store.getters.getCompanyId ,
get:(url, params)=> api.get(url,params, getCompanyHeader()),
post:(url, params )=> api.post(url,params,getCompanyHeader()),
put:(url,params)=> api.put(url,params ,getCompanyHeader()),
delete:(url,params)=> api.delete(url,params ,getCompanyHeader()),
patch:(url,params) => api.patch(url,params, getCompanyHeader())
};
function getUserHeader(){
const mgr = new Mgr();
return mgr.getAcessToken().then(token=>{
......@@ -85,7 +61,6 @@ function getUserHeader(){
}
})
}
//api.patch()
export const userApi = {
get:(url, params)=> getUserHeader().then(headers=>api.get(url, params, headers)),
......
src/assets/js/SecurityService.js 0 → 100644
/* eslint-disable */
import Oidc from "oidc-client";
import axios from "axios";
import qs from "qs";
import { GetCommonPms } from "../js/CommonPms.js";
import "babel-polyfill";
import store from "../../store";
const oidc_config = JSON.parse(process.env.VUE_APP_OIDC_CONFIG)
//console.log(oidc_config);
const mgr = new Oidc.UserManager({
userStore: new Oidc.WebStorageStateStore(),
authority: oidc_config.authority,
client_id: oidc_config.client_id,
redirect_uri: oidc_config.redirect_uri,
response_type: oidc_config.response_type,
scope: oidc_config.scope,
post_logout_redirect_uri: oidc_config.post_logout_redirect_uri,
silent_redirect_uri: oidc_config.silent_redirect_uri,
accessTokenExpiringNotificationTime: oidc_config.accessTokenExpiringNotificationTime,
automaticSilentRenew: oidc_config.automaticSilentRenew,
filterProtocolClaims: oidc_config.filterProtocolClaims,
loadUserInfo: oidc_config.loadUserInfo
});
Oidc.Log.logger = console;
Oidc.Log.level = Oidc.Log.INFO;
mgr.events.addUserLoaded(function(user) {
console.log('add user loaded',user);
});
mgr.events.addAccessTokenExpiring(function() {
// console.log("过期前");
// console.log("AccessToken Expiring：", arguments);
});
mgr.events.addAccessTokenExpired(function() {
console.log("AccessToken Expired：", arguments);
mgr.signoutRedirect()
.then(function(resp) {
console.log("signed out", resp);
location.href="/";
})
.catch(function(err) {
console.log(err);
});
});
mgr.events.addSilentRenewError(function() {
console.error("Silent Renew Error：", arguments);
});
mgr.events.addUserSignedOut(function() {
console.log("UserSignedOut：", arguments);
mgr.signoutRedirect()
.then(function(resp) {
//location.href="/";
})
.catch(function(err) {
console.log(err);
});
});
function getQueryString(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
var r = window.location.search.substr(1).match(reg);
if (r != null) return unescape(r[2]);
return null;
}
export default class SecurityService {
signinRedirectCallback() {
mgr.signinRedirectCallback()
.then(function(user) {
console.log(user);
// window.location.href = '../';
})
.catch(function(err) {
console.log(err);
});
}
signinSilentCallback() {
mgr.signinSilentCallback().catch(function(err) {
console.log(err);
});
}
// Renew the token manually
renewToken() {
let self = this;
console.log("执行");
return new Promise((resolve, reject) => {
mgr.signinSilent()
.then(function(user) {
if (user == null) {
self.signIn(null);
} else {
return resolve(user);
}
})
.catch(function(err) {
alert(err);
console.log(err);
return reject(err);
});
});
}
// Get the user who is logged in
getUser() {
let self = this;
return new Promise((resolve, reject) => {
mgr.getUser()
.then(function(user) {
if (user == null) {
//self.signIn();
return resolve(null);
} else {
return resolve(user);
}
})
.catch(function(err) {
console.log(err);
return reject(err);
});
});
}
// Check if there is any user logged in
getSignedIn() {
let self = this;
return new Promise((resolve, reject) => {
mgr.getUser()
.then(function(user) {
// console.log("user=================>",user);
// let comid = getQueryString("comid");
// let authcode = getQueryString("authcode");
// //console.log(comid)
// localStorage.setItem("comid", comid == null ? "" : comid);
if (user == null) {
//console.log("=======>",comid,authcode);
// if (comid == null || authcode == null) {
// self.signIn();
// return resolve(false);
// } else {
// mgr.signinRedirect({
// extraQueryParams: {
// authcode: authcode
// }
// }).catch(function(err) {
// console.log(err);
// });
return resolve(false);
// }
} else {
//return resolve(false);
return resolve(true);
}
})
.catch(function(err) {
console.log(err);
return reject(err);
});
});
}
// Redirect of the current window to the authorization endpoint.
signIn(args = {}) {
mgr.signinRedirect(args).catch(function(err) {
console.log(err);
});
//console.log("login args ===============>",args);
}
signOutPopup(){
return mgr.signoutPopup();
}
// Redirect of the current window to the end session endpoint
signOut() {
mgr.signoutRedirect()
.then(function(resp) {
console.log("signed out", resp);
//location.href="/";
})
.catch(function(err) {
console.log(err);
});
}
// Get the profile of the user logged in
getProfile() {
let self = this;
return new Promise((resolve, reject) => {
mgr.getUser()
.then(function(user) {
if (user == null) {
//self.signIn();
return resolve(null);
} else {
return resolve(user.profile);
}
})
.catch(function(err) {
console.log(err);
return reject(err);
});
});
}
// Get the token id
getIdToken() {
let self = this;
return new Promise((resolve, reject) => {
mgr.getUser()
.then(function(user) {
if (user == null) {
//self.signIn();
return resolve(null);
} else {
return resolve(user.id_token);
}
})
.catch(function(err) {
console.log(err);
return reject(err);
});
});
}
// Get the session state
getSessionState() {
let self = this;
return new Promise((resolve, reject) => {
mgr.getUser()
.then(function(user) {
if (user == null) {
//self.signIn();
return resolve(null);
} else {
return resolve(user.session_state);
}
})
.catch(function(err) {
console.log(err);
return reject(err);
});
});
}
// Get the access token of the logged in user
getAcessToken() {
let self = this;
return new Promise((resolve, reject) => {
mgr.getUser()
.then(function(user) {
if (user == null) {
//self.signIn();
return resolve(null);
} else {
return resolve(user.access_token);
}
})
.catch(function(err) {
console.log(err);
return reject(err);
});
});
}
// Takes the scopes of the logged in user
getScopes() {
let self = this;
return new Promise((resolve, reject) => {
mgr.getUser()
.then(function(user) {
if (user == null) {
//self.signIn();
return resolve(null);
} else {
return resolve(user.scopes);
}
})
.catch(function(err) {
console.log(err);
return reject(err);
});
});
}
// Get the user roles logged in
getRole() {
let self = this;
return new Promise((resolve, reject) => {
mgr.getUser()
.then(function(user) {
if (user == null) {
//self.signIn();
return resolve(null);
} else {
return resolve(user.profile.role);
}
})
.catch(function(err) {
console.log(err);
return reject(err);
});
});
}
}
src/store/modules/token.js
......@@ -7,12 +7,11 @@ try {
}
} catch (error) { }
const state = { token };
const getters = {
getToken(state) {
return state.token;
}
};
......
vue.config.js 0 → 100644
const path = require("path");
const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
// gzip --start
const CompressionWebpackPlugin = require("compression-webpack-plugin")
const productionGzipExtensions = ["js", "css"]; // 需要gzip压缩的文件后缀
module.exports = {
// 部署应用时的基本 URL
// baseUrl: process.env.NODE_ENV === "production" ? "192.168.60.110:8080" : "192.168.60.110:8080",
publicPath: process.env.VUE_APP_PUBLIC_DIR,
// publicPath: IS_PROD ? "/mobile" : "/",
// build时构建文件的目录 构建时传入 --no-clean 可关闭该行为
outputDir: "dist",
// build时放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录
assetsDir: "",
// 指定生成的 index.html 的输出路径 (相对于 outputDir)。也可以是一个绝对路径。
//indexPath: "index.html",
pages: {
app: {
entry: "src/main.js",
template: "public/index.html",
filename: "index.html",
excludeChunks: ["silent-renew-oidc"]
},
silentrenewoidc: {
entry: "src/assets/js/SilentRenew.js",
template: "public/silentrenew.html",
filename: "silentrenew.html",
excludeChunks: ["app"]
},
callback: {
entry: "src/assets/js/CallBack.js",
template: "public/callback.html",
filename: "callback.html",
excludeChunks: ["app"]
}
},
// 默认在生成的静态资源文件名中包含hash以控制缓存
filenameHashing: true,
// 是否在开发环境下通过 eslint-loader 在每次保存时 lint 代码 (在生产构建时禁用 eslint-loader)
// lintOnSave: process.env.NODE_ENV !== "production",
lintOnSave: false,
// 是否使用包含运行时编译器的 Vue 构建版本
runtimeCompiler: false,
// Babel 显式转译列表
transpileDependencies: [],
// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建
productionSourceMap: false,
// 设置生成的 HTML 中 <link rel="stylesheet"> 和 <script> 标签的 crossorigin 属性（注：仅影响构建时注入的标签）
crossorigin: "",
// 在生成的 HTML 中的 <link rel="stylesheet"> 和 <script> 标签上启用 Subresource Integrity (SRI)
integrity: false,
// 如果这个值是一个对象，则会通过 webpack-merge 合并到最终的配置中
// 如果你需要基于环境有条件地配置行为，或者想要直接修改配置，那就换成一个函数 (该函数会在环境变量被设置之后懒执行)。该方法的第一个参数会收到已经解析好的配置。在函数内，你可以直接修改配置，或者返回一个将会被合并的对象
configureWebpack: config => {
if (process.env.NODE_ENV === "production") {
config.plugins = config.plugins.concat([
new UglifyJsPlugin({
uglifyOptions: {
warnings: false,
compress: {
drop_debugger: true,
drop_console: false
}
}
})
]);
// gzip
// 2. 构建时开启gzip，降低服务器压缩对CPU资源的占用，服务器也要相应开启gzip
config.plugins.push(
new CompressionWebpackPlugin({
algorithm: "gzip",
test: new RegExp(
"\\.(" + productionGzipExtensions.join("|") + ")$"
),
threshold: 10240,
minRatio: 0.8
})
);
}
Object.assign(config, {
// 开发生产共同配置
resolve: {
alias: {
"@": path.resolve(__dirname, "./src"),
"@img": path.resolve(__dirname, "./src/assets/images"),
"@js": path.resolve(__dirname, "./src/assets/js"),
"@components": path.resolve(__dirname, "./src/components/"),
"vue$": 'vue/dist/vue.common.js'
},
modules: [path.resolve(__dirname,'node_modules')]
}
});
},
// 对内部的 webpack 配置（比如修改、增加Loader选项）(链式操作)
chainWebpack: () => { },
// css的处理
css: {
// 当为true时，css文件名可省略 module 默认为 false
modules: false,
// 是否将组件中的 CSS 提取至一个独立的 CSS 文件中,当作为一个库构建时，你也可以将其设置为 false 免得用户自己导入 CSS
// 默认生产环境下是 true，开发环境下是 false
extract: false,
// 是否为 CSS 开启 source map。设置为 true 之后可能会影响构建的性能
sourceMap: false,
//向 CSS 相关的 loader 传递选项(支持 css-loader postcss-loader sass-loader less-loader stylus-loader)
loaderOptions: {
// postcss: {
// plugins: [require("postcss-px2rem")({ remUnit: 75 })]
// },
css: {},
less: {}
}
},
// 是否为 Babel 或 TypeScript 使用 thread-loader
parallel: require("os").cpus().length > 1,
// 向 PWA 插件传递选项
pwa: {},
// eslint-disable-next-line no-dupe-keys
devServer: {
host: "0.0.0.0",
port: 8080,
https: false,
hotOnly: false, // 热更新
proxy: null // 设置代理
},
// 可以用来传递任何第三方插件选项
pluginOptions: {}
};
\ No newline at end of file
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 sign in to comment