feats

pom.xml

@@ -200,9 +200,41 @@
 						<artifactId>spring-boot-maven-plugin</artifactId>
 						<configuration>
 							<includeSystemScope>true</includeSystemScope>
+							<!-- 以下为减少依赖 -->
+							<layout>ZIP</layout>
+							<includes>
+								<include>
+									<groupId>com.njyunzhi</groupId>
+									<artifactId>pet_identity</artifactId>
+								</include>
+							</includes>
 						</configuration>
 					</plugin>
 
+					<!-- 拷贝依赖 -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<excludeGroupIds>
+										com.njyunzhi
+									</excludeGroupIds>
+									<excludeArtifactIds>
+										pet_identity
+									</excludeArtifactIds>
+									<outputDirectory>${project.build.directory}/libs</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+
 					<!-- 跳过测试 -->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
@@ -230,71 +262,30 @@
 						<directory>src/main/resources</directory>
 						<filtering>true</filtering>
 						<includes>
-							<include>**/*.p12</include>
-							<include>**/*.pem</include>
-							<include>**/*.xml</include>
+<!--							<include>**/*.p12</include>-->
+<!--							<include>**/*.pem</include>-->
+<!--							<include>**/*.xml</include>-->
 <!--							<include>*.xlsx</include>-->
 							<include>application.yml</include>
 							<include>application-${profileActive}.yml</include>
 						</includes>
+						<targetPath>${project.build.directory}/config</targetPath>
+					</resource>
+					<resource>
+						<directory>src/main/resources</directory>
+						<filtering>true</filtering>
+						<includes>
+							<include>**/*.p12</include>
+							<include>**/*.pem</include>
+							<include>**/*.xml</include>
+							<!--							<include>*.xlsx</include>-->
+<!--							<include>application.yml</include>-->
+<!--							<include>application-${profileActive}.yml</include>-->
+						</includes>
 					</resource>
 				</resources>
 			</build>
 		</profile>
 	</profiles>
 
-
-<!--	<build>-->
-<!--		<plugins>-->
-<!--			<plugin>-->
-<!--				<groupId>org.springframework.boot</groupId>-->
-<!--				<artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--				<configuration>-->
-<!--					<excludes>-->
-<!--						<exclude>-->
-<!--							<groupId>org.projectlombok</groupId>-->
-<!--							<artifactId>lombok</artifactId>-->
-<!--						</exclude>-->
-<!--					</excludes>-->
-<!--				</configuration>-->
-<!--			</plugin>-->
-<!--		</plugins>-->
-<!--	</build>-->
-<!--	<repositories>-->
-<!--		<repository>-->
-<!--			<id>spring-milestones</id>-->
-<!--			<name>Spring Milestones</name>-->
-<!--			<url>https://repo.spring.io/milestone</url>-->
-<!--			<snapshots>-->
-<!--				<enabled>false</enabled>-->
-<!--			</snapshots>-->
-<!--		</repository>-->
-<!--		<repository>-->
-<!--			<id>spring-snapshots</id>-->
-<!--			<name>Spring Snapshots</name>-->
-<!--			<url>https://repo.spring.io/snapshot</url>-->
-<!--			<releases>-->
-<!--				<enabled>false</enabled>-->
-<!--			</releases>-->
-<!--		</repository>-->
-<!--	</repositories>-->
-<!--	<pluginRepositories>-->
-<!--		<pluginRepository>-->
-<!--			<id>spring-milestones</id>-->
-<!--			<name>Spring Milestones</name>-->
-<!--			<url>https://repo.spring.io/milestone</url>-->
-<!--			<snapshots>-->
-<!--				<enabled>false</enabled>-->
-<!--			</snapshots>-->
-<!--		</pluginRepository>-->
-<!--		<pluginRepository>-->
-<!--			<id>spring-snapshots</id>-->
-<!--			<name>Spring Snapshots</name>-->
-<!--			<url>https://repo.spring.io/snapshot</url>-->
-<!--			<releases>-->
-<!--				<enabled>false</enabled>-->
-<!--			</releases>-->
-<!--		</pluginRepository>-->
-<!--	</pluginRepositories>-->
-
 </project>

src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java

@@ -399,7 +399,7 @@ public class TaApplicationController extends BaseController {
             return ResponseBean.error("卡号不能为空");
         } else {
             TaCardNo taCardNo = iTaCardNoService.getUnuseCard(makeCardParam.getCardNo());
-            if (taCardNo != null) {
+            if (taCardNo == null) {
                 return ResponseBean.error("卡号无效或者已使用");
             }
 

src/main/java/com/njyunzhi/pet_identity/controller/TaPersonController.java

@@ -50,12 +50,12 @@ public class TaPersonController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                     @ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
+                                     @ApiParam("犬主") @RequestParam(value ="nickName", required = false) String nickName,
                                      @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
 
         IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(!StringUtils.isEmpty(personName), "person_name", "%" + personName + "%");
+        queryWrapper.like(!StringUtils.isEmpty(nickName), "nick_name", "%" + nickName + "%");
         queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%" + phone + "%");
         queryWrapper.isNotNull("phone");
         queryWrapper.orderByDesc("create_date");