diff --git a/api-admin/pom.xml b/api-admin/pom.xml index f74cfcbf..d5786a8a 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -342,32 +342,6 @@ true - - org.mybatis.generator - mybatis-generator-maven-plugin - 1.4.0 - - src/main/resources/mybatis/configuration.xml - true - true - - - - Generate MyBatis Artifacts - - generate - - - - - - org.mybatis.generator - mybatis-generator-core - 1.4.0 - - - - org.apache.maven.plugins maven-compiler-plugin @@ -380,4 +354,39 @@ + + + + pro + + pro + + + + true + + + + + dev + + dev + + + + + test1 + + test1 + + + + + test2 + + test2 + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties new file mode 100644 index 00000000..3df9e61b --- /dev/null +++ b/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 + + + + diff --git a/api-admin/src/main/resources/application-test1.properties b/api-admin/src/main/resources/application-test1.properties new file mode 100644 index 00000000..9d629cbd --- /dev/null +++ b/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 + + + + diff --git a/api-admin/src/main/resources/application-test2.properties b/api-admin/src/main/resources/application-test2.properties new file mode 100644 index 00000000..202f6c6b --- /dev/null +++ b/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 + + + + diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index 0f5d7b4c..e0814264 100644 --- a/api-admin/src/main/resources/application.properties +++ b/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 diff --git a/api-admin/src/main/resources/mybatis/configuration.xml b/api-admin/src/main/resources/mybatis/configuration.xml deleted file mode 100644 index 771e01b3..00000000 --- a/api-admin/src/main/resources/mybatis/configuration.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
\ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/db.properties b/api-admin/src/main/resources/mybatis/db.properties deleted file mode 100644 index 8caaaaff..00000000 --- a/api-admin/src/main/resources/mybatis/db.properties +++ /dev/null @@ -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 \ No newline at end of file diff --git a/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class b/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class index 44720484..577b074a 100644 Binary files a/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class and b/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class differ diff --git a/api-common/target/classes/com/glxp/api/common/converter/LongList2StringConverter.class b/api-common/target/classes/com/glxp/api/common/converter/LongList2StringConverter.class index 92743f46..f8a82971 100644 Binary files a/api-common/target/classes/com/glxp/api/common/converter/LongList2StringConverter.class and b/api-common/target/classes/com/glxp/api/common/converter/LongList2StringConverter.class differ diff --git a/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class b/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class index e42ad1de..f255a0a6 100644 Binary files a/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class and b/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class differ diff --git a/api-common/target/classes/com/glxp/api/common/converter/String2StringListConverter.class b/api-common/target/classes/com/glxp/api/common/converter/String2StringListConverter.class index ae0201a1..4440d2a2 100644 Binary files a/api-common/target/classes/com/glxp/api/common/converter/String2StringListConverter.class and b/api-common/target/classes/com/glxp/api/common/converter/String2StringListConverter.class differ diff --git a/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class b/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class index 3fd28e70..0d2a8722 100644 Binary files a/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class and b/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class differ diff --git a/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class b/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class index 39622c81..61ab44a7 100644 Binary files a/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class and b/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class differ diff --git a/api-common/target/classes/com/glxp/api/common/req/BaseRequest.class b/api-common/target/classes/com/glxp/api/common/req/BaseRequest.class index fb40c792..f3adc5d3 100644 Binary files a/api-common/target/classes/com/glxp/api/common/req/BaseRequest.class and b/api-common/target/classes/com/glxp/api/common/req/BaseRequest.class differ diff --git a/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class b/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class index af05693a..1a959be9 100644 Binary files a/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class and b/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class differ diff --git a/api-common/target/classes/com/glxp/api/common/util/ResultVOUtils.class b/api-common/target/classes/com/glxp/api/common/util/ResultVOUtils.class index aaa35d17..f5446c73 100644 Binary files a/api-common/target/classes/com/glxp/api/common/util/ResultVOUtils.class and b/api-common/target/classes/com/glxp/api/common/util/ResultVOUtils.class differ diff --git a/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class b/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class index 9f4eb69e..032c8eeb 100644 Binary files a/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class and b/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class differ