Преглед изворни кода

1)修复小程序自动注册/登录 2)mybatis查询兼容问题

JIM-PC2024\Administrator пре 1 година
родитељ
комит
a764d34a5d

+ 43 - 43
src/main/resources/i18n/messages_en_US.properties

@@ -3,53 +3,53 @@ message={0}
 sqlError={0}
 sqlError={0}
 
 
 # -- crud message
 # -- crud message
-entity.saved=\u6210\u529f\u4fdd\u5b58\u3002
-entity.missing=\u627e\u4e0d\u5230\u6b64ID\u7684\u5bf9\u8c61\u3002
-entity.deleted=\u6210\u529f\u5220\u9664\u3002
+entity.saved=\u6210\u529F\u4FDD\u5B58\u3002
+entity.missing=\u627E\u4E0D\u5230\u6B64ID\u7684\u5BF9\u8C61\u3002
+entity.deleted=\u6210\u529F\u5220\u9664\u3002
 
 
 # -- validator errors --
 # -- validator errors --
-errors.required={0} \u4e3a\u5fc5\u586b\u9879\u3002
-errors.maxlength={0} \u4e0d\u80fd\u5927\u4e8e {1} \u4e2a\u5b57\u7b26\u3002
-errors.minlength={0} \u4e0d\u80fd\u5c11\u4e8e {1} \u4e2a\u5b57\u7b26\u3002
-errors.invalid={0} \u65e0\u6548\u3002
-
-errors.byte={0} \u5fc5\u987b\u4e3abyte\u7c7b\u578b\u3002
-errors.double={0} \u5fc5\u987b\u4e3adouble\u7c7b\u578b\u3002
-errors.float={0} \u5fc5\u987b\u4e3afloat\u7c7b\u578b\u3002
-errors.integer={0} \u5fc5\u987b\u4e3a\u4e00\u6570\u503c\u3002
-errors.long={0} \u5fc5\u987b\u4e3along\u7c7b\u578b\u3002
-errors.short={0} \u5fc5\u987b\u4e3ashort\u7c7b\u578b\u3002
-
-errors.date={0} \u4e0d\u662f\u6709\u6548\u65e5\u671f\u683c\u5f0f\u3002
-errors.range={0} \u672a\u5728 {1} \u4e0e {2} \u8303\u56f4\u5185\u3002
-errors.creditcard={0} \u4e3a\u65e0\u6548\u4fe1\u7528\u5361\u53f7\u3002
-errors.email={0} \u4e3a\u65e0\u6548\u90ae\u4ef6\u5730\u5740\u3002
-errors.phone={0} \u4e3a\u65e0\u6548\u7535\u8bdd\u53f7\u7801\u3002
-errors.zip={0} \u4e3a\u65e0\u6548\u90ae\u653f\u7f16\u7801\u3002
-errors.url={0} \u4e3a\u65e0\u6548url\u3002
-
-#=============================================\u7528\u6237\u767b\u9646/\u6ce8\u518c\u6a21\u5757============
-errors.regist.duplicateLoginId=\u7528\u6237 {0} \u5df2\u5b58\u5728
-errors.regist.duplicateActiveEmail= \u90ae\u7bb1 {0} \u88ab\u5176\u5b83\u7528\u6237\u4f7f\u7528
-
-errors.login.noexist={0}\u4e0d\u5b58\u5728
-errors.login.validate=\u8f93\u5165\u9a8c\u8bc1\u7801\u4e0d\u6b63\u786e
-errors.login.password=\u7528\u6237\u540d/\u5bc6\u7801\u8f93\u5165\u4e0d\u6b63\u786e
-errors.login.freeze=\u7528\u6237{0}\u5df2\u51bb\u7ed3\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458
+errors.required={0} \u4E3A\u5FC5\u586B\u9879\u3002
+errors.maxlength={0} \u4E0D\u80FD\u5927\u4E8E {1} \u4E2A\u5B57\u7B26\u3002
+errors.minlength={0} \u4E0D\u80FD\u5C11\u4E8E {1} \u4E2A\u5B57\u7B26\u3002
+errors.invalid={0} \u65E0\u6548\u3002
+
+errors.byte={0} \u5FC5\u987B\u4E3Abyte\u7C7B\u578B\u3002
+errors.double={0} \u5FC5\u987B\u4E3Adouble\u7C7B\u578B\u3002
+errors.float={0} \u5FC5\u987B\u4E3Afloat\u7C7B\u578B\u3002
+errors.integer={0} \u5FC5\u987B\u4E3A\u4E00\u6570\u503C\u3002
+errors.long={0} \u5FC5\u987B\u4E3Along\u7C7B\u578B\u3002
+errors.short={0} \u5FC5\u987B\u4E3Ashort\u7C7B\u578B\u3002
+
+errors.date={0} \u4E0D\u662F\u6709\u6548\u65E5\u671F\u683C\u5F0F\u3002
+errors.range={0} \u672A\u5728 {1} \u4E0E {2} \u8303\u56F4\u5185\u3002
+errors.creditcard={0} \u4E3A\u65E0\u6548\u4FE1\u7528\u5361\u53F7\u3002
+errors.email={0} \u4E3A\u65E0\u6548\u90AE\u4EF6\u5730\u5740\u3002
+errors.phone={0} \u4E3A\u65E0\u6548\u7535\u8BDD\u53F7\u7801\u3002
+errors.zip={0} \u4E3A\u65E0\u6548\u90AE\u653F\u7F16\u7801\u3002
+errors.url={0} \u4E3A\u65E0\u6548url\u3002
+
+#=============================================\u7528\u6237\u767B\u9646/\u6CE8\u518C\u6A21\u5757============
+errors.regist.duplicateLoginId=\u7528\u6237 {0} \u5DF2\u5B58\u5728
+errors.regist.duplicateActiveEmail= \u90AE\u7BB1 {0} \u88AB\u5176\u5B83\u7528\u6237\u4F7F\u7528
+
+errors.login.noexist={0}\u4E0D\u5B58\u5728
+errors.login.validate=\u8F93\u5165\u9A8C\u8BC1\u7801\u4E0D\u6B63\u786E
+errors.login.password=\u7528\u6237\u540D/\u5BC6\u7801\u8F93\u5165\u4E0D\u6B63\u786E
+errors.login.freeze=\u7528\u6237{0}\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
 errors.login.multiShop={0}
 errors.login.multiShop={0}
 
 
-errors.saveUser.duplicateEmail=\u8be5\u90ae\u7bb1\u5df2\u6ce8\u518c
-errors.login.mobile=\u8be5\u624b\u673a\u53f7\u7801\u5df2\u6ce8\u518c
-errors.remain.time.login.password=\u5bc6\u7801\u51fa\u9519\uff0c\u60a8\u4eca\u5929\u8fd8\u6709 {0} \u6b21\u91cd\u65b0\u8f93\u5165\u7684\u673a\u4f1a
-errors.login.no.remain.time=\u60a8\u8fde\u7eed\u5bc6\u7801\u8f93\u9519 {0} \u6b21\uff0c\u5df2\u88ab\u7cfb\u7edf\u5c4f\u853d
+errors.saveUser.duplicateEmail=\u8BE5\u90AE\u7BB1\u5DF2\u6CE8\u518C
+errors.login.mobile=\u8BE5\u624B\u673A\u53F7\u7801\u5DF2\u6CE8\u518C
+errors.remain.time.login.password=\u5BC6\u7801\u51FA\u9519\uFF0C\u60A8\u4ECA\u5929\u8FD8\u6709 {0} \u6B21\u91CD\u65B0\u8F93\u5165\u7684\u673A\u4F1A
+errors.login.no.remain.time=\u60A8\u8FDE\u7EED\u5BC6\u7801\u8F93\u9519 {0} \u6B21\uFF0C\u5DF2\u88AB\u7CFB\u7EDF\u5C4F\u853D
 
 
-errors.login.lastPswModifyTime=\u60a8\u5df2\u8d85\u8fc7{0}\u5929\u6ca1\u6709\u4fee\u6539\u5bc6\u7801\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u534f\u52a9\u4fee\u6539
+errors.login.lastPswModifyTime=\u60A8\u5DF2\u8D85\u8FC7{0}\u5929\u6CA1\u6709\u4FEE\u6539\u5BC6\u7801\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u534F\u52A9\u4FEE\u6539
 
 
-#=============================================\u5bc6\u7801\u627e\u56de\u6a21\u5757============
-# errors.fetchPassword.mobileNotExists=\u8be5\u624b\u673a\u53f7\u672a\u7ed1\u5b9a
-errors.fetchPassword.mobileNotExists=\u8be5\u624b\u673a\u53f7\u672a\u6ce8\u518c
-errors.fetchPassword.too.frequent=\u53d6\u56de\u5bc6\u7801\u64cd\u4f5c\u592a\u9891\u7e41\uff0c\u7b49\u9694\u4e00\u6bb5\u65f6\u95f4\u540e\u518d\u6267\u884c\u53d6\u56de\u64cd\u4f5c
-errors.fetchPassword.inf.code.expired=\u53d6\u56de\u5bc6\u7801\u64cd\u4f5c\u8bf7\u6c42\u8fc7\u671f\uff0c\u8bf7\u91cd\u65b0\u8fdb\u884c\u53d6\u5bc6\u64cd\u4f5c
+#=============================================\u5BC6\u7801\u627E\u56DE\u6A21\u5757============
+# errors.fetchPassword.mobileNotExists=\u8BE5\u624B\u673A\u53F7\u672A\u7ED1\u5B9A
+errors.fetchPassword.mobileNotExists=\u8BE5\u624B\u673A\u53F7\u672A\u6CE8\u518C
+errors.fetchPassword.too.frequent=\u53D6\u56DE\u5BC6\u7801\u64CD\u4F5C\u592A\u9891\u7E41\uFF0C\u7B49\u9694\u4E00\u6BB5\u65F6\u95F4\u540E\u518D\u6267\u884C\u53D6\u56DE\u64CD\u4F5C
+errors.fetchPassword.inf.code.expired=\u53D6\u56DE\u5BC6\u7801\u64CD\u4F5C\u8BF7\u6C42\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u8FDB\u884C\u53D6\u5BC6\u64CD\u4F5C
 
 
-#=========================================\u641c\u7d22\u5f02\u5e38================
-error.search.server.all=\u641c\u7d22\u670d\u52a1\u5f02\u5e38{0}
+#=========================================\u641C\u7D22\u5F02\u5E38================
+error.search.server.all=\u641C\u7D22\u670D\u52A1\u5F02\u5E38{0}

+ 46 - 43
src/main/resources/i18n/messages_zh_CN.properties

@@ -2,54 +2,57 @@
 message={0}
 message={0}
 sqlError={0}
 sqlError={0}
 
 
+# -- mvc --
+error.mvc.uriNotFound = \u8DEF\u5F84\u4E0D\u5B58\u5728\uFF0C\u8BF7\u68C0\u67E5\u8DEF\u5F84\u662F\u5426\u6B63\u786E
+
 # -- crud message
 # -- crud message
-entity.saved=\u6210\u529f\u4fdd\u5b58\u3002
-entity.missing=\u627e\u4e0d\u5230\u6b64ID\u7684\u5bf9\u8c61\u3002
-entity.deleted=\u6210\u529f\u5220\u9664\u3002
+entity.saved=\u6210\u529F\u4FDD\u5B58\u3002
+entity.missing=\u627E\u4E0D\u5230\u6B64ID\u7684\u5BF9\u8C61\u3002
+entity.deleted=\u6210\u529F\u5220\u9664\u3002
 
 
 # -- validator errors --
 # -- validator errors --
-errors.required={0} \u4e3a\u5fc5\u586b\u9879\u3002
-errors.maxlength={0} \u4e0d\u80fd\u5927\u4e8e {1} \u4e2a\u5b57\u7b26\u3002
-errors.minlength={0} \u4e0d\u80fd\u5c11\u4e8e {1} \u4e2a\u5b57\u7b26\u3002
-errors.invalid={0} \u65e0\u6548\u3002
-
-errors.byte={0} \u5fc5\u987b\u4e3abyte\u7c7b\u578b\u3002
-errors.double={0} \u5fc5\u987b\u4e3adouble\u7c7b\u578b\u3002
-errors.float={0} \u5fc5\u987b\u4e3afloat\u7c7b\u578b\u3002
-errors.integer={0} \u5fc5\u987b\u4e3a\u4e00\u6570\u503c\u3002
-errors.long={0} \u5fc5\u987b\u4e3along\u7c7b\u578b\u3002
-errors.short={0} \u5fc5\u987b\u4e3ashort\u7c7b\u578b\u3002
-
-errors.date={0} \u4e0d\u662f\u6709\u6548\u65e5\u671f\u683c\u5f0f\u3002
-errors.range={0} \u672a\u5728 {1} \u4e0e {2} \u8303\u56f4\u5185\u3002
-errors.creditcard={0} \u4e3a\u65e0\u6548\u4fe1\u7528\u5361\u53f7\u3002
-errors.email={0} \u4e3a\u65e0\u6548\u90ae\u4ef6\u5730\u5740\u3002
-errors.phone={0} \u4e3a\u65e0\u6548\u7535\u8bdd\u53f7\u7801\u3002
-errors.zip={0} \u4e3a\u65e0\u6548\u90ae\u653f\u7f16\u7801\u3002
-errors.url={0} \u4e3a\u65e0\u6548url\u3002
-
-#=============================================\u7528\u6237\u767b\u9646/\u6ce8\u518c\u6a21\u5757============
-errors.regist.duplicateLoginId=\u7528\u6237 {0} \u5df2\u5b58\u5728
-errors.regist.duplicateActiveEmail= \u90ae\u7bb1 {0} \u88ab\u5176\u5b83\u7528\u6237\u4f7f\u7528
-
-errors.login.noexist={0}\u4e0d\u5b58\u5728
-errors.login.validate=\u8f93\u5165\u9a8c\u8bc1\u7801\u4e0d\u6b63\u786e
-errors.login.password=\u7528\u6237\u540d/\u5bc6\u7801\u8f93\u5165\u4e0d\u6b63\u786e
-errors.login.freeze=\u7528\u6237{0}\u5df2\u51bb\u7ed3\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458
+errors.required={0} \u4E3A\u5FC5\u586B\u9879\u3002
+errors.maxlength={0} \u4E0D\u80FD\u5927\u4E8E {1} \u4E2A\u5B57\u7B26\u3002
+errors.minlength={0} \u4E0D\u80FD\u5C11\u4E8E {1} \u4E2A\u5B57\u7B26\u3002
+errors.invalid={0} \u65E0\u6548\u3002
+
+errors.byte={0} \u5FC5\u987B\u4E3Abyte\u7C7B\u578B\u3002
+errors.double={0} \u5FC5\u987B\u4E3Adouble\u7C7B\u578B\u3002
+errors.float={0} \u5FC5\u987B\u4E3Afloat\u7C7B\u578B\u3002
+errors.integer={0} \u5FC5\u987B\u4E3A\u4E00\u6570\u503C\u3002
+errors.long={0} \u5FC5\u987B\u4E3Along\u7C7B\u578B\u3002
+errors.short={0} \u5FC5\u987B\u4E3Ashort\u7C7B\u578B\u3002
+
+errors.date={0} \u4E0D\u662F\u6709\u6548\u65E5\u671F\u683C\u5F0F\u3002
+errors.range={0} \u672A\u5728 {1} \u4E0E {2} \u8303\u56F4\u5185\u3002
+errors.creditcard={0} \u4E3A\u65E0\u6548\u4FE1\u7528\u5361\u53F7\u3002
+errors.email={0} \u4E3A\u65E0\u6548\u90AE\u4EF6\u5730\u5740\u3002
+errors.phone={0} \u4E3A\u65E0\u6548\u7535\u8BDD\u53F7\u7801\u3002
+errors.zip={0} \u4E3A\u65E0\u6548\u90AE\u653F\u7F16\u7801\u3002
+errors.url={0} \u4E3A\u65E0\u6548url\u3002
+
+#=============================================\u7528\u6237\u767B\u9646/\u6CE8\u518C\u6A21\u5757============
+errors.regist.duplicateLoginId=\u7528\u6237 {0} \u5DF2\u5B58\u5728
+errors.regist.duplicateActiveEmail= \u90AE\u7BB1 {0} \u88AB\u5176\u5B83\u7528\u6237\u4F7F\u7528
+
+errors.login.noexist={0}\u4E0D\u5B58\u5728
+errors.login.validate=\u8F93\u5165\u9A8C\u8BC1\u7801\u4E0D\u6B63\u786E
+errors.login.password=\u7528\u6237\u540D/\u5BC6\u7801\u8F93\u5165\u4E0D\u6B63\u786E
+errors.login.freeze=\u7528\u6237{0}\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
 errors.login.multiShop={0}
 errors.login.multiShop={0}
 
 
-errors.saveUser.duplicateEmail=\u8be5\u90ae\u7bb1\u5df2\u6ce8\u518c
-errors.login.mobile=\u8be5\u624b\u673a\u53f7\u7801\u5df2\u6ce8\u518c
-errors.remain.time.login.password=\u5bc6\u7801\u51fa\u9519\uff0c\u60a8\u4eca\u5929\u8fd8\u6709 {0} \u6b21\u91cd\u65b0\u8f93\u5165\u7684\u673a\u4f1a
-errors.login.no.remain.time=\u60a8\u8fde\u7eed\u5bc6\u7801\u8f93\u9519 {0} \u6b21\uff0c\u5df2\u88ab\u7cfb\u7edf\u5c4f\u853d
+errors.saveUser.duplicateEmail=\u8BE5\u90AE\u7BB1\u5DF2\u6CE8\u518C
+errors.login.mobile=\u8BE5\u624B\u673A\u53F7\u7801\u5DF2\u6CE8\u518C
+errors.remain.time.login.password=\u5BC6\u7801\u51FA\u9519\uFF0C\u60A8\u4ECA\u5929\u8FD8\u6709 {0} \u6B21\u91CD\u65B0\u8F93\u5165\u7684\u673A\u4F1A
+errors.login.no.remain.time=\u60A8\u8FDE\u7EED\u5BC6\u7801\u8F93\u9519 {0} \u6B21\uFF0C\u5DF2\u88AB\u7CFB\u7EDF\u5C4F\u853D
 
 
-errors.login.lastPswModifyTime=\u60a8\u5df2\u8d85\u8fc7{0}\u5929\u6ca1\u6709\u4fee\u6539\u5bc6\u7801\uff0c\u8bf7\u8054\u7cfb\u7ba1\u7406\u5458\u534f\u52a9\u4fee\u6539
+errors.login.lastPswModifyTime=\u60A8\u5DF2\u8D85\u8FC7{0}\u5929\u6CA1\u6709\u4FEE\u6539\u5BC6\u7801\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u534F\u52A9\u4FEE\u6539
 
 
-#=============================================\u5bc6\u7801\u627e\u56de\u6a21\u5757============
-# errors.fetchPassword.mobileNotExists=\u8be5\u624b\u673a\u53f7\u672a\u7ed1\u5b9a
-errors.fetchPassword.mobileNotExists=\u8be5\u624b\u673a\u53f7\u672a\u6ce8\u518c
-errors.fetchPassword.too.frequent=\u53d6\u56de\u5bc6\u7801\u64cd\u4f5c\u592a\u9891\u7e41\uff0c\u7b49\u9694\u4e00\u6bb5\u65f6\u95f4\u540e\u518d\u6267\u884c\u53d6\u56de\u64cd\u4f5c
-errors.fetchPassword.inf.code.expired=\u53d6\u56de\u5bc6\u7801\u64cd\u4f5c\u8bf7\u6c42\u8fc7\u671f\uff0c\u8bf7\u91cd\u65b0\u8fdb\u884c\u53d6\u5bc6\u64cd\u4f5c
+#=============================================\u5BC6\u7801\u627E\u56DE\u6A21\u5757============
+# errors.fetchPassword.mobileNotExists=\u8BE5\u624B\u673A\u53F7\u672A\u7ED1\u5B9A
+errors.fetchPassword.mobileNotExists=\u8BE5\u624B\u673A\u53F7\u672A\u6CE8\u518C
+errors.fetchPassword.too.frequent=\u53D6\u56DE\u5BC6\u7801\u64CD\u4F5C\u592A\u9891\u7E41\uFF0C\u7B49\u9694\u4E00\u6BB5\u65F6\u95F4\u540E\u518D\u6267\u884C\u53D6\u56DE\u64CD\u4F5C
+errors.fetchPassword.inf.code.expired=\u53D6\u56DE\u5BC6\u7801\u64CD\u4F5C\u8BF7\u6C42\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u8FDB\u884C\u53D6\u5BC6\u64CD\u4F5C
 
 
-#=========================================\u641c\u7d22\u5f02\u5e38================
-error.search.server.all=\u641c\u7d22\u670d\u52a1\u5f02\u5e38{0}
+#=========================================\u641C\u7D22\u5F02\u5E38================
+error.search.server.all=\u641C\u7D22\u670D\u52A1\u5F02\u5E38{0}

+ 4 - 4
src/test/resources/CodeEnum.ts

@@ -1,9 +1,9 @@
 /**
 /**
-  使用模板生成的代码表
-  用法:
+  浣跨敤妯℃澘鐢熸垚鐨勪唬鐮佽〃
+  鐢ㄦ硶锛�
   import * as CodeEnum from 'codeEnum';
   import * as CodeEnum from 'codeEnum';
-  然后直接使用Enum例如 CodeEnum.UserStatCodeEnum.NORMAL;
-  generate at 2024-1-19 1:38:14
+  鐒跺悗鐩存帴浣跨敤Enum渚嬪� CodeEnum.UserStatCodeEnum.NORMAL;
+  generate at 2024-3-14 14:27:34
 */
 */
 
 
 export enum AccountTypeCodeEnum {
 export enum AccountTypeCodeEnum {

+ 33 - 33
src/test/resources/adminAPI.ts

@@ -1,16 +1,16 @@
 /**
 /**
-    TypeScript API模块.
-    该功能基于V3 Admin改进的service模块,支持url参数和from post
+    TypeScript API妯″潡.
+    璇ュ姛鑳藉熀浜嶸3 Admin鏀硅繘鐨剆ervice妯″潡锛屾敮鎸乽rl鍙傛暟鍜宖rom post
 
 
     usage:
     usage:
-    1) import * as adminAPI from '@/api/adminAPI.vue', 其中adminAPI是别名,后台API建议用adminAPI,前台用memberAPI
-    2) adminAPI.<controller名>.<方法名> 来访问方法。注意多个参数要使用对象方式传入
-    3) 方法返回一个Promise,使用.then来执行回调参数接收
-    4) 后台的controller多个原始类型参数自动组装为application/x-www-form-urlencoded的形式来传递,避免生成太多VO,只有使用RequestBody方式时,才使用application/json来发送对象
-    5) application/json来发送对象时,允许增加其他原始类型参数,自动作为URL的参数来传递给后台
-    6) 业务类异常BusinessException自动激发弹窗提示(依赖改进的service模块)
+    1) import * as adminAPI from '@/api/adminAPI.vue', 鍏朵腑adminAPI鏄�埆鍚嶏紝鍚庡彴API寤鸿�鐢╝dminAPI锛屽墠鍙扮敤memberAPI
+    2) adminAPI.<controller鍚�>.<鏂规硶鍚�> 鏉ヨ�闂�柟娉曘€傛敞鎰忓�涓�弬鏁拌�浣跨敤瀵硅薄鏂瑰紡浼犲叆
+    3) 鏂规硶杩斿洖涓€涓狿romise锛屼娇鐢�.then鏉ユ墽琛屽洖璋冨弬鏁版帴鏀�
+    4) 鍚庡彴鐨刢ontroller澶氫釜鍘熷�绫诲瀷鍙傛暟鑷�姩缁勮�涓篴pplication/x-www-form-urlencoded鐨勫舰寮忔潵浼犻€掞紝閬垮厤鐢熸垚澶��VO锛屽彧鏈変娇鐢≧equestBody鏂瑰紡鏃讹紝鎵嶄娇鐢╝pplication/json鏉ュ彂閫佸�璞�
+    5) application/json鏉ュ彂閫佸�璞℃椂锛屽厑璁稿�鍔犲叾浠栧師濮嬬被鍨嬪弬鏁帮紝鑷�姩浣滀负URL鐨勫弬鏁版潵浼犻€掔粰鍚庡彴
+    6) 涓氬姟绫诲紓甯窧usinessException鑷�姩婵€鍙戝脊绐楁彁绀�(渚濊禆鏀硅繘鐨剆ervice妯″潡)
 
 
-    Auto generate by ccframeTool@JIM at 2024-1-19 1:38:14
+    Auto generate by ccframeTool@JIM at 2024-3-14 14:27:34
 */
 */
 /* eslint-disable quotes */
 /* eslint-disable quotes */
 import { request } from '@/utils/service'
 import { request } from '@/utils/service'
@@ -120,14 +120,14 @@ export interface UserInfo {
 }
 }
 
 
 export const actuatorController = {
 export const actuatorController = {
-  // 获取所有机器列表
+  // 鑾峰彇鎵€鏈夋満鍣ㄥ垪琛�
   getServerList() {
   getServerList() {
     return request({
     return request({
       url: `admin/actuator/servers`,
       url: `admin/actuator/servers`,
       method: 'get'
       method: 'get'
     })
     })
   },
   },
-  // 获取指定机器的状态信息
+  // 鑾峰彇鎸囧畾鏈哄櫒鐨勭姸鎬佷俊鎭�
   getSysStatus(actuatorTimeRangeCode: string | null, serverName: string | null) {
   getSysStatus(actuatorTimeRangeCode: string | null, serverName: string | null) {
     return request({
     return request({
       url: `admin/actuator/status`,
       url: `admin/actuator/status`,
@@ -140,7 +140,7 @@ export const actuatorController = {
   }
   }
 }
 }
 export const cacheIndexController = {
 export const cacheIndexController = {
-  // 清理缓存
+  // 娓呯悊缂撳瓨
   clearCache(region: string | null) {
   clearCache(region: string | null) {
     return request({
     return request({
       url: `admin/cacheIndex/clearCache`,
       url: `admin/cacheIndex/clearCache`,
@@ -150,14 +150,14 @@ export const cacheIndexController = {
       }
       }
     })
     })
   },
   },
-  // 查询所有索引状态
+  // 鏌ヨ�鎵€鏈夌储寮曠姸鎬�
   queryIndexing() {
   queryIndexing() {
     return request({
     return request({
       url: `admin/cacheIndex/queryIndexing`,
       url: `admin/cacheIndex/queryIndexing`,
       method: 'get'
       method: 'get'
     })
     })
   },
   },
-  // 重建索引
+  // 閲嶅缓绱㈠紩
   rebuildIndex(idsStr: string | null, searchService: string | null) {
   rebuildIndex(idsStr: string | null, searchService: string | null) {
     return request({
     return request({
       url: `admin/cacheIndex/rebuildIndex`,
       url: `admin/cacheIndex/rebuildIndex`,
@@ -168,7 +168,7 @@ export const cacheIndexController = {
       }
       }
     })
     })
   },
   },
-  // 单独建立指定索引,同时清理对象缓存
+  // 鍗曠嫭寤虹珛鎸囧畾绱㈠紩锛屽悓鏃舵竻鐞嗗�璞$紦瀛�
   rebuildSingle(clientJwtAlg: string | null, searchService: string | null) {
   rebuildSingle(clientJwtAlg: string | null, searchService: string | null) {
     return request({
     return request({
       url: `admin/cacheIndex/rebuildSingle`,
       url: `admin/cacheIndex/rebuildSingle`,
@@ -191,7 +191,7 @@ export const fileInfController = {
       }
       }
     })
     })
   },
   },
-  // 添加
+  // 娣诲姞
   save(
   save(
     data : FileInf
     data : FileInf
   ) {
   ) {
@@ -213,7 +213,7 @@ export const fileInfController = {
   }
   }
 }
 }
 export const mainFrameController = {
 export const mainFrameController = {
-  // 后台管理员登录
+  // 鍚庡彴绠$悊鍛樼櫥褰�
   doLogin(loginId: string | null, sid: string | null, userPsw: string | null, validateCode: string | null) {
   doLogin(loginId: string | null, sid: string | null, userPsw: string | null, validateCode: string | null) {
     return request({
     return request({
       url: `admin/mainFrame/doLogin`,
       url: `admin/mainFrame/doLogin`,
@@ -227,14 +227,14 @@ export const mainFrameController = {
       }
       }
     })
     })
   },
   },
-  // 软件授权
+  // 杞�欢鎺堟潈
   getSoftwareAuth() {
   getSoftwareAuth() {
     return request({
     return request({
       url: `admin/mainFrame/getSoftwareAuth`,
       url: `admin/mainFrame/getSoftwareAuth`,
       method: 'get'
       method: 'get'
     })
     })
   },
   },
-  // 软件授权
+  // 杞�欢鎺堟潈
   getVersion(maxRecord: number | null) {
   getVersion(maxRecord: number | null) {
     return request({
     return request({
       url: `admin/mainFrame/getVersion`,
       url: `admin/mainFrame/getVersion`,
@@ -244,14 +244,14 @@ export const mainFrameController = {
       }
       }
     })
     })
   },
   },
-  // 用户登录状态保持心跳,每5分钟一次
+  // 鐢ㄦ埛鐧诲綍鐘舵€佷繚鎸佸績璺筹紝姣�5鍒嗛挓涓€娆�
   heartbeat() {
   heartbeat() {
     return request({
     return request({
       url: `admin/mainFrame/heartbeat`,
       url: `admin/mainFrame/heartbeat`,
       method: 'get'
       method: 'get'
     })
     })
   },
   },
-  // 用户修改密码
+  // 鐢ㄦ埛淇�敼瀵嗙爜
   updatePassword(userPsw: string | null) {
   updatePassword(userPsw: string | null) {
     return request({
     return request({
       url: `admin/mainFrame/updatePassword`,
       url: `admin/mainFrame/updatePassword`,
@@ -262,7 +262,7 @@ export const mainFrameController = {
       }
       }
     })
     })
   },
   },
-  // 获取登陆用户信息
+  // 鑾峰彇鐧婚檰鐢ㄦ埛淇℃伅
   userInfo() {
   userInfo() {
     return request({
     return request({
       url: `admin/mainFrame/userInfo`,
       url: `admin/mainFrame/userInfo`,
@@ -271,7 +271,7 @@ export const mainFrameController = {
   }
   }
 }
 }
 export const menuConfigController = {
 export const menuConfigController = {
-  // 获取报表菜单配置
+  // 鑾峰彇鎶ヨ〃鑿滃崟閰嶇疆
   getReportMenu() {
   getReportMenu() {
     return request({
     return request({
       url: `admin/menuConfig/getReportMenu`,
       url: `admin/menuConfig/getReportMenu`,
@@ -280,7 +280,7 @@ export const menuConfigController = {
   }
   }
 }
 }
 export const quartzController = {
 export const quartzController = {
-  // 查询任务
+  // 鏌ヨ�浠诲姟
   list(
   list(
     data : any
     data : any
   ) {
   ) {
@@ -290,7 +290,7 @@ export const quartzController = {
       data
       data
     })
     })
   },
   },
-  // 暂停任务
+  // 鏆傚仠浠诲姟
   pause(triggerKey: string | null) {
   pause(triggerKey: string | null) {
     return request({
     return request({
       url: `admin/quartz/pause`,
       url: `admin/quartz/pause`,
@@ -301,7 +301,7 @@ export const quartzController = {
       }
       }
     })
     })
   },
   },
-  // 继续任务
+  // 缁х画浠诲姟
   resume(triggerKey: string | null) {
   resume(triggerKey: string | null) {
     return request({
     return request({
       url: `admin/quartz/resume`,
       url: `admin/quartz/resume`,
@@ -314,7 +314,7 @@ export const quartzController = {
   }
   }
 }
 }
 export const simpleLabelValueController = {
 export const simpleLabelValueController = {
-  // 动态获取选择项
+  // 鍔ㄦ€佽幏鍙栭€夋嫨椤�
   getLabelValueList(beanName: string | null, extraParam: string | null) {
   getLabelValueList(beanName: string | null, extraParam: string | null) {
     return request({
     return request({
       url: `admin/simpleLabelValue`,
       url: `admin/simpleLabelValue`,
@@ -327,7 +327,7 @@ export const simpleLabelValueController = {
   }
   }
 }
 }
 export const treeNodeController = {
 export const treeNodeController = {
-  // 添加节点
+  // 娣诲姞鑺傜偣
   addNode(sysObjectId: number | null, treeNodeNm: string | null, treeNodePosition: number | null, upperTreeNodeId: number | null) {
   addNode(sysObjectId: number | null, treeNodeNm: string | null, treeNodePosition: number | null, upperTreeNodeId: number | null) {
     return request({
     return request({
       url: `admin/treeNode/addNode`,
       url: `admin/treeNode/addNode`,
@@ -341,7 +341,7 @@ export const treeNodeController = {
       }
       }
     })
     })
   },
   },
-  // 删除节点
+  // 鍒犻櫎鑺傜偣
   deleteNode(autoPosition: boolean | null, deleteCheckBeans: string | null, treeNodeId: number | null) {
   deleteNode(autoPosition: boolean | null, deleteCheckBeans: string | null, treeNodeId: number | null) {
     return request({
     return request({
       url: `admin/treeNode/deleteNode`,
       url: `admin/treeNode/deleteNode`,
@@ -354,7 +354,7 @@ export const treeNodeController = {
       }
       }
     })
     })
   },
   },
-  // 编辑节点
+  // 缂栬緫鑺傜偣
   editNode(sysObjectId: number | null, treeNodeId: number | null, treeNodeNm: string | null, treeNodePosition: number | null) {
   editNode(sysObjectId: number | null, treeNodeId: number | null, treeNodeNm: string | null, treeNodePosition: number | null) {
     return request({
     return request({
       url: `admin/treeNode/editNode`,
       url: `admin/treeNode/editNode`,
@@ -368,7 +368,7 @@ export const treeNodeController = {
       }
       }
     })
     })
   },
   },
-  // 获得节点树子集
+  // 鑾峰緱鑺傜偣鏍戝瓙闆�
   getAllSubNodes(treeNodeTypeCode: string | null) {
   getAllSubNodes(treeNodeTypeCode: string | null) {
     return request({
     return request({
       url: `admin/treeNode/getAllSubNodes`,
       url: `admin/treeNode/getAllSubNodes`,
@@ -378,7 +378,7 @@ export const treeNodeController = {
       }
       }
     })
     })
   },
   },
-  // 获得节点树
+  // 鑾峰緱鑺傜偣鏍�
   getTree(treeNodeTypeCode: string | null) {
   getTree(treeNodeTypeCode: string | null) {
     return request({
     return request({
       url: `admin/treeNode/getTree`,
       url: `admin/treeNode/getTree`,
@@ -388,7 +388,7 @@ export const treeNodeController = {
       }
       }
     })
     })
   },
   },
-  // 交换节点
+  // 浜ゆ崲鑺傜偣
   swapNode(treeNodeAId: number | null, treeNodeBId: number | null) {
   swapNode(treeNodeAId: number | null, treeNodeBId: number | null) {
     return request({
     return request({
       url: `admin/treeNode/swapNode`,
       url: `admin/treeNode/swapNode`,

+ 15 - 15
src/test/resources/memberAPI.ts

@@ -1,16 +1,16 @@
 /**
 /**
-    TypeScript API模块.
-    该功能基于V3 Admin改进的service模块,支持url参数和from post
+    TypeScript API妯″潡.
+    璇ュ姛鑳藉熀浜嶸3 Admin鏀硅繘鐨剆ervice妯″潡锛屾敮鎸乽rl鍙傛暟鍜宖rom post
 
 
     usage:
     usage:
-    1) import * as adminAPI from '@/api/adminAPI.vue', 其中adminAPI是别名,后台API建议用adminAPI,前台用memberAPI
-    2) adminAPI.<controller名>.<方法名> 来访问方法。注意多个参数要使用对象方式传入
-    3) 方法返回一个Promise,使用.then来执行回调参数接收
-    4) 后台的controller多个原始类型参数自动组装为application/x-www-form-urlencoded的形式来传递,避免生成太多VO,只有使用RequestBody方式时,才使用application/json来发送对象
-    5) application/json来发送对象时,允许增加其他原始类型参数,自动作为URL的参数来传递给后台
-    6) 业务类异常BusinessException自动激发弹窗提示(依赖改进的service模块)
+    1) import * as adminAPI from '@/api/adminAPI.vue', 鍏朵腑adminAPI鏄�埆鍚嶏紝鍚庡彴API寤鸿�鐢╝dminAPI锛屽墠鍙扮敤memberAPI
+    2) adminAPI.<controller鍚�>.<鏂规硶鍚�> 鏉ヨ�闂�柟娉曘€傛敞鎰忓�涓�弬鏁拌�浣跨敤瀵硅薄鏂瑰紡浼犲叆
+    3) 鏂规硶杩斿洖涓€涓狿romise锛屼娇鐢�.then鏉ユ墽琛屽洖璋冨弬鏁版帴鏀�
+    4) 鍚庡彴鐨刢ontroller澶氫釜鍘熷�绫诲瀷鍙傛暟鑷�姩缁勮�涓篴pplication/x-www-form-urlencoded鐨勫舰寮忔潵浼犻€掞紝閬垮厤鐢熸垚澶��VO锛屽彧鏈変娇鐢≧equestBody鏂瑰紡鏃讹紝鎵嶄娇鐢╝pplication/json鏉ュ彂閫佸�璞�
+    5) application/json鏉ュ彂閫佸�璞℃椂锛屽厑璁稿�鍔犲叾浠栧師濮嬬被鍨嬪弬鏁帮紝鑷�姩浣滀负URL鐨勫弬鏁版潵浼犻€掔粰鍚庡彴
+    6) 涓氬姟绫诲紓甯窧usinessException鑷�姩婵€鍙戝脊绐楁彁绀�(渚濊禆鏀硅繘鐨剆ervice妯″潡)
 
 
-    Auto generate by ccframeTool@JIM at 2024-1-19 1:38:14
+    Auto generate by ccframeTool@JIM at 2024-3-14 14:27:34
 */
 */
 /* eslint-disable quotes */
 /* eslint-disable quotes */
 import { request } from '@/utils/service'
 import { request } from '@/utils/service'
@@ -47,7 +47,7 @@ export interface QueryObject {
 }
 }
 
 
 export const commonApiController = {
 export const commonApiController = {
-  // 用户名密码方式会员登录
+  // 鐢ㄦ埛鍚嶅瘑鐮佹柟寮忎細鍛樼櫥褰�
   doLogin(loginId: string | null, sid: string | null, userPsw: string | null, validateCode: string | null) {
   doLogin(loginId: string | null, sid: string | null, userPsw: string | null, validateCode: string | null) {
     return request({
     return request({
       url: `api/common/doLogin`,
       url: `api/common/doLogin`,
@@ -61,7 +61,7 @@ export const commonApiController = {
       }
       }
     })
     })
   },
   },
-  // 手机短信方式会员登录
+  // 鎵嬫満鐭�俊鏂瑰紡浼氬憳鐧诲綍
   mobileLogin(sid: string | null, userMobile: string | null, validateCode: string | null) {
   mobileLogin(sid: string | null, userMobile: string | null, validateCode: string | null) {
     return request({
     return request({
       url: `api/common/mobileLogin`,
       url: `api/common/mobileLogin`,
@@ -74,7 +74,7 @@ export const commonApiController = {
       }
       }
     })
     })
   },
   },
-  // 修改当前用户的密码
+  // 淇�敼褰撳墠鐢ㄦ埛鐨勫瘑鐮�
   modUserPass(modPassword: string | null) {
   modUserPass(modPassword: string | null) {
     return request({
     return request({
       url: `api/common/modUserPass`,
       url: `api/common/modUserPass`,
@@ -92,7 +92,7 @@ export const commonApiController = {
       method: 'get'
       method: 'get'
     })
     })
   },
   },
-  // 临时测试方法
+  // 涓存椂娴嬭瘯鏂规硶
   mytest1(
   mytest1(
     page: number | null,
     page: number | null,
     size: number | null,
     size: number | null,
@@ -108,7 +108,7 @@ export const commonApiController = {
       data
       data
     })
     })
   },
   },
-  // 给会员发送鉴权短信
+  // 缁欎細鍛樺彂閫侀壌鏉冪煭淇�
   sendAuthCode(sid: string | null, userMobile: string | null) {
   sendAuthCode(sid: string | null, userMobile: string | null) {
     return request({
     return request({
       url: `api/common/sendAuthCode`,
       url: `api/common/sendAuthCode`,
@@ -120,7 +120,7 @@ export const commonApiController = {
       }
       }
     })
     })
   },
   },
-  // 页面唯一key
+  // 椤甸潰鍞�竴key
   uuid() {
   uuid() {
     return request({
     return request({
       url: `api/common/uuid`,
       url: `api/common/uuid`,