diff --git a/litemall-wx-api/pom.xml b/litemall-wx-api/pom.xml index 2f06d74d..17828cad 100644 --- a/litemall-wx-api/pom.xml +++ b/litemall-wx-api/pom.xml @@ -10,6 +10,13 @@ 0.1.0 + + UTF-8 + UTF-8 + 1.8 + litemall + + @@ -35,6 +42,22 @@ + + + + src/main/resources + + + + src/main/java + + **/*.properties + **/*.xml + + false + + + org.springframework.boot @@ -53,6 +76,24 @@ + + + com.spotify + docker-maven-plugin + 0.4.13 + + ${docker.image.prefix}/${project.artifactId} + src/main/docker + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + diff --git a/litemall-wx-api/src/main/docker/Dockerfile b/litemall-wx-api/src/main/docker/Dockerfile new file mode 100644 index 00000000..0d0714de --- /dev/null +++ b/litemall-wx-api/src/main/docker/Dockerfile @@ -0,0 +1,4 @@ +FROM java +MAINTAINER tiger +ADD /litemall-wx-api-0.1.0.jar // +ENTRYPOINT java -jar /litemall-wx-api-0.1.0.jar \ No newline at end of file diff --git a/litemall-wx-api/src/main/resources/application-docker.yml b/litemall-wx-api/src/main/resources/application-docker.yml new file mode 100644 index 00000000..2686e9a2 --- /dev/null +++ b/litemall-wx-api/src/main/resources/application-docker.yml @@ -0,0 +1,14 @@ +spring: + datasource: + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://${MYSQL_HOST}:3306/${MYSQL_DATABASE}?useUnicode=true&characterEncoding=utf-8 + username: ${MYSQL_USERNAME} + password: ${MYSQL_PASSWORD} + type: com.alibaba.druid.pool.DruidDataSource + +wx: + app-id: ${WX_APP_ID} + app-secret: ${WX_APP_SECRET} + mch-id: ${WX_MCH_ID} + mch-key: ${WX_MCH_KEY} + notify-url: ${WX_NOTIFY_URL} \ No newline at end of file diff --git a/litemall-wx-api/src/main/resources/application.properties b/litemall-wx-api/src/main/resources/application.properties index 1d5bfda0..591705b4 100644 --- a/litemall-wx-api/src/main/resources/application.properties +++ b/litemall-wx-api/src/main/resources/application.properties @@ -1,3 +1,3 @@ -spring.profiles.active=dev +spring.profiles.active=docker server.port=8082 logging.level.org.linlinjava.litemall.wx.Application=DEBUG diff --git a/litemall-wx/project.config.json b/litemall-wx/project.config.json index 3455070e..1fe9aefb 100644 --- a/litemall-wx/project.config.json +++ b/litemall-wx/project.config.json @@ -9,8 +9,8 @@ }, "compileType": "miniprogram", "libVersion": "1.9.93", - "appid": "wxa5b486c6b918ecfb", - "projectname": "litemall-wx", + "appid": "wx3d9beeb7481eddd3", + "projectname": "%E5%BE%AE%E5%A6%9E%E6%89%AB%E7%A0%81%E8%B4%AD", "condition": { "search": { "current": -1,