move package

dbsyncer-web/src/main/java/org/dbsyncer/web/Application.java

@@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableAsync
 @EnableScheduling
 @EnableCaching
-@SpringBootApplication(scanBasePackages ="org.dbsyncer", exclude = DataSourceAutoConfiguration.class)
+@SpringBootApplication(scanBasePackages = "org.dbsyncer", exclude = DataSourceAutoConfiguration.class)
 public class Application {
 
     public static void main(String[] args) {

dbsyncer-web/src/main/java/org/dbsyncer/web/config/WebAppConfig.java

@@ -67,7 +67,7 @@ public class WebAppConfig extends WebSecurityConfigurerAdapter implements Authen
     protected void configure(HttpSecurity http) throws Exception { //配置策略
         http.csrf().disable()
                 .authorizeRequests()
-                .antMatchers("/css/**", "/js/**", "/images/**", "/config/**", "/plugins/**").permitAll().anyRequest()
+                .antMatchers("/css/**", "/js/**", "/img/**", "/config/**", "/plugins/**").permitAll().anyRequest()
                 .authenticated()
                 .and()
                 .formLogin()

dbsyncer-web/src/main/resources/application.properties

@@ -16,13 +16,10 @@ application.version=1.0.0.Alpha
 #All < Trace < Debug < Info < Warn < Error < Fatal < OFF
 logging.level.root=info
 #thymelea config
-spring.thymeleaf.prefix=classpath:/templates/
+spring.thymeleaf.prefix=classpath:/public/
 spring.thymeleaf.suffix=.html
 spring.thymeleaf.mode=HTML
 spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.cache=false
 spring.resources.chain.strategy.content.enabled=true
-spring.resources.chain.strategy.content.paths=/**
-#devtools enable
-spring.devtools.restart.enabled=false
-spring.devtools.add-properties=false
+spring.resources.chain.strategy.content.paths=/**

dbsyncer-web/src/main/resources/templates/index.html → dbsyncer-web/src/main/resources/public/index.html

@@ -12,7 +12,7 @@
     <meta name="description" content="search">
     <meta name="author" content="AE86">
     <title>dbsyncer</title>
-    <link type="image/x-icon" rel="icon" th:href="@{/images/sync.ico}"/>
+    <link type="image/x-icon" rel="icon" th:href="@{/img/sync.ico}"/>
     <link type="text/css" rel="stylesheet" th:href="@{/plugins/css/bootstrap/bootstrap.min.css}"/>
     <link type="text/css" rel="stylesheet" th:href="@{/plugins/css/bootstrap-dialog/bootstrap-dialog.min.css}"/>
     <link type="text/css" rel="stylesheet" th:href="@{/plugins/css/icheck/all.css}"/>

dbsyncer-web/src/main/resources/templates/index/index.html → dbsyncer-web/src/main/resources/public/index/index.html

@@ -28,7 +28,7 @@
                                     <div class="col-md-1" th:each="c,state : ${connectors}">
                                         <div th:id="${c?.id}" class="jumbotron dbsyncer_block">
                                             <div class="row">
-                                                <img th:src="@{'/images/'+ ${c?.config?.connectorType} + '.png'}">
+                                                <img th:src="@{'/img/'+ ${c?.config?.connectorType} + '.png'}">
                                             </div>
                                             <div class="row dbsyncer_over_hidden">
                                                 <span th:text="${c?.name}" th:title="${c?.name}" />
@@ -81,7 +81,7 @@
                                                 <div class="col-md-5">
                                                     <div class="well well-lg">
                                                         <div class="col-md-4">
-                                                            <img th:src="@{'/images/'+ ${m?.sourceConnector?.config?.connectorType} + '.png'}">
+                                                            <img th:src="@{'/img/'+ ${m?.sourceConnector?.config?.connectorType} + '.png'}">
                                                         </div>
                                                         <div class="col-md-7 dbsyncer_over_hidden">
                                                             <span th:text="${m?.sourceConnector?.name}" th:title="${m?.sourceConnector?.name}"></span>
@@ -106,7 +106,7 @@
                                                 <div class="col-md-5">
                                                     <div class="well well-lg">
                                                         <div class="col-md-4">
-                                                            <img th:src="@{'/images/'+ ${m?.targetConnector?.config?.connectorType} + '.png'}">
+                                                            <img th:src="@{'/img/'+ ${m?.targetConnector?.config?.connectorType} + '.png'}">
                                                         </div>
                                                         <div class="col-md-7 dbsyncer_over_hidden">
                                                             <span th:text="${m?.targetConnector?.name}" th:title="${m?.targetConnector?.name}"></span>

dbsyncer-web/src/main/resources/templates/login.html → dbsyncer-web/src/main/resources/public/login.html

@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>dbsyncer</title>
-<link type="image/x-icon" rel="icon" th:href="@{/images/sync.ico}"/>
+<link type="image/x-icon" rel="icon" th:href="@{img}"/>
 <link type="text/css" rel="stylesheet" th:href="@{/css/login/login.css}"/>
 </head>
 <body>

dbsyncer-web/src/main/resources/templates/mapping/edit.html → dbsyncer-web/src/main/resources/public/mapping/edit.html

@@ -27,7 +27,7 @@
                             <div class="col-md-4">
                                 <div class="row">
                                     <div class="col-md-4 text-right">
-                                        <img class="dbsyncer_img" th:src="@{'/images/'+ ${mapping?.sourceConnector?.config?.connectorType} + '.png'}">
+                                        <img class="dbsyncer_img" th:src="@{'/img/'+ ${mapping?.sourceConnector?.config?.connectorType} + '.png'}">
                                     </div>
                                     <div class="col-md-8">
                                         <p class="driver_break_word">[[${mapping?.sourceConnector?.name}]]</p>
@@ -45,7 +45,7 @@
                             <div class="col-md-4">
                                 <div class="row">
                                     <div class="col-md-4 text-right">
-                                        <img class="dbsyncer_img" th:src="@{'/images/'+ ${mapping?.targetConnector?.config?.connectorType} + '.png'}">
+                                        <img class="dbsyncer_img" th:src="@{'/img/'+ ${mapping?.targetConnector?.config?.connectorType} + '.png'}">
                                     </div>
                                     <div class="col-md-8">
                                         <p class="driver_break_word">[[${mapping?.targetConnector?.name}]]</p>

dbsyncer-web/src/main/resources/templates/mapping/editTableGroup.html → dbsyncer-web/src/main/resources/public/mapping/editTableGroup.html

@@ -19,7 +19,7 @@
                             <div class="col-md-4">
                                 <div class="row">
                                     <div class="col-md-4 text-right">
-                                        <img class="dbsyncer_img" th:src="@{'/images/'+ ${mapping?.sourceConnector?.config?.connectorType} + '.png'}">
+                                        <img class="dbsyncer_img" th:src="@{'/img/'+ ${mapping?.sourceConnector?.config?.connectorType} + '.png'}">
                                     </div>
                                     <div class="col-md-8">
                                         <p class="driver_break_word">[[${mapping?.sourceConnector?.name}]]</p>
@@ -37,7 +37,7 @@
                             <div class="col-md-4">
                                 <div class="row">
                                     <div class="col-md-4 text-right">
-                                        <img class="dbsyncer_img" th:src="@{'/images/'+ ${mapping?.targetConnector?.config?.connectorType} + '.png'}">
+                                        <img class="dbsyncer_img" th:src="@{'/img/'+ ${mapping?.targetConnector?.config?.connectorType} + '.png'}">
                                     </div>
                                     <div class="col-md-8">
                                         <p class="driver_break_word">[[${mapping?.targetConnector?.name}]]</p>

dbsyncer-web/src/main/resources/templates/test.html → dbsyncer-web/src/main/resources/public/test.html

@@ -12,7 +12,7 @@
     <meta name="description" content="search">
     <meta name="author" content="AE86">
     <title>dbsyncer</title>
-    <link type="image/x-icon" rel="icon" th:href="@{/images/sync.ico}"/>
+    <link type="image/x-icon" rel="icon" th:href="@{img}"/>
     <link type="text/css" rel="stylesheet" th:href="@{/plugins/css/bootstrap/bootstrap.min.css}"/>
     <link type="text/css" rel="stylesheet" th:href="@{/plugins/css/bootstrap-dialog/bootstrap-dialog.min.css}"/>
     <link type="text/css" rel="stylesheet" th:href="@{/plugins/css/icheck/all.css}"/>

dbsyncer-web/src/main/resources/static/js/login/login.js

@@ -8,10 +8,10 @@ var $formHtml = "<dl class=\"admin_login\">\n" +
     "\t</dt>\n" +
     "\t<div id=\"loginTip\" class=\"loginVerifcateTextError\"></div>\n" +
     "\t<dd class=\"user_icon\">\n" +
-    "\t\t<input type=\"text\" name=\"username\" placeholder=\"请输入帐号\" class=\"login_txtbx required\" value=\"admin\"/>\n" +
+    "\t\t<input type=\"text\" name=\"username\" placeholder=\"请输入帐号\" class=\"login_txtbx required\" />\n" +
     "\t</dd>\n" +
     "\t<dd class=\"pwd_icon\">\n" +
-    "\t\t<input type=\"password\" name=\"password\" placeholder=\"请输入密码\" class=\"login_txtbx required\" value=\"admin\"/>\n" +
+    "\t\t<input type=\"password\" name=\"password\" placeholder=\"请输入密码\" class=\"login_txtbx required\" />\n" +
     "\t</dd>\n" +
     "\t<dd>\n" +
     "\t\t<input type=\"button\" value=\"登录\" class=\"submit_btn\" id=\"loginSubmitBtn\" />\n" +