Browse Source

修改config信息

xuyi3 6 years ago
parent
commit
333a23447f

+ 2 - 2
config/database/pom.xml

@ -4,7 +4,7 @@
4 4
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 5
    <parent>
6 6
        <artifactId>config</artifactId>
7
        <groupId>org.eddy</groupId>
7
        <groupId>com.ipu</groupId>
8 8
        <version>1.0-SNAPSHOT</version>
9 9
    </parent>
10 10
    <modelVersion>4.0.0</modelVersion>
@ -13,7 +13,7 @@
13 13
14 14
    <dependencies>
15 15
        <dependency>
16
            <groupId>org.eddy</groupId>
16
            <groupId>com.ipu</groupId>
17 17
            <artifactId>share</artifactId>
18 18
            <version>1.0-SNAPSHOT</version>
19 19
        </dependency>

+ 3 - 3
config/database/src/main/java/org/eddy/database/DatabaseResourceFinder.java

@ -1,10 +1,10 @@
1
package org.eddy.database;
1
package com.ipu.config.database;
2 2
3
import com.ipu.config.basic.Resource;
4
import com.ipu.config.basic.ResourceFinder;
3 5
import org.apache.ibatis.session.SqlSession;
4 6
import org.apache.ibatis.session.SqlSessionFactory;
5 7
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
6
import org.eddy.basic.Resource;
7
import org.eddy.basic.ResourceFinder;
8 8
9 9
import java.util.Objects;
10 10

+ 1 - 1
config/database/src/main/java/org/eddy/database/DruidSourceFactory.java

@ -1,4 +1,4 @@
1
package org.eddy.database;
1
package com.ipu.config.database;
2 2
3 3
import com.alibaba.druid.pool.DruidDataSourceFactory;
4 4
import org.apache.ibatis.datasource.DataSourceFactory;

+ 2 - 2
config/database/src/main/java/org/eddy/database/ResourceMapper.java

@ -1,7 +1,7 @@
1
package org.eddy.database;
1
package com.ipu.config.database;
2 2
3 3
import org.apache.ibatis.annotations.Param;
4
import org.eddy.basic.Resource;
4
import com.ipu.config.basic.Resource;
5 5
6 6
public interface ResourceMapper {
7 7

+ 1 - 0
config/database/src/main/resources/META-INF/services/com.ipu.config.basic.ResourceFinder

@ -0,0 +1 @@
1
com.ipu.config.database.DatabaseResourceFinder

+ 0 - 1
config/database/src/main/resources/META-INF/services/org.eddy.basic.ResourceFinder

@ -1 +0,0 @@
1
org.eddy.database.DatabaseResourceFinder

+ 2 - 2
config/database/src/main/resources/ResourceMapper.xml

@ -1,8 +1,8 @@
1 1
<?xml version="1.0" encoding="UTF-8" ?>
2 2
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3
<mapper namespace="org.eddy.database.ResourceMapper">
3
<mapper namespace="com.ipu.config.database.ResourceMapper">
4 4
5
    <resultMap id="resource" type="org.eddy.basic.Resource">
5
    <resultMap id="resource" type="com.ipu.config.basic.Resource">
6 6
        <result column="id" property="id"/>
7 7
        <result column="name" property="name"/>
8 8
        <result column="namespace" property="namespace"/>

+ 1 - 1
config/database/src/main/resources/configuration.xml

@ -28,7 +28,7 @@
28 28
    <environment id="development">
29 29
      <transactionManager type="JDBC">
30 30
      </transactionManager>
31
      <dataSource type="org.eddy.database.DruidSourceFactory">
31
      <dataSource type="com.ipu.config.database.DruidSourceFactory">
32 32
        <property name="driver" value="com.mysql.jdbc.Driver" />
33 33
        <property name="url" value="jdbc:mysql://121.42.183.206:3307/test" />
34 34
        <property name="validationQuery" value="SELECT 1" />

+ 3 - 3
config/database/src/test/java/org/eddy/DatabaseTest.java

@ -1,7 +1,7 @@
1
package org.eddy;
1
package org.ipu;
2 2
3
import org.eddy.basic.ResourceFinder;
4
import org.eddy.database.DatabaseResourceFinder;
3
import com.ipu.config.basic.ResourceFinder;
4
import com.ipu.config.database.DatabaseResourceFinder;
5 5
import org.junit.Test;
6 6
7 7
import java.util.ServiceLoader;

+ 1 - 1
config/pom.xml

@ -4,7 +4,7 @@
4 4
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 5
    <modelVersion>4.0.0</modelVersion>
6 6
7
    <groupId>org.eddy</groupId>
7
    <groupId>com.ipu</groupId>
8 8
    <artifactId>config</artifactId>
9 9
    <packaging>pom</packaging>
10 10
    <version>1.0-SNAPSHOT</version>

+ 1 - 1
config/share/pom.xml

@ -4,7 +4,7 @@
4 4
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 5
    <parent>
6 6
        <artifactId>config</artifactId>
7
        <groupId>org.eddy</groupId>
7
        <groupId>com.ipu</groupId>
8 8
        <version>1.0-SNAPSHOT</version>
9 9
    </parent>
10 10
    <modelVersion>4.0.0</modelVersion>

+ 1 - 1
config/share/src/main/java/org/eddy/basic/Resource.java

@ -1,4 +1,4 @@
1
package org.eddy.basic;
1
package com.ipu.config.basic;
2 2
3 3
import lombok.Getter;
4 4
import lombok.Setter;

+ 1 - 3
config/share/src/main/java/org/eddy/basic/ResourceFinder.java

@ -1,6 +1,4 @@
1
package org.eddy.basic;
2
3
import java.util.List;
1
package com.ipu.config.basic;
4 2
5 3
public interface ResourceFinder {
6 4

+ 1 - 1
config/share/src/main/java/org/eddy/basic/ResourceType.java

@ -1,4 +1,4 @@
1
package org.eddy.basic;
1
package com.ipu.config.basic;
2 2
3 3
public enum  ResourceType {
4 4