Compare commits

..

No commits in common. "crsec" and "master" have entirely different histories.

4 changed files with 115 additions and 956 deletions

10
Jenkinsfile vendored
View File

@ -1,8 +1,10 @@
@Library('jgpl') _
webPipeline([
onBuildInstallShell:{->
return """
pnpm install --no-prefer-frozen-lockfile
pnpm run build || echo 'Ignore build error !!!'
"""}
return """
npm install url-loader --userconfig ${env.NPM_CONFIG_USERCONFIG} --no-package-lock
pnpm install -no-frozen-lockfile
pnpm run build || echo 'Ignore build error !!!'
"""
},
])

View File

@ -22,7 +22,6 @@
"cmp-element": "1.0.0-5.6-release",
"cmp-graph-editor": "1.0.0-5.6-release",
"cmp-socket": "1.0.0",
"codemirror": "5.60",
"core-js": "^3.3.2",
"crypto-js": "^3.1.9-1",
"dayjs": "^1.10.4",
@ -34,7 +33,6 @@
"nprogress": "^0.2.0",
"qs": "^6.7.0",
"sortablejs": "^1.8.4",
"url-loader": "^4.1.1",
"vue": "2.6.14",
"vue-class-component": "^7.0.2",
"vue-code-diff": "^0.0.4",

File diff suppressed because it is too large Load Diff

View File

@ -12,9 +12,9 @@ const CompressPlugin = require('compress-webpack-plugin')
function resolve(dir) {
return path.join(__dirname, dir)
}
const httpType = 'http://'
const httpType = 'https://'
// const proxyUrl = 'develop.cmp56.com:60006/' // 代理地址设置
const proxyUrl = '23.33.3.20:60006/' // 代理地址设置
const proxyUrl = '10.20.12.56:60006/' // 代理地址设置
// const publicPath = process.env.NODE_ENV === 'production' ? '/cop-web/' : '/cop-web/';
const publicPath = '/cop-web/'
module.exports = {