1.修改pom文件，适配多环境打包部署，删除mybatis代码生成插件及对应的配置文件，修复maven打包测试失败导致无法打包成功的问题

api-admin/pom.xml

@@ -342,32 +342,6 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.mybatis.generator</groupId>
-                <artifactId>mybatis-generator-maven-plugin</artifactId>
-                <version>1.4.0</version>
-                <configuration>
-                    <configurationFile>src/main/resources/mybatis/configuration.xml</configurationFile>
-                    <overwrite>true</overwrite>
-                    <verbose>true</verbose>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>Generate MyBatis Artifacts</id>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.mybatis.generator</groupId>
-                        <artifactId>mybatis-generator-core</artifactId>
-                        <version>1.4.0</version>
-                    </dependency>
-                </dependencies>
-
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -380,4 +354,39 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <!--生产-->
+            <id>pro</id>
+            <properties>
+                <profiles.active>pro</profiles.active>
+            </properties>
+            <!--是否默认，默认打包开发环境配置-->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <!--开发-->
+            <id>dev</id>
+            <properties>
+                <profiles.active>dev</profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <!--测试1-->
+            <id>test1</id>
+            <properties>
+                <profiles.active>test1</profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <!--测试2-->
+            <id>test2</id>
+            <properties>
+                <profiles.active>test2</profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>

api-admin/src/main/resources/application-dev.properties

@@ -0,0 +1,68 @@
+# \u672C\u5730\u73AF\u5883
+server.port=9991
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.username=root
+spring.datasource.password=root
+#spring.datasource.password=89083fb2fc145533
+server.servlet.context-path=
+#logging.level.com.glxp.api.admin.dao=debug
+logging.level.com.glxp.api.admin.dao.auth=debug
+logging.level.com.glxp.api.admin.dao.basic=debug
+logging.level.com.glxp.api.admin.dao.business=debug
+logging.level.com.glxp.api.admin.dao.info=debug
+logging.level.com.glxp.api.admin.dao.inout=debug
+logging.level.com.glxp.api.admin.dao.inventory=debug
+logging.level.com.glxp.api.admin.dao.thrsys=debug
+logging.level.com.glxp.api.admin.erp.second=debug
+#logback\u914D\u7F6E
+logging.path=output/logs
+# \u4E0D\u6307\u5B9A\u7684\u60C5\u51B5\u4E0B\u9ED8\u8BA4\u751F\u6210\u5728\u9879\u76EE\u6839\u76EE\u5F55\uFF0C\u6309\u7167\u914D\u7F6E\u751F\u6210\u6240\u9700\u7684\u65E5\u5FD7\u540D\u79F0
+#logging.file=D:/udi.log
+file_path=D:/udi/udiwms/udiwmsfile/
+#file_path=/home/glxp/udiwms
+#UDI\u6570\u636E\u4E0B\u8F7D
+UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
+UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
+SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
+#\u4E2D\u8F6C\u670D\u52A1IP\u5730\u5740
+#SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER
+SPSYNC_IP=http://127.0.0.1:9989
+#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
+#UDI_SERVER_URL=http://127.0.0.1:9995
+##\u7AEF\u53E3\u53F7
+# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+spring.redis.database=8 
+# Redis\u670D\u52A1\u5668\u5730\u5740
+spring.redis.host=192.168.235.137
+# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
+spring.redis.port=6379 
+# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
+spring.redis.password=123456
+#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.jedis.pool.max-active=8 
+# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.jedis.pool.max-wait=-1
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.jedis.pool.max-idle=8 
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.jedis.pool.min-idle=0 
+# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
+spring.redis.jedis.timeout=300
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+spring.servlet.multipart.max-file-size=500MB
+spring.servlet.multipart.max-request-size=500MB
+
+
+ok.http.connect-timeout=3000
+ok.http.read-timeout=3000
+ok.http.write-timeout=3000
+# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF
+ok.http.max-idle-connections=200
+# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2
+ok.http.keep-alive-duration=300
+
+
+
+

api-admin/src/main/resources/application-test1.properties

@@ -0,0 +1,68 @@
+# \u672C\u5730\u73AF\u5883
+server.port=9991
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3360/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.username=root
+spring.datasource.password=root
+#spring.datasource.password=89083fb2fc145533
+server.servlet.context-path=
+#logging.level.com.glxp.api.admin.dao=debug
+logging.level.com.glxp.api.admin.dao.auth=debug
+logging.level.com.glxp.api.admin.dao.basic=debug
+logging.level.com.glxp.api.admin.dao.business=debug
+logging.level.com.glxp.api.admin.dao.info=debug
+logging.level.com.glxp.api.admin.dao.inout=debug
+logging.level.com.glxp.api.admin.dao.inventory=debug
+logging.level.com.glxp.api.admin.dao.thrsys=debug
+logging.level.com.glxp.api.admin.erp.second=debug
+#logback\u914D\u7F6E
+logging.path=output/logs
+# \u4E0D\u6307\u5B9A\u7684\u60C5\u51B5\u4E0B\u9ED8\u8BA4\u751F\u6210\u5728\u9879\u76EE\u6839\u76EE\u5F55\uFF0C\u6309\u7167\u914D\u7F6E\u751F\u6210\u6240\u9700\u7684\u65E5\u5FD7\u540D\u79F0
+#logging.file=D:/udi.log
+file_path=D:/udi/udiwms/udiwmsfile/
+#file_path=/home/glxp/udiwms
+#UDI\u6570\u636E\u4E0B\u8F7D
+UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
+UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
+SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
+#\u4E2D\u8F6C\u670D\u52A1IP\u5730\u5740
+#SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER
+SPSYNC_IP=http://127.0.0.1:9989
+#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
+#UDI_SERVER_URL=http://127.0.0.1:9995
+##\u7AEF\u53E3\u53F7
+# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+spring.redis.database=8 
+# Redis\u670D\u52A1\u5668\u5730\u5740
+spring.redis.host=192.168.0.66
+# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
+spring.redis.port=6400 
+# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
+spring.redis.password=
+#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.jedis.pool.max-active=8 
+# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.jedis.pool.max-wait=-1
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.jedis.pool.max-idle=8 
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.jedis.pool.min-idle=0 
+# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
+spring.redis.jedis.timeout=300
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+spring.servlet.multipart.max-file-size=500MB
+spring.servlet.multipart.max-request-size=500MB
+
+
+ok.http.connect-timeout=3000
+ok.http.read-timeout=3000
+ok.http.write-timeout=3000
+# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF
+ok.http.max-idle-connections=200
+# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2
+ok.http.keep-alive-duration=300
+
+
+
+

api-admin/src/main/resources/application-test2.properties

@@ -0,0 +1,68 @@
+# \u672C\u5730\u73AF\u5883
+server.port=9991
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3361/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.username=root
+spring.datasource.password=root
+#spring.datasource.password=89083fb2fc145533
+server.servlet.context-path=
+#logging.level.com.glxp.api.admin.dao=debug
+logging.level.com.glxp.api.admin.dao.auth=debug
+logging.level.com.glxp.api.admin.dao.basic=debug
+logging.level.com.glxp.api.admin.dao.business=debug
+logging.level.com.glxp.api.admin.dao.info=debug
+logging.level.com.glxp.api.admin.dao.inout=debug
+logging.level.com.glxp.api.admin.dao.inventory=debug
+logging.level.com.glxp.api.admin.dao.thrsys=debug
+logging.level.com.glxp.api.admin.erp.second=debug
+#logback\u914D\u7F6E
+logging.path=output/logs
+# \u4E0D\u6307\u5B9A\u7684\u60C5\u51B5\u4E0B\u9ED8\u8BA4\u751F\u6210\u5728\u9879\u76EE\u6839\u76EE\u5F55\uFF0C\u6309\u7167\u914D\u7F6E\u751F\u6210\u6240\u9700\u7684\u65E5\u5FD7\u540D\u79F0
+#logging.file=D:/udi.log
+file_path=D:/udi/udiwms/udiwmsfile/
+#file_path=/home/glxp/udiwms
+#UDI\u6570\u636E\u4E0B\u8F7D
+UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
+UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
+SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
+#\u4E2D\u8F6C\u670D\u52A1IP\u5730\u5740
+#SPSYNC_IP=http://192.168.0.35:9150/SP_SYNC_SERVER
+SPSYNC_IP=http://127.0.0.1:9989
+#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
+#UDI_SERVER_URL=http://127.0.0.1:9995
+##\u7AEF\u53E3\u53F7
+# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+spring.redis.database=8 
+# Redis\u670D\u52A1\u5668\u5730\u5740
+spring.redis.host=192.168.0.66
+# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
+spring.redis.port=6401 
+# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
+spring.redis.password=
+#\u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.jedis.pool.max-active=8 
+# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.jedis.pool.max-wait=-1
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.jedis.pool.max-idle=8 
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.jedis.pool.min-idle=0 
+# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
+spring.redis.jedis.timeout=300
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+spring.servlet.multipart.max-file-size=500MB
+spring.servlet.multipart.max-request-size=500MB
+
+
+ok.http.connect-timeout=3000
+ok.http.read-timeout=3000
+ok.http.write-timeout=3000
+# \u8FDE\u63A5\u6C60\u4E2D\u6574\u4F53\u7684\u7A7A\u95F2\u8FDE\u63A5\u7684\u6700\u5927\u6570\u91CF
+ok.http.max-idle-connections=200
+# \u8FDE\u63A5\u7A7A\u95F2\u65F6\u95F4\u6700\u591A\u4E3A 300 \u79D2
+ok.http.keep-alive-duration=300
+
+
+
+

api-admin/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=pro
+spring.profiles.active=@profiles.active@
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 

api-admin/src/main/resources/mybatis/configuration.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration
-        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-
-<generatorConfiguration>
-    <!--mysql 连接数据库jar 这里选择自己本地位置;
-    如果不知道maven本地仓库地址，可以使用EveryThing工具全局搜索mysql-connector-java，找到jar包位置；
-    也可以手动下载一个jar放在指定位置，进行引用。
-    -->
-    <classPathEntry location="D:/Program Files/maven/maven-repository/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar"/>
-
-    <context id="testTables" targetRuntime="MyBatis3">
-        <commentGenerator>
-            <!-- 是否去除自动生成的注释,true：是,false:否 -->
-            <property name="suppressAllComments" value="true"/>
-        </commentGenerator>
-
-        <!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
-        <jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
-                        connectionURL="jdbc:mysql://127.0.0.1:3306/warehouse?serverTimezone=GMT%2B8&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false" userId="root"
-                        password="123456">
-            <property name="nullCatalogMeansCurrent" value="true" />
-        </jdbcConnection>
-
-        <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和
-           NUMERIC 类型解析为java.math.BigDecimal -->
-        <javaTypeResolver>
-            <property name="forceBigDecimals" value="false"/>
-        </javaTypeResolver>
-
-        <!-- 指定javaBean生成的位置
-            targetPackage：生成的类要放的包，真实的包受enableSubPackages属性控制；
-            targetProject：目标项目，指定一个存在的目录下，生成的内容会放到指定目录中，如果目录不存在，MBG不会自动建目录
-         -->
-        <javaModelGenerator targetPackage="com.glxp.api.admin.entity.inout" targetProject="src/main/java">
-            <!-- 在targetPackage的基础上，根据数据库的schema再生成一层package，最终生成的类放在这个package下，默认为false；如果多个数据库改为true分目录 -->
-            <property name="enableSubPackages" value="true"/>
-            <!-- 设置是否在getter方法中，对String类型字段调用trim()方法 -->
-            <property name="trimStrings" value="true"/>
-        </javaModelGenerator>
-
-        <!--  指定mapper映射文件生成的位置
-           targetPackage、targetProject同javaModelGenerator中作用一样-->
-        <sqlMapGenerator targetPackage="mybatis.mapper.inout" targetProject="src/main/resources">
-            <property name="enableSubPackages" value="false"/>
-        </sqlMapGenerator>
-
-        <!-- 指定mapper接口生成的位置
-         targetPackage、targetProject同javaModelGenerator中作用一样
-         -->
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.glxp.api.admin.dao.inout" targetProject="src/main/java">
-            <property name="enableSubPackages" value="false"/>
-        </javaClientGenerator>
-
-        <!-- 指定数据库表
-        domainObjectName：生成的domain类的名字,当表名和domain类的名字有差异时一定要设置，如果不设置，直接使用表名作为domain类的名字；
-        可以设置为somepck.domainName，那么会自动把domainName类再放到somepck包里面；
-        -->
-        <table tableName="druginfo" schema="warehouse"></table>
-        <!--<table tableName="receiptsdetail" schema="warehouse"></table>-->
-    </context>
-</generatorConfiguration>

api-admin/src/main/resources/mybatis/db.properties

@@ -1,5 +0,0 @@
-jdbc.jar.path=D:/Program Files/maven/maven-repository/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar
-jdbc.driver=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://127.0.0.1:3306/warehouse?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-jdbc.username=root
-jdbc.password=123456