Merge remote-tracking branch 'origin/master' into akun

@@ -13,6 +13,7 @@ use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\News\News;
 use App\Models\News\News;
+use App\Models\Product\Category;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
 use App\Models\Template\Template;
 use App\Models\Template\Template;
@@ -36,7 +37,392 @@ class LyhImportTest extends Command
      */
      */
     protected $description = '导入数据';
     protected $description = '导入数据';
 
 
-    public $data = '';
+    public $data = '1740192727366583733,"Electrical Transmission and Control Series Relay series",1740132848932187377
+1740192836461235605,Connecting cables,-3
+1740192976846127984,C-lin  Sensor Price List,1740192727366576157
+1740193010378233300,Solid state relay,1740192518974523400
+1740193111689540125,M8,1740192836461235605
+1740193111689556835,M12,1740192836461235605
+1740193149374663559,M8,1740193111689540125
+1740193203100056309,M12,1740193111689556835
+1740193535217827975,KSS,-3
+1740193535217844541,Ribbon,1740193535217827975
+1740193597681677178,Ribbon price list,1740193535217844541
+1740193777125983977,FangNuo,-3
+1740193831258425323,Laminator,1740193777125983977
+1740194014173428572,Household glue machine,1740193831258425323
+1740194058273532445,NUOMI,-3
+1740194296762313716,Kraft Paper Bag,1740194058273532445
+1740194296762328368,Aluminum foil bag,1740194058273532445
+1740194425503958650,Kraft Paper Bag  price list,1740194296762313716
+1740194542715225591,Continental,-3
+1740194598552212489,Belt,1740194542715225591
+1740194624773525844,industrial belt,1740194598552212489
+1740194624776105664,Continental industrial belt,1740194598552212489
+1740195015343747911,Aluminum foil bag,1740194296762328368
+1740195164397968669,Sensor,1740192644100000417
+1740195468197444364,Relay,1740133082101205249
+1740204496795912169,KINCO,-1
+1740204496795934912,yaskawa,-1
+1740204496795942275,resi,-1
+1740204654100002536,KINCO PLC,1740204496795912169
+1740204682100001669,MINGWEI Substitutes,-2
+1740204751295231178,power supply,-3
+1740204846975212584,connect,-3
+1740204846975232824,cable,-3
+1740379444470403440,BULL,-3
+1740379444470425911,Power strips,1740379444470403440
+1740379586616762498,E-Weichat,-3
+1740379586616779971,Waterproof junction box,1740379586616762498
+1740379676696319944,WNE,-3
+1740379676696331900,Multi-function electric pen,1740379676696319944
+1740379817943319952,HongSH,-3
+1740379817943355678,MC4 connectors and plugs,1740379817943319952
+1740380067210619738,CHCC,-3
+1740380067210633767,Cable ties,1740380067210619738
+1740380383829552143,LJ,-3
+1740380383829565723,Pneumatic joints,1740380383829552143
+1740380581697941898,LZ,-3
+1740380581697955520,On-off valves,1740380581697941898
+1740380697154905966,KSR,-3
+1740380697154919110,Thickened corner code,1740380697154905966
+1740380860543808335,BECKHOFF,1740380860542589719
+1740380860543822686,IO-EtherCAT BOX EPPxxxx,1740380860543808335
+1740380916100000537,WZBTFM,-3
+1740380916100024798,Waterproof Connector,1740380916100000537
+1740381181352991481,IO-EtherCAT BOX EPPxxxx,1740380860542589719
+1740381458773048901,Weidmueller,-1
+1740384098809425590,FP7,1740129447728729493
+1740384098809449448,FP0H,1740129447728729493
+1740384098809459239,FP0R,1740129447728729493
+1740384098809467774,Area Sensors,1740129447728729493
+1740384098809475922,Fiber Sensors,1740129447728729493
+1740384098809484347,Particular Use Sensors,1740129447728729493
+1740384098809493905,Laser Sensor,1740129447728729493
+1740384098809503125,Light Curtains / Safety Components,1740129447728729493
+1740384098809511902,Micro photoelectric sensor,1740129447728729493
+1740384098809521126,photoelectric sensor,1740129447728729493
+1740387532161783913,Terminal blocks,1740381458773048901
+1740387539610785520,FP7,1740384098809425590
+1740387559491139809,FP0H,1740384098809449448
+1740387569924103963,FP0R,1740384098809459239
+1740387595725216579,Area Sensors,1740384098809467774
+1740387610401221601,Fiber Sensors,1740384098809475922
+1740387627312520154,Particular Use Sensors,1740384098809484347
+1740387640650373809,Laser Sensor,1740384098809493905
+1740387654897107480,Light Curtains / Safety Components,1740384098809503125
+1740387669172141556,Micro photoelectric sensor,1740384098809511902
+1740387820903433309,photoelectric sensor,1740384098809521126
+1740388742240035792,TP-LINK,-3
+1740388742240057430,MOWESTAR,-3
+1740388742240064486,UOTEK,-3
+1740394391502920604,Terminal block accessories,1740381458773048901
+1740449417616168263,Festo,-1
+1740451080540349142,Festo VUVX,1740449417616168263
+1740451424100000605,Festo VUVX,1740451080540349142
+1740451471538445382,Festo Solenoid valve VUVS,1740449417616168263
+1740451482540909336,Festo Solenoid valve VUVS,1740451471538445382
+1740451535240929323,Festo Solenoid valve VUVG,1740449417616168263
+1740451543481706759,Festo Solenoid valve VUVG,1740451535240929323
+1740451583570472650,Festo Standards-based valve VSVA,1740449417616168263
+1740451592871499344,Festo Standards-based valve VSVA,1740451583570472650
+1740451631546732450,Festo Solenoid valve VSNC,1740449417616168263
+1740451639598849159,Festo Solenoid valve VSNC,1740451631546732450
+1740451745944421728,Festo Solenoid valve VMPA,1740449417616168263
+1740451755100001294,Festo Solenoid valve VMPA,1740451745944421728
+1740451792290618418,Festo Push-in fitting QST,1740449417616168263
+1740451800194972302,Festo Push-in fitting QST,1740451792290618418
+1740451841537976524,Festo Push-in fitting QSL,1740449417616168263
+1740451848180617360,Festo Push-in fitting QSL,1740451841537976524
+1740451892589892446,Festo Push-in fitting QS,1740449417616168263
+1740451899296708332,Festo Push-in fitting QS,1740451892589892446
+1740451932736823527,Festo Standard valve MFH,1740449417616168263
+1740451939448036690,Festo Standard valve MFH,1740451932736823527
+1740451979954727905,Festo Standard valve JMFH,1740449417616168263
+1740451989398777972,Festo Standard valve JMFH,1740451979954727905
+1740452021146680350,Festo Standards-based cylinder DSBG,1740449417616168263
+1740452029334674488,Festo Standards-based cylinder DSBG,1740452021146680350
+1740452074809820460,Festo Round cylinder DSNU,1740449417616168263
+1740452081450325611,Festo Round cylinder DSNU,1740452074809820460
+1740452131531504298,Festo cylinder DSBC,1740449417616168263
+1740452142511839791,Festo cylinder DSBC,1740452131531504298
+1740452199889464211,Festo Compact cylinder ADN-S,1740449417616168263
+1740452205719137552,Festo Compact cylinder ADN-S,1740452199889464211
+1740452243115738363,Festo Compact cylinder ADN,1740449417616168263
+1740452256225656109,Festo Compact cylinder ADN,1740452243115738363
+1740452902891860328,Festo,-1
+1740453023522996961,Pneumatic FESTO,1740453478558548235
+1740453441694351110,AIRTAC,-1
+1740453478558548235,Pneumatic Accessories,1740449417616168263
+1740453883384938270,AirTAC Fittings,1740453441694351110
+1740464692534765652,plug-in modules,1740380860542589719
+1740464747495350378,IO-EtherCAT plug-in modules,1740464692534765652
+1740476741811397597,Guide rail and slide block,-2
+1740476808100000209,Lead screw guide,1740476741811397597
+1740476931671002744,Lead screw guide,1740476808100000209
+1740476961259780292,Linear guides,1740476741811397597
+1740476990753093740,Linear guides,1740476961259780292
+1740531391445426661,THK Guideway and slider,1740476741811397597
+1740531440324706223,THK Guideway and slider,1740531391445426661
+1740540415292726866,Proximity sensor,1740192644100000417
+1740540744329087346,Shenler,-3
+1740540744329110250,Relays,1740540744329087346
+1740548672915904742,HGS,-3
+1740548719202352495,Eco-friendly LED light connecting cable,1740548672915904742
+1740548784495164342,Eco-friendly LED light connecting cable,1740548719202352495
+1740548906257921948,BULL,-3
+1740548991829183530,European Standard Universal Socket,1740548906257921948
+1740549036380698790,European Standard Universal Socket,1740548991829183530
+1740549055495036342,European standard plugs and sockets,1740548906257921948
+1740549086842318296,European standard plugs and sockets,1740549055495036342
+1740552065133458952,DELIX,-3
+1740552086784919211,IP67 Industrial Aviation Plugs,1740552065133458952
+1740552120100001622,IP67 Industrial Aviation Plugs,1740552086784919211
+1740552158100001281,IP44 Plug and socket connectors,1740552065133458952
+1740552178107775346,IP44 Plug and socket connectors,1740552158100001281
+1740552245763919162,American Standard Convertible Plug,1740548906257921948
+1740552278329600464,American Standard Convertible Plug,1740552245763919162
+1740552434219136525,Hao Xiang,-3
+1740552469642349718,Metal round flat gasket washers,1740552434219136525
+1740552668406666840,Metal round flat gasket washers,1740552469642349718
+1740552808281889545,Flat head tapping screws Phillips countersunk head,1740552434219136525
+1740553161577709887,Flat head tapping screws Phillips countersunk head,1740552808281889545
+1740620655870912946,TBI Ball Screw Nuts,1740476741811397597
+1740621298788401519,Ball Screw Nuts,1740620655870912946
+1740621426378264770,Zheng gong,-3
+1740621475647272584,Explosion-proof socket plug board,1740621426378264770
+1740621564731368658,Explosion-proof socket plug board,1740621475647272584
+1740621602637171197,Li wei,-3
+1740621622463206187,Blade Remote IO Module,1740621602637171197
+1740621787955193884,Blade Remote IO Module,1740621622463206187
+1740625149539095968,Embedded switch,1740388742240057430
+1740625149539120132,Fiber optic transceiver,1740388742240057430
+1740625149539131969,Industrial wireless data transmission terminal,1740388742240057430
+1740625149539140192,Industrial wireless router,1740388742240057430
+1740625149539150446,Interface converter,1740388742240057430
+1740625149539158206,Managed industrial switch,1740388742240057430
+1740625149539167954,Network accessories,1740388742240057430
+1740625149539177665,PoE switch,1740388742240057430
+1740625149539187117,Serial server,1740388742240057430
+1740625149539196112,Unmanaged industrial switch,1740388742240057430
+1740625318708400740,Embedded switch,1740625149539095968
+1740625418405386106,Fiber optic transceiver,1740625149539120132
+1740625446406396410,Industrial wireless data transmission terminal,1740625149539131969
+1740625473541536296,Industrial wireless router,1740625149539140192
+1740625490524326651,Interface converter,1740625149539150446
+1740625512696312974,Managed industrial switch,1740625149539158206
+1740625553769387342,Network accessories,1740625149539167954
+1740625575464504817,PoE switch,1740625149539177665
+1740625597844669363,Serial server,1740625149539187117
+1740625628874531516,Unmanaged industrial switch,1740625149539196112
+1740626079885957759,Embedded Modules,1740388742240064486
+1740626079885970803,Industrial Ethernet Switches,1740388742240064486
+1740626079885977153,Interface Converters,1740388742240064486
+1740626079885982561,Lightning Isolators,1740388742240064486
+1740626079885989751,Multiport Serial Cards,1740388742240064486
+1740626079885995488,Network Card,1740388742240064486
+1740626079886014977,Security Switch,1740388742240064486
+1740626079886021793,Serial Device Servers,1740388742240064486
+1740626079886027469,Serial Media Converters,1740388742240064486
+1740626079886033190,Wireless communication,1740388742240064486
+1740626206811954562,Embedded Modules,1740626079885957759
+1740627415894669503,Industrial Ethernet Switches,1740626079885970803
+1740627442111480154,Interface Converters,1740626079885977153
+1740627464769805357,Lightning Isolators,1740626079885982561
+1740627525143457778,Multiport Serial Cards,1740626079885989751
+1740627550626980317,Network Card,1740626079885995488
+1740627620663566682,Security Switch,1740626079886014977
+1740627652999155653,Serial Device Servers,1740626079886021793
+1740627666100000490,Serial Media Converters,1740626079886027469
+1740627694102109998,Wireless communication,1740626079886033190
+1740628131495071104,All optical network,1740388742240035792
+1740628131495088739,Ethernet optical switch,1740628131495071104
+1740628131495096166,Fiber optic transceiver,1740628131495071104
+1740628131495114986,Optical module,1740628131495071104
+1740628131495128507,Enterprise Wireless,1740388742240035792
+1740628131495135270,Enterprise-grade wireless VPN routers,1740628131495128507
+1740628131495141945,Wireless Access Points (APs),1740628131495128507
+1740628131495148516,Wireless bridge/wireless bridge for monitoring,1740628131495128507
+1740628131495154416,Wireless Controller (AC),1740628131495128507
+1740628131495161963,Industrial products,1740388742240035792
+1740628131495167495,Industrial computer,1740628131495161963
+1740628131495173418,Industrial cybersecurity,1740628131495161963
+1740628131495178736,Industrial Fiber Optic Transceivers Modules,1740628131495161963
+1740628131495184721,Industrial Power Supplies Accessories,1740628131495161963
+1740628131495190902,Industrial routers/gateways,1740628131495161963
+1740628131495195721,Industrial switches,1740628131495161963
+1740628131495201580,Industrial vision,1740628131495161963
+1740628131495207256,Industrial wireless,1740628131495161963
+1740628131495213319,Networking of industrial equipment,1740628131495161963
+1740628131495219324,Network card,1740388742240035792
+1740628131495225527,PCIe wireless network card,1740628131495219324
+1740628131495231389,USB wireless network card,1740628131495219324
+1740628131495237621,Wired network card/adapter,1740628131495219324
+1740628131495242710,Router,1740388742240035792
+1740628131495249317,Cybersecurity,1740628131495242710
+1740628131495255469,Enterprise routers,1740628131495242710
+1740628131495261415,Extenders/mini-routes,1740628131495242710
+1740628131495272210,PoE· AC all-in-one router,1740628131495242710
+1740628131495278114,SOHO broadband router,1740628131495242710
+1740628131495283506,Wi-Fi 4/ Wi-Fi 5 wireless routers,1740628131495242710
+1740628131495289621,Wi-Fi 6 wireless router,1740628131495242710
+1740628131495295219,Wi-Fi 7 wireless router,1740628131495242710
+1740628131495301237,Switchs,1740388742240035792
+1740628131495307234,100 mbit switch,1740628131495301237
+1740628131495318873,2.5G switch,1740628131495301237
+1740628131495324883,Fiber optic transceiver,1740628131495301237
+1740628131495330457,Gigabit switch,1740628131495301237
+1740628131495351185,PoE switch and PoE module,1740628131495301237
+1740628131495357594,Ten gigabit switch,1740628131495301237
+1740628131495363949,Visual security,1740388742240035792
+1740628131495377610,Dark night full-color camera,1740628131495363949
+1740628131495382617,Display products,1740628131495363949
+1740628131495389744,PTZ cameras,1740628131495363949
+1740628131495395613,Sound column products,1740628131495363949
+1740628131495406937,Storage management products,1740628131495363949
+1740628131495412181,Wired network cameras,1740628131495363949
+1740628131495418588,Wireless IP camera,1740628131495363949
+1740628241100001927,Ethernet optical switch,1740628131495088739
+1740628287100002371,Fiber optic transceiver,1740628131495096166
+1740628311814314440,Optical module,1740628131495114986
+1740628376841613521,Enterprise-grade wireless VPN routers,1740628131495135270
+1740628472956366805,Wireless Access Points (APs),1740628131495141945
+1740634759119601361,Wireless bridge/wireless bridge for monitoring,1740628131495148516
+1740634787365527713,Wireless Controller (AC),1740628131495154416
+1740634845886686550,Industrial computer,1740628131495167495
+1740634868100000492,Industrial cybersecurity,1740628131495173418
+1740634895100000654,Industrial Fiber Optic Transceivers Modules,1740628131495178736
+1740634928314219464,Industrial Power Supplies Accessories,1740628131495184721
+1740634945591478433,Industrial routers/gateways,1740628131495190902
+1740634998795438500,Industrial switches,1740628131495195721
+1740635018403329352,Industrial vision,1740628131495201580
+1740635050636749972,Industrial wireless,1740628131495207256
+1740635065128308934,Networking of industrial equipment,1740628131495213319
+1740635079851826125,PCIe wireless network card,1740628131495225527
+1740635105480874722,USB wireless network card,1740628131495231389
+1740635133471141350,Wired network card/adapter,1740628131495237621
+1740635161920456854,Cybersecurity,1740628131495249317
+1740635247726093775,Enterprise routers,1740628131495255469
+1740635265998147934,Extenders/mini-routes,1740628131495261415
+1740635304775724782,PoE· AC all-in-one router,1740628131495272210
+1740635319689738805,SOHO broadband router,1740628131495278114
+1740635657976219497,Hydraulic Shock Absorbe,1740133289853630501
+1740635746731236841,Wi-Fi 4/ Wi-Fi 5 wireless routers,1740628131495283506
+1740635781100002853,Wi-Fi 6 wireless router,1740628131495289621
+1740635836940903207,Wi-Fi 7 wireless router,1740628131495295219
+1740635882100001522,100 mbit switch,1740628131495307234
+1740635929100002107,2.5G switch,1740628131495318873
+1740636257301503394,mini cylinders-MAC，MG，PB，MBL,1740133289853653834
+1740636384100000359,Intermediate relays-RKF，RKL，RKM，RKE,1740540744329110250
+1740636436862759464,Hydraulic Shock Absorbe-ACA，ACJ,1740635657976219497
+1740636467932608237,Fiber optic transceiver,1740628131495324883
+1740636563301133529,Gigabit switch,1740628131495330457
+1740636626983401394,PoE switch and PoE module,1740628131495351185
+1740636647723709413,Ten gigabit switch,1740628131495357594
+1740636705208586290,Dark night full-color camera,1740628131495377610
+1740636746100001277,Standard cylinders-SE，SAI，SC，SAU,1740133289853653834
+1740636768100000390,Display products,1740628131495382617
+1740636793390604507,PTZ cameras,1740628131495389744
+1740636820667020397,Sound column products,1740628131495395613
+1740636915918342963,Storage management products,1740628131495406937
+1740637011477771328,Rotary cylinders-HRQ，ACK,1740133289853653834
+1740637084559275407,Wired network cameras,1740628131495412181
+1740637176394450463,Wireless IP camera,1740628131495418588
+1740638067129654533,Guided cylinders-TCM,1740133289853653834
+1740638356645759814,Compact cylinders-ACK，SDA，ACQ,1740133289853653834
+1740638519100000672,Finger cylinders-HFC，HFD，HFY,1740133289853653834
+1740638593137501269,Miniature free-mount cylinders-MU,1740133289853653834
+1740638649459919860,Multi-position fixed cylinder-MD,1740133289853653834
+1740639109192579650,General Purpose Relay-REH，RFT，RUB，RGF,1740540744329110250
+1740640221743882170,AB,1740640221742360994
+1740640221743899330,AB servo feed back line,1740640221743882170
+1740640221743907110,MPL Low inertia servomotor,1740640221743882170
+1740640221743914610,TL and TLY compact service,1740640221743882170
+1740640221743920239,VPL Series Service Motor,1740640221743882170
+1740640808813120826,AB,1740640221743899330
+1740640827761782941,AB,1740640221743907110
+1740640841331791744,AB,1740640221743914610
+1740640869199602613,AB,1740640221743920239
+1740641583226511879,DELTA,1740640221742360994
+1740641583226529161,frequency converter price list,1740641583226511879
+1740641715588807735,DELTA,1740641583226529161
+1740644647506374856,power supply,1740204751295231178
+1740644820235508593,type-contact,1740644833285737571
+1740644833285737571,contact,1740204846975212584
+1740644911884830496,LAN-cable,1740204846975232824
+1740644991844027330,PLC,1740204496795912169
+1740644991844046858,HMI,1740204496795912169
+1740644991844055259,frequency transformer,1740204496795912169
+1740645049100001834,frequency transformer,1740204496795934912
+1740645140343687522,resistance,1740204496795942275
+1740645183921585771,power supply,1740204682100001669
+1740645249717644138,diy-more,-3
+1740645345100001810,circuit board,1740645369668483435
+1740645369668483435,circuit board,1740645249717644138
+1740648082474209137,GONEO,-3
+1740648082474224139,Goneo overseas socket,1740648082474209137
+1740648082474231535,Geneo International Interlude,1740648082474224139
+1740648116762627698,Geneo International Interlude,1740648082474231535
+1740705655279596214,phoenix power supply,1740705684548892110
+1740705684548892110,phoenix,-1
+1740705703761727311,power supply,1740705684548892110
+1740705786787784151,EATON,-1
+1740705786787797193,ups power supply,1740705786787784151
+1740705966345822426,eaton ups power supply,1740705786787797193
+1740706095437227956,eaton fuse,1740706131480147977
+1740706131480147977,eaton fuse,1740705786787784151
+1740706280726584952,shanhao-kj,-3
+1740706280726597174,relay module,1740706280726584952
+1740706355100000811,relay module,1740706280726584952
+1740706780936777779,Lab supplies,1740709417544065857
+1740707127530551519,AirTAC Fittings,1740453441694351110
+1740707138337405933,Fittings,1740707127530551519
+1740707421100001176,Precision slide cylinder,1740453441694351110
+1740707570229606156,HLQ Series Double Axis Precision Slide Table Cylinders (Recirculating Ball),1740707421100001176
+1740709081812169666,CHCC,-3
+1740709081812182359,Cable ties,1740709081812169666
+1740709184621838660,BULL,-3
+1740709184621851858,Power strips,1740709184621838660
+1740709259219243247,WNE,-3
+1740709259219255599,Multi-function electric pen,1740709259219243247
+1740709305203332899,LJ,-3
+1740709305203356993,Pneumatic joints,1740709305203332899
+1740709363449530211,LZ,-3
+1740709363449542586,On-off valves,1740709363449530211
+1740709417544053447,LUOTAI,-3
+1740709417544065857,Lab supplies,1740709417544053447
+1740709477652948638,KSK,-3
+1740709477652962532,Thickened corner code,1740709477652948638
+1740722435880680451,BI-NI-FI Series,1740722635837639118
+1740722466953104785,E2E Series,1740722635837639118
+1740722635837624470,Domenzi,-3
+1740722635837639118,Proximity switches,1740722635837624470
+1740722635837646950,Photoelectric switches,1740722635837624470
+1740722740763961825,Terminal blocks,1740381458773048901
+1740722740763977321,Terminal block accessories,1740381458773048901
+1740722887562481910,M12,1740722635837639118
+1740723584285184606,M18,1740722635837639118
+1740724152822793972,Medium load mold spring,-3
+1740724241626771571,RF connector,-3
+1740725342968624192,M30,1740722635837639118
+1740725407844921166,M8,1740722635837639118
+1740725459459970713,NBB-NBN Seires,1740722635837639118
+1740725487719752860,Rectangle NI Series,1740722635837639118
+1740725531352700317,Rectangle SN-TL-PL,1740722635837639118
+1740725577110265290,CDD Seires,1740722635837646950
+1740725595995011162,E3F Seires,1740722635837646950
+1740725622100000699,E3FA Seires,1740722635837646950
+1740725649602038369,E3FM Seires,1740722635837646950
+1740725676100000630,E3JK Seires,1740722635837646950
+1740727174680572532,smc,1740640221742360994
+1740727376100000906,Reed sensor,1740192644100000417
+1740728610616204948,Schneider,-1
+1740728610616219995,Low-voltage,1740728610616204948
+1740728653265687795,Industrial Automation and Control,1740728610616204948
+1740730292656428776,Electrical connector,-3
+1740732268866014434,phoenix,1740732268864577229
+1740732268866027494,Distribution blocks,1740732268866014434
+';
 
 
     /**
     /**
      * @remark :统一更新路由
      * @remark :统一更新路由
@@ -46,15 +432,64 @@ class LyhImportTest extends Command
      * @time   :2023/11/20 15:13
      * @time   :2023/11/20 15:13
      */
      */
     public function handle(){
     public function handle(){
-        ProjectServer::useProject(2385);
+        ProjectServer::useProject(3283);
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
 //        $this->importCustomModule($this->data);
 //        $this->importCustomModule($this->data);
-        $this->newsImportCustom();
+        $this->importProductCategory($this->data,3283);
+        $this->handleCatePid();
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
 
 
     /**
     /**
+     * @remark :导入分类
+     * @name   :importProductCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2025/3/3 15:59
+     */
+    public function importProductCategory($text,$project_id){
+        //设置对应管理数组
+        $key_val = [];
+        $arr = explode("\n", $text);
+        foreach ($arr as $val){
+            $cate_arr = explode(",", $val);
+            $key_val[$cate_arr[1]] = $cate_arr[1];
+            $saveData = [
+                'project_id'=>$project_id,
+                'title'=>$cate_arr[1],
+                'seo_title'=>$cate_arr[0],
+                'seo_des'=>$cate_arr[2]
+            ];
+            $cateModel = new Category();
+            $id = $cateModel->addReturnId($saveData);
+            $route = RouteMap::setRoute($cate_arr[1],RouteMap::SOURCE_PRODUCT_CATE,$id,$project_id);
+            $cateModel->edit(['route'=>$route],['id'=>$id]);
+        }
+        return true;
+    }
+
+    public function handleCatePid(){
+        $cateModel = new Category();
+        $list = $cateModel->list([],'id',['*'],'asc');
+        foreach ($list as $k => $v){
+            if($v['seo_des'] == 0){
+                $pid = 0;
+            }else{
+                $info = $cateModel->read(['seo_title'=>$v['seo_des']],['id']);
+                if($info !== false){
+                    $pid = $info['id'];
+                }else{
+                    $pid = 0;
+                }
+            }
+            //更新pid
+            $cateModel->edit(['pid'=>$pid],['id'=>$v['id']]);
+        }
+        return true;
+    }
+
+    /**
      * @remark :导入扩展模块数据
      * @remark :导入扩展模块数据
      * @name   :importCustomModule
      * @name   :importCustomModule
      * @author :lyh
      * @author :lyh

@@ -37,7 +37,7 @@ class UserLoginLogic
      */
      */
     public function login(){
     public function login(){
         //先验证手机号是否在项目中存在
         //先验证手机号是否在项目中存在
-        $info = $this->model->read(['mobile'=>$this->param['mobile'],'status'=>$this->model::STATUS_ZERO],['id','is_password']);
+        $info = $this->model->read(['mobile'=>$this->param['mobile'],'status'=>$this->model::STATUS_ZERO],['id','is_password','project_id']);
         if($info === false){
         if($info === false){
             $this->fail('当前用户不存在或者被禁用',Code::USER_REGISTER_ERROE);
             $this->fail('当前用户不存在或者被禁用',Code::USER_REGISTER_ERROE);
         }
         }
@@ -46,7 +46,7 @@ class UserLoginLogic
             $list = $this->model->list(['mobile'=>$this->param['mobile'],
             $list = $this->model->list(['mobile'=>$this->param['mobile'],
                 'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);
                 'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);
         }else{
         }else{
-            if($info['is_password'] == $this->model::STATUS_ZERO){//查看是否开启了密码登录：默认未开启
+            if(($info['is_password'] == $this->model::STATUS_ZERO) && ($info['project_id'] != 1)){//查看是否开启了密码登录：默认未开启
                 //验证code
                 //验证code
                 $list = $this->verifyCode($this->param['mobile'],$this->param['password']);
                 $list = $this->verifyCode($this->param['mobile'],$this->param['password']);
             }else{
             }else{