diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java index bdeec74a..0a952467 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrScOrderController.java @@ -14,6 +14,7 @@ import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; import com.glxp.api.admin.service.basic.BussinessOriginTypeService; import com.glxp.api.admin.service.basic.UnitMaintainService; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -40,7 +41,7 @@ public class ThrScOrderController { InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectByThirdSys(thrPostOrderRequest.getThirdIdSys(), thrPostOrderRequest.getInvCode()); PostOrderRequest postOrderRequest = new PostOrderRequest(); - + return ResultVOUtils.success("上传成功！"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java index 6f1f7eb9..ed99da25 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrPostOrderRequest.java @@ -20,7 +20,7 @@ public class ThrPostOrderRequest { private String invName; //当前所在仓库名称 private String subInvCode; //当前所在分库号 private String subInvName; //当前所在分库名称 - private Integer status; //单据状态 + private String status; //单据状态 private List codeArray; @Data diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 3df9e61b..db6a4274 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,9 +1,9 @@ # \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.jdbc-url=jdbc:mysql://127.0.0.1:3306/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=123456 #spring.datasource.password=89083fb2fc145533 server.servlet.context-path= #logging.level.com.glxp.api.admin.dao=debug @@ -15,10 +15,6 @@ 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 @@ -34,11 +30,11 @@ SPSYNC_IP=http://127.0.0.1:9989 # 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 +spring.redis.host=127.0.0.1 # 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 +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 diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index db6a4274..c4212717 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -1,9 +1,9 @@ # \u672C\u5730\u73AF\u5883 server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://192.168.0.148:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=123456 +spring.datasource.password=Glxp@6066 #spring.datasource.password=89083fb2fc145533 server.servlet.context-path= #logging.level.com.glxp.api.admin.dao=debug @@ -15,22 +15,26 @@ 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 -file_path=D:/udi/udiwms/udiwmsfile/ -#file_path=/home/glxp/udiwms -#UDI\u6570\u636E\u4E0B\u8F7D +#logback配置 +logging.path=output/logs +# 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称 +#logging.file=D:/udi.log +#file_path=D:/udi/udiwms/udiwmsfile/ +file_path=/home/glxp/udiwms +#UDI数据下载 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 +#中转服务IP地址 +SPSYNC_IP=http://122.112.160.36: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 +##端口号 +# Redis数据库索引（默认为0） spring.redis.database=8 -# Redis\u670D\u52A1\u5668\u5730\u5740 -spring.redis.host=127.0.0.1 +# Redis服务器地址 +spring.redis.host=192.168.0.148 # 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 diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index e0814264..e487e916 100644 --- a/api-admin/src/main/resources/application.properties +++ b/api-admin/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=@profiles.active@ +spring.profiles.active=dev spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/api-common/target/classes/application.properties b/api-common/target/classes/application.properties deleted file mode 100644 index e69de29b..00000000 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 deleted file mode 100644 index 577b074a..00000000 Binary files a/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class and /dev/null 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 deleted file mode 100644 index f8a82971..00000000 Binary files a/api-common/target/classes/com/glxp/api/common/converter/LongList2StringConverter.class and /dev/null 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 deleted file mode 100644 index f255a0a6..00000000 Binary files a/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class and /dev/null 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 deleted file mode 100644 index 4440d2a2..00000000 Binary files a/api-common/target/classes/com/glxp/api/common/converter/String2StringListConverter.class and /dev/null 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 deleted file mode 100644 index 0d2a8722..00000000 Binary files a/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class and /dev/null 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 deleted file mode 100644 index 61ab44a7..00000000 Binary files a/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class and /dev/null 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 deleted file mode 100644 index f3adc5d3..00000000 Binary files a/api-common/target/classes/com/glxp/api/common/req/BaseRequest.class and /dev/null 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 deleted file mode 100644 index 1a959be9..00000000 Binary files a/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class and /dev/null 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 deleted file mode 100644 index f5446c73..00000000 Binary files a/api-common/target/classes/com/glxp/api/common/util/ResultVOUtils.class and /dev/null 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 deleted file mode 100644 index 032c8eeb..00000000 Binary files a/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class and /dev/null differ