修改datax-admin里面的静态资源

.gitignore

@@ -7,6 +7,7 @@
 /datax-admin/target/
 /.idea/
 /datax-admin/.idea/
+/datax-admin/src/main/resources/static/
 /datax-registry/datax-registry.iml
 /datax-registry/target/
 /datax-rpc/datax-rpc.iml

datax-admin/src/main/java/com/wugui/datax/admin/config/SecurityConfig.java

@@ -50,7 +50,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
         http.cors().and().csrf().disable()
                 .authorizeRequests()
-                .antMatchers("/static/**","/index.html","/favicon.ico","/avatar.jpg").permitAll()
+                // 新增：放行根路径 / ，和其他公开资源放在一起
+                .antMatchers("/", "/static/**","/index.html","/favicon.ico","/avatar.jpg").permitAll()
                 .antMatchers("/api/callback","/api/processCallback","/api/registry","/api/registryRemove").permitAll()
                 .antMatchers("/doc.html","/swagger-resources/**","/webjars/**","/*/api-docs").anonymous()
                 .anyRequest().authenticated()

datax-admin/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: root
     password: 456123
-    url: jdbc:mysql://192.168.31.36:3306/dataxweb?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://192.168.31.15:3306/dataxweb?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8
     #    password: ${DB_PASSWORD:password}
     #    username: ${DB_USERNAME:username}
     #    url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_DATABASE:dataxweb}?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8

datax-admin/src/main/resources/static/static/css/chunk-03e96171.42d5ee4e.css

@@ -1 +0,0 @@
-.editor-container[data-v-75d10b0a]{height:82vh;overflow:auto}

datax-admin/src/main/resources/static/static/css/chunk-35cb90ad.1ff60aed.css

@@ -1 +0,0 @@
-.json-editor[data-v-fad11014]{height:100%;position:relative}.json-editor[data-v-fad11014] .CodeMirror{height:auto;min-height:300px}.json-editor[data-v-fad11014] .CodeMirror-scroll{min-height:300px}.json-editor[data-v-fad11014] .cm-s-rubyblue span.cm-string{color:#f08047}

datax-admin/src/main/resources/static/static/css/chunk-3a8a15ea.3dacfa09.css

@@ -1 +0,0 @@
-.el-dropdown-link{cursor:pointer;color:#409eff}.el-dropdown+.el-dropdown{margin-left:15px}

datax-admin/src/main/resources/static/static/css/chunk-69a205c2.2b021e6b.css

@@ -1 +0,0 @@
-.log-container[data-v-55de34aa]{background:#f5f5f5;height:500px;overflow:scroll;margin:20px;border:1px solid #ddd}.log-container pre[data-v-55de34aa]{display:block;padding:10px;margin:0 0 10.5px;word-break:break-all;word-wrap:break-word;color:#334851;background-color:#f5f5f5;border-radius:1px}

datax-admin/src/main/resources/static/static/css/chunk-commons.c2ac5852.css

@@ -1 +0,0 @@
-.pagination-container[data-v-f3b72548]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-f3b72548]{display:none}

datax-admin/src/main/resources/static/static/js/chunk-2d230fe7.341b11ea.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d230fe7"],{ef3c:function(e,r,n){"use strict";n.r(r);n("a481");var t,u,a={created:function(){var e=this.$route,r=e.params,n=e.query,t=r.path;this.$router.replace({path:"/"+t,query:n})},render:function(e){return e()}},c=a,o=n("2877"),p=Object(o["a"])(c,t,u,!1,null,null,null);r["default"]=p.exports}}]);

datax-core/pom.xml

@@ -78,6 +78,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>