Merge branch 'LB-2' into 'dev-1.2.0_k8s'

陆小龙 · 陆小龙 · commit 527b6a5f5ab1 · 2022-01-05T07:09:29.000Z
Resolve LB-2

See merge request luban/dataspherestudio!264
diff --git a/db/dss_dml.sql b/db/dss_dml.sql
@@ -472,7 +472,7 @@ DELETE FROM dss_appconn;
 INSERT INTO `dss_appconn` VALUES (2,'orchestrator-framework',0,1,NULL,0,NULL,'com.webank.wedatasphere.dss.appconn.orchestrator.DefaultOrchestratorFrameworkAppConn','/opt/dss/dss-appconns/orchestrator-framework','{\"resource\":{\"fileName\":\"orchestrator-framework.zip\",\"resourceId\":\"95a6b56c-bb16-41c7-bb73-6c65fd29ac78\",\"version\":\"v000073\"},\"lastModifiedTime\":1637154970000,\"size\":4212166}'),(3,'workflow',0,1,NULL,0,NULL,'com.webank.wedatasphere.dss.appconn.workflow.DefaultWorkflowAppConn','/opt/dss/dss-appconns/workflow','{\"resource\":{\"fileName\":\"workflow.zip\",\"resourceId\":\"f9ac5b6c-76cb-4e5e-97b9-a6820c903160\",\"version\":\"v000022\"},\"lastModifiedTime\":1637154970000,\"size\":26744}'),(5,'eventchecker',0,1,NULL,0,NULL,'com.webank.wedatasphere.dss.appconn.eventchecker.EventCheckerAppConn','/opt/dss/dss-appconns/eventchecker','{\"resource\":{\"fileName\":\"eventchecker.zip\",\"resourceId\":\"8719b185-15db-45d5-8b6d-2b7070b2c1b9\",\"version\":\"v000022\"},\"lastModifiedTime\":1637154970000,\"size\":10722445}'),(6,'datachecker',0,1,NULL,0,NULL,'com.webank.wedatapshere.dss.appconn.datachecker.DataCheckerAppConn','/opt/dss/dss-appconns/datachecker','{\"resource\":{\"fileName\":\"datachecker.zip\",\"resourceId\":\"6ae4329b-65ca-47b3-99cf-1e30b75a5cba\",\"version\":\"v000022\"},\"lastModifiedTime\":1637154969000,\"size\":11772154}'),(7,'dolphinscheduler',0,1,NULL,0,NULL,'com.webank.wedatasphere.dss.appconn.dolphinscheduler.DolphinSchedulerAppConn','/opt/dss/dss-appconns/dolphinscheduler','{\"resource\":{\"fileName\":\"dolphinscheduler.zip\",\"resourceId\":\"2325c2ee-e68f-4fee-9dfc-d628f2b7262d\",\"version\":\"v000008\"},\"lastModifiedTime\":1637154972000,\"size\":15251697}');
 
 DELETE FROM dss_appconn_instance;
-INSERT INTO `dss_appconn_instance` VALUES (1,1,'PROD','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/','','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/'),(2,2,'DEV','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104','','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104'),(3,3,'DEV','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104','','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104'),(4,4,'DEV','http://VISUALIS_IP:VISUALIS_PORT/','','http://VISUALIS_NGINX_IP_2:VISUALIS_NGINX_PORT/dss/visualis/#/projects','http://VISUALIS_NGINX_IP_2:VISUALIS_NGINX_PORT/'),(5,5,'DEV','eventchecker','{\"msg.eventchecker.jdo.option.name\": \"msg\",\"msg.eventchecker.jdo.option.url\": \"EVENTCHECKER_JDBC_URL\",\"msg.eventchecker.jdo.option.username\": \"EVENTCHECKER_JDBC_USERNAME\",\"msg.eventchecker.jdo.option.password\": \"EVENTCHECKER_JDBC_PASSWORD\"}',NULL,NULL),(6,6,'DEV','datachecker','{\"job.datachecker.jdo.option.name\":\"job\",\"job.datachecker.jdo.option.url\":\"DATACHECKER_JOB_JDBC_URL\",\"job.datachecker.jdo.option.username\":\"DATACHECKER_JOB_JDBC_USERNAME\",\"job.datachecker.jdo.option.password\":\"DATACHECKER_JOB_JDBC_PASSWORD\",\"bdp.datachecker.jdo.option.name\":\"bdp\",\"bdp.datachecker.jdo.option.url\":\"DATACHECKER_BDP_JDBC_URL\",\"bdp.datachecker.jdo.option.username\":\"DATACHECKER_BDP_JDBC_USERNAME\",\"bdp.datachecker.jdo.option.password\":\"DATACHECKER_BDP_JDBC_PASSWORD\",\"bdp.datachecker.jdo.option.login.type\":\"base64\",\"bdp.mask.url\":\"http://BDP_MASK_IP:BDP_MASK_PORT/api/v1/mask-status?\",\"bdp.mask.app.id\":\"wtss\",\"bdp.mask.app.token\":\"20a0ccdfc0\"}',NULL,NULL),(7,7,'DEV','http://***REMOVED***:12345/dolphinscheduler',NULL,'http://***REMOVED***:12345/dolphinscheduler','http://***REMOVED***:12345/dolphinscheduler');
+INSERT INTO `dss_appconn_instance` VALUES (1,1,'PROD','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/','','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/','http://AZKABAN_ADRESS_IP_2:AZKABAN_ADRESS_PORT/'),(2,2,'DEV','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104','','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104','http://ORCHESTRATOR_IP:ORCHESTRATOR_PORT/#/workspaceHome?workspaceId=104'),(3,3,'DEV','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104','','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104','http://WORKFLOW_IP:WORKFLOW_PORT/#/workspaceHome?workspaceId=104'),(4,4,'DEV','http://VISUALIS_IP:VISUALIS_PORT/','','http://VISUALIS_NGINX_IP_2:VISUALIS_NGINX_PORT/dss/visualis/#/projects','http://VISUALIS_NGINX_IP_2:VISUALIS_NGINX_PORT/'),(5,5,'DEV','eventchecker','{\"msg.eventchecker.jdo.option.name\": \"msg\",\"msg.eventchecker.jdo.option.url\": \"EVENTCHECKER_JDBC_URL\",\"msg.eventchecker.jdo.option.username\": \"EVENTCHECKER_JDBC_USERNAME\",\"msg.eventchecker.jdo.option.password\": \"EVENTCHECKER_JDBC_PASSWORD\"}',NULL,NULL),(6,6,'DEV','datachecker','{\"job.datachecker.jdo.option.name\":\"job\",\"job.datachecker.jdo.option.url\":\"DATACHECKER_JOB_JDBC_URL\",\"job.datachecker.jdo.option.username\":\"DATACHECKER_JOB_JDBC_USERNAME\",\"job.datachecker.jdo.option.password\":\"DATACHECKER_JOB_JDBC_PASSWORD\",\"bdp.datachecker.jdo.option.name\":\"bdp\",\"bdp.datachecker.jdo.option.url\":\"DATACHECKER_BDP_JDBC_URL\",\"bdp.datachecker.jdo.option.username\":\"DATACHECKER_BDP_JDBC_USERNAME\",\"bdp.datachecker.jdo.option.password\":\"DATACHECKER_BDP_JDBC_PASSWORD\",\"bdp.datachecker.jdo.option.login.type\":\"base64\",\"bdp.mask.url\":\"http://BDP_MASK_IP:BDP_MASK_PORT/api/v1/mask-status?\",\"bdp.mask.app.id\":\"wtss\",\"bdp.mask.app.token\":\"20a0ccdfc0\"}',NULL,NULL),(7,7,'DEV','http://dolphinscheduler-api.ns-luban.svc.cluster.local:12345/dolphinscheduler',NULL,'http://dolphinscheduler-api.ns-luban.svc.cluster.local:12345/dolphinscheduler','http://dolphinscheduler-api.ns-luban.svc.cluster.local:12345/dolphinscheduler');
 
 
 DELETE FROM dss_component_role;
diff --git a/dss-framework/dss-framework-admin/src/main/java/com/webank/wedatasphere/dss/framework/admin/restful/DssFrameworkAdminUserController.java b/dss-framework/dss-framework-admin/src/main/java/com/webank/wedatasphere/dss/framework/admin/restful/DssFrameworkAdminUserController.java
@@ -10,7 +10,7 @@
 import com.webank.wedatasphere.dss.framework.admin.conf.ProjectConf;
 import com.webank.wedatasphere.dss.framework.admin.pojo.entity.DssAdminUser;
 import com.webank.wedatasphere.dss.framework.admin.service.DssAdminUserService;
-import com.webank.wedatasphere.dss.framework.admin.service.LdapService;
+//import com.webank.wedatasphere.dss.framework.admin.service.LdapService;
 import com.webank.wedatasphere.dss.framework.admin.xml.DssUserMapper;
 import org.apache.linkis.server.security.SecurityFilter;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -45,8 +45,8 @@
 public class DssFrameworkAdminUserController extends BaseController {
     @Resource
     private DssAdminUserService dssAdminUserService;
-    @Autowired
-    private LdapService ldapService;
+//    @Autowired
+//    private LdapService ldapService;
     @Autowired
 
     DssUserMapper dssUserMapper;
@@ -72,7 +72,7 @@ public TableDataInfo list(@QueryParam("userName") String userName, @QueryParam("
     //    @PostMapping("/add")
 //    @POST
 //    @Path("/add")
-    @RequestMapping(path ="add", method = RequestMethod.POST)
+/*    @RequestMapping(path ="add", method = RequestMethod.POST)
 
     public Message add(@Validated @RequestBody DssAdminUser user, @Context HttpServletRequest req
     ) {
@@ -107,7 +107,7 @@ public Message add(@Validated @RequestBody DssAdminUser user, @Context HttpServl
             return Message.error().data("rows", 0).message(exception.getMessage());
         }
 
-    }
+    }*/
 
 
     //    @GET
@@ -134,7 +134,7 @@ public Message edit(@Validated @RequestBody DssAdminUser user) {
 
 //    @POST
 //    @Path("/resetPsw")
-    @RequestMapping(path ="resetPsw", method = RequestMethod.POST)
+/*    @RequestMapping(path ="resetPsw", method = RequestMethod.POST)
     public Message resetPwd(@RequestBody DssAdminUser user) {
         try {
             PasswordResult passwordResult = PasswordUtils.checkPwd(user.getPassword(), user);
@@ -149,6 +149,6 @@ public Message resetPwd(@RequestBody DssAdminUser user) {
         } catch (Exception exception) {
             return  Message.error().message(exception.getMessage());
         }
-    }
+    }*/
 }
 
diff --git a/web/.eslintrc.js b/web/.eslintrc.js
@@ -16,73 +16,73 @@
  */
 
 module.exports = {
-    root: true,
-    env: {
-        node: true
-    },
-    extends: [
-        'eslint:recommended',
-        'plugin:vue/essential'
+  root: true,
+  env: {
+    node: true
+  },
+  extends: ["eslint:recommended", "plugin:vue/essential"],
+  rules: {
+    "no-console": process.env.NODE_ENV === "production" ? "error" : "off",
+    "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
+    "key-spacing": ["error"],
+    "standard/no-callback-literal": 0,
+    "handle-callback-err": 0,
+    "no-return-assign": 0,
+    eqeqeq: 0,
+    "comma-dangle": 0,
+    semi: 0,
+    "space-before-function-paren": 0,
+    "keyword-spacing": 0,
+    "no-useless-escape": 0,
+    "operator-linebreak": 0,
+    indent: [
+      "error",
+      2,
+      {
+        SwitchCase: 1
+      }
     ],
-    rules: {
-        'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-        'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-        'key-spacing': ['error'],
-        'standard/no-callback-literal': 0,
-        'handle-callback-err': 0,
-        'no-return-assign': 0,
-        'eqeqeq': 0,
-        'comma-dangle': 0,
-        'semi': 0,
-        'space-before-function-paren': 0,
-        'keyword-spacing': 0,
-        'no-useless-escape': 0,
-        'operator-linebreak': 0,
-        'indent': [
-            'error',
-            2,
-            {
-                'SwitchCase': 1
-            }
-        ],
-        'no-const-assign': 'warn',
-        'no-this-before-super': 'warn',
-        "no-irregular-whitespace": 0,
-        'no-undef': 2,
-        'no-unreachable': 'warn',
-        'no-unused-vars': ['error', { "args": "none" }],
-        'constructor-super': 'warn',
-        'valid-typeof': 'warn',
-        'one-var': 'warn',
-        'max-len': 'off',
-        'no-trailing-spaces': 'off',
-        'require-jsdoc': 'warn',
-        'camelcase': 'warn',
-        'no-invalid-this': 'off',
-        'linebreak-style': 0,
-        'vue/no-parsing-error': [2, {
-            'x-invalid-end-tag': false,
-            'invalid-first-character-of-tag-name': false
-        }],
-        'no-tabs': 0,
-        'vue/require-default-prop': 0,
-        'vue/component-name-in-template-casing': 0,
-        'vue/html-closing-bracket-spacing': 0,
-        'vue/html-closing-bracket-newline': 0,
-        'vue/singleline-html-element-content-newline': 0,
-        'vue/multiline-html-element-content-newline': 0,
-        'vue/attributes-order': 0,
-        'vue/html-self-closing': 0,
-        'no-useless-constructor': 0,
-        'no-mixed-operators': 0,
-        'no-new-func': 0,
-        'no-template-curly-in-string': 0,
-        'no-useless-call': 0,
-        "one-var": 0,
-        "camelcase": 0
-    },
-    parserOptions: {
-        "parser": 'babel-eslint',
-        "sourceType": "module"
-    }
-}
+    "no-const-assign": "warn",
+    "no-this-before-super": "warn",
+    "no-irregular-whitespace": 0,
+    "no-undef": 2,
+    "no-unreachable": "warn",
+    "no-unused-vars": ["error", { args: "none" }],
+    "constructor-super": "warn",
+    "valid-typeof": "warn",
+    "one-var": "warn",
+    "max-len": "off",
+    "no-trailing-spaces": "off",
+    "require-jsdoc": "warn",
+    camelcase: "warn",
+    "no-invalid-this": "off",
+    "linebreak-style": 0,
+    "vue/no-parsing-error": [
+      2,
+      {
+        "x-invalid-end-tag": false,
+        "invalid-first-character-of-tag-name": false
+      }
+    ],
+    "no-tabs": 0,
+    "vue/require-default-prop": 0,
+    "vue/component-name-in-template-casing": 0,
+    "vue/html-closing-bracket-spacing": 0,
+    "vue/html-closing-bracket-newline": 0,
+    "vue/singleline-html-element-content-newline": 0,
+    "vue/multiline-html-element-content-newline": 0,
+    "vue/attributes-order": 0,
+    "vue/html-self-closing": 0,
+    "no-useless-constructor": 0,
+    "no-mixed-operators": 0,
+    "no-new-func": 0,
+    "no-template-curly-in-string": 0,
+    "no-useless-call": 0,
+    "one-var": 0,
+    camelcase: 0
+  },
+  parserOptions: {
+    parser: "babel-eslint",
+    sourceType: "module"
+  }
+};
diff --git a/web/src/apps/workspace/module/permissions/module/personManagement.vue b/web/src/apps/workspace/module/permissions/module/personManagement.vue
@@ -95,18 +95,26 @@
       <div class="tableWrap">
         <div class="addWrap">
           <p>{{ tableTitle }}</p>
-          <Button type="primary" @click="handleAdd()" icon="md-add">{{
-            $t("message.permissions.add")
-          }}</Button>
+          <Button
+            v-if="false"
+            type="primary"
+            @click="handleAdd()"
+            icon="md-add"
+            >{{ $t("message.permissions.add") }}</Button
+          >
         </div>
         <Table :columns="columns" :data="userList" :loading="tableLoading">
           <template slot-scope="{ row, index }" slot="operation">
             <div class="deptName">
               <div class="operation" @click="edit(row, index)">
                 {{ $t("message.permissions.edit") }}
               </div>
-              <Divider type="vertical" />
-              <div class="operation" @click="modifyPassword(row, index)">
+              <Divider v-if="false" type="vertical" />
+              <div
+                class="operation"
+                v-if="false"
+                @click="modifyPassword(row, index)"
+              >
                 {{ $t("message.permissions.modifyPassword") }}
               </div>
               <Divider v-if="false" type="vertical" />
@@ -169,7 +177,7 @@
             </div>
             <label slot="option-label" slot-scope="{ node }">
               <Icon
-                style="font-size: 16px;margin-right:5px;top: -3px;"
+                style="font-size: 16px; margin-right: 5px; top: -3px"
                 :type="
                   node.isBranch ? 'ios-folder-outline' : 'ios-paper-outline'
                 "
@@ -325,8 +333,8 @@ export default {
             tag === "empty"
               ? this.$t("message.permissions.passwordEmpty")
               : tag === "keyboard"
-                ? this.$t("message.permissions.pwdKeyboardError")
-                : this.$t("message.permissions.pwdCheckError")
+              ? this.$t("message.permissions.pwdKeyboardError")
+              : this.$t("message.permissions.pwdCheckError")
           )
         );
       }
@@ -752,7 +760,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-@import '@/common/style/variables.scss';
+@import "@/common/style/variables.scss";
 .container {
   width: 100%;
   // height: 100%;
@@ -855,7 +863,8 @@ export default {
   width: 22px;
   @include font-color($light-text-color, $dark-text-color);
 }
-.folder-label, .foldIcon{
+.folder-label,
+.foldIcon {
   @include font-color($light-text-color, $dark-text-color);
 }
 .operation {
