Merge remote-tracking branch 'origin/dev' into dev

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/adapter/gbs/GbsUserFacadeClient.java

@@ -7,6 +7,7 @@ import com.jjb.saas.system.client.user.request.*;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.qinan.safetyeval.domain.exception.BizException;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -19,12 +20,20 @@ public class GbsUserFacadeClient {
     @DubboReference(protocol = "dubbo", url = "${safety-eval.gbs-user-sync.user-facade-url:}")
     private UserFacade userFacade;
 
+
+
+    @Value("${auth.deptId.org}")
+    private Long deptId;
+    @Value("${auth.roleId.org}")
+    private Long roleId;
+
+
     public void add(UserAddCmd cmd) {
         //2069596397920849920{key: "1782463085576", deptId: "2069596397920849920", roleId: "2069671307598893058"}
         List<RoleDeptAddCmd> list = new ArrayList<>();
         RoleDeptAddCmd roleDeptAddCmd = new RoleDeptAddCmd();
-        roleDeptAddCmd.setDeptId(2069596397920849920L);
-        roleDeptAddCmd.setRoleId(2069671307598893058L);
+        roleDeptAddCmd.setDeptId(deptId);
+        roleDeptAddCmd.setRoleId(roleId);
         list.add(roleDeptAddCmd);
         cmd.setRoleDepts(list);
         SingleResponse<Long> singleResponse = userFacade.add(cmd);

safety-eval-start/src/main/resources/sdk-prod.yml

@@ -64,4 +64,10 @@ openapi:
 
 sms:
   sign:
-    sourceCode: MS000151
+    sourceCode: MS000151
+
+auth:
+  deptId:
+    org: 2069624650907299840
+  roleId:
+    org: 2069630661722419201

safety-eval-start/src/main/resources/sdk.yml

@@ -65,4 +65,10 @@ openapi:
 
 sms:
   sign:
-    sourceCode: MS000146
+    sourceCode: MS000146
+
+auth:
+  deptId:
+    org: 2069596397920849920
+  roleId:
+    org: 2069671307598893058