From a72c47581b8525230e74925e4ddb2e901b852568 Mon Sep 17 00:00:00 2001 From: "578646533@qq.com" <123456qq> Date: Fri, 22 Nov 2024 13:48:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bootstrap/pom.xml | 13 +- .../resources/application-test.properties | 28 ++++ .../src/main/resources/application.properties | 2 +- pom.xml | 135 ++++++++---------- 4 files changed, 101 insertions(+), 77 deletions(-) create mode 100644 bootstrap/src/main/resources/application-test.properties diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 89eefd5..a84a188 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -149,9 +149,8 @@ spring-boot-maven-plugin 2.1.13.RELEASE - - ../target - + -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7087 + true @@ -161,6 +160,14 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.5 + + true + + diff --git a/bootstrap/src/main/resources/application-test.properties b/bootstrap/src/main/resources/application-test.properties new file mode 100644 index 0000000..80c6abc --- /dev/null +++ b/bootstrap/src/main/resources/application-test.properties @@ -0,0 +1,28 @@ +#required +spring.application.name=electromagnetic-data + +spring.profiles.active=test +# security +run.mode=NORMAL +com.alipay.env=shared +#log +logging.path=./logs +loggerPath=electromagnetic-data +logging.level.com.aliyun.fsi.insurance=${LOG_LEVEL:INFO} +#日志配置 +logging.config=classpath:${LOG_CONFIG:log4j2-spring.xml} + + +spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true +spring.datasource.username=comac +spring.datasource.password=2024*Comac + + +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +mybatis.mapper-locations=classpath:sqlmapper/*.xml +pagehelper.helperDialect=mysql +pagehelper.reasonable=false +server.port=8888 + diff --git a/bootstrap/src/main/resources/application.properties b/bootstrap/src/main/resources/application.properties index cfdc88c..cc4dfa0 100644 --- a/bootstrap/src/main/resources/application.properties +++ b/bootstrap/src/main/resources/application.properties @@ -15,7 +15,7 @@ spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource #spring.datasource.url=jdbc:mysql://${DATASOURCE_URL:obproxy-0c63.ops.cloud.cic.inter}:3306/${DATASOURCE_HOST:dataplatform_ptst}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true #spring.datasource.username=${DATASOURCE_NAME:dataplatform@ProjectTest_tenant5#testdb} #spring.datasource.password=${DATASOURCE_PASSWORD:Y7G6v4_3ijn77K_Kbl_U85} -spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true +spring.datasource.url=jdbc:mysql://139.224.43.89:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true spring.datasource.username=comac spring.datasource.password=2024*Comac diff --git a/pom.xml b/pom.xml index a309f07..39ef8b7 100644 --- a/pom.xml +++ b/pom.xml @@ -257,89 +257,78 @@ - org.springframework.boot - spring-boot-maven-plugin + org.apache.maven.plugins + maven-resources-plugin - true - - none - execute + + ico + eot + svg + ttf + woff + woff2 + tag + - - - - repackage - - - + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 org.apache.maven.plugins - maven-compiler-plugin - 3.6.2 - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - - - - - maven-resources-plugin - 2.5 - UTF-8 - - - - - - - /usr/src/target - - - - - - - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - - **/*DO.class - **/*Config.class - **/*Param.class - **/*Enum.class - - - + + @ + + true - - + + + src/main/webapp + + + src/main/resources + false + + + src/main/java + + **/*.xml + + + + src/main/java + + **/*.btl + + + + ${project.basedir}/src/main/resources + true + + static/** + + + + ${project.basedir}/src/main/resources + false + + static/** + + + \ No newline at end of file