diff --git a/pom.xml b/pom.xml index fa04c30..a03fa5c 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,11 @@ maven-jar-plugin 3.4.2 + + com.ly.smart-doc + smart-doc-maven-plugin + 3.0.9 + @@ -423,6 +428,25 @@ + + com.ly.smart-doc + smart-doc-maven-plugin + + + ./src/main/resources/smart-doc.json + + middleware-agent + + + + + + + html + + + + diff --git a/src/main/resources/application-common.properties b/src/main/resources/application-common.properties deleted file mode 100644 index e99ec45..0000000 --- a/src/main/resources/application-common.properties +++ /dev/null @@ -1,22 +0,0 @@ -# Server Configuration -server.port=18080 -server.servlet.context-path=/mw/agent -server.compression.enabled=true -server.compression.mime-types=application/json -server.compression.min-response-size=1KB - -# Spring Web Configuration -spring.web.resources.add-mappings=false - -# Spring Jackson Configuration -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss.SSS -spring.jackson.timezone=GMT+8 -spring.jackson.default-property-inclusion=non_null -spring.jackson.mapper.default-view-inclusion=true -spring.jackson.deserialization.fail-on-unknown-properties=false - -# Log4j Configuration -#log4j.logger.org.mybatis=info - -# Swagger-UI Custom Path -springdoc.swagger-ui.path=/swagger-ui.html \ No newline at end of file diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/application-user.properties b/src/main/resources/application-user.properties deleted file mode 100644 index 2def4ab..0000000 --- a/src/main/resources/application-user.properties +++ /dev/null @@ -1,28 +0,0 @@ -# common : -common.token-expired-of-seconds=600 -common.allow-passwd-retry-times=3 -common.show-sql-command=false -common.locale=zh_CN - -# protocol: -protocol.check-timestamp=true -protocol.timeout-of-seconds=600 -protocol.crypto-type=0 -#crypto-key: 12354 - -# Platform Service -# Manager Platform URL -service.platform-url=http://xajhuang.com:1300 -# APPID -service.platform-appid=appid -# cluster name -service.platform-cluster=cluster -# HTTP Request timeout of seconds -service.request-timeout=5 - -# threads pool -thread.core-pool-size=5 -thread.max-pool-size=10 -thread.queue-capacity=25 -thread.name-prefix=Async- - diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0760bbd..e7ab99e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,51 @@ -spring.profiles.active=local,common,user \ No newline at end of file +# Server Configuration +server.port=18080 +server.servlet.context-path=/mw/agent +server.compression.enabled=true +server.compression.mime-types=application/json +server.compression.min-response-size=1KB + +# Spring Web Configuration +spring.web.resources.add-mappings=false + +# Spring Jackson Configuration +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss.SSS +spring.jackson.timezone=GMT+8 +spring.jackson.default-property-inclusion=non_null +spring.jackson.mapper.default-view-inclusion=true +spring.jackson.deserialization.fail-on-unknown-properties=false + +# Log4j Configuration +#log4j.logger.org.mybatis=info + +# Swagger-UI Custom Path +springdoc.swagger-ui.path=/swagger-ui.html + +# common : +common.token-expired-of-seconds=600 +common.allow-passwd-retry-times=3 +common.show-sql-command=false +common.locale=zh_CN + +# protocol: +protocol.check-timestamp=true +protocol.timeout-of-seconds=600 +protocol.crypto-type=0 +#crypto-key: 12354 + +# Platform Service +# Manager Platform URL +service.platform-url=http://xajhuang.com:1300 +# APPID +service.platform-appid=appid +# cluster name +service.platform-cluster=cluster +# HTTP Request timeout of seconds +service.request-timeout=5 + +# threads pool +thread.core-pool-size=5 +thread.max-pool-size=10 +thread.queue-capacity=25 +thread.name-prefix=Async- + diff --git a/src/main/resources/smart-doc.json b/src/main/resources/smart-doc.json new file mode 100644 index 0000000..ff98bf2 --- /dev/null +++ b/src/main/resources/smart-doc.json @@ -0,0 +1,14 @@ +{ + "isStrict": false, + "allInOne": true, + "outPath": "target/doc", + "projectName": "middleware-agent", + "pathPrefix": "/mw/agent", + "inlineEnum": true, + "appToken": "71d1c3fc4d5f44c49fda68cb3ba3723d", + "openUrl": "http://172.21.48.233:7700/api", + "debugEnvName": "平台页面测试环境", + "debugEnvUrl": "https://172.21.44.35:50443/", + "packageFilters": "com.cmcc.magent.controller.*", + "replace": true +} \ No newline at end of file diff --git a/src/test/java/com/cmcc/magent/IntegrationTestSuite.java b/src/test/java/com/cmcc/magent/IntegrationTestSuite.java index 96d8694..1feb1c1 100644 --- a/src/test/java/com/cmcc/magent/IntegrationTestSuite.java +++ b/src/test/java/com/cmcc/magent/IntegrationTestSuite.java @@ -18,6 +18,7 @@ import com.cmcc.magent.validation.valids.impl.ValidProtocolTimestampImplTest; import org.junit.jupiter.api.DisplayName; import org.junit.platform.suite.api.SelectClasses; import org.junit.platform.suite.api.Suite; +import org.springframework.test.context.ActiveProfiles; /** * IntegrationTestSuite 是一个 JUnit 5 测试套件。 @@ -48,11 +49,12 @@ import org.junit.platform.suite.api.Suite; * @version 1.0.0 * @since 2025-01-15 */ -@SelectClasses({CommonFrameworkApiTest.class, EnumCoverTest.class, HelperUtilsTest.class, PlatformApiServiceImplTest.class, - SystemInfoApiTest.class, CryptoHelperTest.class, ProtocolSecurityServiceImplTest.class, CommonEnumHandlerTest.class, - SpringBootBeanUtilsTest.class, ValidProtocolTimestampImplTest.class, ValidPageSizeImplTest.class, - ValidHttpMethodImplTest.class, JsonParameterizedTypeTest.class, CustomExceptionTest.class, - RequestBodyCacheWrapperTest.class}) +// @SelectClasses({CommonFrameworkApiTest.class, EnumCoverTest.class, HelperUtilsTest.class, PlatformApiServiceImplTest.class, +// SystemInfoApiTest.class, CryptoHelperTest.class, ProtocolSecurityServiceImplTest.class, CommonEnumHandlerTest.class, +// SpringBootBeanUtilsTest.class, ValidProtocolTimestampImplTest.class, ValidPageSizeImplTest.class, +// ValidHttpMethodImplTest.class, JsonParameterizedTypeTest.class, CustomExceptionTest.class, +// RequestBodyCacheWrapperTest.class}) +@SelectClasses({ValidHttpMethodImplTest.class}) @DisplayName("接口集成测试") @Suite public class IntegrationTestSuite { diff --git a/src/test/java/com/cmcc/magent/base/SpringBootTestBase.java b/src/test/java/com/cmcc/magent/base/SpringBootTestBase.java index 043370c..282c093 100644 --- a/src/test/java/com/cmcc/magent/base/SpringBootTestBase.java +++ b/src/test/java/com/cmcc/magent/base/SpringBootTestBase.java @@ -42,7 +42,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultHandlers. @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, classes = {MiddlewareAgentApplication.class}) @AutoConfigureMockMvc @TestInstance(TestInstance.Lifecycle.PER_CLASS) -@ActiveProfiles({"common", "test", "user"}) public abstract class SpringBootTestBase { /** diff --git a/src/test/resources/application-common.properties b/src/test/resources/application-common.properties deleted file mode 100644 index e99ec45..0000000 --- a/src/test/resources/application-common.properties +++ /dev/null @@ -1,22 +0,0 @@ -# Server Configuration -server.port=18080 -server.servlet.context-path=/mw/agent -server.compression.enabled=true -server.compression.mime-types=application/json -server.compression.min-response-size=1KB - -# Spring Web Configuration -spring.web.resources.add-mappings=false - -# Spring Jackson Configuration -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss.SSS -spring.jackson.timezone=GMT+8 -spring.jackson.default-property-inclusion=non_null -spring.jackson.mapper.default-view-inclusion=true -spring.jackson.deserialization.fail-on-unknown-properties=false - -# Log4j Configuration -#log4j.logger.org.mybatis=info - -# Swagger-UI Custom Path -springdoc.swagger-ui.path=/swagger-ui.html \ No newline at end of file diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties deleted file mode 100644 index 170ae8f..0000000 --- a/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -common.locale=en_US diff --git a/src/test/resources/application-user.properties b/src/test/resources/application-user.properties deleted file mode 100644 index 2def4ab..0000000 --- a/src/test/resources/application-user.properties +++ /dev/null @@ -1,28 +0,0 @@ -# common : -common.token-expired-of-seconds=600 -common.allow-passwd-retry-times=3 -common.show-sql-command=false -common.locale=zh_CN - -# protocol: -protocol.check-timestamp=true -protocol.timeout-of-seconds=600 -protocol.crypto-type=0 -#crypto-key: 12354 - -# Platform Service -# Manager Platform URL -service.platform-url=http://xajhuang.com:1300 -# APPID -service.platform-appid=appid -# cluster name -service.platform-cluster=cluster -# HTTP Request timeout of seconds -service.request-timeout=5 - -# threads pool -thread.core-pool-size=5 -thread.max-pool-size=10 -thread.queue-capacity=25 -thread.name-prefix=Async- - diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index d5b79bf..92284a5 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -1 +1,51 @@ -spring.profiles.active=test,common,user \ No newline at end of file +# Server Configuration +server.port=18080 +server.servlet.context-path=/mw/agent +server.compression.enabled=true +server.compression.mime-types=application/json +server.compression.min-response-size=1KB + +# Spring Web Configuration +spring.web.resources.add-mappings=false + +# Spring Jackson Configuration +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss.SSS +spring.jackson.timezone=GMT+8 +spring.jackson.default-property-inclusion=non_null +spring.jackson.mapper.default-view-inclusion=true +spring.jackson.deserialization.fail-on-unknown-properties=false + +# Log4j Configuration +#log4j.logger.org.mybatis=info + +# Swagger-UI Custom Path +springdoc.swagger-ui.path=/swagger-ui.html + +# common : +common.token-expired-of-seconds=600 +common.allow-passwd-retry-times=3 +common.show-sql-command=false +common.locale=en_US + +# protocol: +protocol.check-timestamp=true +protocol.timeout-of-seconds=600 +protocol.crypto-type=0 +#crypto-key: 12354 + +# Platform Service +# Manager Platform URL +service.platform-url=http://xajhuang.com:1300 +# APPID +service.platform-appid=appid +# cluster name +service.platform-cluster=cluster +# HTTP Request timeout of seconds +service.request-timeout=5 + +# threads pool +thread.core-pool-size=5 +thread.max-pool-size=10 +thread.queue-capacity=25 +thread.name-prefix=Async- + diff --git a/src/test/resources/i18n/enumMessage_en_US.properties b/src/test/resources/i18n/enumMessage_en_US.properties deleted file mode 100644 index 163333c..0000000 --- a/src/test/resources/i18n/enumMessage_en_US.properties +++ /dev/null @@ -1,9 +0,0 @@ -NORMAL=Normal -LOCKED=Locked -DISABLED=Disabled -DELETED=Deleted -CRYPTO_NONE=Unencrypted -CRYPTO_BASE64=Base64 encoding -CRYPTO_AES128=AES128 encryption -CRYPTO_DES=DES symmetric encryption -CRYPTO_AES256=AES256 encryption \ No newline at end of file diff --git a/src/test/resources/i18n/enumMessage_zh_CN.properties b/src/test/resources/i18n/enumMessage_zh_CN.properties deleted file mode 100644 index b666708..0000000 --- a/src/test/resources/i18n/enumMessage_zh_CN.properties +++ /dev/null @@ -1,9 +0,0 @@ -NORMAL=\u6B63\u5E38 -LOCKED=\u5DF2\u9501\u5B9A -DISABLED=\u5DF2\u7981\u7528 -DELETED=\u5DF2\u5220\u9664 -CRYPTO_NONE=\u4E0D\u52A0\u5BC6 -CRYPTO_BASE64=Base64\u7F16\u7801 -CRYPTO_AES128=AES128\u52A0\u5BC6 -CRYPTO_DES=DES\u5BF9\u79F0\u52A0\u5BC6 -CRYPTO_AES256=AES256\u52A0\u5BC6 \ No newline at end of file diff --git a/src/test/resources/i18n/errorMessage_en_US.properties b/src/test/resources/i18n/errorMessage_en_US.properties deleted file mode 100644 index a491f86..0000000 --- a/src/test/resources/i18n/errorMessage_en_US.properties +++ /dev/null @@ -1,58 +0,0 @@ -ERR_OK=Successful -ERR_PASSWORD=Incorrect password -ERR_USERNOTFOUND=User does not exist -ERR_PASSWORDMORE=The number of consecutive incorrect passwords reaches the upper limit -ERR_USERLOCK=Password error reaches the upper limit, The user is locked -ERR_PASSWORD_EXPIRED=The password has expired -ERR_ACCOUNT=The user account is abnormal -ERR_USEREXIST=The user already exists -ERR_PASSWORDSIMPLE=The user password strength does not meet the requirement. ERR_INPUTFORMAT=The input information format is incorrect -ERR_INPUTMISS=No necessary input information -ERR_PERMISSION=Operator permission is insufficient -ERR_REQTIMEOUT=Request timeout -ERR_PARAMS=Parameter error -ERR_SYSTEMEXCEPTION=System exception -ERR_UNKNOWNCMD=Unknown command -ERR_LOGOUT=User not logged in -ERR_TOKENTIMEOUT=Token timeout -ERR_TOKENNOTFOUND=Illegal Token -ERR_TOKEN_KEY=Token key error -ERR_MISSAUTHHEAD=Http request missing authentication header -ERR_NOSUCHITEM=No such content -ERR_ITEMEXISTS=The content already exists -ERR_PARAMEXCEPTION=Parameter exception -ERR_DEVICELOCKED=Device locked -ERR_VERSION=Protocol version incompatible, Please upgrade the system -ERR_NOSUCHTYPE=No device of this type exists -ERR_REMOVEMORE=Disable deleting multiple devices at the same time -ERR_TASKRUNNING=Similar tasks are running -ERR_UNSUPPORT=Unsupported operations -ERR_INTERRUPT=Operation interruption -ERR_CALLDEVICE=Failed to call the device -ERR_NOSUCHTASK=No task -ERR_TASKNOTRUNNING=No task is running -ERR_REQUESTTIMEOUT=Request timeout -ERR_UNABLEDISPOSEIP=Unable to handle the IP -ERR_DATABASE=Failed to operate the database -ERR_UNTRUSTHOST=Unauthorized client -ERR_UNTRUSTTOKEN=Unauthorized Token -ERR_UNKNOWNINTERFACE=Interface not provided -ERR_DECRYPT_BASE64=BASE64 decryption failure -ERR_ENCRYPT_BASE64=BASE64 encryption failure -ERR_DECRYPT_AES128=AES128 decryption failure -ERR_ENCRYPT_AES128=AES128 encryption failure -ERR_DECRYPT_3DES=3DES decryption failure -ERR_ENCRYPT_3DES=3DES Encryption failure -ERR_DECRYPT_UNKNOWN=Unsupported decryption algorithm -ERR_ENCRYPT_UNKNOWN=unsupported encryption algorithm -ERR_JSON_ENCODE=Json Sequence number error -ERR_JSON_DECODE=Json deserialization error -ERR_ENCRYPT_AES256=AES256 Encryption failure -ERR_DECRYPT_AES256=AES256 decryption failure -ERR_CRYPTO_KEY=Wrong secret key -ERR_USER_ROLE_NOTEXISTS=The user role does not exist -ERR_RESOURCE_USED=Resource used -err.auth.key.convert=Key algorithm or key conversion error -err.auth.key.verify=Key missing verification data -err.auth.key.timeout=Key expired -err.auth.key.prase=Key resolution error \ No newline at end of file diff --git a/src/test/resources/i18n/errorMessage_zh_CN.properties b/src/test/resources/i18n/errorMessage_zh_CN.properties deleted file mode 100644 index c895483..0000000 --- a/src/test/resources/i18n/errorMessage_zh_CN.properties +++ /dev/null @@ -1,59 +0,0 @@ -ERR_OK=\u6210\u529F -ERR_PASSWORD=\u5BC6\u7801\u9519\u8BEF -ERR_USERNOTFOUND=\u7528\u6237\u4E0D\u5B58\u5728 -ERR_PASSWORDMORE=\u8FDE\u7EED\u5BC6\u7801\u9519\u8BEF\u8FBE\u4E0A\u9650\uFF0C\u518D\u6B21\u8F93\u5165\u9519\u8BEF\u5C06\u9501\u5B9A\u7528\u6237 -ERR_USERLOCK=\u5BC6\u7801\u9519\u8BEF\u8FBE\u4E0A\u9650\uFF0C\u7528\u6237\u88AB\u9501\u5B9A -ERR_PASSWORD_EXPIRED=\u5BC6\u7801\u5DF2\u7ECF\u8FC7\u671F -ERR_ACCOUNT=\u7528\u6237\u8D26\u6237\u5F02\u5E38 -ERR_USEREXIST=\u8BE5\u7528\u6237\u5DF2\u7ECF\u5B58\u5728 -ERR_PASSWORDSIMPLE=\u7528\u6237\u5BC6\u7801\u5F3A\u5EA6\u4E0D\u7B26\u5408\u8981\u6C42 -ERR_INPUTFORMAT=\u8F93\u5165\u4FE1\u606F\u683C\u5F0F\u6709\u8BEF -ERR_INPUTMISS=\u7F3A\u5C11\u5FC5\u8981\u8F93\u5165\u4FE1\u606F -ERR_PERMISSION=\u64CD\u4F5C\u5458\u6743\u9650\u4E0D\u8DB3 -ERR_REQTIMEOUT=\u8BF7\u6C42\u8D85\u65F6 -ERR_PARAMS=\u53C2\u6570\u9519\u8BEF -ERR_SYSTEMEXCEPTION=\u7CFB\u7EDF\u5F02\u5E38 -ERR_UNKNOWNCMD=\u672A\u77E5\u547D\u4EE4 -ERR_LOGOUT=\u7528\u6237\u672A\u767B\u5F55 -ERR_TOKENTIMEOUT=Token\u8D85\u65F6 -ERR_TOKENNOTFOUND=\u975E\u6CD5Token -ERR_TOKEN_KEY=Token \u79D8\u94A5\u9519\u8BEF -ERR_MISSAUTHHEAD=Http \u8BF7\u6C42\u7F3A\u5C11\u8BA4\u8BC1\u5934\u90E8 -ERR_NOSUCHITEM=\u6CA1\u6709\u8BE5\u5185\u5BB9 -ERR_ITEMEXISTS=\u8BE5\u5185\u5BB9\u5DF2\u7ECF\u5B58\u5728 -ERR_PARAMEXCEPTION=\u53C2\u6570\u5F02\u5E38 -ERR_DEVICELOCKED=\u8BBE\u5907\u5DF2\u9501\u5B9A -ERR_VERSION=\u534F\u8BAE\u7248\u672C\u4E0D\u517C\u5BB9\uFF0C\u8BF7\u5347\u7EA7\u7CFB\u7EDF -ERR_NOSUCHTYPE=\u6CA1\u6709\u8FD9\u4E2A\u7C7B\u578B\u7684\u8BBE\u5907 -ERR_REMOVEMORE=\u7981\u6B62\u540C\u65F6\u5220\u9664\u591A\u4E2A\u8BBE\u5907 -ERR_TASKRUNNING=\u540C\u7C7B\u4EFB\u52A1\u6B63\u5728\u8FD0\u884C -ERR_UNSUPPORT=\u4E0D\u652F\u6301\u7684\u64CD\u4F5C -ERR_INTERRUPT=\u64CD\u4F5C\u4E2D\u65AD -ERR_CALLDEVICE=\u8C03\u7528\u8BBE\u5907\u5931\u8D25 -ERR_NOSUCHTASK=\u6CA1\u6709\u8BE5\u4EFB\u52A1 -ERR_TASKNOTRUNNING=\u8BE5\u4EFB\u52A1\u6CA1\u6709\u8FD0\u884C -ERR_REQUESTTIMEOUT=\u8BF7\u6C42\u8D85\u65F6 -ERR_UNABLEDISPOSEIP=\u65E0\u6CD5\u5904\u7F6E\u8BE5IP -ERR_DATABASE=\u64CD\u4F5C\u6570\u636E\u5E93\u5931\u8D25 -ERR_UNTRUSTHOST=\u672A\u7ECF\u6388\u6743\u7684\u5BA2\u6237\u7AEF -ERR_UNTRUSTTOKEN=\u672A\u7ECF\u6388\u6743\u7684Token -ERR_UNKNOWNINTERFACE=\u672A\u63D0\u4F9B\u8BE5\u63A5\u53E3 -ERR_DECRYPT_BASE64=BASE64\u89E3\u5BC6\u5931\u8D25 -ERR_ENCRYPT_BASE64=BASE64\u52A0\u5BC6\u5931\u8D25 -ERR_DECRYPT_AES128=AES128\u89E3\u5BC6\u5931\u8D25 -ERR_ENCRYPT_AES128=AES128\u52A0\u5BC6\u5931\u8D25 -ERR_DECRYPT_3DES=3DES\u89E3\u5BC6\u5931\u8D25 -ERR_ENCRYPT_3DES=3DES\u52A0\u5BC6\u5931\u8D25 -ERR_DECRYPT_UNKNOWN=\u4E0D\u652F\u6301\u7684\u89E3\u5BC6\u7B97\u6CD5 -ERR_ENCRYPT_UNKNOWN=\u4E0D\u652F\u6301\u7684\u52A0\u5BC6\u7B97\u6CD5 -ERR_JSON_ENCODE=Json \u5E8F\u5217\u53F7\u9519\u8BEF -ERR_JSON_DECODE=Json \u53CD\u5E8F\u5217\u5316\u9519\u8BEF -ERR_ENCRYPT_AES256=AES256\u52A0\u5BC6\u5931\u8D25 -ERR_DECRYPT_AES256=AES256\u89E3\u5BC6\u5931\u8D25 -ERR_CRYPTO_KEY=\u9519\u8BEF\u7684\u79D8\u94A5 -ERR_USER_ROLE_NOTEXISTS=\u7528\u6237\u89D2\u8272\u4E0D\u5B58\u5728 -ERR_RESOURCE_USED=\u8D44\u6E90\u88AB\u5360\u7528 -err.auth.key.convert=\u5BC6\u94A5\u7B97\u6CD5\u6216\u8005\u5BC6\u94A5\u8F6C\u6362\u9519\u8BEF -err.auth.key.verify=\u5BC6\u94A5\u7F3A\u5C11\u6821\u9A8C\u6570\u636E -err.auth.key.timeout=\u5BC6\u94A5\u5DF2\u8FC7\u671F -err.auth.key.prase=\u5BC6\u94A5\u89E3\u6790\u9519\u8BEF \ No newline at end of file diff --git a/src/test/resources/i18n/message_en_US.properties b/src/test/resources/i18n/message_en_US.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/resources/i18n/message_zh_CN.properties b/src/test/resources/i18n/message_zh_CN.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/resources/i18n/syslogMessage_en_US.properties b/src/test/resources/i18n/syslogMessage_en_US.properties deleted file mode 100644 index d5ef3ca..0000000 --- a/src/test/resources/i18n/syslogMessage_en_US.properties +++ /dev/null @@ -1,37 +0,0 @@ -SYSLOG_MOD_COMMON=Universal Module -SYSLOG_MOD_SYSLOG=Operation Log Module -SYSLOG_MOD_AUTH=Rights Management Module -SYSLOG_MOD_DICT=Dictionary Module -SYSLOG_MOD_SYSINFO=System Information Module -SYSLOG_MOD_USER_MGR=User Management Module -SYSLOG_MOD_SECURITY=System Safety Module -SYSLOG_TYPE_AUTH=Authentication/Authentication -SYSLOG_TYPE_READ=READ -SYSLOG_TYPE_CREATE=CREATE -SYSLOG_TYPE_DEL=DELETE -SYSLOG_TYPE_MODIFY=MODIFY -SYSLOG_DESC_GET_VERSION=Obtain the current system version information -SYSLOG_DESC_GET_SYSLOG_SUMMARY=Obtain the brief information about operationlogs -SYSLOG_DESC_GET_SYSLOG_DETAIL=Obtain operation logdetails -SYSLOG_DESC_GET_CUR_USR_RES_RIGHT=Get the current user resource rights -SYSLOG_DESC_GET_USR_RES_RIGHT=Obtain user resource rights -SYSLOG_DESC_GET_ALL_USR_GROUP=Get all current user groups -SYSLOG_DESC_CREATE_RESOURCE=Register a new resource -SYSLOG_DESC_DEL_RESOURCE=Delete resource -SYSLOG_DESC_GET_ALL_ENUM_DICT=Get all enumeration dictionary type information of the system -SYSLOG_DESC_GET_ENUM_DETAIL=Gets the details of the system enumeration dictionary -SYSLOG_DESC_CREATE_USER_DICT=Creating a user dictionary -SYSLOG_DESC_MODIFY_USER_DICT=Modify the contents of the user dictionary -SYSLOG_DESC_GET_ALL_USER_DICT=Get all user dictionaries -SYSLOG_DESC_GET_USER_DETAIL=Get the user dictionary content item -SYSLOG_DESC_CREATE_USER_DICT_ITEM=Add user dictionary content items -SYSLOG_DESC_GET_OS_INFO=Obtain information about the current operating system -SYSLOG_DESC_GET_CPU_INFO=Gets current processor information -SYSLOG_DESC_GET_HW_INFO=Obtain system hardware information -SYSLOG_DESC_GET_USER=Get user information -SYSLOG_DESC_GET_USER_LIST=Get user list -SYSLOG_DESC_GET_CUR_USER=get current user information -SYSLOG_DESC_CREATE_USER=Create new user -SYSLOG_DESC_DEL_USER=Delete user -SYSLOG_DESC_LOGOUT=Logout -SYSLOG_DESC_LOGIN=Login \ No newline at end of file diff --git a/src/test/resources/i18n/syslogMessage_zh_CN.properties b/src/test/resources/i18n/syslogMessage_zh_CN.properties deleted file mode 100644 index d8e699f..0000000 --- a/src/test/resources/i18n/syslogMessage_zh_CN.properties +++ /dev/null @@ -1,37 +0,0 @@ -SYSLOG_MOD_COMMON=\u901A\u7528\u6A21\u5757 -SYSLOG_MOD_SYSLOG=\u64CD\u4F5C\u65E5\u5FD7\u6A21\u5757 -SYSLOG_MOD_AUTH=\u6743\u9650\u7BA1\u7406\u6A21\u5757 -SYSLOG_MOD_DICT=\u5B57\u5178\u6A21\u5757 -SYSLOG_MOD_SYSINFO=\u7CFB\u7EDF\u4FE1\u606F\u6A21\u5757 -SYSLOG_MOD_USER_MGR=\u7528\u6237\u7BA1\u7406\u6A21\u5757 -SYSLOG_MOD_SECURITY=\u7CFB\u7EDF\u5B89\u5168\u6A21\u5757 -SYSLOG_TYPE_AUTH=\u8BA4\u8BC1/\u9274\u6743 -SYSLOG_TYPE_READ=\u8BFB\u53D6 -SYSLOG_TYPE_CREATE=\u521B\u5EFA -SYSLOG_TYPE_DEL=\u5220\u9664 -SYSLOG_TYPE_MODIFY=\u4FEE\u6539 -SYSLOG_DESC_GET_VERSION=\u83B7\u53D6\u5F53\u524D\u7CFB\u7EDF\u7248\u672C\u4FE1\u606F -SYSLOG_DESC_GET_SYSLOG_SUMMARY=\u83B7\u53D6\u64CD\u4F5C\u65E5\u5FD7\u7B80\u8981\u4FE1\u606F -SYSLOG_DESC_GET_SYSLOG_DETAIL=\u83B7\u53D6\u64CD\u4F5C\u65E5\u5FD7\u8BE6\u7EC6\u4FE1\u606F -SYSLOG_DESC_GET_CUR_USR_RES_RIGHT=\u83B7\u53D6\u5F53\u524D\u7528\u6237\u8D44\u6E90\u6743\u9650 -SYSLOG_DESC_GET_USR_RES_RIGHT=\u83B7\u53D6\u7528\u6237\u8D44\u6E90\u6743\u9650 -SYSLOG_DESC_GET_ALL_USR_GROUP=\u83B7\u53D6\u5F53\u524D\u6240\u6709\u7528\u6237\u7EC4 -SYSLOG_DESC_CREATE_RESOURCE=\u6CE8\u518C\u65B0\u7684\u8D44\u6E90 -SYSLOG_DESC_DEL_RESOURCE=\u5220\u9664\u8D44\u6E90 -SYSLOG_DESC_GET_ALL_ENUM_DICT=\u83B7\u53D6\u7CFB\u7EDF\u6240\u6709\u679A\u4E3E\u5B57\u5178\u7C7B\u578B\u4FE1\u606F -SYSLOG_DESC_GET_ENUM_DETAIL=\u83B7\u53D6\u7CFB\u7EDF\u679A\u4E3E\u5B57\u5178\u8BE6\u7EC6\u5185\u5BB9 -SYSLOG_DESC_CREATE_USER_DICT=\u65B0\u5EFA\u7528\u6237\u5B57\u5178 -SYSLOG_DESC_MODIFY_USER_DICT=\u4FEE\u6539\u7528\u6237\u5B57\u5178\u5185\u5BB9 -SYSLOG_DESC_GET_ALL_USER_DICT=\u83B7\u53D6\u6240\u6709\u7528\u6237\u5B57\u5178 -SYSLOG_DESC_GET_USER_DETAIL=\u83B7\u53D6\u7528\u6237\u5B57\u5178\u5185\u5BB9\u9879 -SYSLOG_DESC_CREATE_USER_DICT_ITEM=\u65B0\u589E\u7528\u6237\u5B57\u5178\u5185\u5BB9\u9879 -SYSLOG_DESC_GET_OS_INFO=\u83B7\u53D6\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u606F -SYSLOG_DESC_GET_CPU_INFO=\u83B7\u53D6\u5F53\u524D\u5904\u7406\u5668\u4FE1\u606F -SYSLOG_DESC_GET_HW_INFO=\u83B7\u53D6\u7CFB\u7EDF\u786C\u4EF6\u4FE1\u606F -SYSLOG_DESC_GET_USER=\u83B7\u53D6\u7528\u6237\u4FE1\u606F -SYSLOG_DESC_GET_USER_LIST=\u83B7\u53D6\u7528\u6237\u5217\u8868 -SYSLOG_DESC_GET_CUR_USER=\u83B7\u53D6\u5F53\u524D\u7528\u6237\u4FE1\u606F -SYSLOG_DESC_CREATE_USER=\u521B\u5EFA\u65B0\u7528\u6237 -SYSLOG_DESC_DEL_USER=\u5220\u9664\u7528\u6237 -SYSLOG_DESC_LOGOUT=\u6CE8\u9500 -SYSLOG_DESC_LOGIN=\u767B\u5F55 \ No newline at end of file diff --git a/src/test/resources/i18n/validationMessage_en_US.properties b/src/test/resources/i18n/validationMessage_en_US.properties deleted file mode 100644 index e22320a..0000000 --- a/src/test/resources/i18n/validationMessage_en_US.properties +++ /dev/null @@ -1,14 +0,0 @@ -item.not_null=field cannot be null -item.not_empty=field cannot be empty string -item.value_range=Field value range [{min}, {max}] -item.value_min=Minimum value is {min} -array.value_range=Array/List size range [{min}, {max}] -array.not_empty=Arrays/List cannot be NULL and elements cannot be empty -timestamp.timeout=The difference between the field value and the current time cannot be greater than the timeout configuration -page.item_size=The value must be an integer multiple of 5 -uuid.format=UUID string must match format(xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx) -invalid.character=Invalid character strings exist -password.length=The password size must be SHA256 length -http.request_invalid=Not a legitimate HTTP request method -timeout.current.format=Request time[{0}] greater than current server time[{1}] -timeout.server.format=Request time [{0}] Delay exceeds current server time [{1}] Allowed range {2}(S) \ No newline at end of file diff --git a/src/test/resources/i18n/validationMessage_zh_CN.properties b/src/test/resources/i18n/validationMessage_zh_CN.properties deleted file mode 100644 index f5b50e0..0000000 --- a/src/test/resources/i18n/validationMessage_zh_CN.properties +++ /dev/null @@ -1,14 +0,0 @@ -item.not_null=\u5B57\u6BB5\u4E0D\u80FD\u4E3A NULL -item.not_empty=\u5B57\u6BB5\u4E0D\u80FD\u4E3A\u7A7A\u5B57\u7B26\u4E32 -item.value_range=\u5B57\u6BB5\u53D6\u503C\u8303\u56F4 [{min}, {max}] -item.value_min=\u6700\u5C0F\u503C\u4E3A {min} -array.value_range=\u6570\u7EC4/\u94FE\u8868\u5143\u7D20\u4E2A\u6570\u53D6\u503C\u8303\u56F4 [{min}, {max}] -array.not_empty=\u6570\u7EC4/\u94FE\u8868\u4E0D\u80FD\u4E3ANULL\u4E14\u5143\u7D20\u4E0D\u80FD\u4E3A\u7A7A -timestamp.timeout=\u5B57\u6BB5\u503C\u4E0E\u5F53\u524D\u65F6\u95F4\u5DEE\u4E0D\u80FD\u5927\u4E8E\u8D85\u65F6\u914D\u7F6E -page.item_size=\u53D6\u503C\u5FC5\u987B\u4E3A 5 \u7684\u6574\u6570\u500D -uuid.format=\u5FC5\u987B\u4E3A\u7B26\u5408UUID\u89C4\u8303(xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx)\u7684\u5B57\u7B26\u4E32 -invalid_character=\u5B57\u7B26\u4E32\u5B58\u5728\u975E\u6CD5\u5B57\u7B26 -password.length=\u5BC6\u7801\u957F\u5EA6\u5FC5\u987B\u4E3ASHA256\u7F16\u7801\u540E\u7684\u957F\u5EA6 -http.request_invalid=\u4E0D\u662F\u5408\u6CD5\u7684 HTTP \u8BF7\u6C42\u65B9\u6CD5 -timeout.current.format=\u8BF7\u6C42\u65F6\u95F4[{0}] \u5927\u4E8E\u5F53\u524D\u670D\u52A1\u5668\u65F6\u95F4[{1}] -timeout.server.format=\u8BF7\u6C42\u65F6\u95F4[{0}] \u5EF6\u65F6\u8D85\u8FC7\u5F53\u524D\u670D\u52A1\u5668\u65F6\u95F4[{1}] \u5141\u8BB8\u8303\u56F4 {2}(S) \ No newline at end of file diff --git a/src/test/resources/logback-spring.xml b/src/test/resources/logback-spring.xml deleted file mode 100644 index 65eb78c..0000000 --- a/src/test/resources/logback-spring.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - [%d{yy-MM-dd HH:mm:ss:SSS}][%-5p][%c{0}][%M\(%L\)][%t]: %m%n - - - - - ${LOG_PATH}/biz.log - - ${LOG_PATH}/biz.log.%d{yyyyMMdd} - - - - [%d{yy-MM-dd HH:mm:ss:SSS}][%-5p][%c{0}][%M\(%L\)][%t]: %m%n - - - - ${LOG_PATH}/system.log - - ${LOG_PATH}/system.log.%d{yyyyMMdd} - - - - [%d{yy-MM-dd HH:mm:ss:SSS}][%-5p][%c{0}][%M\(%L\)][%t]: %m%n - - - - - ${LOG_PATH}/data.log - - ${LOG_PATH}/data.log.%d{yyyyMMdd} - - - - [%d{yy-MM-dd HH:mm:ss:SSS}][%-5p][%c{0}][%M\(%L\)][%t]: %m%n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -