From de4a61ae7ed1e452ab75b03ce403b5a8733d54ab Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 7 Jul 2022 11:37:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8D=E5=A4=9A=E7=8E=AF=E5=A2=83=E6=89=93?= =?UTF-8?q?=E5=8C=85=E9=83=A8=E7=BD=B2=EF=BC=8C=E5=88=A0=E9=99=A4mybatis?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=8F=92=E4=BB=B6=E5=8F=8A?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8Dmaven=E6=89=93=E5=8C=85=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=A4=B1=E8=B4=A5=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=88=90=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-admin/pom.xml | 61 +++++++++------- .../main/resources/application-dev.properties | 68 ++++++++++++++++++ .../resources/application-test1.properties | 68 ++++++++++++++++++ .../resources/application-test2.properties | 68 ++++++++++++++++++ .../src/main/resources/application.properties | 2 +- .../main/resources/mybatis/configuration.xml | 63 ---------------- .../src/main/resources/mybatis/db.properties | 5 -- .../api/common/constant/CacheConstant.class | Bin 233 -> 233 bytes .../converter/LongList2StringConverter.class | Bin 1483 -> 1483 bytes .../converter/String2LongListConverter.class | Bin 1481 -> 1481 bytes .../String2StringListConverter.class | Bin 1268 -> 1268 bytes .../glxp/api/common/enums/ResultEnum.class | Bin 2288 -> 2291 bytes .../api/common/req/BaseLimitRequest.class | Bin 1248 -> 1248 bytes .../com/glxp/api/common/req/BaseRequest.class | Bin 1096 -> 1096 bytes .../glxp/api/common/res/BaseResponse.class | Bin 2915 -> 2915 bytes .../glxp/api/common/util/ResultVOUtils.class | Bin 2007 -> 2007 bytes .../api/common/util/ResultVOUtilsTest.class | Bin 393 -> 393 bytes 17 files changed, 240 insertions(+), 95 deletions(-) create mode 100644 api-admin/src/main/resources/application-dev.properties create mode 100644 api-admin/src/main/resources/application-test1.properties create mode 100644 api-admin/src/main/resources/application-test2.properties delete mode 100644 api-admin/src/main/resources/mybatis/configuration.xml delete mode 100644 api-admin/src/main/resources/mybatis/db.properties 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 44720484f2ff647faa6f85761b0e4650ffa21315..577b074a536286b4d8c7bab5b87fa485826e84b1 100644 GIT binary patch delta 112 zcmaFK_>xiJ)W2Q(7#J8#7b=z(L)W2Q(7#J8#7-#5Vr6!k56tEKK zWMmLdOv%m6i%%>q$%rp1%}Fh`QZ1h7t)#}r$iT?J3^a$4L6U)$felEr19?mg9AGgn HFq<0yo9-6G 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 92743f46b792ce5df37961df0a8f544f825e6540..f8a8297176298e6ec2f017d78920e8a091bd2380 100644 GIT binary patch delta 591 zcmZ9IOHUI~7>1uSo#|<3hT4J@Q7N_*?Uj1L3zUm@tHHV;k?3xe28yIE7>zsP4{%Ys zFvcI?mc&G@Cd9RD{Q>UuH<)<&hMJIglKH;(eb0B^dC%E(cAcd!zd!B(liae2QFJI# z)=b!hdZgko&dH#h(ww%5aK<6aWKhaBXE~=iueqQI&oo<2e@+p~N z`5Jn;=yHI#rs^`otRk`IJ@qP2{N{S4=54GlHhh;k=3Oo_>vD<9irC)By4PB%EIe+l zxLo0?%QdcRZn)IAxn)$-@%^DY57rtFeMR5Cwb-_IhT65!_KU2o(5v1?z46R%e@}JB zR3;@+z2#-aU~b`mn`-`kXG=XwlBQ4IC0GV3xP#P0=ee2O>=!L83>*fex_j8-AcMl9 zBpH%NObGrVXD#XVLKj2v3QKK&B6ROP=53KIMZMf59PEq;(2CDQrp?l@`HpB8+hFO< zpKqlu&cDN@;s+w`wpg0S zDwJ3f@e*5Ye%RdS CrDwnZ 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 e42ad1dea5c8925d4a108823c0dd56f5bb5dbda7..f255a0a6f6971d458f1dcbb72274f2da797b39d6 100644 GIT binary patch delta 615 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 WOw+wV(%TR;I(vYF7$TcGME(I0oho_& literal 2288 zcma)8>vI!T6#v~ck8N1!wuM>>%EMZc@Q5hLBLy4Nlt$8|X4^mnt=n`7!8|Yz#*cub z;*3>3&>1__ah%Z^#u+V5i!DZ!&;A>dr2XUvzdN3LHIPJ{t+5PSBcg{Wco^zT% z{`uuM07sB-h6znJm}OXCW$2D))9ys-!>exXYSK+F>1@WWXNu{(JEG@{se+%L8EoBA zZ*bJFGVHq$+=#?uhlFMutTOD_#9)c1vKgIWtHT+*qFvM6DJ_$5hsUqz@d9x-V~Y(f zG8D8jYzCX{&=)`sgb38jiYi@4{5y%wugr4(o+71~z@jPu#TF>XT1Tothn01#D zb`e7z_4)j&YR4Yzwc$mcXg5Ra(?sij`LY6y>tBs0p@-b$i}5(cvQuye&&SE&Suc%- zWvn`AfL6CjXBrp&g8}J5$5?*7F zYt!Y*qp8YwbJeL^Tyk8dnkC6ek_>wz-l4UUUfS}?mp7|Z_g8+Ppf^_TOfS#Qa^Yzi zC%LeXR_h%d8KfA2pubfMFvorhdF zEF;K;kyT;DKkWBXtPzG5Ls(fXRet=cGINjfqcS3#f1bfE0{J76a74n}v|;t^|I7QL zjPv|Bt)gY}3{Ho0gB?rt?i2Oi5=>_FP%%BO=SH;g6xH>~b&AZnv4Y`Ek&SDqsFq7| zXLXO}jFu+H%8*{ToShifa`alzbF^S{;c}9Uy_-*=ZiBYjc**7_k{K<<(5xmC8Ld#v zkqbxT+WxQFseclB!ANo2nlZGhqNv0eTJ7ewv#Q=TR2;qWRDFgtIh;|3;|;yV=S}a% zcILE);;GqUF0KzG`7XCSow$eiWav9ghrgM|w%oU!Hz`1tI!IV*3t_3sg{9IJmP%4s zsxV=xa)hO-AWtSf*o39Y1t?wozW}{k(TsQSE*Qq>Z7*5=XD@;M4BKN!_vww{J-S=P zH=6AT7vu-CeAml;g1s{8!W_mY)sH)VTfPnRGMXI63#A?wa}+F z*Z!T0bU*k29j@)>2k4q3)NtAcGd*|FVs>B?4dGUD$OG&qEh(XkWcd?M*T8tfW)Za2 zj7tiTpsSPUJL$SimkCK)-xa)1cb=7-EYHf~T0qCM33Z5gMnaZ)Jcbm~>xjFa6?d*9 zmXJZ#5Hq(p6X5SMOtH2XnwpldyX~b#?3;&6KnKlc4!H$%SU|5@EF3y2pko3$VYPC| zBcM|PdfjH@kXJxH0r@3~LuUjO5YSo0stDa7TsPka_jEzEb(GLgE r>9$kZ^iUg|z!n;tEp#*ra&+RK(&^67*E#y3VX7bCReV4i6LS9oLDepJ 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 39622c81b8fee984e802765db57b90fef2eeca68..61ab44a76d9714dd1d55176899e63e697a07d843 100644 GIT binary patch literal 1248 zcma))TTj$b5Xb*#x4UIa5m;p9rhTNY5UDe?ug7-yilKdPyDtnOU38V*3CyaF_F}?OXCal*Bv?12kB-tMtN$=OO9GiLZ^Y`(QDGSU;RjIYV!t>O-7% zoiZN>^BARVcN0*;4SGsuL;2_BkI205xjdG7nPVi8T;8P4Q0Lvnb7X#%w&Lg%a-6o5 zFLkq$@`5IPDNOM!r|1Y17n8!2?PZ!yW#U3v;|f!@muZen^M7HI8DBCD#!R~;k7%-4CF$hz^`d5aE*Yv{kG^w^* z*9s$**Y1hyG~8C**=&Wnu7h<+dc(w!WK1_CN;JbJilWK*hld><=BT=9ViY9>qpri< zDBY-4j!Brq7;YOFH*p6O3d7f~RLFX*u)@5U z-=L;g@oR3Q>IR;i`^r>!jF;> zrJ_vRU!XokZV$PNS=L8f&7K1m=?v~U09^kJ{tV+IjR{-?kHrSFW%QEZ4N4)+*bApH zF0Phe1ehS>WR#)Q^XgwOQ1UK?$Mi}o9)yX_jbX}PWtxs<;t=qTYfSm8Omk$K{|l4U z_?&4dVtNwGRJh7y#WF3Ocjz5^Db3hc_8CS#ATQz!x87sWPJPAX8D_*X-?Pj|7Sk@| zB9mqJy;BF`L*o(krzptVl2NzDd6UdRkrf@s5_QX1<+p{kOJv*q`Y+QrgH+KN&XQ_{ Irvz4i0YcK!6951J 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 fb40c79281c09b380b9c218c27ba49977772c597..f3adc5d30e80db40b8460f27677da3041c26e087 100644 GIT binary patch literal 1096 zcma))+iuf95QhKF$%!$|u_=W@fwYjMP;b z+6LAbvY|NK4j3w(1AfG9m-{2TCqu^{J!L3J#}hrty)i>6kKmG`PnWEL>!0{6|mdlGBNG`v+nm8Rm2-l8$Td?!JCWR3Z0=fj4#H;^G9=SQ$)P zct)`IVIqacP##2KD12T1mgBl=WHjx~-&g7PqI$q!9C0@i-FFPt=4Nt2x<&L3^Yki# z6n#{=-chl%WkNFO6ZyX*;a$1pzWqh+!cWXP7uR!E?V zOQ_Kf)I%*mks5gn^Qh0nZCcg8Z2L1ZA8C`K<3LUa7ZQiF@!Um6w)=Zfi#I*7c QCe{0x$M$fmIT3m=)zEC2ui literal 1096 zcma)*U31bv6o%ggLLkN#0&T5Ut5OuGHhxrZaC)JRGj?ckq~(5rm8O#q8kUa!E1j|0 z@xmYAk8(U4Qkpt-#*3Vsb8`0G=bYXA`u*c4fK5C%kV0BV#)O6}L*bAgbKB+q&~En* zMPD*xUpT%aw;0m3de=Y>c^!s{D=-=6qVkD!Tzh~2?P~@j;(`+*j3nd+86AM^msPqHR9=ab#HXk`Q1zzCWp*XT%^09a? zjwWJEv>Ii00|sllb5hU1H7x76ZsG=3F0|VDG?v0+DE22|D15o+cw)zKU1uD1y=~wY zR(0GqaR+zLx{jn? zU?3RgTaGVwCtgp4d%WjT#%cw9?sj?Ts5nk$B%T`zNpn)u$&F|3LM?$2 zPrlwIx*Z`8g26i;a!*JR(ncl;sL{myv*SH)m1;;iQBz8)M@=eiqZ3TRzIfxP)(VO9 z+fdhqhHTNT1U)Hr^pQu?qqhb+VPwhPr>KoIdBAexJ6Pis`ZruXL6N+rQ`|g3}*mIh5!olu@UQITb(y>l86OKp_^l>8-@I##aTd&GKMgC9!eSI>V+EzI`em@GN@El#rbl>8R>>xrDt|MrUdr?Y dPcLIijAqJIA*Qu|Fsa$kn5q%eCfO98{Q*z`(C`2N 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 af05693a3d57d4e4393c6ea5f1a7fba7eaad537a..1a959be9e94ddca559ac11f8eddfb52ac9d99c5b 100644 GIT binary patch literal 2915 zcma)7ZF3V<6n-|@w}dT(Kng+7suk0uC5ot!zQ|kAY74b3RS=bJx~9Q2iOE*+NAL&y z0rG_pIHP4oXB_>4GyWzKpR;$9Y)aJ3B=??s&U4Q_=Q-!z{qygie+6&`UnG&iwFC?- z%kZHLD;8FhoY!QyE`W8BK9b>MS>CX4GYJRRY|D1IWBV(>)d=PIQYO~weDTr+1~J4YwkuZII2;0YwK>SD(g_G z`&-qvhLels#&)q%yW1?f&1#X0?MA)W^4i6VZrfY&+RaA2?eVbD#XcwBHam_ALwT5C z#B+3GRXktCnaNE=DCkj?Bx0$<(&0W(mnZRZIiRW^&?U>rO#~EK?apzdxdEpMZK);C z-)d|wyDfLy^Su^HNpe>=giLf}7=i2)*D8iSL>Ph~%p79~1n;XIw?@YUkvBDH4Gl)a z-|||lvlM1rHBmCqg$pMzbQ@?y*}7}BPc=}uPc0^fD^Om_GqUQtIMfhwV2MeHwBzYo$mzLeA!% zRk0SUjh$B6yHb@-J{WDvQ*yx^JdYO~jN*ucqsTfqhUYXei2rYD2N&_SgIAGr@Rmpu z$U7)t(!nKM)^MbEfmPfWcdE5bDN#BaMovmK>!6HH85m`9ax6@KmTfXQCh1esCLDZ# zJUg!ESY=NB+-B3OZ)%tt)NK)7`XXV$`tY6J`&T?(C>F#N)x6zj#2Kp`w_8+ zR7Bl5L%L(R2Dppwb+>;=cPu=~*c+X`*IjBTcZ$U+#&-(E(Cs4U7;`oAg`W@`Oya0Q zgd_^VQY9@yr%9X8`5ONQpJk+IejTR=9TFe*5NUz`IOJ$>$Q%50#sh-ZqnYT#9-{h7 z8l#t`WFlD}!wCiu=5&n5DFWZ5l2=pZrmb;K5Pq+a{~m_^pzu44?_k6q6n=xTG@0Lp z87wJSS0_1?^r=6vFRMSs!TWHgvidIU4kA%92uYO8tRWclG1B)jk~Oks1e7dU1SLy$ z))J5%f~>6F0qGAIkp9eNxTON^*6|+B2DdANyEw-S663#$5_NHQaT(K;bi9izn4x4~ z3Fk3O$wZC5=O|fdaeRk=JLm?*;k~dMl;898dx7y3;8^xw*l)pjf>8?@{%q|Djw&$` z6+5J#CF#1nh>C2!R2n7rn6NBKMz5&4@hSwPo20?iG*6pLzH)Mc<(D0ebUc_WcA7_8o9Z#@R}~NUuAXmAGspzRsaA1 literal 2915 zcma)8ZBrXn6n<{9Z=_2bUfU=t)mRe}8m;&iUZk|NqCgP>+FG?sSVL+^VzOxc5&Z-H z0Q;pM>WtDEopJO_o$)tW>vQ++h7B-IW?=W+d!PHgT)g_={Z6mD$ab<3WBF;lHqy*Yt+CcD)K3w{lJK;RGe`=Udv3e!REQjm zAUC{LwO;XogEodROuik*bGlK=+vx=9Ms1wMIRUHe)EB?mcWMG7nFwJ3&EAsW=WINW zF`ivsQ;3QNrAJ6GAi$SpQhwEvs|satNVM~ZmZ;M*Zit! zl%3j^)2hmGFsXUF)waNet+oGUS z5H_yt$b>%^3~Ya)(}VqLtut2pRObcz)F9iNFcVUi{teG5f4$-~gY4*Q>q{$(ba08@ z^5WR9@y5{uhpcqxa6PTg%FL9Cktz#fojX3o*ftvbt+IQqDobM^+7K6I|KL0uGR8|V z&L=N3S}}PI`ETAb5V-8y3tXj7F!;Q}nag|&zV(U65I@m~<0_wW8R)|zpSA+v8m@En zLD$R@M?&5?e0J0Q4D%5eqjYwUbi9L3pzA+Mce+P9UQ!g}sCNTL>5@IsDHT7Ye;;8v zpp|c_y)lvd1?I^jjw(bTq7+zWNkrr{xF+RX;lD1poaFKg0UNlm=#28O7 z_yGMWJ!M2d>7q$cx@e_L39w{CH853n?vFv1BUM zQo5-7OU$Cb$x7+|(%8v~nNtS_KF6_+&+!G_(XoavX~mFW=yw=LoY%`GIJ7j(QJ8I7 zdL*{ZKzb?ocQBq2qET=mC^Ce2MuNj}OiqkI4*?-Y>z)c=Mg(?6w_Nl}p9;h}Oskxcof`|< Kw2U2p0CV6s}(`*g@Vv278OARinl7t#rR_6NlQbtgfu2?edQBOogXnV z)7}ad87T zCA(!~RN}lWw=FEVaHJf=qKi9NlI5;!mo2PVSk(|+X||f3ss>|v=B3})cP*>kZ8Y}U z{wJ;KXN*7o8-3?XDpJ#Ig#?lsihfTo)+|&N)^JbZJ{~AM#3O|o9&1SK*FV%N-A?nM zvR-e$+p51;7{w(EPZZYiRN)ym6edvAFh!)aZy3pxhWJU_LA~|1@_cuHuhHps7kmAQ z-tS32s}&5PeGw`85xwBg>BS84G!f@0fG9|cB-fPRGBdBz;TfQCfw^J@FpfviNd*Y!Kv|$ocY$pJ&VVa_B4oBSR zWV3{k&WFCFmSru+4o7D**cK?72^B3ciZ?|e@{J5|erQeJ>JV5u^Cc52!DB;?A7@o! q5QpUuZ>OUBdAm=sG?NEEC)%z>;C`}Dq({F delta 848 zcmZWmOHUI~6#iy9?X=^CK7>|4>4PG)Q>>2yVxiy*ke55-V_`}|w1hM!ZQT-ofvNKs z+?tpeYa@w!^#`zVBJ##ADRQ4MCZU8@~5oAQ=WIEOLktugJEPAHtm1?Q`g$(cxMh`RjkR{f~B zS#3Vwt-i1@DLffWnaC=PV%ixt?9TUc#KH__P2?2vuw7Ln&O1Hg#QYgz&tOjB5{gdA zpXD`!D+*U}?T!AVv;WiyYQH`_*4MQ-(tOf63m^bZhQNQxY53z0=e-=Du)wq83s|v; z>x?0h!p;)UZAQUJp1^$c385W3x|iy~>LOytM!JaG`7Xxo_bl;Y-udC5I2OQozX?mY z!CMdsl(9^b72brbpQ-S)%8XxQVV`%6Dd8;>Kr{`VV3NG4?R*buVbLMtWw$_zIO%@| zf;6y%n*tb;d9Xx~UNahuY0trKfr=vqo7z3>y}}$l6#jbn7)ZJv^8Gg4!fmz_0C#Yg zqJkK6-RKzS*2zfc17Gr1A*CxrXEWH=SG4XaT3{4!ib5{(EA()AU`@7k4B`$Jqp*QZ sHh8nz@bK<=cq@!Dj*#Hl|AB$}2RjLQSR$$K$5Se(qEy2c2T8!~Kfrir&j0`b 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 9f4eb69e77b809465ecb052ffc0c7f07130cd9ce..032c8eebc33481bc268977f38198012054a81823 100644 GIT binary patch delta 212 zcmeBV?qpUu^>5cc1_lNb20<2lz=A9c96&Y?L;(XQ0~e6T$iNNPtPSP^#n3d$F|Z@)WQ6PF0jg(W-~|B2Dip~8 delta 213 zcmeBV?qs$(^>5cc1_lNb20<$cIDHN21bx>Ajt{j=>us-AkC_^oq=&9 ySegq+f}|N3SQxm0Bo9OZkmd#Q7#aBBnzg}vpcuMFb|j6AAdL{6{6O_g3<3ZUwiOuw