-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into develop-2.0.0
- Loading branch information
Showing
107 changed files
with
3,254 additions
and
287 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <!-- | ||
| ~ Copyright 2019 The FATE Authors. All Rights Reserved. | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
| <assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd"> | ||
| <id>release</id> | ||
|
|
||
| <formats> | ||
| <format>zip</format> | ||
| </formats> | ||
|
|
||
| <includeBaseDirectory>false</includeBaseDirectory> | ||
| <fileSets> | ||
| <fileSet> | ||
| <outputDirectory>/</outputDirectory> | ||
| <directory>target</directory> | ||
| <includes> | ||
| <include>*.jar</include> | ||
| </includes> | ||
| </fileSet> | ||
|
|
||
|
|
||
| <fileSet> | ||
| <outputDirectory>/lib</outputDirectory> | ||
| <directory>target/lib</directory> | ||
| <includes> | ||
| <include>*.jar</include> | ||
| </includes> | ||
| </fileSet> | ||
|
|
||
| <fileSet> | ||
| <outputDirectory>/</outputDirectory> | ||
| <directory>bin</directory> | ||
| <includes> | ||
| <include>*.sh</include> | ||
| </includes> | ||
| <fileMode>755</fileMode> | ||
| <lineEnding>unix</lineEnding> | ||
| </fileSet> | ||
|
|
||
| <fileSet> | ||
| <outputDirectory>/dag</outputDirectory> | ||
| <directory>static</directory> | ||
| <includes> | ||
| <include>*.yaml</include> | ||
| </includes> | ||
| <fileMode>755</fileMode> | ||
| <lineEnding>unix</lineEnding> | ||
| </fileSet> | ||
|
|
||
| <fileSet> | ||
| <outputDirectory>/conf</outputDirectory> | ||
| <directory>src/main/resources</directory> | ||
| <includes> | ||
| <include>*</include> | ||
| </includes> | ||
| </fileSet> | ||
|
|
||
| </fileSets> | ||
| </assembly> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,98 +1,59 @@ | ||
| { | ||
| "name": "aisp-scvmadm-web", | ||
| "version": "3.9.0", | ||
| "version": "2.0.0", | ||
| "license": "MIT", | ||
| "description": "aisp-scvmadm-web", | ||
| "author": "webank", | ||
| "scripts": { | ||
| "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", | ||
| "start": "npm run dev", | ||
| "build": "node build/build.js", | ||
| "build:report": "npm_config_report=true npm run build", | ||
| "lint": "eslint --ext .js,.vue src", | ||
| "test": "npm run lint", | ||
| "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" | ||
| "devDependencies": { | ||
| "@babel/core": "^7.23.2", | ||
| "@babel/preset-env": "^7.23.2", | ||
| "@types/lodash": "^4.14.200", | ||
| "@types/node": "^20.8.7", | ||
| "@typescript-eslint/eslint-plugin": "^6.8.0", | ||
| "@typescript-eslint/parser": "^6.8.0", | ||
| "babel-loader": "^9.1.3", | ||
| "css-loader": "^6.8.1", | ||
| "eslint": "^8.52.0", | ||
| "eslint-config-standard-with-typescript": "^39.1.1", | ||
| "eslint-plugin-import": "^2.28.1", | ||
| "eslint-plugin-n": "^16.2.0", | ||
| "eslint-plugin-promise": "^6.1.1", | ||
| "eslint-plugin-vue": "^9.17.0", | ||
| "file-loader": "^6.2.0", | ||
| "fork-ts-checker-webpack-plugin": "^9.0.0", | ||
| "html-webpack-plugin": "^5.5.3", | ||
| "lerna": "^5.6.2", | ||
| "mini-css-extract-plugin": "^2.7.6", | ||
| "postcss": "^8.4.31", | ||
| "postcss-loader": "^7.3.3", | ||
| "postcss-preset-env": "^9.2.0", | ||
| "postcss-short": "^5.0.0", | ||
| "prettier": "^3.0.3", | ||
| "sass": "^1.69.4", | ||
| "sass-loader": "^13.3.2", | ||
| "style-loader": "^3.3.3", | ||
| "svg-inline-loader": "^0.8.2", | ||
| "ts-loader": "^9.5.0", | ||
| "typescript": "^5.2.2", | ||
| "url-loader": "^4.1.1", | ||
| "vue-loader": "^17.2.2", | ||
| "vue-template-compiler": "^2.7.14", | ||
| "webpack": "^5.89.0", | ||
| "webpack-cli": "^5.1.4", | ||
| "webpack-dev-server": "^4.15.1", | ||
| "webpack-merge": "^5.10.0" | ||
| }, | ||
| "workspaces": [ | ||
| "packages/*" | ||
| ], | ||
| "dependencies": { | ||
| "axios": "^0.27.2", | ||
| "babel-polyfill": "^6.26.0", | ||
| "clipboard": "^2.0.8", | ||
| "echarts": "^4.2.1", | ||
| "element-ui": "2.8.2", | ||
| "file-saver": "^2.0.1", | ||
| "hmac_sha1": "^0.1.1", | ||
| "js-cookie": "2.2.0", | ||
| "jszip": "^3.8.0", | ||
| "@element-plus/icons-vue": "^2.1.0", | ||
| "element-plus": "^2.4.1", | ||
| "lodash": "^4.17.21", | ||
| "mockjs": "1.0.1-beta3", | ||
| "normalize.css": "7.0.0", | ||
| "nprogress": "0.2.0", | ||
| "sortablejs": "^1.8.4", | ||
| "vue": "2.5.17", | ||
| "vue-observe-visibility": "^0.4.6", | ||
| "vue-router": "3.0.1", | ||
| "vuex": "3.0.1", | ||
| "xlsx": "^0.18.5" | ||
| }, | ||
| "devDependencies": { | ||
| "autoprefixer": "8.5.0", | ||
| "babel-core": "6.26.0", | ||
| "babel-eslint": "8.2.6", | ||
| "babel-helper-vue-jsx-merge-props": "2.0.3", | ||
| "babel-loader": "7.1.5", | ||
| "babel-plugin-syntax-jsx": "6.18.0", | ||
| "babel-plugin-transform-runtime": "6.23.0", | ||
| "babel-plugin-transform-vue-jsx": "3.7.0", | ||
| "babel-preset-env": "1.7.0", | ||
| "babel-preset-stage-2": "6.24.1", | ||
| "chalk": "2.4.1", | ||
| "compression-webpack-plugin": "2.0.0", | ||
| "copy-webpack-plugin": "4.5.2", | ||
| "css-loader": "1.0.0", | ||
| "eslint": "4.19.1", | ||
| "eslint-friendly-formatter": "4.0.1", | ||
| "eslint-loader": "2.0.0", | ||
| "eslint-plugin-vue": "4.7.1", | ||
| "eventsource-polyfill": "0.9.6", | ||
| "file-loader": "1.1.11", | ||
| "friendly-errors-webpack-plugin": "1.7.0", | ||
| "html-webpack-plugin": "4.5.2", | ||
| "mini-css-extract-plugin": "0.4.1", | ||
| "node-notifier": "^8.0.2", | ||
| "node-sass": "^8.0.0", | ||
| "optimize-css-assets-webpack-plugin": "5.0.0", | ||
| "ora": "3.0.0", | ||
| "path-to-regexp": "2.4.0", | ||
| "portfinder": "1.0.16", | ||
| "postcss-import": "12.0.0", | ||
| "postcss-loader": "2.1.6", | ||
| "postcss-url": "7.3.2", | ||
| "rimraf": "2.6.2", | ||
| "sass-loader": "7.0.3", | ||
| "script-ext-html-webpack-plugin": "2.1.5", | ||
| "script-loader": "^0.7.2", | ||
| "semver": "5.5.0", | ||
| "shelljs": "0.8.5", | ||
| "svg-sprite-loader": "3.8.0", | ||
| "svgo": "^1.2.2", | ||
| "uglifyjs-webpack-plugin": "1.2.7", | ||
| "url-loader": "1.0.1", | ||
| "vue-loader": "15.3.0", | ||
| "vue-style-loader": "4.1.2", | ||
| "vue-template-compiler": "2.5.17", | ||
| "webpack": "4.16.5", | ||
| "webpack-bundle-analyzer": "3.3.2", | ||
| "webpack-cli": "3.1.0", | ||
| "webpack-dev-server": "3.1.14", | ||
| "webpack-merge": "4.1.4" | ||
| }, | ||
| "engines": { | ||
| "node": ">= 6.0.0", | ||
| "npm": ">= 3.0.0" | ||
| "vue": "^3.3.4" | ||
| }, | ||
| "browserslist": [ | ||
| "> 1%", | ||
| "last 2 versions", | ||
| "not ie <= 8" | ||
| ] | ||
| "scripts": { | ||
| "dev": "lerna run dev --scope=fate-board", | ||
| "build": "lerna run build" | ||
| } | ||
| } |
21 changes: 0 additions & 21 deletions
21
src/main/java/com/webank/ai/fate/board/services/FlowLogFeign.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
src/main/java/org/fedai/fate/board/conf/CaffeineCacheConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package org.fedai.fate.board.conf; | ||
|
|
||
| import com.github.benmanes.caffeine.cache.Cache; | ||
| import com.github.benmanes.caffeine.cache.Caffeine; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
|
|
||
| @Configuration | ||
| public class CaffeineCacheConfig { | ||
|
|
||
| @Bean | ||
| public Cache<String, Map<String,String>> caffeineCache() { | ||
| return Caffeine.newBuilder() | ||
| .build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ebank/ai/fate/board/conf/FeignConfig.java → ...rg/fedai/fate/board/conf/FeignConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...bank/ai/fate/board/conf/TomcatConfig.java → ...g/fedai/fate/board/conf/TomcatConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.