Kaynağa Gözat

Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5

xiwa 2 yıl önce
ebeveyn
işleme
fd28cef2d3
2 değiştirilmiş dosya ile 201 ekleme ve 95 silme
  1. 200 94
      data/init/sys_role_menu.json
  2. 1 1
      pom.xml

+ 200 - 94
data/init/sys_role_menu.json

@@ -1,296 +1,402 @@
  [
+
     {
-      "id": 429162174689349,
+      "id": 429541652308037,
       "menu_id": 1,
       "role_id": 2
     },
     {
-      "id": 429162174689350,
+      "id": 429541652308038,
       "menu_id": 100,
       "role_id": 2
     },
     {
-      "id": 429162174689351,
-      "menu_id": 1001,
+      "id": 429541652308039,
+      "menu_id": 101,
       "role_id": 2
     },
     {
-      "id": 429162174689352,
-      "menu_id": 1002,
+      "id": 429541652308040,
+      "menu_id": 102,
       "role_id": 2
     },
     {
-      "id": 429162174689353,
-      "menu_id": 101,
+      "id": 429541652308041,
+      "menu_id": 103,
       "role_id": 2
     },
     {
-      "id": 429162174689354,
-      "menu_id": 1008,
+      "id": 429541652308042,
+      "menu_id": 104,
       "role_id": 2
     },
     {
-      "id": 429162174689355,
-      "menu_id": 1009,
+      "id": 429541652308043,
+      "menu_id": 105,
       "role_id": 2
     },
     {
-      "id": 429162174689356,
-      "menu_id": 1010,
+      "id": 429541652308044,
+      "menu_id": 106,
       "role_id": 2
     },
     {
-      "id": 429162174689357,
-      "menu_id": 102,
+      "id": 429541652308045,
+      "menu_id": 107,
       "role_id": 2
     },
     {
-      "id": 429162174689358,
-      "menu_id": 1013,
+      "id": 429541652308046,
+      "menu_id": 108,
       "role_id": 2
     },
     {
-      "id": 429162174689359,
-      "menu_id": 1014,
+      "id": 429541652308047,
+      "menu_id": 500,
       "role_id": 2
     },
     {
-      "id": 429162174689360,
-      "menu_id": 103,
+      "id": 429541652308048,
+      "menu_id": 501,
       "role_id": 2
     },
     {
-      "id": 429162174689361,
-      "menu_id": 1017,
+      "id": 429541652308049,
+      "menu_id": 1001,
       "role_id": 2
     },
     {
-      "id": 429162174689362,
-      "menu_id": 1018,
+      "id": 429541652308050,
+      "menu_id": 1002,
       "role_id": 2
     },
     {
-      "id": 429162174689363,
-      "menu_id": 104,
+      "id": 429541652308051,
+      "menu_id": 1005,
       "role_id": 2
     },
     {
-      "id": 429162174689364,
-      "menu_id": 1021,
+      "id": 429541652312133,
+      "menu_id": 1008,
       "role_id": 2
     },
     {
-      "id": 429162174689365,
-      "menu_id": 1022,
+      "id": 429541652312134,
+      "menu_id": 1009,
       "role_id": 2
     },
     {
-      "id": 429162174689366,
-      "menu_id": 1023,
+      "id": 429541652312135,
+      "menu_id": 1013,
       "role_id": 2
     },
     {
-      "id": 429162174689367,
-      "menu_id": 105,
+      "id": 429541652312136,
+      "menu_id": 1014,
       "role_id": 2
     },
     {
-      "id": 429162174689368,
-      "menu_id": 1026,
+      "id": 429541652312137,
+      "menu_id": 1017,
       "role_id": 2
     },
     {
-      "id": 429162174689369,
-      "menu_id": 1027,
+      "id": 429541652312138,
+      "menu_id": 1018,
       "role_id": 2
     },
     {
-      "id": 429162174689370,
-      "menu_id": 1030,
+      "id": 429541652312139,
+      "menu_id": 1021,
       "role_id": 2
     },
     {
-      "id": 429162174689371,
-      "menu_id": 106,
+      "id": 429541652312140,
+      "menu_id": 1022,
       "role_id": 2
     },
     {
-      "id": 429162174689372,
-      "menu_id": 1031,
+      "id": 429541652312141,
+      "menu_id": 1023,
       "role_id": 2
     },
     {
-      "id": 429162174689373,
-      "menu_id": 1032,
+      "id": 429541652312142,
+      "menu_id": 1026,
       "role_id": 2
     },
     {
-      "id": 429162174689374,
-      "menu_id": 1033,
+      "id": 429541652312143,
+      "menu_id": 1027,
       "role_id": 2
     },
     {
-      "id": 429162174689375,
-      "menu_id": 107,
+      "id": 429541652312144,
+      "menu_id": 1031,
       "role_id": 2
     },
     {
-      "id": 429162174689376,
+      "id": 429541652312145,
+      "menu_id": 1032,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312146,
+      "menu_id": 1035,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312147,
       "menu_id": 1036,
       "role_id": 2
     },
     {
-      "id": 429162174689377,
+      "id": 429541652312148,
       "menu_id": 1037,
       "role_id": 2
     },
     {
-      "id": 429162174689378,
-      "menu_id": 108,
+      "id": 429541652312149,
+      "menu_id": 1040,
       "role_id": 2
     },
     {
-      "id": 429162174689379,
-      "menu_id": 500,
+      "id": 429541652312150,
+      "menu_id": 1042,
       "role_id": 2
     },
     {
-      "id": 429162174689380,
-      "menu_id": 1040,
+      "id": 429541652312151,
+      "menu_id": 1043,
       "role_id": 2
     },
     {
-      "id": 429162174689381,
-      "menu_id": 1041,
+      "id": 429541652312152,
+      "menu_id": 1045,
       "role_id": 2
     },
     {
-      "id": 429162174689382,
-      "menu_id": 1042,
+      "id": 429541652312153,
+      "menu_id": 118,
       "role_id": 2
     },
     {
-      "id": 429162174693445,
-      "menu_id": 501,
+      "id": 429541652312154,
+      "menu_id": 1600,
       "role_id": 2
     },
     {
-      "id": 429162174693446,
-      "menu_id": 1043,
+      "id": 429541652312155,
+      "menu_id": 1601,
       "role_id": 2
     },
     {
-      "id": 429162174693447,
-      "menu_id": 1044,
+      "id": 429541652312156,
+      "menu_id": 1602,
       "role_id": 2
     },
     {
-      "id": 429162174693448,
-      "menu_id": 1045,
+      "id": 429541652312157,
+      "menu_id": 1603,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312158,
+      "menu_id": 1604,
       "role_id": 2
     },
     {
-      "id": 429162174693449,
-      "menu_id": 1050,
+      "id": 429541652312159,
+      "menu_id": 1605,
       "role_id": 2
     },
     {
-      "id": 429162174693450,
+      "id": 429541652312160,
       "menu_id": 2200,
       "role_id": 2
     },
     {
-      "id": 429162174693451,
+      "id": 429541652312161,
+      "menu_id": 2201,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312162,
+      "menu_id": 2214,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312163,
+      "menu_id": 2205,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312164,
+      "menu_id": 2206,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312165,
+      "menu_id": 2207,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312166,
+      "menu_id": 2215,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312167,
       "menu_id": 2208,
       "role_id": 2
     },
     {
-      "id": 429162174693452,
+      "id": 429541652312168,
+      "menu_id": 2209,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312169,
+      "menu_id": 2210,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312170,
       "menu_id": 2211,
       "role_id": 2
     },
     {
-      "id": 429162174693453,
+      "id": 429541652312171,
+      "menu_id": 2212,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312172,
+      "menu_id": 2213,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312173,
       "menu_id": 2216,
       "role_id": 2
     },
     {
-      "id": 429162174693454,
+      "id": 429541652312174,
+      "menu_id": 2217,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312175,
       "menu_id": 2218,
       "role_id": 2
     },
     {
-      "id": 429162174693455,
+      "id": 429541652312176,
+      "menu_id": 2219,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312177,
+      "menu_id": 2220,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312178,
       "menu_id": 2221,
       "role_id": 2
     },
     {
-      "id": 429162174693456,
+      "id": 429541652312179,
+      "menu_id": 2222,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312180,
+      "menu_id": 2223,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312181,
+      "menu_id": 2,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312182,
       "menu_id": 109,
       "role_id": 2
     },
     {
-      "id": 429162174693457,
+      "id": 429541652312183,
       "menu_id": 1046,
       "role_id": 2
     },
     {
-      "id": 429162174693458,
+      "id": 429541652312184,
       "menu_id": 1047,
       "role_id": 2
     },
     {
-      "id": 429162174693459,
+      "id": 429541652312185,
       "menu_id": 1048,
       "role_id": 2
     },
     {
-      "id": 429162174693460,
+      "id": 429541652312186,
       "menu_id": 113,
       "role_id": 2
     },
     {
-      "id": 429162174693461,
+      "id": 429541652312187,
+      "menu_id": 117,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312188,
+      "menu_id": 120,
+      "role_id": 2
+    },
+    {
+      "id": 429541652312189,
       "menu_id": 3,
       "role_id": 2
     },
     {
-      "id": 429162174693462,
+      "id": 429541652312190,
       "menu_id": 114,
       "role_id": 2
     },
     {
-      "id": 429162174693463,
+      "id": 429541652312191,
       "menu_id": 115,
       "role_id": 2
     },
     {
-      "id": 429162174693464,
+      "id": 429541652316229,
       "menu_id": 1055,
       "role_id": 2
     },
     {
-      "id": 429162174693465,
+      "id": 429541652316230,
       "menu_id": 1056,
       "role_id": 2
     },
     {
-      "id": 429162174693466,
+      "id": 429541652316231,
       "menu_id": 1058,
       "role_id": 2
     },
     {
-      "id": 429162174693467,
+      "id": 429541652316232,
       "menu_id": 1057,
       "role_id": 2
     },
     {
-      "id": 429162174693468,
+      "id": 429541652316233,
       "menu_id": 1059,
       "role_id": 2
     },
     {
-      "id": 429162174693469,
+      "id": 429541652316234,
       "menu_id": 1060,
       "role_id": 2
     }

+ 1 - 1
pom.xml

@@ -36,7 +36,7 @@
         <hutool.version>5.8.18</hutool.version>
         <redisson.version>3.17.4</redisson.version>
         <lock4j.version>2.2.4</lock4j.version>
-        <mapstruct-plus.version>1.2.5</mapstruct-plus.version>
+        <mapstruct-plus.version>1.3.1</mapstruct-plus.version>
         <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
         <poi.version>5.2.3</poi.version>
         <easyexcel.version>3.2.1</easyexcel.version>