multiple database

src/main/java/com/zglc/fm/FaultManagemnetApplication.java

@@ -10,7 +10,7 @@ import com.zglc.fm.utils.ExcelToPdf;
 
 @SpringBootApplication
 @ServletComponentScan
-@MapperScan("com.zglc.fm.dao")
+//@MapperScan("com.zglc.fm.dao")
 public class FaultManagemnetApplication {
 
     public static void main(String[] args) {

src/main/java/com/zglc/fm/conf/AuthConfigurer.java

@@ -41,7 +41,7 @@ public class AuthConfigurer implements WebMvcConfigurer {
 
         } else {  //linux 和mac
             registry.addResourceHandler("/sourcefm/**")
-                    .addResourceLocations("file:///sourcefm/");  //媒体资源
+                    .addResourceLocations("file:///source/");  //媒体资源
         }
 
         registry.addResourceHandler("swagger-ui.html")
@@ -58,7 +58,7 @@ public class AuthConfigurer implements WebMvcConfigurer {
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/datas/**").allowedOrigins("*").allowCredentials(true).allowedMethods(ORIGINS)
+        registry.addMapping("/sourcefm/**").allowedOrigins("*").allowCredentials(true).allowedMethods(ORIGINS)
                 .maxAge(3600);
 
     }

src/main/java/com/zglc/fm/conf/MasterDataSourceConfig.java

@@ -0,0 +1,66 @@
+package com.zglc.fm.conf;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import tk.mybatis.mapper.autoconfigure.MybatisProperties;
+import tk.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+@Configuration
+// 扫描 Mapper 接口并容器管理
+@MapperScan(basePackages = "com.zglc.fm.dao.master", sqlSessionFactoryRef = "masterSqlSessionFactory")
+public class MasterDataSourceConfig {
+    // 精确到 master 目录，以便跟其他数据源隔离
+    static final String MAPPER_LOCATION = "classpath:mapping/master/*.xml";
+
+    @Value("${spring.datasource.master.url}")
+    private String url;
+
+    @Value("${spring.datasource.master.username}")
+    private String user;
+
+    @Value("${spring.datasource.master.password}")
+    private String password;
+
+    @Value("${spring.datasource.master.driverClassName}")
+    private String driverClass;
+
+    @Bean(name = "masterDataSource")
+    @Primary
+    public DataSource masterDataSource() {
+        DruidDataSource dataSource = new DruidDataSource();
+        dataSource.setDriverClassName(driverClass);
+        dataSource.setUrl(url);
+        dataSource.setUsername(user);
+        dataSource.setPassword(password);
+        return dataSource;
+    }
+
+    @Bean(name = "masterTransactionManager")
+    @Primary
+    public DataSourceTransactionManager masterTransactionManager() {
+        return new DataSourceTransactionManager(masterDataSource());
+    }
+
+    @Bean(name = "masterSqlSessionFactory")
+    @Primary
+    public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource masterDataSource, MybatisProperties mybatisProperties)
+            throws Exception {
+        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        sessionFactory.setDataSource(masterDataSource);
+        sessionFactory.setConfiguration(mybatisProperties.getConfiguration());
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+                .getResources(MasterDataSourceConfig.MAPPER_LOCATION));
+        return sessionFactory.getObject();
+    }
+}
+

src/main/java/com/zglc/fm/conf/SecondDataSourceConfig.java

@@ -0,0 +1,58 @@
+package com.zglc.fm.conf;
+import com.alibaba.druid.pool.DruidDataSource;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import tk.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+@Configuration
+// 扫描 Mapper 接口并容器管理
+@MapperScan(basePackages = "com.zglc.fm.dao.second", sqlSessionFactoryRef = "secondSqlSessionFactory")
+public class SecondDataSourceConfig {
+    static final String MAPPER_LOCATION = "classpath:mapping/second/*.xml";
+
+    @Value("${spring.datasource.second.url}")
+    private String url;
+
+    @Value("${spring.datasource.second.username}")
+    private String user;
+
+    @Value("${spring.datasource.second.password}")
+    private String password;
+
+    @Value("${spring.datasource.second.driverClassName}")
+    private String driverClass;
+
+    @Bean(name = "secondDataSource")
+    public DataSource clusterDataSource() {
+        DruidDataSource dataSource = new DruidDataSource();
+        dataSource.setDriverClassName(driverClass);
+        dataSource.setUrl(url);
+        dataSource.setUsername(user);
+        dataSource.setPassword(password);
+        return dataSource;
+    }
+
+    @Bean(name = "secondTransactionManager")
+    public DataSourceTransactionManager clusterTransactionManager() {
+        return new DataSourceTransactionManager(clusterDataSource());
+    }
+
+    @Bean(name = "secondSqlSessionFactory")
+    public SqlSessionFactory clusterSqlSessionFactory(@Qualifier("secondDataSource") DataSource clusterDataSource)
+            throws Exception {
+        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        sessionFactory.setDataSource(clusterDataSource);
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+                .getResources(SecondDataSourceConfig.MAPPER_LOCATION));
+        return sessionFactory.getObject();
+    }
+}

src/main/java/com/zglc/fm/conf/SpringDaoMethodAspect.java

@@ -0,0 +1,33 @@
+package com.zglc.fm.conf;
+
+import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
+import org.springframework.aop.support.DefaultPointcutAdvisor;
+import org.springframework.aop.support.JdkRegexpMethodPointcut;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+
+@Configuration
+public class SpringDaoMethodAspect {
+    @Bean
+    public DruidStatInterceptor druidStatInterceptor() {
+        DruidStatInterceptor dsInterceptor = new DruidStatInterceptor();
+        return dsInterceptor;
+    }
+
+    @Bean
+    @Scope("prototype")
+    public JdkRegexpMethodPointcut druidStatPointcut() {
+        JdkRegexpMethodPointcut pointcut = new JdkRegexpMethodPointcut();
+        pointcut.setPattern("com.zglc.fm.dao.*");
+        return pointcut;
+    }
+
+    @Bean
+    public DefaultPointcutAdvisor druidStatAdvisor(DruidStatInterceptor druidStatInterceptor, JdkRegexpMethodPointcut druidStatPointcut) {
+        DefaultPointcutAdvisor defaultPointAdvisor = new DefaultPointcutAdvisor();
+        defaultPointAdvisor.setPointcut(druidStatPointcut);
+        defaultPointAdvisor.setAdvice(druidStatInterceptor);
+        return defaultPointAdvisor;
+    }
+}

src/main/java/com/zglc/fm/dao/AircraftTypeDao.java → src/main/java/com/zglc/fm/dao/master/AircraftTypeDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.AircraftTypeEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/dao/BookDao.java → src/main/java/com/zglc/fm/dao/master/BookDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.BookEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/dao/BookTypeDao.java → src/main/java/com/zglc/fm/dao/master/BookTypeDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.BookTypeEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/dao/CardDao.java → src/main/java/com/zglc/fm/dao/master/CardDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.CardEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/dao/CatalogueDao.java → src/main/java/com/zglc/fm/dao/master/CatalogueDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.base.Result;
 import com.zglc.fm.entity.CatalogueEntity;

src/main/java/com/zglc/fm/dao/DepartmentDao.java → src/main/java/com/zglc/fm/dao/master/DepartmentDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.DepartmentEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/dao/FaultDao.java → src/main/java/com/zglc/fm/dao/master/FaultDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.FaultEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/dao/FloatValueDao.java → src/main/java/com/zglc/fm/dao/master/FloatValueDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.FloatValue;
 import org.springframework.stereotype.Repository;

src/main/java/com/zglc/fm/dao/IntValueDao.java → src/main/java/com/zglc/fm/dao/master/IntValueDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.IntValue;
 import org.springframework.stereotype.Repository;

src/main/java/com/zglc/fm/dao/LogDao.java → src/main/java/com/zglc/fm/dao/master/LogDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.LogEntity;
 import org.springframework.stereotype.Repository;

src/main/java/com/zglc/fm/dao/MajorDao.java → src/main/java/com/zglc/fm/dao/master/MajorDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.MajorEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/dao/ManuelDao.java → src/main/java/com/zglc/fm/dao/master/ManuelDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.ManuelEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/dao/OutlineDao.java → src/main/java/com/zglc/fm/dao/master/OutlineDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.OutlineEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/dao/RightsDao.java → src/main/java/com/zglc/fm/dao/master/RightsDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.RightsEntity;
 import org.springframework.stereotype.Repository;

src/main/java/com/zglc/fm/dao/RoleDao.java → src/main/java/com/zglc/fm/dao/master/RoleDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.RoleEntity;
 import org.springframework.stereotype.Repository;

src/main/java/com/zglc/fm/dao/StrValueDao.java → src/main/java/com/zglc/fm/dao/master/StrValueDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.master;
 
 import com.zglc.fm.entity.StrValue;
 import org.springframework.stereotype.Repository;

src/main/java/com/zglc/fm/dao/UserDao.java → src/main/java/com/zglc/fm/dao/second/UserDao.java

@@ -1,4 +1,4 @@
-package com.zglc.fm.dao;
+package com.zglc.fm.dao.second;
 
 import com.zglc.fm.entity.UserEntity;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/zglc/fm/service/AircraftTypeService.java

@@ -1,7 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.AircraftTypeDao;
+import com.zglc.fm.dao.master.AircraftTypeDao;
 import com.zglc.fm.entity.AircraftTypeEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/zglc/fm/service/BookService.java

@@ -1,8 +1,8 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.BookDao;
-import com.zglc.fm.dao.CatalogueDao;
+import com.zglc.fm.dao.master.BookDao;
+import com.zglc.fm.dao.master.CatalogueDao;
 import com.zglc.fm.entity.BookEntity;
 //import com.zglc.fm.entity.FaultEntity;
 import com.zglc.fm.entity.CatalogueEntity;

src/main/java/com/zglc/fm/service/BookTypeService.java

@@ -1,7 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.BookTypeDao;
+import com.zglc.fm.dao.master.BookTypeDao;
 import com.zglc.fm.entity.BookTypeEntity;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/CardService.java

@@ -1,8 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.CardDao;
-import com.zglc.fm.entity.BookEntity;
+import com.zglc.fm.dao.master.CardDao;
 import com.zglc.fm.entity.CardEntity;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/DepartmentService.java

@@ -1,11 +1,9 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.entity.DepartmentEntity;
-import com.zglc.fm.dao.DepartmentDao;
-import com.zglc.fm.exceptions.BusinessException;
+import com.zglc.fm.dao.master.DepartmentDao;
 import org.springframework.stereotype.Service;
 import com.zglc.fm.base.Result;
-import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 import java.util.Iterator;
 import java.util.List;

src/main/java/com/zglc/fm/service/FaultService.java

@@ -1,9 +1,8 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.FaultDao;
+import com.zglc.fm.dao.master.FaultDao;
 import com.zglc.fm.entity.FaultEntity;
-import org.apache.poi.hssf.record.PageBreakRecord;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/FloatValueService.java

@@ -1,7 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.FloatValueDao;
+import com.zglc.fm.dao.master.FloatValueDao;
 import com.zglc.fm.entity.FloatValue;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/IntValueService.java

@@ -1,7 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.IntValueDao;
+import com.zglc.fm.dao.master.IntValueDao;
 import com.zglc.fm.entity.IntValue;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/LogService.java

@@ -1,7 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.entity.LogEntity;
-import com.zglc.fm.dao.LogDao;
+import com.zglc.fm.dao.master.LogDao;
 import org.springframework.stereotype.Service;
 import com.zglc.fm.base.Result;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/MajorService.java

@@ -2,8 +2,7 @@ package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
 import com.zglc.fm.entity.MajorEntity;
-import com.zglc.fm.dao.MajorDao;
-import com.zglc.fm.entity.ManuelEntity;
+import com.zglc.fm.dao.master.MajorDao;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 

src/main/java/com/zglc/fm/service/ManuelService.java

@@ -1,8 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.ManuelDao;
-import com.zglc.fm.entity.FaultEntity;
+import com.zglc.fm.dao.master.ManuelDao;
 import com.zglc.fm.entity.ManuelEntity;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/OutlineService.java

@@ -1,8 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.OutlineDao;
-import com.zglc.fm.entity.FaultEntity;
+import com.zglc.fm.dao.master.OutlineDao;
 import com.zglc.fm.entity.OutlineEntity;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/RightsService.java

@@ -1,8 +1,8 @@
 package com.zglc.fm.service;
 
-import com.zglc.fm.dao.RoleDao;
+import com.zglc.fm.dao.master.RoleDao;
 import com.zglc.fm.entity.RightsEntity;
-import com.zglc.fm.dao.RightsDao;
+import com.zglc.fm.dao.master.RightsDao;
 import com.zglc.fm.entity.RoleEntity;
 import com.zglc.fm.utils.RightsTool;
 import org.springframework.stereotype.Service;

src/main/java/com/zglc/fm/service/RoleService.java

@@ -1,8 +1,8 @@
 package com.zglc.fm.service;
 
-import com.zglc.fm.dao.RightsDao;
+import com.zglc.fm.dao.master.RightsDao;
 import com.zglc.fm.entity.RoleEntity;
-import com.zglc.fm.dao.RoleDao;
+import com.zglc.fm.dao.master.RoleDao;
 import org.springframework.stereotype.Service;
 import com.zglc.fm.base.Result;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/StrValueService.java

@@ -1,7 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
-import com.zglc.fm.dao.StrValueDao;
+import com.zglc.fm.dao.master.StrValueDao;
 import com.zglc.fm.entity.StrValue;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;

src/main/java/com/zglc/fm/service/UserService.java

@@ -1,8 +1,7 @@
 package com.zglc.fm.service;
 
 import com.zglc.fm.entity.UserEntity;
-import com.zglc.fm.dao.UserDao;
-import com.zglc.fm.utils.DigestUtil;
+import com.zglc.fm.dao.second.UserDao;
 import org.springframework.stereotype.Service;
 import com.zglc.fm.base.Result;
 import tk.mybatis.mapper.entity.Example;

src/main/resources/application-dev.yml

@@ -1,92 +1,105 @@
 spring:
-
   datasource:
-    url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
-#    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+    master:
+      driverClassName: com.mysql.jdbc.Driver
+
+      url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+  #    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+
+      username: root
+
+      password: w.cf123321
+
+      type: com.alibaba.druid.pool.DruidDataSource
+
+    second:
+      driverClassName: com.mysql.jdbc.Driver
 
-    username: root
+      url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+        #    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
 
-    password: w.cf123321
+      username: root
 
-    type: com.alibaba.druid.pool.DruidDataSource
+      password: w.cf123321
 
-    druid:
+      type: com.alibaba.druid.pool.DruidDataSource
+  druid:
 
-      # 下面为连接池的补充设置，应用到上面所有数据源中
+    # 下面为连接池的补充设置，应用到上面所有数据源中
 
-      # 初始化大小，最小，最大
+    # 初始化大小，最小，最大
 
-      initial-size: 5
+    initial-size: 5
 
-      min-idle: 5
+    min-idle: 5
 
-      max-active: 20
+    max-active: 20
 
-      # 配置获取连接等待超时的时间
+    # 配置获取连接等待超时的时间
 
-      max-wait: 60000
+    max-wait: 60000
 
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+    # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
 
-      time-between-eviction-runs-millis: 60000
+    time-between-eviction-runs-millis: 60000
 
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
+    # 配置一个连接在池中最小生存的时间，单位是毫秒
 
-      min-evictable-idle-time-millis: 300000
+    min-evictable-idle-time-millis: 300000
 
-      validation-query: SELECT 1 FROM DUAL
+    validation-query: SELECT 1 FROM DUAL
 
-      test-while-idle: true
+    test-while-idle: true
 
-      test-on-borrow: false
+    test-on-borrow: false
 
-      test-on-return: false
+    test-on-return: false
 
-      # 打开PSCache，并且指定每个连接上PSCache的大小
+    # 打开PSCache，并且指定每个连接上PSCache的大小
 
-      pool-prepared-statements: true
+    pool-prepared-statements: true
 
-      #   配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+    #   配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
 
-      max-pool-prepared-statement-per-connection-size: 20
+    max-pool-prepared-statement-per-connection-size: 20
 
-      filters: stat,wall
+    filters: stat,wall
 
-      use-global-data-source-stat: true
+    use-global-data-source-stat: true
 
-      # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+    # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
 
-      connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+    connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 
-      # 配置监控服务器
+    # 配置监控服务器
 
-      stat-view-servlet:
+    stat-view-servlet:
 
-        login-username: admin
+      login-username: admin
 
-        login-password: druid.123456
+      login-password: druid.123456
 
-        reset-enable: false
+      reset-enable: false
 
-        url-pattern: /druid/*
+      url-pattern: /druid/*
 
-        # 添加IP白名单
+      # 添加IP白名单
 
-        #allow:
+      #allow:
 
-        # 添加IP黑名单，当白名单和黑名单重复时，黑名单优先级更高
+      # 添加IP黑名单，当白名单和黑名单重复时，黑名单优先级更高
 
-        #deny:
+      #deny:
 
-      web-stat-filter:
+    web-stat-filter:
 
-        # 添加过滤规则
+      # 添加过滤规则
 
-        url-pattern: /*
+      url-pattern: /*
 
-        # 忽略过滤格式
+      # 忽略过滤格式
 
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+      exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
   fault:
     sourcePath: d:\sourcefm
     uploadPath: d:\uploadfm

src/main/resources/application-prod.yml

@@ -1,15 +1,28 @@
 spring:
-
   datasource:
-    url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
-#    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+    master:
+      driverClassName: com.mysql.jdbc.Driver
+
+      url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+      #    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+
+      username: root
+
+      password: w.cf123321
 
-    username: root
+      type: com.alibaba.druid.pool.DruidDataSource
 
-    password:  w.cf123321
+    second:
+      driverClassName: com.mysql.jdbc.Driver
 
-    type: com.alibaba.druid.pool.DruidDataSource
+      url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+      #    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
 
+      username: root
+
+      password: w.cf123321
+
+      type: com.alibaba.druid.pool.DruidDataSource
     druid:
 
       # 下面为连接池的补充设置，应用到上面所有数据源中
@@ -87,7 +100,6 @@ spring:
         # 忽略过滤格式
 
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-
   fault:
     sourcePath: \sourcefm
     uploadPath: \uploadfm

src/main/resources/mapping/AircraftTypeDao.xml → src/main/resources/mapping/master/AircraftTypeDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.AircraftTypeDao">
+<mapper namespace="com.zglc.fm.dao.master.AircraftTypeDao">
 
     <!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.AircraftTypeEntity" id="AircraftTypeMap">

src/main/resources/mapping/BookDao.xml → src/main/resources/mapping/master/BookDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.BookDao">
+<mapper namespace="com.zglc.fm.dao.master.BookDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.BookEntity" id="bookMap">

src/main/resources/mapping/BookTypeDao.xml → src/main/resources/mapping/master/BookTypeDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.BookTypeDao">
+<mapper namespace="com.zglc.fm.dao.master.BookTypeDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.BookTypeEntity" id="bookTypeMap">

src/main/resources/mapping/CardDao.xml → src/main/resources/mapping/master/CardDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.CardDao">
+<mapper namespace="com.zglc.fm.dao.master.CardDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.CardEntity" id="cardMap">

src/main/resources/mapping/CatalogueDao.xml → src/main/resources/mapping/master/CatalogueDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.CatalogueDao">
+<mapper namespace="com.zglc.fm.dao.master.CatalogueDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.CatalogueEntity" id="catalogueMap">

src/main/resources/mapping/DepartmentDao.xml → src/main/resources/mapping/master/DepartmentDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.DepartmentDao">
+<mapper namespace="com.zglc.fm.dao.master.DepartmentDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.DepartmentEntity" id="departmentMap">

src/main/resources/mapping/FaultDao.xml → src/main/resources/mapping/master/FaultDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.FaultDao">
+<mapper namespace="com.zglc.fm.dao.master.FaultDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.FaultEntity" id="faultMap">

src/main/resources/mapping/LogDao.xml → src/main/resources/mapping/master/LogDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.LogDao">
+<mapper namespace="com.zglc.fm.dao.master.LogDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.LogEntity" id="logMap">

src/main/resources/mapping/MajorDao.xml → src/main/resources/mapping/master/MajorDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.MajorDao">
+<mapper namespace="com.zglc.fm.dao.master.MajorDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.MajorEntity" id="majorMap">

src/main/resources/mapping/ManuelDao.xml → src/main/resources/mapping/master/ManuelDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.ManuelDao">
+<mapper namespace="com.zglc.fm.dao.master.ManuelDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.ManuelEntity" id="manuelMap">

src/main/resources/mapping/OutlineDao.xml → src/main/resources/mapping/master/OutlineDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.OutlineDao">
+<mapper namespace="com.zglc.fm.dao.master.OutlineDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.OutlineEntity" id="outlineMap">

src/main/resources/mapping/RightsDao.xml → src/main/resources/mapping/master/RightsDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.RightsDao">
+<mapper namespace="com.zglc.fm.dao.master.RightsDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.RightsEntity" id="rightsMap">

src/main/resources/mapping/RoleDao.xml → src/main/resources/mapping/master/RoleDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.RoleDao">
+<mapper namespace="com.zglc.fm.dao.master.RoleDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.RoleEntity" id="roleMap">

src/main/resources/mapping/StrValueDao.xml → src/main/resources/mapping/master/StrValueDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.StrValueDao">
+<mapper namespace="com.zglc.fm.dao.master.StrValueDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.StrValue" id="strValueMap">

src/main/resources/mapping/UserDao.xml → src/main/resources/mapping/second/UserDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.zglc.fm.dao.UserDao">
+<mapper namespace="com.zglc.fm.dao.second.UserDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.zglc.fm.entity.UserEntity" id="userMap">

src/main/resources/static/.gitignore

@@ -1,34 +0,0 @@
-.DS_Store
-node_modules
-dist
-example.html
-favicon.ico
-# local env files
-.env.local
-.env.*.local
-*.tar
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw*
-
-/vim_settings.xml
-/vcs.xml
-/colors.scheme.xml
-/code.style.schemes.xml
-/ignore.xml
-/find.xml
-/editor.xml
-/editor.codeinsight.xml
-/material_theme.xml
-/ide.general.xml
-/debugger.xml

src/main/resources/static/Electronics.html → src/main/resources/static/Ordinary/Electronics.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/Electronics.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/Flying.html → src/main/resources/static/Ordinary/Flying.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/Flying.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 60px!important;
+        }
     </style>
 </head>
 

src/main/resources/static/Not_indexed.html → src/main/resources/static/Ordinary/Not_indexed.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/Not_indexed.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 60px!important;
+        }
     </style>
 </head>
 

src/main/resources/static/ad_hoc.html → src/main/resources/static/Ordinary/ad_hoc.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/ad_hoc.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 60px!important;
+        }
     </style>
 </head>
 

src/main/resources/static/aircraft-edit.html → src/main/resources/static/Ordinary/aircraft-edit.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/aircraft-edit.js"></script>
 </head>
 
@@ -27,7 +27,8 @@
                         <div class="layui-form-item">
                             <label for="aircraft_type" class="layui-form-label"> <span class="x-red">*</span> 机型 </label>
                             <div class="layui-input-inline">
-                                <select name="aircraft_type" id="aircraft_type" lay-search="aircraft_type" lay-verify="required"></select>
+                                <input type="text" id="aircraft_type" name="aircraft_type" autocomplete="off" class="layui-input">
+
                             </div>
                         </div>
                     </div>

src/main/resources/static/aircraft.html → src/main/resources/static/Ordinary/aircraft.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/aircraft.js"></script>
     <style>
         .search {
@@ -24,7 +24,20 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
+
 </head>
 
 <body class="layui-anim layui-anim-up">
@@ -34,7 +47,7 @@
             <button id="addair" class="layui-btn layui-btn-sm">
         <i class="layui-icon">&#xe61f;</i>增加</button>
             <button id="batchDelete" class="layui-btn layui-btn-sm layui-btn-danger " style="padding-right: 10px;">
-            <i class="layui-icon">&#xe640;</i> 删除</button>
+            <i class="layui-icon">&#xe640;</i> 批量删除</button>
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
                 <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
             </a>

src/main/resources/static/book-add.html → src/main/resources/static/Ordinary/book-add.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/book-add.js"></script>
 </head>
 
@@ -63,9 +63,9 @@
                 <div class="layui-row">
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="img" class="layui-form-label">图片</label>
+                            <label for="type_name" class="layui-form-label">  类型名称</label>
                             <div class="layui-input-inline">
-                                <input type="text" id="img" name="img" autocomplete="off" class="layui-input">
+                                <input type="text" id="type_name" name="type_name" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                     </div>
@@ -81,7 +81,7 @@
                 <div class="layui-row">
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="major_type" class="layui-form-label"><span class="x-red">*</span> 专业</label>
+                            <label for="major_type" class="layui-form-label"> 专业</label>
                             <div class="layui-input-inline">
                                 <input type="text" id="major_type" name="major_type" autocomplete="off" class="layui-input">
                             </div>
@@ -89,27 +89,30 @@
                     </div>
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="publish_time" class="layui-form-label"><span class="x-red">*</span> 出版时间</label>
+                            <label for="publish_time" class="layui-form-label">  出版时间</label>
                             <div class="layui-input-inline">
                                 <input type="text" id="publish_time" name="publish_time" autocomplete="off" class="layui-input" placeholder="yyyy-MM-dd">
                             </div>
                         </div>
                     </div>
                 </div>
+
                 <div class="layui-row">
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="type_id" class="layui-form-label"><span class="x-red">*</span> 类型id</label>
+                            <label for="file_path" class="layui-form-label">
+                                <span class="x-red">*</span> 文件路径
+								</label>
                             <div class="layui-input-inline">
-                                <input type="text" id="type_id" name="type_id" autocomplete="off" class="layui-input">
+                                <input type="text" id="file_path" name="file_path" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                     </div>
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="type_name" class="layui-form-label"><span class="x-red">*</span> 类型名称</label>
-                            <div class="layui-input-inline">
-                                <input type="text" id="type_name" name="type_name" autocomplete="off" class="layui-input">
+                            <label for="fileSelector" class="layui-form-label"> <span class="x-red">*</span> 选择文件 </label>
+                            <div class="layui-input-inline" style="padding-top:6px">
+                                <input type="file" name="file" id="fileSelector">
                             </div>
                         </div>
                     </div>
@@ -117,32 +120,23 @@
                 <div class="layui-row">
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="file_path" class="layui-form-label">
-                                <span class="x-red">*</span> 文件路径
-								</label>
+                            <label for="img" class="layui-form-label"><span class="x-red">*</span>图片路径</label>
                             <div class="layui-input-inline">
-                                <input type="text" id="file_path" name="file_path" autocomplete="off" class="layui-input">
+                                <input type="text" id="img" name="img" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                     </div>
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="fileSelector" class="layui-form-label"> <span class="x-red">*</span> 选择文件 </label>
+                            <label for="imgSelector" class="layui-form-label"> <span class="x-red">*</span> 选择文件 </label>
                             <div class="layui-input-inline" style="padding-top:6px">
-                                <input type="file" name="file" id="fileSelector">
+                                <input type="file" name="file" id="imgSelector">
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="layui-row">
-                    <!-- <div class="layui-col-sm6">
-                        <div class="layui-form-item">
-                            <input type="hidden" name="images" class="image">
-                        </div>
-                    </div> -->
-                    <div class="layui-row-sm6">
+                    <!-- <div class="layui-row-sm6">
                         <div class="layui-form-item">
-                            <label class="layui-form-label ">照片:</label>
+                            <label class="layui-form-label">照片:</label>
                             <div class="layui-upload">
                                 <button type="button" class="layui-btn" id="test1">上传图片</button> <span style="color:red">图片格式支持：jpg/png</span>
                                 <div class="layui-upload-list">
@@ -151,7 +145,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
+                    </div> -->
 
 
                 </div>
@@ -187,6 +181,6 @@
     });
 </script>
 
-</html>t>
+</html>
 
 </html>

src/main/resources/static/book-edit.html → src/main/resources/static/Ordinary/book-edit.html

@@ -13,8 +13,9 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/book-edit.js"></script>
+
 </head>
 
 <body>
@@ -97,14 +98,7 @@
                     </div>
                 </div>
                 <div class="layui-row">
-                    <div class="layui-col-sm6">
-                        <div class="layui-form-item">
-                            <label for="type_id" class="layui-form-label">类型id</label>
-                            <div class="layui-input-inline">
-                                <input type="text" id="type_id" name="type_id" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
-                    </div>
+
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
                             <label for="type_name" class="layui-form-label">类型名称</label>

src/main/resources/static/book.html → src/main/resources/static/Ordinary/book.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/book.js"></script>
     <style>
         .search {
@@ -24,6 +24,23 @@
         #realName {
             display: inline-block;
         }
+        /* .layui-table-cell {
+            text-align: center;
+            height: auto;
+            white-space: normal;
+        } */
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 
@@ -35,7 +52,7 @@
             <!-- <button id="tolead" class="layui-btn layui-btn-sm " style="padding-left: 10px;padding-right: 10px;">
             <i class="layui-icon">&#xe67c;</i>导入</button> -->
             <button id="batchDelete" class="layui-btn layui-btn-sm layui-btn-danger " style="padding-right: 10px;">
-            <i class="layui-icon">&#xe640;</i> 删除</button>
+            <i class="layui-icon">&#xe640;</i>批量删除</button>
 
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
                 <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
@@ -56,7 +73,7 @@
             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
         </script>
         <script type="text/html" id="imgtemp">
-            <div><img src="./admin/images/1.jpg" style="width:20px;height:20px"></div>
+            <div><img src="{{d.img}}"></div>
         </script>
     </div>
 </body>

src/main/resources/static/bookAir.html → src/main/resources/static/Ordinary/bookAir.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/bookAir.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/bookAirEle.html → src/main/resources/static/Ordinary/bookAirEle.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/bookAirEle.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/bookAirEqu.html → src/main/resources/static/Ordinary/bookAirEqu.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/bookAirEqu.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/bookFlying.html → src/main/resources/static/Ordinary/bookFlying.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/bookFlying.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/bookGeneralIntroduction.html → src/main/resources/static/Ordinary/bookGeneralIntroduction.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/bookGeneralIntroduction.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/bookIntegratedAvionics.html → src/main/resources/static/Ordinary/bookIntegratedAvionics.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/bookIntegratedAvionics.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/bookOrdnance.html → src/main/resources/static/Ordinary/bookOrdnance.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/bookOrdnance.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/bookStructure.html → src/main/resources/static/Ordinary/bookStructure.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/bookStructure.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/card-add.html → src/main/resources/static/Ordinary/card-add.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/card-add.js"></script>
 </head>
 

src/main/resources/static/card-edit.html → src/main/resources/static/Ordinary/card-edit.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/card-edit.js"></script>
 </head>
 
@@ -24,7 +24,7 @@
                 <div class="layui-row">
                     <div class="layui-col-sm6">
                         <div class="layui-form-item">
-                            <label for="card_name" class="layui-form-label">工艺卡片名称</label>
+                            <label for="card_name" class="layui-form-label" style="width:84px">工艺卡片名称</label>
                             <div class="layui-input-inline">
                                 <input type="text" id="card_name" name="card_name" required="" lay-verify="required" autocomplete="off" class="layui-input">
                             </div>
@@ -79,19 +79,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-row">
-                    <div class="layui-col-sm6">
-                        <div class="layui-form-item">
-                            <label for="file_path" class="layui-form-label">
-									文件路径
-								</label>
-                            <div class="layui-input-inline">
-                                <input type="text" id="file_path" name="file_path" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
-                    </div>
 
-                </div>
             </div>
             <br>
             <div class="layui-row" style="text-align: center;">

src/main/resources/static/card.html → src/main/resources/static/Ordinary/card.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/card.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 
@@ -33,7 +45,7 @@
             <button id="add" class="layui-btn layui-btn-sm">
         <i class="layui-icon">&#xe61f;</i>增加</button>
             <button id="batchDelete" class="layui-btn layui-btn-sm layui-btn-danger " style="padding-right: 10px;">
-            <i class="layui-icon">&#xe640;</i> 删除</button>
+            <i class="layui-icon">&#xe640;</i> 批量删除</button>
             <a class="layui-btn layui-btn-sm" style="padding-left: 10px" href="javascript:location.replace(location.href);" title="刷新">
                 <i class="layui-icon" style="line-height:30px">&#xe669;</i>刷新
             </a>

src/main/resources/static/cardAdHoc.html → src/main/resources/static/Ordinary/cardAdHoc.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/cardAdHoc.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/cardElectronics.html → src/main/resources/static/Ordinary/cardElectronics.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/cardElectronics.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/cardFireControl.html → src/main/resources/static/Ordinary/cardFireControl.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/cardFireControl.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/cardFlying.html → src/main/resources/static/Ordinary/cardFlying.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/cardFlying.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/cardOrdnance.html → src/main/resources/static/Ordinary/cardOrdnance.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/cardOrdnance.js"></script>
     <style>
         .search {
@@ -24,6 +24,18 @@
         #realName {
             display: inline-block;
         }
+        
+        .layui-border-box {
+            height: 428px!important;
+        }
+        
+        .layui-table-body {
+            height: 380px!important;
+        }
+        
+        #pagination {
+            margin-top: 45px;
+        }
     </style>
 </head>
 

src/main/resources/static/chapter.html → src/main/resources/static/Ordinary/chapter.html

@@ -14,7 +14,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/aircraft.js"></script>
 
 </head>

src/main/resources/static/department-edit.html → src/main/resources/static/Ordinary/department-edit.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/departmentEdit.js"></script>
 </head>
 

src/main/resources/static/department.html → src/main/resources/static/Ordinary/department.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/department.js"></script>
 
     <Style>

src/main/resources/static/faul-add.html → src/main/resources/static/Ordinary/faul-add.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/faul-add.js"></script>
     <style>
 

src/main/resources/static/faul.html → src/main/resources/static/Ordinary/faul.html

@@ -13,7 +13,7 @@
     <script src="./lib/jquery.min.js"></script>
     <script src="./lib/layui/layui.js" charset="utf-8"></script>
     <script src="./js/xadmin.js"></script>
-    <script src="./other/js/functions.js"></script>
+    <script src="../other/js/functions.js"></script>
     <script src="./js/faul.js"></script>
     <style>
         .search {