diff --git a/db/toco_soap.sql b/db/toco_soap.sql index c39f4186ae57b9e4ff9238105e1db86cdb94d2c9..ec8391d84af143b6b70f6d8eb40d4554985e813e 100644 --- a/db/toco_soap.sql +++ b/db/toco_soap.sql @@ -172,7 +172,7 @@ CREATE TABLE `userGems` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE `transaction`( - `t_id` int(11) NOT NULL AUTO_INCREMENT, + `tid` int(11) NOT NULL AUTO_INCREMENT, `user_id` int NOT NULL, `amount` int NOT NULL, `image` VARCHAR(255) NOT NULL, @@ -180,13 +180,6 @@ CREATE TABLE `transaction`( PRIMARY KEY (`tid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -CREATE TABLE `apikey` ( - `a_id` int(11) NOT NULL AUTO_INCREMENT, - `desc` varchar(255) NOT NULL, - `key` varchar(255) NOT NULL, - PRIMARY KEY (`id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - diff --git a/docker-compose.yml b/docker-compose.yml index 200677ccd178f9361aaa295c453c6d81a9d7caba..9f061ab57d93d2bc65f8998c0fca28a0fdcff2fb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,3 +11,9 @@ services: MYSQL_USER: toco MYSQL_PASSWORD: toco + toco-soap: + build: + dockerfile: Dockerfile + ports: + - "8080:8080" + diff --git a/dockerfile b/dockerfile index 6f3145b8c3e47dea0707636a87e7c12360e6b115..1577820e6bbe6823c080de8ba907ad83f98f4afd 100644 --- a/dockerfile +++ b/dockerfile @@ -1,3 +1,22 @@ FROM mysql/mysql-server:8.0.23 COPY db/toco_soap.sql /docker-entrypoint-initdb.d/ +FROM maven:3.8.6-amazoncorretto-8 AS build + +COPY . /app + +WORKDIR /app + +RUN --mount=type=cache,target=/root/.m2 mvn clean install + +FROM amazoncorretto:8 + +COPY --from=build /app/target /app + +COPY .env /app + +WORKDIR /app + +EXPOSE 8080 + +CMD java -jar toco_Soap-1.0-SNAPSHOT.jar \ No newline at end of file diff --git a/pom.xml b/pom.xml index 37b108b6b7d1685fda1e1a1b3e06f5cc9866596d..45e8028539d412855dcadb1a29a05c603f5ac158 100644 --- a/pom.xml +++ b/pom.xml @@ -14,5 +14,67 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + <dependencies> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.3.1</version> + </dependency> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <version>1.3.5</version> + </dependency> + + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + <version>2.3.7</version> + </dependency> + <!-- lombok--> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.18.20</version> + <scope>provided</scope> + </dependency> + <!-- javax jws--> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>javax.jws-api</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>org.glassfish.metro</groupId> + <artifactId>webservices-api</artifactId> + <version>4.0.2</version> + </dependency> + <dependency> + <groupId>org.glassfish.metro</groupId> + <artifactId>webservices-rt</artifactId> + <version>2.3.1</version> + </dependency> + + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.2.0</version> + <configuration> + <archive> + <manifest> + <mainClass>org.toco.Main</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + </project> \ No newline at end of file diff --git a/src/main/java/org/toco/Main.java b/src/main/java/org/toco/Main.java index f10a7e1f406d79510c4857d8c81056fc47a6a574..cee29a3b5834b677f37c6a9f2037e04ac8dbd539 100644 --- a/src/main/java/org/toco/Main.java +++ b/src/main/java/org/toco/Main.java @@ -1,16 +1,12 @@ package org.toco; -import org.toco.publisher.testingPublisher; import org.toco.publisher.gemsPublisher; import org.toco.publisher.transactionPublisher; public class Main { public static void main(String[] args) { - testingPublisher testingpublisher = new testingPublisher(); - testingpublisher.publish(); gemsPublisher gemspublisher = new gemsPublisher(); gemspublisher.publish(); transactionPublisher transactionpublisher = new transactionPublisher(); transactionpublisher.publish(); - } } \ No newline at end of file diff --git a/src/main/java/org/toco/service/transaction.java b/src/main/java/org/toco/service/transaction.java index 57101f1ed17c132c23739861705bc0b8d52d52d8..0f9e80fd5605515ce706a7dacec80338d8be1048 100644 --- a/src/main/java/org/toco/service/transaction.java +++ b/src/main/java/org/toco/service/transaction.java @@ -10,7 +10,7 @@ import javax.annotation.Resource; import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; import com.sun.net.httpserver.HttpExchange; -import com.sun.xml.internal.ws.developer.JAXWSProperties; +import com.sun.xml.ws.developer.JAXWSProperties; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/src/main/java/org/toco/service/userGems.java b/src/main/java/org/toco/service/userGems.java index 3b38242a4dc823460840f6da5bee0b95aa14e328..114076f72ee2c2d4083c1a758bfea31a72d8b7ed 100644 --- a/src/main/java/org/toco/service/userGems.java +++ b/src/main/java/org/toco/service/userGems.java @@ -10,7 +10,7 @@ import javax.annotation.Resource; import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; import com.sun.net.httpserver.HttpExchange; -import com.sun.xml.internal.ws.developer.JAXWSProperties; +import com.sun.xml.ws.developer.JAXWSProperties; import java.net.InetAddress; import java.net.InetSocketAddress;