open-hand · dependabot · May 30, 2022 · May 31, 2022 · May 31, 2022 · May 31, 2022
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # maven ignore
 target/
 *.versionsBackup
+src/main/java/io/choerodon/kb/api/controller/v1/TestController.java
 
 # eclipse ignore
 .settings/
@@ -41,12 +42,14 @@ choerodon_temp/
 lib
 yarn.lock
 node_modules
-package-lock.json
 **/lib/dist/
 **/lib/assets/
 **/lib/fonts/
 
 /liquibase
 init-local-database-csn.sh
 yalc.lock
-.yalc
+.yalc
+
+
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,129 +1 @@
-image: registry.cn-shanghai.aliyuncs.com/c7n/cibase:0.11.4
-
-stages:
-  - build
-  - release
-
-build front:
-  stage: build
-  script:
-    - npm config set "//${NPM_REPO}:_authToken" "${NPM_TOKEN}"
-    - npm config set "//${NPM_REGISTRY}:_authToken" "${NPM_TOKEN}"
-    - npm config set always-auth true
-    - yarn install --registry "https://${NPM_REPO}" --sass-binary-site=http://npm.taobao.org/mirrors/node-sass
-    - chmod -R 755 node_modules
-    - npm run compile
-    - npm publish --registry "https://${NPM_REGISTRY}"
-    - curl -sX POST -F token=${FRONT_REPOSITORY_TOKEN} -F ref=${REF_NAME} https://code.choerodon.com.cn/api/v4/projects/7909/trigger/pipeline
-  except:
-    changes:
-      - pom.xml
-      - src/**/*
-      - docker/**/*
-      - chart/**/*
-      - init-mysql-database.sh
-      - .circleci/**/*
-      - .gitignore
-      - .github/**/*
-      - .gitlab-ci.yml
-      - "*.md"
-  only:
-    refs:
-      - master
-      - /^.*bugfix.*$/
-      - /^.*hotfix.*$/
-      - /^.*release.*$/
-
-#tag front:
-#  stage: build
-#  script:
-#    - npm config set "//${NPM_REPO}:_authToken" "${NPM_TOKEN}"
-#    - npm config set "//${NPM_REGISTRY}:_authToken" "${NPM_TOKEN}"
-#    - npm config set always-auth true
-#    - yarn install --registry "https://${NPM_REPO}" --sass-binary-site=http://npm.taobao.org/mirrors/node-sass
-#    - chmod -R 755 node_modules
-#    - npm run compile
-#    - npm publish --registry "https://${NPM_REGISTRY}"
-#  only:
-#    refs:
-#      - tags
-
-build backend:
-  stage: build
-  script:
-    - update_pom_version
-    - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test -Dmaven.test.failure.ignore=true -DskipTests=true -U
-    - mvn package spring-boot:repackage
-    - mv target/app.jar $PWD/docker
-    - saveImageMetadata
-    - kaniko -c $PWD/docker -f $PWD/docker/Dockerfile -d ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}
-  except:
-    changes:
-      - .editorconfig
-      - .eslintrc.json
-      - .stylelintrc.json
-      - gulpfile.js
-      - package.json
-      - react/**/*
-      - .gitignore
-      - .github/**/*
-      - .gitlab-ci.yml
-      - "*.md"
-  only:
-    refs:
-      - master
-      - /^.*bugfix.*$/
-      - /^.*hotfix.*$/
-      - /^.*release.*$/
-
-tag backend:
-  stage: build
-  script:
-    - update_pom_version
-    - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test -Dmaven.test.failure.ignore=true -DskipTests=true -U
-    - mvn package spring-boot:repackage
-    - mv target/app.jar $PWD/docker
-    - saveImageMetadata
-    - docker build --platform linux/arm64 -t ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}-arm -f $PWD/docker/Dockerfile $PWD/docker
-    - docker push ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}-arm
-    - kaniko -c $PWD/docker -f $PWD/docker/Dockerfile -d ${DOCKER_REGISTRY}/${GROUP_NAME}/${PROJECT_NAME}:${CI_COMMIT_TAG}
-  only:
-    refs:
-      - tags
-
-
-release backend:
-  stage: release
-  script:
-    - chart_build
-  except:
-    changes:
-      - .editorconfig
-      - .eslintrc.json
-      - .stylelintrc.json
-      - gulpfile.js
-      - package.json
-      - react/**/*
-      - .gitignore
-      - .github/**/*
-      - .gitlab-ci.yml
-      - "*.md"
-
-
-tag release:
-  stage: release
-  script:
-    - chart_build
-  only:
-    - tags
-
-.auto_devops: &auto_devops |
-  http_status_code=`curl -o .auto_devops.sh -s -m 10 --connect-timeout 10 -w %{http_code} "${CHOERODON_URL}/devops/ci?token=${Token}&type=microservice"`
-  if [ "$http_status_code" != "200" ]; then
-    cat .auto_devops.sh
-    exit 1
-  fi
-  source .auto_devops.sh
-
-before_script:
-  - *auto_devops
+include: https://api.choerodon.com.cn/devops/v1/projects/261445508798373888/ci_contents/pipelines/3886cf8e-3685-4cb9-8fd1-ed73c90c6cb7/content.yaml
diff --git a/.stylelintrc.json b/.stylelintrc.json
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,6 +1,22 @@
 # Changelog
 All notable changes about knowledgebase-service will be documented in this file.
 
+## [1.2.0] - 2022-02-11
+
+### Added
+
+- It supports the role export of project members, moving documents and viewing the historical version of documents, so as to improve the efficiency of document communication among project members.
+- The watermark function is added. After the watermark is turned on, the document can be viewed and exported, and the watermark can be displayed to enhance the security of the document.
+
+### Changed
+
+- After the knowledge base documents are shared externally, the sharing can be cancelled to ensure the security of document information.
+
+### Fixed
+
+- Knowledge base fixes log4j vulnerability.
+
+
 ## [1.1.0-alpha] - 2021-09-18
 
 ### Changed

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -1,6 +1,21 @@
 # 更新日志
 这个文件记录knowledgebase-service所有版本的重大变动。
 
+## [1.2.0] - 2022-02-11
+
+### 新增
+
+- 支持项目成员角色导出、移动文档以及查看文档历史版本，提高项目成员使用文档沟通的效率。
+- 新增水印功能，开启水印后，查看和导出文档显示水印，以增强文档安全性。
+
+### 改变
+
+- 知识库文档对外分享后支持取消分享，保证文档信息的安全性。
+
+### 修复
+
+- 知识库修复log4j漏洞。
+
 
 ## [1.1.0-alpha] - 2021-09-18
 

diff --git a/babel.config.js b/babel.config.js
diff --git a/charts/knowledgebase-service/.helmignore b/charts/knowledgebase-service/.helmignore
@@ -18,4 +18,4 @@
 # Various IDEs
 .project
 .idea/
-*.tmproj
+*.tmproj
diff --git a/charts/knowledgebase-service/Chart.yaml b/charts/knowledgebase-service/Chart.yaml
@@ -1,5 +1,24 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
+annotations:
+  category: Infrastructure
+apiVersion: v2
+appVersion: 2.0.0
+dependencies:
+  - name: common
+    repository: https://openchart.choerodon.com.cn/choerodon/c7n
+    version: 1.x.x
+description: Knowledgebase service of Choerodon.
+engine: gotpl
+home: https://github.com/open-hand/knowledgebase-service/tree/master/chart/knowledgebase-service
+icon: https://ui-avatars.com/api/?name=knowledgebase-service
+keywords:
+  - choerodon
+  - knowledgebase
+maintainers:
+  - email: [email protected]
+    name: choerodon
+    url: https://choerodon.io
 name: knowledgebase-service
-version: 0.1.0
+sources:
+  - https://github.com/open-hand/knowledgebase-service
+  - https://gitee.com/open-hand/knowledgebase-service
+version: 2.0.0