Merge branch 'master' of https://github.com/metersphere/metersphere

backend/src/main/java/io/metersphere/commons/utils/ShiroUtils.java

@@ -28,6 +28,7 @@ public class ShiroUtils {
         filterChainDefinitionMap.put("/authsource/list/allenable", "anon");
         filterChainDefinitionMap.put("/sso/signin", "anon");
         filterChainDefinitionMap.put("/sso/callback", "anon");
+        filterChainDefinitionMap.put("/license/valid", "anon");
 
         // for swagger
         filterChainDefinitionMap.put("/swagger-ui.html", "anon");

backend/src/main/java/io/metersphere/notice/service/MailService.java

@@ -53,14 +53,14 @@ public class MailService {
                     props.put("mail.smtp.starttls.enable", result);
                     props.put("mail.smtp.starttls.required", result);
                     break;
-                case "smtp.anon":
+             /*   case "smtp.anon":
                     boolean isAnon = BooleanUtils.toBoolean(p.getParamValue());
                     if (isAnon) {
                         props.put("mail.smtp.auth", "false");
                         javaMailSender.setUsername(null);
                         javaMailSender.setPassword(null);
                     }
-                    break;
+                    break;*/
                 default:
                     break;
             }

frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue

@@ -20,7 +20,7 @@
         <el-table-column prop="tagNames" :label="$t('api_test.automation.tag')" width="200px">
           <template v-slot:default="scope">
             <div v-for="itemName in scope.row.tags" :key="itemName">
-              <ms-tag type="success" effect="plain" :content="itemName.substring(1, itemName.length-1)"/>
+              <ms-tag type="success" effect="plain" :content="itemName"/>
             </div>
           </template>
         </el-table-column>

frontend/src/login/Login.vue

@@ -62,6 +62,7 @@ import {DEFAULT_LANGUAGE} from "@/common/js/constants";
 const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/);
 const display = requireComponent.keys().length > 0 ? requireComponent("./display/Display.vue") : {};
 const auth = requireComponent.keys().length > 0 ? requireComponent("./auth/Auth.vue") : {};
+const license = requireComponent.keys().length > 0 ? requireComponent("./license/LicenseMessage.vue") : null;
 
 export default {
   name: "Login",
@@ -117,6 +118,10 @@ export default {
   created: function () {
     // 主页添加键盘事件,注意,不能直接在焦点事件上添加回车
     document.addEventListener("keydown", this.watchEnter);
+    //
+    if (license.default) {
+      license.default.valid(this)
+    }
   },
 
   destroyed() {