移除copilot相关逻辑

WeDataSphere · Sep 19, 2024 · 8ebf01d · 8ebf01d
1 parent 127cf97
commit 8ebf01d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 32 deletions.
diff --git a/...r/src/main/java/com/webank/wedatasphere/dss/scriptis/config/DSSScriptisConfiguration.java b/...r/src/main/java/com/webank/wedatasphere/dss/scriptis/config/DSSScriptisConfiguration.java
@@ -16,7 +16,6 @@
 
 package com.webank.wedatasphere.dss.scriptis.config;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.linkis.common.conf.CommonVars;
 
 
@@ -30,21 +29,4 @@ public class DSSScriptisConfiguration {
     public final static String GLOBAL_LIMITS_PREFIX = "wds.dss.scriptis.global.limits.";
     public final static String GLOBAL_LIMIT_PREFIX = "wds.dss.scriptis.global.limit.";
 
-
-    public static final String DELIMITER_COMMA = ",";
-
-    public static final String[] GLOBAL_COPILOT_WHITELIST = CommonVars.apply("wds.dss.scriptis.copilot.whitelist", "").getValue().split(DELIMITER_COMMA);
-
-    public static final String COPILOT_ENABLE_KEY = "copilotEnable";
-
-    public static boolean isInCopilotWhiteList(String username) {
-        if (StringUtils.isNotBlank(username)) {
-            for (String name : GLOBAL_COPILOT_WHITELIST) {
-                if (username.equalsIgnoreCase(name)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
 }
diff --git a/...er/src/main/java/com/webank/wedatasphere/dss/scriptis/restful/ScriptisAuthRestfulApi.java b/...er/src/main/java/com/webank/wedatasphere/dss/scriptis/restful/ScriptisAuthRestfulApi.java
@@ -2,17 +2,9 @@
 
 import com.webank.wedatasphere.dss.common.conf.DSSCommonConf;
 import com.webank.wedatasphere.dss.common.utils.GlobalLimitsUtils;
-import com.webank.wedatasphere.dss.scriptis.config.DSSScriptisConfiguration;
 import com.webank.wedatasphere.dss.scriptis.service.ScriptisAuthService;
-import org.apache.linkis.common.conf.BDPConfiguration;
-import org.apache.linkis.server.Message;
-import org.apache.linkis.server.security.SecurityFilter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
 import java.util.Map;
 
 import static com.webank.wedatasphere.dss.scriptis.config.DSSScriptisConfiguration.GLOBAL_LIMITS_PREFIX;
@@ -40,12 +32,7 @@ public void init() {
     public Message globalLimits(HttpServletRequest req) {
         String username = SecurityFilter.getLoginUsername(req);
         Map<String,Object> globalLimits = scriptisAuthService.getGlobalLimits(username);
-        Map<String, Object> newGlobalLimits = new HashMap<>();
-        newGlobalLimits.putAll(globalLimits);
-        if (DSSScriptisConfiguration.isInCopilotWhiteList(username)) {
-            newGlobalLimits.put(DSSScriptisConfiguration.COPILOT_ENABLE_KEY, true);
-        }
-        return Message.ok().data("globalLimits", newGlobalLimits);
+        return Message.ok().data("globalLimits", globalLimits);
     }
 
     @RequestMapping(value = "/globalLimits/{globalLimitName}",method = RequestMethod.GET)