From b2c863f66ef2844840318b57156e639568b9f703 Mon Sep 17 00:00:00 2001 From: smallbun <2689170096@qq.com> Date: Sat, 16 Sep 2023 10:45:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?:arrow=5Fup:=20=E4=BE=9D=E8=B5=96=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eiam-console/src/main/console-fe/package.json | 10 +++++----- eiam-portal/src/main/portal-fe/package.json | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json index 4ef36b8c..1544a232 100644 --- a/eiam-console/src/main/console-fe/package.json +++ b/eiam-console/src/main/console-fe/package.json @@ -49,9 +49,9 @@ "@ant-design/maps": "^1.0.7", "@ant-design/pro-components": "^2.6.18", "ahooks": "^3.7.8", - "antd": "^5.9.0", + "antd": "^5.9.1", "antd-img-crop": "^4.12.2", - "antd-style": "^3.4.5", + "antd-style": "^3.4.6", "classnames": "^2.3.2", "codemirror": "^5.65.5", "content-security-policy-parser": "^0.4.1", @@ -88,15 +88,15 @@ "@types/crypto-js": "^4.1.2", "@types/google-libphonenumber": "^7.4.26", "@types/history": "^4.7.11", - "@types/js-yaml": "^4.0.5", + "@types/js-yaml": "^4.0.6", "@types/lodash": "^4.14.198", "@types/numeral": "^2.0.2", "@types/qs": "^6.9.8", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", "@types/react-helmet": "^6.1.6", - "@umijs/lint": "^4.0.80", - "@umijs/max": "^4.0.80", + "@umijs/lint": "^4.0.81", + "@umijs/max": "^4.0.81", "cross-env": "^7.0.3", "cross-port-killer": "^1.4.0", "eslint": "^8.49.0", diff --git a/eiam-portal/src/main/portal-fe/package.json b/eiam-portal/src/main/portal-fe/package.json index ffdc177c..27f2f043 100644 --- a/eiam-portal/src/main/portal-fe/package.json +++ b/eiam-portal/src/main/portal-fe/package.json @@ -50,9 +50,9 @@ "@ant-design/maps": "^1.0.7", "@ant-design/pro-components": "^2.6.18", "ahooks": "^3.7.8", - "antd": "^5.9.0", + "antd": "^5.9.1", "antd-img-crop": "^4.12.2", - "antd-style": "^3.4.5", + "antd-style": "^3.4.6", "classnames": "^2.3.2", "crypto-js": "^4.1.1", "dayjs": "^1.11.9", @@ -64,7 +64,7 @@ "jsencrypt": "^3.3.2", "lodash": "^4.17.21", "moment": "^2.29.4", - "nanoid": "^4.0.2", + "nanoid": "^5.0.1", "numeral": "^2.0.6", "omit.js": "^2.0.2", "qs": "^6.11.2", @@ -83,15 +83,15 @@ "@types/crypto-js": "^4.1.2", "@types/google-libphonenumber": "^7.4.26", "@types/history": "^4.7.11", - "@types/js-yaml": "^4.0.5", + "@types/js-yaml": "^4.0.6", "@types/lodash": "^4.14.198", "@types/numeral": "^2.0.2", "@types/qs": "^6.9.8", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", "@types/react-helmet": "^6.1.6", - "@umijs/lint": "^4.0.80", - "@umijs/max": "^4.0.80", + "@umijs/lint": "^4.0.81", + "@umijs/max": "^4.0.81", "cross-env": "^7.0.3", "cross-port-killer": "^1.4.0", "eslint": "^8.49.0", From 2a8a0a7bbc2e06aa36a50d028f4fa8cf80ff01c1 Mon Sep 17 00:00:00 2001 From: smallbun <2689170096@qq.com> Date: Sat, 16 Sep 2023 11:16:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?:arrow=5Fup:=20=E4=BE=9D=E8=B5=96=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eiam-console/src/main/console-fe/package.json | 2 +- eiam-portal/src/main/portal-fe/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json index 1544a232..772887fe 100644 --- a/eiam-console/src/main/console-fe/package.json +++ b/eiam-console/src/main/console-fe/package.json @@ -47,7 +47,7 @@ "@ant-design/charts": "^1.4.2", "@ant-design/icons": "^5.2.6", "@ant-design/maps": "^1.0.7", - "@ant-design/pro-components": "^2.6.18", + "@ant-design/pro-components": "^2.6.19", "ahooks": "^3.7.8", "antd": "^5.9.1", "antd-img-crop": "^4.12.2", diff --git a/eiam-portal/src/main/portal-fe/package.json b/eiam-portal/src/main/portal-fe/package.json index 27f2f043..0970138e 100644 --- a/eiam-portal/src/main/portal-fe/package.json +++ b/eiam-portal/src/main/portal-fe/package.json @@ -48,7 +48,7 @@ "@ant-design/charts": "^1.4.2", "@ant-design/icons": "^5.2.6", "@ant-design/maps": "^1.0.7", - "@ant-design/pro-components": "^2.6.18", + "@ant-design/pro-components": "^2.6.19", "ahooks": "^3.7.8", "antd": "^5.9.1", "antd-img-crop": "^4.12.2", From 4f0e2b69907b1e5680543d96b12df80247a95f92 Mon Sep 17 00:00:00 2001 From: smallbun <2689170096@qq.com> Date: Sat, 16 Sep 2023 11:31:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:arrow=5Fup:=20=E4=BE=9D=E8=B5=96=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eiam-console/src/main/console-fe/package.json | 2 +- eiam-portal/src/main/portal-fe/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json index 772887fe..1544a232 100644 --- a/eiam-console/src/main/console-fe/package.json +++ b/eiam-console/src/main/console-fe/package.json @@ -47,7 +47,7 @@ "@ant-design/charts": "^1.4.2", "@ant-design/icons": "^5.2.6", "@ant-design/maps": "^1.0.7", - "@ant-design/pro-components": "^2.6.19", + "@ant-design/pro-components": "^2.6.18", "ahooks": "^3.7.8", "antd": "^5.9.1", "antd-img-crop": "^4.12.2", diff --git a/eiam-portal/src/main/portal-fe/package.json b/eiam-portal/src/main/portal-fe/package.json index 0970138e..27f2f043 100644 --- a/eiam-portal/src/main/portal-fe/package.json +++ b/eiam-portal/src/main/portal-fe/package.json @@ -48,7 +48,7 @@ "@ant-design/charts": "^1.4.2", "@ant-design/icons": "^5.2.6", "@ant-design/maps": "^1.0.7", - "@ant-design/pro-components": "^2.6.19", + "@ant-design/pro-components": "^2.6.18", "ahooks": "^3.7.8", "antd": "^5.9.1", "antd-img-crop": "^4.12.2", From b83450b4b48099a4da83e27b396822f6c4896917 Mon Sep 17 00:00:00 2001 From: smallbun <2689170096@qq.com> Date: Sat, 16 Sep 2023 11:31:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?:arrow=5Fup:=20=E4=BE=9D=E8=B5=96=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 264229fe..982858d6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ 开源不代表免费，`TOPIAM` 遵循 AGPL-3.0 开源协议发布，并提供技术交流学习，但绝不允许修改后和衍生的代码做为闭源的商业软件发布和销售！ 如果需要将本产品在本地进行任何附带商业化性质行为使用，请联系项目负责人进行商业授权，以遵守 AGPL 协议保证您的正常使用。 -我们也提供了商业授权，如果您**需要将本产品进行二次开发、更改并进行任何附带商业化性质行为使用**，请联系我们进行商业授权，以遵守 `AGPL-3.0` 协议保证您的正常使用。 +如果您**需要将本产品进行二次开发、更改并进行任何附带商业化性质行为使用**，请联系我们进行商业授权，以遵守 `AGPL-3.0` 协议保证您的正常使用。 目前在国内 `GPL` 协议**具备合同特征，是一种民事法律行为** ，属于我国《合同法》调整的范围。 `TOPIAM` 项目团队保留诉讼权利。