Skip to content

H
huhu-partner
Commit 092fb6aa by houseme
Options

更新配置信息11

parent e55710df
Showing with 45 additions and 87 deletions
pom.xml
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<mainClass>com.lanren.huhu.partner.PartnerApplication</mainClass> <start-class>com.lanren.huhu.partner.PartnerApplication</start-class>
<todir>./data/release/${profiles.active}/</todir>
</properties> </properties>
<dependencies> <dependencies>
...@@ -160,6 +159,17 @@ ...@@ -160,6 +159,17 @@
<id>test</id> <id>test</id>
<properties> <properties>
<profiles.active>test</profiles.active> <profiles.active>test</profiles.active>
<mysql.server>jdbc:mysql://10.9.121.204:3306/huhu</mysql.server>
<!--<mysql.username>yanfa</mysql.username>-->
<!--<mysql.password>cScdKw%ZKC1i$C!1uAz3Kg$c</mysql.password>-->
<mysql.username>apihu</mysql.username>
<mysql.password>tqH9clYRAxZ@LV4x</mysql.password>
<redis.host>10.9.186.167</redis.host>
<redis.password>passwdredis</redis.password>
<spring.profiles.active>dev</spring.profiles.active>
<logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path>
<!--<providers-path>/data/java/service</providers-path>-->
<providers-path>/Users/chen/Develop/workspace/partner/data/release/dev</providers-path>
</properties> </properties>
</profile> </profile>
<profile> <profile>
...@@ -183,110 +193,60 @@ ...@@ -183,110 +193,60 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version> <version>3.7.0</version>
<configuration> <configuration>
<archive> <source>1.8</source>
<manifest> <target>1.8</target>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>${mainClass}</mainClass>
</manifest>
<manifestEntries>
<Class-Path>configs/</Class-Path>
</manifestEntries>
</archive>
<excludes>
<exclude>**/*.properties</exclude>
<exclude>**/*.xml</exclude>
<exclude>**/*.yml</exclude>
</excludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.4</version> <version>3.2.0</version>
<configuration> <configuration>
<descriptors> <warName>${project.artifactId}</warName>
<descriptor>assembly.xml</descriptor> <failOnMissingWebXml>false</failOnMissingWebXml>
</descriptors>
</configuration> </configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>make-assembly</id>
<phase>package</phase>
<goals> <goals>
<goal>single</goal> <goal>repackage</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>1.8</version> <configuration>
<dependencies> <!--公钥私钥等后缀文件不过滤-->
<!-- 支持Ant条件判断 --> <nonFilteredFileExtensions>
<dependency> <extension>private</extension>
<groupId>ant-contrib</groupId> <extension>public</extension>
<artifactId>ant-contrib</artifactId> </nonFilteredFileExtensions>
<version>1.0b3</version> </configuration>
<exclusions> </plugin>
<exclusion> <plugin>
<groupId>ant</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>ant</artifactId> <artifactId>maven-source-plugin</artifactId>
</exclusion> <version>3.0.1</version>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.8.1</version>
</dependency>
</dependencies>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <id>attach-sources</id>
<phase>verify</phase>
<goals> <goals>
<goal>run</goal> <goal>jar-no-fork</goal>
</goals> </goals>
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antlib.xml"
classpathref="maven.plugin.classpath"/>
<if>
<equals arg1="${project.packaging}" arg2="jar"/>
<then>
<copy file="target/${project.artifactId}-${project.version}-bin.zip"
todir="${todir}"/>
</then>
<else>
<echo message="file suffix is not .zip, ignored. [file name:${project.artifactId}.${project.packaging}]"/>
</else>
</if>
<if>
<equals arg1="${project.packaging}" arg2="war"/>
<then>
<!--<copy file="target/${project.artifactId}.${project.packaging}"-->
<copy file="target/${project.artifactId}-${project.version}-bin.zip"
todir="${todir}"/>
</then>
<else>
<echo message="file suffix is not .war, ignored. [file name:${project.artifactId}.${project.packaging}]"/>
</else>
</if>
</target>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<resources> <resources>
......
src/main/java/com/lanren/huhu/partner/controller/PartnerController.java
package com.lanren.huhu.partner.controller; import com.lanren.huhu.partner.domain.PartnerAccount;import com.lanren.huhu.partner.manager.PartnerAccountManager;import com.lanren.huhu.partner.model.Partner;import com.lanren.huhu.partner.model.PartnerRsp;import com.lanren.huhu.partner.result.Result;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.http.HttpHeaders;import org.springframework.validation.BindingResult;import org.springframework.validation.ObjectError;import org.springframework.web.bind.annotation.*; import javax.validation.Valid;import java.time.LocalDateTime;import java.util.ArrayList;import java.util.List; /** * @Author houseme * @Date 2019-06-26 11:00 * @Project partner * @Package com.lanren.huhu.partner.controller * @File: PartnerController */@RestController@RequestMapping("/v1/partner")public class PartnerController { private static Logger logger = LoggerFactory.getLogger(PartnerController.class); @Autowired private PartnerAccountManager partnerAccountManager; @RequestMapping(value = "/{id}", method = RequestMethod.GET) public Result<PartnerAccount> one(@PathVariable("id") Integer id, @RequestHeader HttpHeaders headers) { if (logger.isInfoEnabled()) { logger.info("partner one userId:{},header:{},time:{}", id, headers.entrySet().toString(), LocalDateTime.now()); } return partnerAccountManager.findByUserId(id); } @RequestMapping(value = "/userId/{id}", method = RequestMethod.POST) public Result<PartnerAccount> getOne(@PathVariable("id") Integer id, @RequestBody Partner partner, @RequestHeader HttpHeaders headers, BindingResult result) { if (logger.isInfoEnabled()) { List<String> list = new ArrayList<>(); if (result.hasErrors()) { List<ObjectError> errors = result.getAllErrors(); for (ObjectError objectError : errors) { list.add(objectError.getDefaultMessage()); } Result<PartnerAccount> objectResult = new Result<>(); objectResult.setMessage(list.toString()); return objectResult; } logger.info("partner one userId:{},header:{},time:{}", id, headers.entrySet().toString(), LocalDateTime.now()); } return partnerAccountManager.findByUserId(id); } @RequestMapping(value = "/level", method = RequestMethod.POST) public Result<PartnerRsp> getPartnerLevel(@RequestBody @Valid Partner partner, @RequestHeader HttpHeaders headers) { if (logger.isInfoEnabled()) { logger.info("getPartnerLevel userId:{ },header:{},time:{}", partner.getUserId(), headers.keySet().toArray(), LocalDateTime.now()); } return partnerAccountManager.getPartnerLevel(partner.getUserId()); }} package com.lanren.huhu.partner.controller; import com.lanren.huhu.partner.manager.PartnerAccountManager;import com.lanren.huhu.partner.model.Partner;import com.lanren.huhu.partner.model.PartnerRsp;import com.lanren.huhu.partner.result.Result;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.http.HttpHeaders;import org.springframework.web.bind.annotation.*; import javax.validation.Valid;import java.time.LocalDateTime; /** * @Author houseme * @Date 2019-06-26 11:00 * @Project partner * @Package com.lanren.huhu.partner.controller * @File: PartnerController */@RestController@RequestMapping("/v1/partner")public class PartnerController { private static Logger logger = LoggerFactory.getLogger(PartnerController.class); @Autowired private PartnerAccountManager partnerAccountManager; @RequestMapping(value = "/level", method = RequestMethod.POST) public Result<PartnerRsp> getPartnerLevel(@RequestBody @Valid Partner partner, @RequestHeader HttpHeaders headers) { if (logger.isInfoEnabled()) { logger.info("getPartnerLevel userId:{ },header:{},time:{}", partner.getUserId(), headers.keySet().toArray(), LocalDateTime.now()); } return partnerAccountManager.getPartnerLevel(partner.getUserId()); }}
\ No newline at end of file \ No newline at end of file
......
src/main/resources/ValidationMessages.properties deleted 100644 → 0
partner.user.id=\u7528\u6237id\u4E0D\u80FD\u5C0F\u4E8E0 partner.level.min=\u5408\u4F19\u4EBA\u7B49\u7EA7\u6700\u4F4E\u662F10 partner.level.max=\u5408\u4F19\u4EBA\u7B49\u7EA7\u6700\u9AD8\u662F30
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment