测试配置双数据源

shiwan/admin/.gitignore

@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/

shiwan/admin/.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,118 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-            + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if (mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if (mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if (!outputFile.getParentFile().exists()) {
-            if (!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

shiwan/admin/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

shiwan/admin/admin.iml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <setting name="provider-name" value="Hibernate" />
+        <datasource-mapping>
+          <factory-entry name="entityManagerFactory" />
+          <factory-entry name="entityManagerFactoryPrimary" />
+          <factory-entry name="entityManagerFactorySecondary" />
+        </datasource-mapping>
+        <naming-strategy-map />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.4.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.4.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.4.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.6.28" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.18" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.18" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.6.28" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.41" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: log4j:apache-log4j-extras:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.22" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.4.25.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.27.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss:jandex:2.1.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.0.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.session:spring-session-data-redis:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.session:spring-session-core:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.62" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
+  </component>
+</module>

shiwan/admin/mvnw

@@ -1,322 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ]; then
-
-  if [ -f /etc/mavenrc ]; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ]; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false
-darwin=false
-mingw=false
-case "$(uname)" in
-CYGWIN*) cygwin=true ;;
-MINGW*) mingw=true ;;
-Darwin*)
-  darwin=true
-  # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-  # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-  if [ -z "$JAVA_HOME" ]; then
-    if [ -x "/usr/libexec/java_home" ]; then
-      export JAVA_HOME="$(/usr/libexec/java_home)"
-    else
-      export JAVA_HOME="/Library/Java/Home"
-    fi
-  fi
-  ;;
-esac
-
-if [ -z "$JAVA_HOME" ]; then
-  if [ -r /etc/gentoo-release ]; then
-    JAVA_HOME=$(java-config --jre-home)
-  fi
-fi
-
-if [ -z "$M2_HOME" ]; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ]; do
-    ls=$(ls -ld "$PRG")
-    link=$(expr "$ls" : '.*-> \(.*\)$')
-    if expr "$link" : '/.*' >/dev/null; then
-      PRG="$link"
-    else
-      PRG="$(dirname "$PRG")/$link"
-    fi
-  done
-
-  saveddir=$(pwd)
-
-  M2_HOME=$(dirname "$PRG")/..
-
-  # make it fully qualified
-  M2_HOME=$(cd "$M2_HOME" && pwd)
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=$(cygpath --unix "$M2_HOME")
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="$( (
-      cd "$M2_HOME"
-      pwd
-    ))"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="$( (
-      cd "$JAVA_HOME"
-      pwd
-    ))"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="$(which javac)"
-  if [ -n "$javaExecutable" ] && ! [ "$(expr \"$javaExecutable\" : '\([^ ]*\)')" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=$(which readlink)
-    if [ ! $(expr "$readLink" : '\([^ ]*\)') = "no" ]; then
-      if $darwin; then
-        javaHome="$(dirname \"$javaExecutable\")"
-        javaExecutable="$(cd \"$javaHome\" && pwd -P)/javac"
-      else
-        javaExecutable="$(readlink -f \"$javaExecutable\")"
-      fi
-      javaHome="$(dirname \"$javaExecutable\")"
-      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ]; then
-  if [ -n "$JAVA_HOME" ]; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="$(which java)"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ]; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-
-  if [ -z "$1" ]; then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ]; do
-    if [ -d "$wdir"/.mvn ]; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=$(
-        cd "$wdir/.."
-        pwd
-      )
-    fi
-    # end of workaround
-  done
-  echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' <"$1")"
-  fi
-}
-
-BASE_DIR=$(find_maven_basedir "$(pwd)")
-if [ -z "$BASE_DIR" ]; then
-  exit 1
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-  if [ "$MVNW_VERBOSE" = true ]; then
-    echo "Found .mvn/wrapper/maven-wrapper.jar"
-  fi
-else
-  if [ "$MVNW_VERBOSE" = true ]; then
-    echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-  fi
-  if [ -n "$MVNW_REPOURL" ]; then
-    jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-  else
-    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-  fi
-  while IFS="=" read key value; do
-    case "$key" in wrapperUrl)
-      jarUrl="$value"
-      break
-      ;;
-    esac
-  done <"$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-  if [ "$MVNW_VERBOSE" = true ]; then
-    echo "Downloading from: $jarUrl"
-  fi
-  wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-  if $cygwin; then
-    wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
-  fi
-
-  if command -v wget >/dev/null; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found wget ... using wget"
-    fi
-    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-      wget "$jarUrl" -O "$wrapperJarPath"
-    else
-      wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
-    fi
-  elif command -v curl >/dev/null; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found curl ... using curl"
-    fi
-    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-      curl -o "$wrapperJarPath" "$jarUrl" -f
-    else
-      curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
-    fi
-
-  else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Falling back to using Java to download"
-    fi
-    javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-    # For Cygwin, switch paths to Windows format before running javac
-    if $cygwin; then
-      javaClass=$(cygpath --path --windows "$javaClass")
-    fi
-    if [ -e "$javaClass" ]; then
-      if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo " - Compiling MavenWrapperDownloader.java ..."
-        fi
-        # Compiling the Java class
-        ("$JAVA_HOME/bin/javac" "$javaClass")
-      fi
-      if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-        # Running the downloader
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo " - Running MavenWrapperDownloader.java ..."
-        fi
-        ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-      fi
-    fi
-  fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=$(cygpath --path --windows "$M2_HOME")
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
-fi
-
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

shiwan/admin/mvnw.cmd

@@ -1,182 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %DOWNLOAD_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%

shiwan/admin/pom.xml

@@ -110,6 +110,7 @@
             <version>3.5.6</version>
             <scope>compile</scope>
         </dependency>
+
     </dependencies>
 
     <build>

shiwan/admin/src/main/java/com/huimv/admin/config/DataSourcesConfig.java

@@ -0,0 +1,72 @@
+package com.huimv.admin.config;
+
+import com.zaxxer.hikari.HikariDataSource;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.sql.DataSource;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.config
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2020/12/25 0025 16:56
+ **/
+@Configuration
+public class DataSourcesConfig {
+
+    @Bean
+    @Primary
+    @Qualifier("primaryDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.primary")
+    public DataSourceProperties primaryDataSourceProperties(){
+        return new DataSourceProperties();
+    }
+
+    @Bean
+    @Primary
+    @Qualifier("primaryDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.primary")
+    public DataSource primaryDataSource(@Value("${spring.datasource.primary.url}") String url,
+                                        @Value("${spring.datasource.primary.username}") String userName,
+                                        @Value("${spring.datasource.primary.password}") String pass,
+                                        @Value("${spring.datasource.primary.driver-class-name}") String className) {
+        HikariDataSource hikariDataSource = new HikariDataSource();
+        hikariDataSource.setJdbcUrl(url);
+        hikariDataSource.setDriverClassName(className);
+        hikariDataSource.setUsername(userName);
+        hikariDataSource.setPassword(pass);
+        return hikariDataSource;
+        //return primaryDataSourceProperties().initializeDataSourceBuilder().build();
+    }
+
+    @Bean
+    @Qualifier("secondaryDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.secondary")
+    public DataSourceProperties secondaryDataSourceProperties(){
+        return new DataSourceProperties();
+    }
+
+    @Bean
+    @Qualifier("secondaryDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.secondary")
+    public DataSource secondaryDataSource(@Value("${spring.datasource.secondary.url}") String url,
+                                          @Value("${spring.datasource.secondary.username}") String userName,
+                                          @Value("${spring.datasource.secondary.password}") String pass,
+                                          @Value("${spring.datasource.secondary.driver-class-name}") String className){
+        HikariDataSource hikariDataSource = new HikariDataSource();
+        hikariDataSource.setJdbcUrl(url);
+        hikariDataSource.setDriverClassName(className);
+        hikariDataSource.setUsername(userName);
+        hikariDataSource.setPassword(pass);
+        return hikariDataSource;
+        //return primaryDataSourceProperties().initializeDataSourceBuilder().build();
+    }
+
+}

shiwan/admin/src/main/java/com/huimv/admin/config/PrimaryConfig.java

@@ -0,0 +1,77 @@
+package com.huimv.admin.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
+import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.persistence.EntityManager;
+import javax.sql.DataSource;
+import java.util.Map;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.config
+ * @Description : 主数据源
+ * @Author : yuxuexuan
+ * @Create : 2020/12/25 0025 16:58
+ **/
+
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(
+        entityManagerFactoryRef="entityManagerFactoryPrimary",
+        transactionManagerRef="transactionManagerPrimary",
+        basePackages= { "com.huimv.admin.repo.primary" }) //设置Repository所在位置
+public class PrimaryConfig {
+    @Autowired
+    @Qualifier("primaryDataSource")
+    private DataSource primaryDataSource;
+
+    @Autowired
+    private HibernateProperties hibernateProperties;
+
+    @Autowired(required=false)
+    private JpaProperties jpaProperties;
+
+    @Primary
+    @Bean(name = "entityManagerPrimary")
+    public EntityManager entityManager(EntityManagerFactoryBuilder builder) {    //org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder  导入的包
+        return entityManagerFactoryPrimary(builder).getObject().createEntityManager();
+    }
+
+    @Primary
+    @Bean(name = "entityManagerFactoryPrimary")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactoryPrimary (EntityManagerFactoryBuilder builder) {
+        return builder
+                .dataSource(primaryDataSource)
+                .properties(getVerdorProperties())
+                .packages("com.huimv.admin.domain.primary") //设置实体类所在位置
+                .persistenceUnit("primaryPersistenceUnit")
+                .build();
+    }
+
+
+    public Map<String, Object> getVerdorProperties(){
+        return hibernateProperties.determineHibernateProperties(
+                jpaProperties.getProperties(),new HibernateSettings());
+    }
+
+
+    @Primary
+    @Bean(name = "transactionManagerPrimary")
+    public PlatformTransactionManager transactionManagerPrimary(EntityManagerFactoryBuilder builder) {
+        return new JpaTransactionManager(entityManagerFactoryPrimary(builder).getObject());
+    }
+
+}

shiwan/admin/src/main/java/com/huimv/admin/config/SecondaryConfig.java

@@ -0,0 +1,69 @@
+package com.huimv.admin.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
+import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.persistence.EntityManager;
+import javax.sql.DataSource;
+import java.util.Map;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.config
+ * @Description : 次数据源
+ * @Author : yuxuexuan
+ * @Create : 2020/12/25 0025 17:02
+ **/
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(
+        entityManagerFactoryRef="entityManagerFactorySecondary",
+        transactionManagerRef="transactionManagerSecondary",
+        basePackages= { "com.huimv.admin.repo.secondary" }) //设置Repository所在位置
+public class SecondaryConfig {
+    @Autowired
+    @Qualifier("secondaryDataSource")
+    private DataSource secondaryDataSource;
+
+    @Autowired(required=false)
+    private JpaProperties jpaProperties;
+
+    @Autowired
+    private HibernateProperties hibernateProperties;
+
+    @Bean(name = "entityManagerSecondary")
+    public EntityManager entityManager(EntityManagerFactoryBuilder builder) {  //org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder  导入的包
+        return entityManagerFactorySecondary(builder).getObject().createEntityManager();
+    }
+
+    @Bean(name = "entityManagerFactorySecondary")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactorySecondary (EntityManagerFactoryBuilder builder) {
+        return builder
+                .dataSource(secondaryDataSource)
+                .properties(getVerdorProperties())
+                .packages("com.huimv.admin.domain.secondary") //设置实体类所在位置
+                .persistenceUnit("secondaryPersistenceUnit")
+                .build();
+    }
+
+
+    public Map<String, Object> getVerdorProperties(){
+        return hibernateProperties.determineHibernateProperties(jpaProperties.getProperties(),new HibernateSettings());
+    }
+
+    @Bean(name = "transactionManagerSecondary")
+    public PlatformTransactionManager transactionManagerSecondary(EntityManagerFactoryBuilder builder) {
+        return new JpaTransactionManager(entityManagerFactorySecondary(builder).getObject());
+    }
+}

shiwan/admin/src/main/java/com/huimv/admin/controller/AccountController.java

@@ -1,7 +1,7 @@
 package com.huimv.admin.controller;
 
 ;
-import com.huimv.admin.domain.SysAccountEntity;
+import com.huimv.admin.domain.primary.SysAccountEntity;
 import com.huimv.admin.service.IAccountService;
 import com.huimv.admin.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;

shiwan/admin/src/main/java/com/huimv/admin/controller/AuthorizeController.java

@@ -1,6 +1,6 @@
 package com.huimv.admin.controller;
 
-import com.huimv.admin.domain.SysMenuEntity;
+import com.huimv.admin.domain.primary.SysMenuEntity;
 import com.huimv.admin.service.IAuthorizeService;
 import com.huimv.admin.service.IMenuService;
 import com.huimv.admin.utils.Result;

shiwan/admin/src/main/java/com/huimv/admin/controller/LoginController.java

@@ -1,6 +1,6 @@
 package com.huimv.admin.controller;
 
-import com.huimv.admin.domain.SysAccountEntity;
+import com.huimv.admin.domain.primary.SysAccountEntity;
 import com.huimv.admin.service.ILoginService;
 import com.huimv.admin.session.AccessToken;
 import com.huimv.admin.session.HmSession;

shiwan/admin/src/main/java/com/huimv/admin/controller/MenuController.java

@@ -1,6 +1,6 @@
 package com.huimv.admin.controller;
 
-import com.huimv.admin.domain.SysMenuEntity;
+import com.huimv.admin.domain.primary.SysMenuEntity;
 import com.huimv.admin.service.IMenuService;
 import com.huimv.admin.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;

shiwan/admin/src/main/java/com/huimv/admin/controller/SysGroupController.java

@@ -1,7 +1,7 @@
 package com.huimv.admin.controller;
 
 
-import com.huimv.admin.domain.SysGroupEntity;
+import com.huimv.admin.domain.primary.SysGroupEntity;
 import com.huimv.admin.service.IGroupService;
 import com.huimv.admin.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;

shiwan/admin/src/main/java/com/huimv/admin/controller/SysUserController.java

@@ -2,8 +2,10 @@ package com.huimv.admin.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.admin.domain.SysUserEntity;
+import com.huimv.admin.domain.primary.SysUserEntity;
+import com.huimv.admin.domain.secondary.Users;
 import com.huimv.admin.group.UserAndAccountGroup;
+import com.huimv.admin.repo.secondary.UsersRepository;
 import com.huimv.admin.service.IUserService;
 import com.huimv.admin.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,4 +54,12 @@ public class SysUserController {
         return iUserService.findUserAccount(searchStr,pageNum,pageSize);
     }
 
+    @Autowired
+    private UsersRepository usersRepository;
+    @RequestMapping("/list1")
+    public void listUser1(){
+
+      usersRepository.save(new Users());
+    }
+
 }

shiwan/admin/src/main/java/com/huimv/admin/domain/MemberAccount.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain;
+package com.huimv.admin.domain.primary;
 
 import java.io.Serializable;
 import java.util.Date;

shiwan/admin/src/main/java/com/huimv/admin/domain/MemberInfo.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain;
+package com.huimv.admin.domain.primary;
 
 import com.huimv.admin.EntityBase;
 import com.huimv.admin.converter.KeyValueStringConverter;

shiwan/admin/src/main/java/com/huimv/admin/domain/OrganizeInfo.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain;
+package com.huimv.admin.domain.primary;
 
 import com.huimv.admin.EntityBase;
 import org.hibernate.annotations.DynamicInsert;

shiwan/admin/src/main/java/com/huimv/admin/domain/SysAccountEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain;
+package com.huimv.admin.domain.primary;
 
 import javax.persistence.*;
 import java.io.Serializable;

shiwan/admin/src/main/java/com/huimv/admin/domain/SysAccountGroupEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain;
+package com.huimv.admin.domain.primary;
 
 import lombok.Data;
 

shiwan/admin/src/main/java/com/huimv/admin/domain/SysGroupEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain;
+package com.huimv.admin.domain.primary;
 
 import lombok.Data;
 

shiwan/admin/src/main/java/com/huimv/admin/domain/SysGroupMenuEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain;
+package com.huimv.admin.domain.primary;
 
 import lombok.Data;
 

shiwan/admin/src/main/java/com/huimv/admin/domain/SysMenuEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain;
+package com.huimv.admin.domain.primary;
 
 import javax.persistence.*;
 import java.io.Serializable;

shiwan/admin/src/main/java/com/huimv/admin/domain/SysUserEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain;
+package com.huimv.admin.domain.primary;
 
 import lombok.Data;
 

shiwan/admin/src/main/java/com/huimv/admin/domain/secondary/Users.java

@@ -0,0 +1,38 @@
+package com.huimv.admin.domain.secondary;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.domain.secondary
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2020/12/25 0025 17:07
+ **/
+@Entity
+@Data
+@Table(name = "users")
+public class Users {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "gender")
+    private Integer gender;
+
+    @Column(name = "age")
+    private Integer age;
+
+    @Column(name = "created")
+    @Temporal(TemporalType.TIME)
+    private Date created;
+
+}

shiwan/admin/src/main/java/com/huimv/admin/repo/MemberAccountRepository.java

@@ -1,6 +1,6 @@
-package com.huimv.admin.repo;
+package com.huimv.admin.repo.primary;
 
-import com.huimv.admin.domain.MemberAccount;
+import com.huimv.admin.domain.primary.MemberAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface MemberAccountRepository extends JpaRepository<MemberAccount, Integer> {

shiwan/admin/src/main/java/com/huimv/admin/repo/SysAccountEntityRepository.java

@@ -1,6 +1,6 @@
-package com.huimv.admin.repo;
+package com.huimv.admin.repo.primary;
 
-import com.huimv.admin.domain.SysAccountEntity;
+import com.huimv.admin.domain.primary.SysAccountEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

shiwan/admin/src/main/java/com/huimv/admin/repo/SysAccountGroupEntityRepository.java

@@ -1,6 +1,6 @@
-package com.huimv.admin.repo;
+package com.huimv.admin.repo.primary;
 
-import com.huimv.admin.domain.SysAccountGroupEntity;
+import com.huimv.admin.domain.primary.SysAccountGroupEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

shiwan/admin/src/main/java/com/huimv/admin/repo/SysGroupEntityRepository.java

@@ -1,7 +1,7 @@
-package com.huimv.admin.repo;
+package com.huimv.admin.repo.primary;
 
 
-import com.huimv.admin.domain.SysGroupEntity;
+import com.huimv.admin.domain.primary.SysGroupEntity;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

shiwan/admin/src/main/java/com/huimv/admin/repo/SysGroupMenuEntityRepository.java

@@ -1,6 +1,6 @@
-package com.huimv.admin.repo;
+package com.huimv.admin.repo.primary;
 
-import com.huimv.admin.domain.SysGroupMenuEntity;
+import com.huimv.admin.domain.primary.SysGroupMenuEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

shiwan/admin/src/main/java/com/huimv/admin/repo/SysMenuEntityRepository.java

@@ -1,6 +1,6 @@
-package com.huimv.admin.repo;
+package com.huimv.admin.repo.primary;
 
-import com.huimv.admin.domain.SysMenuEntity;
+import com.huimv.admin.domain.primary.SysMenuEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

shiwan/admin/src/main/java/com/huimv/admin/repo/SysUserEntityRepository.java

@@ -1,7 +1,7 @@
-package com.huimv.admin.repo;
+package com.huimv.admin.repo.primary;
 
 
-import com.huimv.admin.domain.SysUserEntity;
+import com.huimv.admin.domain.primary.SysUserEntity;
 import com.huimv.admin.group.UserAndAccountGroup;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

shiwan/admin/src/main/java/com/huimv/admin/repo/secondary/UsersRepository.java

@@ -0,0 +1,15 @@
+package com.huimv.admin.repo.secondary;
+
+import com.huimv.admin.domain.primary.MemberAccount;
+import com.huimv.admin.domain.secondary.Users;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.admin.repo.secondary
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2020/12/25 0025 17:13
+ **/
+public interface UsersRepository extends JpaRepository<Users, Integer> {
+}

shiwan/admin/src/main/java/com/huimv/admin/service/IAccountService.java

@@ -1,6 +1,6 @@
 package com.huimv.admin.service;
 
-import com.huimv.admin.domain.SysAccountEntity;
+import com.huimv.admin.domain.primary.SysAccountEntity;
 import com.huimv.admin.utils.Result;
 
 import java.util.List;

shiwan/admin/src/main/java/com/huimv/admin/service/IGroupService.java

@@ -1,6 +1,6 @@
 package com.huimv.admin.service;
 
-import com.huimv.admin.domain.SysGroupEntity;
+import com.huimv.admin.domain.primary.SysGroupEntity;
 import com.huimv.admin.utils.Result;
 import org.springframework.data.domain.Page;
 

shiwan/admin/src/main/java/com/huimv/admin/service/IMenuService.java

@@ -1,6 +1,6 @@
 package com.huimv.admin.service;
 
-import com.huimv.admin.domain.SysMenuEntity;
+import com.huimv.admin.domain.primary.SysMenuEntity;
 import com.huimv.admin.utils.Result;
 
 import java.util.List;

shiwan/admin/src/main/java/com/huimv/admin/service/IUserService.java

@@ -1,7 +1,7 @@
 package com.huimv.admin.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.admin.domain.SysUserEntity;
+import com.huimv.admin.domain.primary.SysUserEntity;
 import com.huimv.admin.group.UserAndAccountGroup;
 import com.huimv.admin.utils.Result;
 import org.springframework.data.domain.Page;

shiwan/admin/src/main/java/com/huimv/admin/service/impl/AccountServiceImpl.java

@@ -1,9 +1,9 @@
 package com.huimv.admin.service.impl;
 
-import com.huimv.admin.domain.SysAccountEntity;
-import com.huimv.admin.domain.SysUserEntity;
-import com.huimv.admin.repo.SysAccountEntityRepository;
-import com.huimv.admin.repo.SysUserEntityRepository;
+import com.huimv.admin.domain.primary.SysAccountEntity;
+import com.huimv.admin.domain.primary.SysUserEntity;
+import com.huimv.admin.repo.primary.SysAccountEntityRepository;
+import com.huimv.admin.repo.primary.SysUserEntityRepository;
 import com.huimv.admin.service.IAccountService;
 import com.huimv.admin.utils.GetMD5Str;
 import com.huimv.admin.utils.Result;

shiwan/admin/src/main/java/com/huimv/admin/service/impl/AuthorizeServiceImpl.java

@@ -1,11 +1,11 @@
 package com.huimv.admin.service.impl;
 
-import com.huimv.admin.domain.SysAccountGroupEntity;
-import com.huimv.admin.domain.SysGroupMenuEntity;
-import com.huimv.admin.domain.SysMenuEntity;
-import com.huimv.admin.repo.SysAccountGroupEntityRepository;
-import com.huimv.admin.repo.SysGroupMenuEntityRepository;
-import com.huimv.admin.repo.SysMenuEntityRepository;
+import com.huimv.admin.domain.primary.SysAccountGroupEntity;
+import com.huimv.admin.domain.primary.SysGroupMenuEntity;
+import com.huimv.admin.domain.primary.SysMenuEntity;
+import com.huimv.admin.repo.primary.SysAccountGroupEntityRepository;
+import com.huimv.admin.repo.primary.SysGroupMenuEntityRepository;
+import com.huimv.admin.repo.primary.SysMenuEntityRepository;
 import com.huimv.admin.service.IAuthorizeService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;

shiwan/admin/src/main/java/com/huimv/admin/service/impl/GroupServiceImpl.java

@@ -1,8 +1,8 @@
 package com.huimv.admin.service.impl;
 
-import com.huimv.admin.domain.SysGroupEntity;
-import com.huimv.admin.repo.SysGroupEntityRepository;
-import com.huimv.admin.repo.SysGroupMenuEntityRepository;
+import com.huimv.admin.domain.primary.SysGroupEntity;
+import com.huimv.admin.repo.primary.SysGroupEntityRepository;
+import com.huimv.admin.repo.primary.SysGroupMenuEntityRepository;
 import com.huimv.admin.service.IGroupService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;

shiwan/admin/src/main/java/com/huimv/admin/service/impl/LoginServiceImpl.java

@@ -1,8 +1,8 @@
 package com.huimv.admin.service.impl;
 
-import com.huimv.admin.domain.SysAccountEntity;
-import com.huimv.admin.repo.SysAccountEntityRepository;
-import com.huimv.admin.repo.SysMenuEntityRepository;
+import com.huimv.admin.domain.primary.SysAccountEntity;
+import com.huimv.admin.repo.primary.SysAccountEntityRepository;
+import com.huimv.admin.repo.primary.SysMenuEntityRepository;
 import com.huimv.admin.service.ILoginService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;

shiwan/admin/src/main/java/com/huimv/admin/service/impl/MenuServiceImpl.java

@@ -1,7 +1,7 @@
 package com.huimv.admin.service.impl;
 
-import com.huimv.admin.domain.SysMenuEntity;
-import com.huimv.admin.repo.SysMenuEntityRepository;
+import com.huimv.admin.domain.primary.SysMenuEntity;
+import com.huimv.admin.repo.primary.SysMenuEntityRepository;
 import com.huimv.admin.service.IMenuService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
@@ -37,7 +37,7 @@ public class MenuServiceImpl implements IMenuService {
     public Result editMenu(SysMenuEntity menu) {
         try {
             if (menu.getId() == null){
-                return new Result(1002,"请选择要修改的菜单",false);
+                return new Result(10002,"请选择要修改的菜单",false);
             }
             sysMenuEntityRepository.save(menu);
             return  new Result(ResultCode.SUCCESS);

shiwan/admin/src/main/java/com/huimv/admin/service/impl/UserServiceImpl.java

@@ -2,11 +2,11 @@ package com.huimv.admin.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.admin.domain.SysAccountEntity;
-import com.huimv.admin.domain.SysUserEntity;
+import com.huimv.admin.domain.primary.SysAccountEntity;
+import com.huimv.admin.domain.primary.SysUserEntity;
 import com.huimv.admin.group.UserAndAccountGroup;
-import com.huimv.admin.repo.SysAccountEntityRepository;
-import com.huimv.admin.repo.SysUserEntityRepository;
+import com.huimv.admin.repo.primary.SysAccountEntityRepository;
+import com.huimv.admin.repo.primary.SysUserEntityRepository;
 import com.huimv.admin.service.IUserService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;

shiwan/admin/src/main/java/com/huimv/admin/session/HmSession.java

@@ -1,8 +1,8 @@
 package com.huimv.admin.session;
 
-import com.huimv.admin.domain.MemberAccount;
-import com.huimv.admin.domain.OrganizeInfo;
-import com.huimv.admin.domain.SysAccountEntity;
+import com.huimv.admin.domain.primary.MemberAccount;
+import com.huimv.admin.domain.primary.OrganizeInfo;
+import com.huimv.admin.domain.primary.SysAccountEntity;
 
 import java.io.Serializable;
 

shiwan/admin/src/main/resources/application-test.yml

@@ -1,20 +1,29 @@
 server:
   port: 8081
 spring:
-  application:
-    name: huimv-core
-
   #------DataSource-----
   datasource:
-    #url: jdbc:mysql://127.0.0.1:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    url: jdbc:mysql://192.168.1.7:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    primary:
+      #url: jdbc:mysql://127.0.0.1:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://192.168.1.7:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: root
+      password: hm123456
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      max-active: 20
+      max-idle: 8
+      min-idle: 8
+      initial-size: 10
+    secondary:
+      url: jdbc:mysql://192.168.1.7:3306/demo_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: root
+      password: hm123456
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      max-active: 20
+      max-idle: 8
+      min-idle: 8
+      initial-size: 10
   jpa:
-    hibernate:
-      ddl-auto: update
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    database: mysql
     show-sql: true
 
   mvc:
@@ -33,5 +42,4 @@ spring:
         max-wait: -1
         max-idle: 10
         min-idle: 0
-    timeout: 5000
-
+    timeout: 5000