Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

.gitignore

 backend/.metadata
 .metadata/
+RemoteSystemsTempFiles/

backend/build.war/src/main/java/com/beecode/inz/war/SecurityConfig.java

@@ -225,6 +225,7 @@ public class SecurityConfig  {
 			.antMatchers("/authc/user/modifySelfPassword").permitAll()
 			.antMatchers("/crm/load/publicity/byAssetPackage/**").permitAll()
 			.antMatchers("/workflow/api/**").permitAll()
+			.antMatchers("/dnaserver/**").permitAll()
 			.anyRequest().authenticated();//listAll,modifySelfPassword,loadAuctionByAsset临时开放
 			http.exceptionHandling().authenticationEntryPoint(authenticationEntryPoint);
 			InzWebAuthenticationFilter filter = new InzWebAuthenticationFilter();

backend/build.war/src/main/java/com/beecode/inz/war/web/DnaOssController.java

+package com.beecode.inz.war.web;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+/**
+ * 往DNA系统单点登录的校验接口(DNA 系统调用该接口进行校验)
+ * @author Jackpot
+ * @date 2021-03-10
+ *
+ */
+@RestController
+public class DnaOssController {
+	
+	
+	@RequestMapping("/dnaserver")
+	public String oss(@RequestParam String serviceId) {
+		
+		//credential	凭据
+		//userName  用户名
+		
+		return "1";
+	}
+
+}

backend/common.gradle

@@ -247,9 +247,7 @@ ext {
         
         javax_persistence_api:        "javax.persistence:javax.persistence-api:2.2",
         jboss_javax_transaction_api:  "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final",
-        jboss_javax_transaction_api:  "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final",
         hibernate_common_annotations: "org.hibernate.common:hibernate-commons-annotations:5.0.4.Final"
-		
 
 	]
 }