From aab93f7b44a61dbc22c16d4c716f56be17b156ea Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Fri, 21 Apr 2023 09:36:22 +0800
Subject: [PATCH] =?UTF-8?q?fead&fix:=201.0.0=201.=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BB=84=E6=9C=80=E5=A4=A7=E5=88=86=E5=8C=BA=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E5=9C=A8=E5=88=9B=E5=BB=BA=E7=BB=84=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=85=B6=E6=89=80=E8=83=BD=E9=80=89=E7=9A=84=E6=9C=80=E5=A4=A7?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E5=8C=BA=202.=20=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=BB=A3=E7=A0=81=E5=8C=85=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=BF=94=E5=9B=9E=E7=9A=84=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/sql/{x_retry.sql => easy_retry.sql}               |  2 +-
 .../core/handler/GlobalRestfulResponseBodyAdvice.java |  4 ++--
 .../server/web/controller/GroupConfigController.java  | 11 +++++++++++
 .../web/interceptor/AuthenticationInterceptor.java    |  2 +-
 frontend/src/api/manage.js                            | 11 +++++++++--
 frontend/src/utils/request.js                         |  2 +-
 .../src/views/config/basicConfigForm/GroupForm.vue    |  9 +++++++--
 7 files changed, 32 insertions(+), 9 deletions(-)
 rename doc/sql/{x_retry.sql => easy_retry.sql} (99%)

diff --git a/doc/sql/x_retry.sql b/doc/sql/easy_retry.sql
similarity index 99%
rename from doc/sql/x_retry.sql
rename to doc/sql/easy_retry.sql
index d9f942b94..a87b0c296 100644
--- a/doc/sql/x_retry.sql
+++ b/doc/sql/easy_retry.sql
@@ -152,7 +152,7 @@ CREATE TABLE `system_user`
     UNIQUE KEY `uk_username` (`username`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统用户表';
 
-INSERT INTO x_retry.system_user (username, password, role)
+INSERT INTO system_user (username, password, role)
 VALUES ('admin', 'cdf4a007e2b02a0c49fc9b7ccfbb8a10c644f635e1765dcf2a7ab794ddc7edac', 2);
 
 CREATE TABLE `system_user_permission`
diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java
index eefe1bfae..f81a80ec0 100644
--- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java
+++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java
@@ -14,7 +14,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 import java.lang.annotation.Annotation;
 
 @Slf4j
-@ControllerAdvice(basePackages = {"com.x.retry.client.core", "com.x.retry.server"})
+@ControllerAdvice(basePackages = {"com.aizuda.easy.retry.client.core", "com.aizuda.easy.retry.server"})
 public class GlobalRestfulResponseBodyAdvice implements ResponseBodyAdvice<Object> {
 
     @Override
@@ -40,4 +40,4 @@ public class GlobalRestfulResponseBodyAdvice implements ResponseBodyAdvice<Objec
         return true;
     }
 
-}
\ No newline at end of file
+}
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/GroupConfigController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/GroupConfigController.java
index aa39d014d..e9db79924 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/GroupConfigController.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/GroupConfigController.java
@@ -1,5 +1,6 @@
 package com.aizuda.easy.retry.server.web.controller;
 
+import com.aizuda.easy.retry.server.config.SystemProperties;
 import com.aizuda.easy.retry.server.service.GroupConfigService;
 import com.aizuda.easy.retry.server.web.model.base.PageResult;
 import com.aizuda.easy.retry.server.web.model.request.GroupConfigQueryVO;
@@ -23,6 +24,8 @@ public class GroupConfigController {
 
     @Autowired
     private GroupConfigService groupConfigService;
+    @Autowired
+    private SystemProperties systemProperties;
 
     @LoginRequired(role = RoleEnum.ADMIN)
     @PostMapping("")
@@ -54,4 +57,12 @@ public class GroupConfigController {
         return groupConfigService.getAllGroupNameList();
     }
 
+    @LoginRequired
+    @GetMapping("/partition")
+    public Integer getTotalPartition() {
+        // 组分区从0开始,所以是最大值减一
+        return systemProperties.getTotalPartition() - 1;
+    }
+
+
 }
diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/AuthenticationInterceptor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/AuthenticationInterceptor.java
index 4bd13a334..9ba3a5a0e 100644
--- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/AuthenticationInterceptor.java
+++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/AuthenticationInterceptor.java
@@ -30,7 +30,7 @@ import java.util.Objects;
 @Configuration
 public class AuthenticationInterceptor implements HandlerInterceptor {
 
-    public static final String AUTHENTICATION = "easy-retry-AUTH";
+    public static final String AUTHENTICATION = "EASY-RETRY-AUTH";
 
     @Autowired
     private SystemUserMapper systemUserMapper;
diff --git a/frontend/src/api/manage.js b/frontend/src/api/manage.js
index baa18463c..636f105dc 100644
--- a/frontend/src/api/manage.js
+++ b/frontend/src/api/manage.js
@@ -30,12 +30,19 @@ const api = {
   countDispatch: '/dashboard/dispatch/count',
   countActivePod: '/dashboard/active-pod/count',
   rankSceneQuantity: '/dashboard/scene/rank',
-  lineDispatchQuantity: '/dashboard/dispatch/line'
-
+  lineDispatchQuantity: '/dashboard/dispatch/line',
+  totalPartition: '/group/partition'
 }
 
 export default api
 
+export function getTotalPartition () {
+  return request({
+    url: api.totalPartition,
+    method: 'get'
+  })
+}
+
 export function getLineDispatchQuantity (parameter) {
   return request({
     url: api.lineDispatchQuantity,
diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js
index 708e25739..5ae683942 100644
--- a/frontend/src/utils/request.js
+++ b/frontend/src/utils/request.js
@@ -47,7 +47,7 @@ request.interceptors.request.use(config => {
   // 如果 token 存在
   // 让每个请求携带自定义 token 请根据实际情况自行修改
   if (token) {
-    config.headers['easy-retry-AUTH'] = token
+    config.headers['EASY-RETRY-AUTH'] = token
   }
   return config
 }, errorHandler)
diff --git a/frontend/src/views/config/basicConfigForm/GroupForm.vue b/frontend/src/views/config/basicConfigForm/GroupForm.vue
index d7fcb0c20..4e959c6f2 100644
--- a/frontend/src/views/config/basicConfigForm/GroupForm.vue
+++ b/frontend/src/views/config/basicConfigForm/GroupForm.vue
@@ -64,7 +64,7 @@
               'groupPartition'
             ]"
             :min="0"
-            :max="10"
+            :max="maxGroupPartition"
           />
         </a-form-item>
       </a-col>
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import { getGroupConfigByGroupName } from '@/api/manage'
+import { getGroupConfigByGroupName, getTotalPartition } from '@/api/manage'
 import pick from 'lodash.pick'
 
 export default {
@@ -90,6 +90,7 @@ export default {
   data () {
     return {
       form: this.$form.createForm(this),
+      maxGroupPartition: 32,
       routeKey: {
         '1': '一致性hash算法',
         '2': '随机算法',
@@ -99,6 +100,10 @@ export default {
   },
   mounted () {
     this.$nextTick(() => {
+      getTotalPartition().then(res => {
+        this.maxGroupPartition = res.data
+      })
+
       const groupName = this.$route.query.groupName
       if (groupName) {
         getGroupConfigByGroupName(groupName).then(res => {