Dev wishhe webpack

.github/ISSUE_TEMPLATE/----.md

@@ -9,11 +9,8 @@ assignees: ''
 
 **描述您的需求**  
 
-
-**预期行为**  
-
-
-**描述您考虑过的替代方案**  
-
+**作为**<角色>
+**我想要**<>
+**从而**<>
 
 **附加**

.github/workflows/maven.yml

@@ -0,0 +1,17 @@
+name: Java CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn clean install 

.github/workflows/sync-release.yml

@@ -0,0 +1,14 @@
+name: Synchronize release
+on:
+  release:
+  workflow_dispatch:
+jobs:
+  sync-published-release:
+    name: Synchronize release
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: build/sync-github-release-to-gitee.sh
+      shell: bash
+      env:
+        GITEE_API_TOKEN: ${{ secrets.GITEE_API_TOKEN }}

.gitignore

@@ -4,13 +4,10 @@
 */dist/
 *.log
 *.log.*.gz
-*/package-lock.json
+## */package-lock.json
 */node/
+bin/
 
-# Ignore the generated front-end resource
-**/resources/static/
-# Ignore the generated index.html
-**/resources/templates/index.html
 
 **/resources/application-dev.yml
 
@@ -40,4 +37,15 @@
 *dist.zip
 
 .DS_Store
+**/a.json
 
+platform-core/platform-core
+platform-core/logs
+
+platform-gateway/config
+platform-auth-server/config
+
+platform-gateway/platform-gateway
+platform-auth-server/platform-auth-server
+
+build/db/database

Makefile

@@ -1,31 +1,67 @@
-current_dir=$(shell pwd)
-date=$(shell date +%Y%m%d%H%M%S)
-version=$(shell bash  ./build/version.sh)
-project_name=$(shell basename "${current_dir}")
-remote_docker_image_registry=ccr.ccs.tencentyun.com/webankpartners/wecube-app
+current_dir:=$(shell pwd)
+date:=$(shell date +%Y%m%d%H%M%S)
+version:=$(VERSION)
+tencent_cloud_docker_image_registry=ccr.ccs.tencentyun.com/webankpartners
 
 clean:
-	rm -rf $(current_dir)/cmdb-core/target
+	rm -rf $(current_dir)/platform-core/platform-core
 	rm -rf $(current_dir)/wecube-portal/node
-	rm -rf $(current_dir)/wecube-portal/node_modules
-	rm -rf $(current_dir)/wecube-core/target
-
-.PHONY:build
-build:
-	mkdir -p repository
-	docker run --rm --name wecube-build  -e SASS_BINARY_SITE=https://npm.taobao.org/mirrors/node-sass -v /data/wecube_repository:/usr/src/mymaven/repository -v $(current_dir)/build/maven_settings.xml:/usr/share/maven/ref/settings-docker.xml  -v $(current_dir):/usr/src/mymaven -w /usr/src/mymaven maven:3.3-jdk-8 mvn -U clean install -Dmaven.test.skip=true -s /usr/share/maven/ref/settings-docker.xml dependency:resolve
-
-image:
-	docker build -t $(project_name):$(version) .
-
-push:
-	docker tag  $(project_name):$(version) $(remote_docker_image_registry):$(date)-$(version)
-	docker push $(remote_docker_image_registry):$(date)-$(version)
-
-env_config=smoke_branch.cfg
-target_host="tcp://10.0.0.1:2375"
-deploy:
-	docker tag  $(project_name):$(version) $(remote_docker_image_registry):$(date)-$(version)
-	docker push $(remote_docker_image_registry):$(date)-$(version)
-	sh build/deploy_generate_compose.sh $(env_config) $(date)-$(version)
-	docker-compose -f docker-compose.yml -H $(target_host) up -d
+	rm -rf $(current_dir)/wecube-portal/dist
+	rm -rf $(current_dir)/platform-gateway/platform-gateway
+	rm -rf $(current_dir)/platform-auth-server/platform-auth-server
+
+build_core:
+	rm -f platform-core/platform-core
+	chmod +x platform-core/build/*.sh
+	docker run --rm -v $(current_dir)/platform-core:/go/src/github.com/WeBankPartners/wecube-platform/platform-core golang:1.19.1 /bin/bash /go/src/github.com/WeBankPartners/wecube-platform/platform-core/build/build-server.sh
+
+image_core: build_core
+	docker build -t platform-core:$(version) platform-core/.
+
+push_core: image_core
+	docker tag  platform-core:$(version) $(tencent_cloud_docker_image_registry)/platform-core:$(version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-core:$(version)
+
+build_auth_server:
+	rm -f platform-auth-server/platform-auth-server
+	chmod +x platform-auth-server/build/*.sh
+	docker run --rm -v $(current_dir)/platform-auth-server:/go/src/github.com/WeBankPartners/wecube-platform/platform-auth-server golang:1.19.1 /bin/bash /go/src/github.com/WeBankPartners/wecube-platform/platform-auth-server/build/build-server.sh
+
+image_auth_server: build_auth_server
+	docker build -t platform-auth-server:$(version) platform-auth-server/.
+
+push_auth_server: image_auth_server
+	docker tag  platform-auth-server:$(version) $(tencent_cloud_docker_image_registry)/platform-auth-server:$(version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-auth-server:$(version)
+
+build_gateway:
+	rm -f platform-gateway/platform-gateway
+	chmod +x platform-gateway/build/*.sh
+	docker run --rm -v $(current_dir)/platform-gateway:/go/src/github.com/WeBankPartners/wecube-platform/platform-gateway golang:1.19.1 /bin/bash /go/src/github.com/WeBankPartners/wecube-platform/platform-gateway/build/build-server.sh
+
+image_gateway: build_gateway
+	docker build -t platform-gateway:$(version) platform-gateway/.
+
+push_gateway: image_gateway
+	docker tag  platform-gateway:$(version) $(tencent_cloud_docker_image_registry)/platform-gateway:$(version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-gateway:$(version)
+
+build_portal:
+	rm -rf wecube-portal/node
+	rm -rf wecube-portal/dist
+	chmod +x build/wecube-portal/*.sh
+	docker run --rm  -v $(current_dir):/home/node/app -w /home/node/app node:12.13.1 /bin/bash /home/node/app/build/wecube-portal/build-ui.sh
+
+image_portal: build_portal
+	docker build -t wecube-portal:$(version) -f build/wecube-portal/Dockerfile .
+
+push_portal: image_portal
+	docker tag  wecube-portal:$(version) $(tencent_cloud_docker_image_registry)/wecube-portal:$(version)
+	docker push $(tencent_cloud_docker_image_registry)/wecube-portal:$(version)
+
+image_db:
+	sh build/db/build-image.sh $(version)
+
+push_db: image_db
+	docker tag  wecube-db:$(version) $(tencent_cloud_docker_image_registry)/mysql:$(version)
+	docker push $(tencent_cloud_docker_image_registry)/mysql:$(version)

Makefile_old

@@ -0,0 +1,151 @@
+current_dir:=$(shell pwd)
+date:=$(shell date +%Y%m%d%H%M%S)
+version:=$(shell bash  ./build/version.sh)
+tencent_cloud_docker_image_registry=ccr.ccs.tencentyun.com/webankpartners
+
+clean:
+	rm -rf $(current_dir)/platform-auth-client/target
+	rm -rf $(current_dir)/platform-auth-server/target
+	rm -rf $(current_dir)/platform-core/target
+	rm -rf $(current_dir)/wecube-portal/node
+	rm -rf $(current_dir)/wecube-portal/dist
+	rm -rf $(current_dir)/platform-gateway/target
+	rm -rf $(current_dir)/platform-auth-server/target
+
+.PHONY:build
+
+
+doc:
+	/bin/bash -ex build/get_wecube_docs.sh
+
+wecube_docs_dirname=wecube-docs
+build_name=wecube-build
+auth_server_dir=$(shell pwd)/platform-auth-server
+auth_server_project_dir=$(shell basename "${auth_server_dir}")
+
+build:
+	# make sure dir exists, even if make doc failed/never exec before
+	mkdir -p $(wecube_docs_dirname)
+	mkdir -p repository
+	docker run --rm --name $(build_name)  -e SASS_BINARY_SITE=https://npm.taobao.org/mirrors/node-sass -v /data/wecube_repository:/usr/src/mymaven/repository -v $(current_dir)/build/maven_settings.xml:/usr/share/maven/ref/settings-docker.xml  -v $(current_dir):/usr/src/mymaven -w /usr/src/mymaven maven:3.3-jdk-8 mvn -U clean install -Dmaven.test.skip=true -s /usr/share/maven/ref/settings-docker.xml dependency:resolve
+	docker run --rm --name $(build_name)_node  -v $(current_dir)/wecube-portal:/home/node/app -w /home/node/app node:12.13.1 npm --registry https://registry.npm.taobao.org install --unsafe-perm
+	docker run --rm --name $(build_name)_node1  -v $(current_dir)/wecube-portal:/home/node/app -w /home/node/app node:12.13.1 npm rebuild node-sass
+	docker run --rm --name $(build_name)_node2  -v $(current_dir)/wecube-portal:/home/node/app -w /home/node/app node:12.13.1 npm run build
+
+build_auth_server:
+	rm -f platform-auth-server/platform-auth-server
+	chmod +x platform-auth-server/build/*.sh
+	docker run --rm -v $(auth_server_dir):/go/src/github.com/WeBankPartners/wecube-platform/$(auth_server_project_dir) --name build_$(auth_server_project_dir)_authserver golang:1.18.0 /bin/bash /go/src/github.com/WeBankPartners/wecube-platform/$(auth_server_project_dir)/build/build-server.sh
+
+build_maven:
+	# make sure dir exists, even if make doc failed/never exec before
+	mkdir -p $(wecube_docs_dirname)
+	mkdir -p repository
+	docker run --rm --name $(build_name)  -e SASS_BINARY_SITE=https://npm.taobao.org/mirrors/node-sass -v /data/wecube_repository:/usr/src/mymaven/repository -v $(current_dir)/build/maven_settings.xml:/usr/share/maven/ref/settings-docker.xml  -v $(current_dir):/usr/src/mymaven -w /usr/src/mymaven maven:3.3-jdk-8 mvn -U clean install -Dmaven.test.skip=true -s /usr/share/maven/ref/settings-docker.xml dependency:resolve
+
+image:
+	docker build -t platform-core:$(version) -f build/platform-core/Dockerfile .
+	docker build -t platform-gateway:$(version) -f build/platform-gateway/Dockerfile .
+	docker build -t wecube-portal:$(version) -f build/wecube-portal/Dockerfile .
+	docker build -t platform-auth-server:$(version) -f build/platform-auth-server/Dockerfile .
+	sh build/db/build-image.sh $(version)
+
+push:
+	docker tag  platform-core:$(version) $(tencent_cloud_docker_image_registry)/platform-core:$(date)-$(version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-core:$(date)-$(version)
+
+	docker tag  platform-gateway:$(version) $(tencent_cloud_docker_image_registry)/platform-gateway:$(date)-$(version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-gateway:$(date)-$(version)
+
+	docker tag  wecube-portal:$(version) $(tencent_cloud_docker_image_registry)/wecube-portal:$(date)-$(version)
+	docker push $(tencent_cloud_docker_image_registry)/wecube-portal:$(date)-$(version)
+
+	docker tag  platform-auth-server:$(version) $(tencent_cloud_docker_image_registry)/platform-auth-server:$(date)-$(version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-auth-server:$(date)-$(version)
+
+	docker tag  wecube-db:$(version) ${tencent_cloud_docker_image_registry}/wecube-db:${date}-$(version)
+	docker push ${tencent_cloud_docker_image_registry}/wecube-db:${date}-$(version)
+
+tencent_cloud_release_version=tencent-cloud-release-version
+releaseToTencentCloud:
+	docker tag  platform-core:$(version) $(tencent_cloud_docker_image_registry)/platform-core:$(tencent_cloud_release_version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-core:$(tencent_cloud_release_version)
+
+	docker tag  platform-gateway:$(version) $(tencent_cloud_docker_image_registry)/platform-gateway:$(tencent_cloud_release_version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-gateway:$(tencent_cloud_release_version)
+
+	docker tag  wecube-portal:$(version) $(tencent_cloud_docker_image_registry)/wecube-portal:$(tencent_cloud_release_version)
+	docker push $(tencent_cloud_docker_image_registry)/wecube-portal:$(tencent_cloud_release_version)
+
+	docker tag  platform-auth-server:$(version) $(tencent_cloud_docker_image_registry)/platform-auth-server:$(tencent_cloud_release_version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-auth-server:$(tencent_cloud_release_version)
+
+	docker tag  wecube-db:$(version) $(tencent_cloud_docker_image_registry)/wecube-db:$(tencent_cloud_release_version)
+	docker push $(tencent_cloud_docker_image_registry)/wecube-db:$(tencent_cloud_release_version)
+
+release_version=release-version
+release:
+	docker tag  platform-core:$(version) webankpartners/platform-core:$(release_version)
+	docker push webankpartners/platform-core:$(release_version)
+
+	docker tag  platform-gateway:$(version) webankpartners/platform-gateway:$(release_version)
+	docker push webankpartners/platform-gateway:$(release_version)
+
+	docker tag  wecube-portal:$(version) webankpartners/wecube-portal:$(release_version)
+	docker push webankpartners/wecube-portal:$(release_version)
+
+	docker tag  platform-auth-server:$(version) webankpartners/platform-auth-server:$(release_version)
+	docker push webankpartners/platform-auth-server:$(release_version)
+
+	docker tag  wecube-db:$(version) webankpartners/wecube-db:$(release_version)
+	docker push webankpartners/wecube-db:$(release_version)
+
+huawei_cloud_release_version=huawei-cloud-release-version
+releaseToHuaweiCloud:
+	docker tag  platform-core:$(version) swr.ap-southeast-3.myhuaweicloud.com/webankpartners/platform-core:$(huawei_cloud_release_version)
+	docker push swr.ap-southeast-3.myhuaweicloud.com/webankpartners/platform-core:$(huawei_cloud_release_version)
+
+	docker tag  platform-gateway:$(version) swr.ap-southeast-3.myhuaweicloud.com/webankpartners/platform-gateway:$(huawei_cloud_release_version)
+	docker push swr.ap-southeast-3.myhuaweicloud.com/webankpartners/platform-gateway:$(huawei_cloud_release_version)
+
+	docker tag  wecube-portal:$(version) swr.ap-southeast-3.myhuaweicloud.com/webankpartners/wecube-portal:$(huawei_cloud_release_version)
+	docker push swr.ap-southeast-3.myhuaweicloud.com/webankpartners/wecube-portal:$(huawei_cloud_release_version)
+
+	docker tag  platform-auth-server:$(version) swr.ap-southeast-3.myhuaweicloud.com/webankpartners/platform-auth-server:$(huawei_cloud_release_version)
+	docker push swr.ap-southeast-3.myhuaweicloud.com/webankpartners/platform-auth-server:$(huawei_cloud_release_version)
+
+	docker tag  wecube-db:$(version) swr.ap-southeast-3.myhuaweicloud.com/webankpartners/wecube-db:$(huawei_cloud_release_version)
+	docker push swr.ap-southeast-3.myhuaweicloud.com/webankpartners/wecube-db:$(huawei_cloud_release_version)
+
+env_config=smoke_branch.cfg
+target_host="tcp://10.0.0.1:2375"
+deploy:
+	docker tag  platform-core:$(version) $(tencent_cloud_docker_image_registry)/platform-core:$(date)-$(version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-core:$(date)-$(version)
+
+	docker tag  platform-gateway:$(version) $(tencent_cloud_docker_image_registry)/platform-gateway:$(date)-$(version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-gateway:$(date)-$(version)
+
+	docker tag  wecube-portal:$(version) $(tencent_cloud_docker_image_registry)/wecube-portal:$(date)-$(version)
+	docker push $(tencent_cloud_docker_image_registry)/wecube-portal:$(date)-$(version)
+
+	docker tag  platform-auth-server:$(version) $(tencent_cloud_docker_image_registry)/platform-auth-server:$(date)-$(version)
+	docker push $(tencent_cloud_docker_image_registry)/platform-auth-server:$(date)-$(version)
+
+	sh build/deploy_generate_compose.sh $(env_config) $(date)-$(version)
+	docker-compose -f docker-compose.yml -H $(target_host) up -d
+
+deploy_demo: image
+	sh build/remove.sh $(version)
+	docker tag  wecube-db:$(version) ${tencent_cloud_docker_image_registry}/wecube-db:${date}-$(version)
+	docker tag  platform-core:$(version) $(tencent_cloud_docker_image_registry)/platform-core:$(date)-$(version)
+	docker tag  platform-gateway:$(version) $(tencent_cloud_docker_image_registry)/platform-gateway:$(date)-$(version)
+	docker tag  wecube-portal:$(version) $(tencent_cloud_docker_image_registry)/wecube-portal:$(date)-$(version)
+	docker tag  platform-auth-server:$(version) $(tencent_cloud_docker_image_registry)/platform-auth-server:$(date)-$(version)
+	sed "s~{{WECUBE_DB_IMAGE_NAME}}~wecube-db:${date}-$(version)~g" build/wecube_core_mysql.tpl > wecube_core_mysql.yml
+	docker-compose -f wecube_core_mysql.yml up -d
+	sleep 30
+	sh build/deploy_generate_compose.sh $(env_config) $(date)-$(version)
+	sed -i "s~{{WECUBE_DB_IMAGE_NAME}}~wecube-db:${date}-$(version)~g" docker-compose.yml
+	sed -i "s~{{WECUBE_APP_IMAGE_VER}}~wecube-db:${date}-$(version)~g" docker-compose.yml
+	docker-compose -f docker-compose.yml up -d