artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 15:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refs #1240 fix can't run server problem

Browse Source
This commit is contained in:
shuang 2019-03-10 23:17:00 +08:00
parent 029f910945
commit 179752084a
24 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
obp-api/pom.xml
View File

@ -349,8 +349,6 @@
</dependencies>
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -404,7 +402,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<version>3.4.6</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
<jvmArgs>
@ -471,16 +469,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.26</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
<jvmArgs>-Xmx512m -Xms512m</jvmArgs>
</configuration>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
@ -497,6 +486,15 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
<jvmArgs>-Xmx512m -Xms512m</jvmArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
@ -548,7 +546,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<version>3.4.6</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
<jvmArgs>

2
obp-api/src/main/scala/bootstrap/liftweb/Boot.scala
View File

@ -31,7 +31,7 @@ import java.util.{Locale, TimeZone}
import code.accountapplication.MappedAccountApplication
import code.accountattribute.MappedAccountAttribute
import code.accountholder.MapperAccountHolders
import code.accountholders.MapperAccountHolders
import code.actorsystem.ObpActorSystem
import code.api.Constant._
import code.api.ResourceDocs1_4_0.ResourceDocs300.ResourceDocs310

13
obp-api/src/main/scala/code/accountholder/AccountHolders.scala → obp-api/src/main/scala/code/accountholders/AccountHolders.scala
View File

@ -1,13 +1,10 @@
package code.accountholder
package code.accountholders
import code.api.util.APIUtil
import code.model._
import net.liftweb.util.{Props, SimpleInjector}
import code.remotedata.RemotedataAccountHolders
import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId, User}
import net.liftweb.common.Box
import net.liftweb.util.SimpleInjector
object AccountHolders extends SimpleInjector {
@ -23,7 +20,7 @@ object AccountHolders extends SimpleInjector {
}
trait AccountHolders {
def getAccountHolders(bankId: BankId, accountId: AccountId): Set[User]
def getAccountsHeld(bankId: BankId, user: User): Set[BankIdAccountId]
def getOrCreateAccountHolder(user: User, bankAccountUID :BankIdAccountId): Box[MapperAccountHolders] //There is no AccountHolder trait, database structure different with view
@ -38,3 +35,7 @@ class RemotedataAccountHoldersCaseClasses {
}
object RemotedataAccountHoldersCaseClasses extends RemotedataAccountHoldersCaseClasses

2
obp-api/src/main/scala/code/accountholder/MapperAccountHolders.scala → obp-api/src/main/scala/code/accountholders/MapperAccountHolders.scala
View File

@ -1,4 +1,4 @@
package code.accountholder
package code.accountholders
import code.model._
import code.model.dataAccess.ResourceUser

3
obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala
View File

@ -2,7 +2,7 @@ package code.api.v3_0_0
import java.util.regex.Pattern
import code.accountholder.AccountHolders
import code.accountholders.AccountHolders
import code.api.APIFailureNewStyle
import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.{bankJSON, banksJSON, branchJsonV300, _}
@ -42,7 +42,6 @@ import scala.collection.immutable.{List, Nil}
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import com.grum.geocalc.Coordinate
import com.grum.geocalc.EarthCalc
import com.grum.geocalc.Point

3
obp-api/src/main/scala/code/bankconnectors/Connector.scala
View File

@ -5,7 +5,8 @@ import java.util.UUID.randomUUID
import code.accountapplication.AccountApplication
import code.accountattribute.AccountAttribute.{AccountAttribute, AccountAttributeType}
import code.accountholder.{AccountHolders, MapperAccountHolders}
import code.accountholders.{AccountHolders, MapperAccountHolders}
import code.accountholders.{AccountHolders, MapperAccountHolders}
import code.api.cache.Caching
import code.api.util.APIUtil._
import code.api.util.ApiRole._

2
obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector.scala
View File

@ -26,8 +26,8 @@ Berlin 13359, Germany
import java.text.SimpleDateFormat
import java.util.{Date, Locale, UUID}
import code.accountholders.AccountHolders
import code.api.util.ErrorMessages._
import code.accountholder.AccountHolders
import code.api.util._
import code.api.v2_1_0.TransactionRequestCommonBodyJSON
import code.bankconnectors.vMar2017.{InboundAdapterInfoInternal, KafkaMappedConnector_vMar2017}

2
obp-api/src/main/scala/code/bankconnectors/KafkaMappedConnector_JVMcompatible.scala
View File

@ -30,7 +30,7 @@ import java.time.format.DateTimeFormatter
import java.util.Date
import java.util.UUID.randomUUID
import code.accountholder.AccountHolders
import code.accountholders.AccountHolders
import code.api.cache.Caching
import code.api.util.APIUtil.saveConnectorMetric
import code.api.util.ErrorMessages._

19
obp-api/src/main/scala/code/bankconnectors/ObpJvmMappedConnector.scala
View File

@ -4,13 +4,12 @@ import java.text.SimpleDateFormat
import java.time.ZoneOffset.UTC
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import java.util.{Date, Locale, Optional, UUID}
import java.util.{Date, Optional}
import code.accountholders.{AccountHolders, MapperAccountHolders}
import code.api.util.ErrorMessages._
import code.accountholder.{AccountHolders, MapperAccountHolders}
import code.api.util._
import code.api.v2_1_0.TransactionRequestCommonBodyJSON
import code.bankconnectors.vMar2017.InboundAdapterInfoInternal
import code.branches.Branches.{Branch, BranchT}
import code.fx.{FXRate, fx}
import code.management.ImporterAPI.ImporterTransaction
@ -29,7 +28,7 @@ import code.util.Helper
import code.util.Helper.MdcLoggable
import code.views.Views
import com.google.common.cache.CacheBuilder
import com.openbankproject.commons.model.{Bank, CounterpartyTrait, _}
import com.openbankproject.commons.model.{Bank, _}
import com.tesobe.obp.kafka.{Configuration, SimpleConfiguration, SimpleNorth}
import com.tesobe.obp.transport.nov2016.{Bank => _, Transaction => _, User => _, _}
import com.tesobe.obp.transport.spi.{DefaultSorter, TimestampFilter}
@ -37,18 +36,16 @@ import com.tesobe.obp.transport.{Pager, Transport}
import net.liftweb.common._
import net.liftweb.mapper._
import net.liftweb.util.Helpers._
import net.liftweb.util.Props
import scala.collection.JavaConversions._
import scala.collection.immutable.{List, Seq}
import scala.concurrent.duration._
import scala.language.postfixOps
import scalacache._
import scalacache.guava._
import scalacache.memoization._
import scala.concurrent.Future
import scala.collection.JavaConversions._
import scala.collection.immutable.{List, Seq}
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import scala.concurrent.duration._
import scala.language.postfixOps
/**
* Uses the https://github.com/OpenBankProject/OBP-JVM library to connect to

2
obp-api/src/main/scala/code/bankconnectors/vMar2017/KafkaMappedConnector_vMar2017.scala
View File

@ -26,8 +26,8 @@ Berlin 13359, Germany
import java.text.SimpleDateFormat
import java.util.{Date, Locale, UUID}
import code.accountholders.AccountHolders
import code.api.util.ErrorMessages._
import code.accountholder.AccountHolders
import code.api.util.APIUtil.MessageDoc
import code.api.util._
import code.api.v2_1_0._

2
obp-api/src/main/scala/code/model/BankingData.scala
View File

@ -28,7 +28,7 @@ package code.model
import java.util.Date
import code.accountholder.AccountHolders
import code.accountholders.AccountHolders
import code.api.util.APIUtil.unboxFullOrFail
import code.api.util.ErrorMessages._
import code.api.util.{APIUtil, CallContext, ErrorMessages, OBPQueryParam}

2
obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
View File

@ -26,7 +26,7 @@ TESOBE (http://www.tesobe.com/)
*/
package code.model.dataAccess
import code.accountholder.AccountHolders
import code.accountholders.AccountHolders
import code.api.util.APIUtil.{hasAnOAuthHeader, isValidStrongPassword, _}
import code.api.util.ErrorMessages._
import code.api.util._

26
obp-api/src/main/scala/code/model/dataAccess/BankAccountCreationDispatcher.scala
View File

@ -43,19 +43,19 @@ package com.tesobe.model {
package code.model.dataAccess {
import code.accountholder.AccountHolders
import code.api.util.APIUtil
import code.bankconnectors.Connector
import code.model._
import code.users.Users
import code.util.Helper.MdcLoggable
import code.views.Views
import com.openbankproject.commons.model._
import com.rabbitmq.client.{Channel, ConnectionFactory}
import com.tesobe.model.{CreateBankAccount, UpdateBankAccount}
import net.liftmodules.amqp.{AMQPAddListener, AMQPDispatcher, AMQPMessage, SerializedConsumer}
import net.liftweb.actor.LiftActor
import net.liftweb.common.{Failure, Full}
import code.accountholders.AccountHolders
import code.api.util.APIUtil
import code.bankconnectors.Connector
import code.model._
import code.users.Users
import code.util.Helper.MdcLoggable
import code.views.Views
import com.openbankproject.commons.model._
import com.rabbitmq.client.{Channel, ConnectionFactory}
import com.tesobe.model.{CreateBankAccount, UpdateBankAccount}
import net.liftmodules.amqp.{AMQPAddListener, AMQPDispatcher, AMQPMessage, SerializedConsumer}
import net.liftweb.actor.LiftActor
import net.liftweb.common.{Failure, Full}
/**

3
obp-api/src/main/scala/code/remotedata/RemotedataAccountHolders.scala
View File

@ -1,9 +1,8 @@
package code.remotedata
import akka.pattern.ask
import code.accountholder.{AccountHolders, MapperAccountHolders, RemotedataAccountHoldersCaseClasses}
import code.accountholders.{AccountHolders, MapperAccountHolders, RemotedataAccountHoldersCaseClasses}
import code.actorsystem.ObpActorInit
import code.model._
import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId, User}
import net.liftweb.common.Box

3
obp-api/src/main/scala/code/remotedata/RemotedataAccountHoldersActor.scala
View File

@ -1,7 +1,8 @@
package code.remotedata
import akka.actor.Actor
import code.accountholder.{MapperAccountHolders, RemotedataAccountHoldersCaseClasses}
import code.accountholders.{MapperAccountHolders, RemotedataAccountHoldersCaseClasses}
import code.accountholders.{MapperAccountHolders, RemotedataAccountHoldersCaseClasses}
import code.actorsystem.ObpActorHelper
import code.model._
import code.util.Helper.MdcLoggable

2
obp-api/src/main/scala/code/sandbox/OBPDataImport.scala
View File

@ -3,7 +3,7 @@ package code.sandbox
import java.text.SimpleDateFormat
import java.util.UUID
import code.accountholder.AccountHolders
import code.accountholders.AccountHolders
import code.api.util.APIUtil._
import code.api.util.{APIUtil, ErrorMessages}
import code.atms.Atms.AtmT

2
obp-api/src/main/scala/code/views/MapperViews.scala
View File

@ -1,7 +1,7 @@
package code.views
import bootstrap.liftweb.ToSchemify
import code.accountholder.MapperAccountHolders
import code.accountholders.MapperAccountHolders
import code.api.APIFailure
import code.api.util.APIUtil._
import code.api.util.{APIUtil, ApiRole}

4
obp-api/src/test/scala/RunWebApp.scala
View File

@ -36,7 +36,9 @@ object RunWebApp extends App {
val context = new WebAppContext()
context.setServer(server)
context.setContextPath("/")
context.setWar("src/main/webapp")
// current project absolute path
val basePath = this.getClass.getResource("/").toString .replaceFirst("target[/\\\\].*$", "")
context.setWar(s"${basePath}src/main/webapp")
server.setHandler(context)

2
obp-api/src/test/scala/code/accountHolder/AccountHoldersTest.scala
View File

@ -1,6 +1,6 @@
package code.accountHolder
import code.accountholder.AccountHolders
import code.accountholders.AccountHolders
import code.model._
import code.setup.{DefaultUsers, ServerSetup}
import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId}

2
obp-api/src/test/scala/code/bankaccountcreation/BankAccountCreationListenerTest.scala
View File

@ -1,6 +1,6 @@
package code.bankaccountcreation
import code.accountholder.AccountHolders
import code.accountholders.AccountHolders
import code.api.util.APIUtil
import code.api.util.ErrorMessages._
import code.views.Views

6
obp-api/src/test/scala/code/connector/June2017Test.scala
View File

@ -1,8 +1,8 @@
package code.connector
import code.accountholder.MapperAccountHolders
import code.bankconnectors.{Connector}
import code.model.dataAccess.{ViewImpl}
import code.accountholders.MapperAccountHolders
import code.bankconnectors.Connector
import code.model.dataAccess.ViewImpl
import code.setup.{DefaultUsers, ServerSetup}
class June2017Test extends ServerSetup with DefaultUsers {

4
obp-api/src/test/scala/code/model/AuthUserTest.scala
View File

@ -1,7 +1,7 @@
package code.model
import code.accountholder.MapperAccountHolders
import code.bankconnectors.{Connector}
import code.accountholders.MapperAccountHolders
import code.bankconnectors.Connector
import code.connector.MockedJune2017Connector
import code.model.dataAccess.{AuthUser, ViewImpl, ViewPrivileges}
import code.setup.{DefaultUsers, ServerSetup}

2
obp-api/src/test/scala/code/setup/TestConnectorSetupWithStandardPermissions.scala
View File

@ -1,7 +1,7 @@
package code.setup
import bootstrap.liftweb.ToSchemify
import code.accountholder.AccountHolders
import code.accountholders.AccountHolders
import code.api.util.ErrorMessages._
import code.model._
import code.model.dataAccess._

9
pom.xml
View File

@ -92,7 +92,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<version>3.4.6</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
<jvmArgs>
@ -154,6 +154,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.26</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
@ -205,7 +210,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.2</version>
<version>3.4.6</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
<jvmArgs>