diff --git a/conf/app.conf b/conf/app.conf index ba3260ecd..87548d77b 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -275,67 +275,6 @@ pddAppSecret = "fa40c1fe356eebc1376ace1d2380ed44e553c602" httpport = 8088 EnableDocs = false -jdOrgCode = "320406" -jdLoginName = "jd_jxcs1223" -jdToken = "29afd5a8-f93f-4d4c-9fce-a7297340af59" -jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d" -jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4" - -jd2OrgCode = "349454" -jd2Token = "29e0e567-c475-433a-aff0-37176ee8d8a7" -jd2AppKey = "7fb947624ff847ae94ff2f068cc99652" -jd2Secret = "1097abd7ef09427099b4922784af123a" - -jd3OrgCode = "359459" -jd3Token = "5e2c0a60-4450-40c0-a1da-b560051251ea" -jd3AppKey = "21b627c23ea04c69b64b48d0b361213e" -jd3Secret = "51cd27a748e64c829b4b7f83f4844610" - -jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm" -jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3" -jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933" - -jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq" -jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6" -jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608" -jdsCookie = "shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; mba_muid=1142616513; TrackID=1qvZk-6QSAOp1NmaouJGEx58_cFglCFv57HEfoHOezMrOnV3_FSK-5ExeYhHx97IltBADG3dvJqLIt3P57wyUW4Z2Q3Y8ITo8Cfdmlz3kykM; RT="z=1&dm=jd.com&si=mcot45862q&ss=kaf1rcqz&sl=2&tt=38t&ld=22qx&nu=b99e5a7f32b36f184614d34a1d926a39&cl=3clu&ul=3crs&hd=3cz3"; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXJIINB3Q4THCFCMVWZPFAYGLWLG; thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5OMQYSJ5MORGQLJS7QAPOMIN7AZD6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURSN2Q7SYULLKZEZHTYWWOI65LS5OIHLUZQKWFGMNSQF2UBSYV7FG46CWJGMVHOGV3FY4RUEVJK6BQ223QK3H3VMTHXCZOZV4GKR5EWGIZZDVUAK4B36BPA5HPBO7PXKBOEXEBX77IYBNQLCGMK72J4VKNOUPYKNB5JE5D5UN3R2MMFGLJARTL2QTC5ZRZ4PJCJZWWOV37VWLWFVAN5IGHPAYME73KTNFABM5W73XLOXJFQWTFRZEK3FCL3BLRV4UOXLBQGA34R4WUBYSZURMKTXXB7U; __jda=65775340.1142616513.1573036516.1589946171.1589952725.54; __jdb=65775340.147.1142616513|54.1589952725; __jdc=65775340; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATJFKID7XOR3NQ2CL6K7A2IEZV5HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE4OUZSED6FTSEZHTM363E7XXCHB4NA7VLZHCQSBHDVGMRA7RM4RGJC3MOI4TJNGCLW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBEOW5ID2ZMQ3XV264IU4MYHN64RA; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTOKMOS5L2CXFVYDR2FCOILVYPEI; _lvtc_=5ZH3OJ7CWYNVGEKDRC32XTFXGY" - -elmIsProd = true -elmToken = "" -elmAppKey = "KLRDcOZGrk" -elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a" - -ebaiSource = "34665" -ebaiSecret = "c3db75b754ea2d89" - -mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605" -mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE" - -weixinAppID = "wx70d0943e61e0d15c" -weixinAppSecret = "c2908eeab509314936c4f535dc03e6de" -weixinID = "wxae51106db0b585d5" -weixinSecret = "a91ffcc507d332028cfca7788b424323" -weixinMiniAppID = "wxa4a76d7b4c88604e" -weixinMiniSecret = "dc0fd8dc3042f383347e0502b73ab1d2" - -yinbaoAppKey = "682628966212343269" -yinbaoAppID = "18C0E0867E467DBC26EFF5E957B02EC4" - -aliUpcAppCode = "00a6eefba0204d3fa310ac0ee7a6fc54" - -wxpayAppID1 = "wx70d0943e61e0d15c" -wxpayAppID2 = "wxa4a76d7b4c88604e" -wxpayAppID3 = "wx2bb99eb5d2c9b82c" -wxpayAppKey = "XKJPOIHJ233adf01KJIXlIeQDSDKFJAD" -wxpayAppMchID = "1603491062" -wxpayAppMchID2 = "1413203902" -wxpayNotifyURL = "http://callback.rsm.jxc4.com/wxpay/msg/" - -tonglianPayAppID = "00183083" -tonglianPayKey = "18048531223" -tonglianPayCusID = "56065105499TVAH" -tonglianPayNotifyURL = "http://callback.rsm.jxc4.com/tonglian/msg/" - dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true" enableStoreWrite = true @@ -344,34 +283,4 @@ enableEbaiStoreWrite = true enableMtwmStoreWrite = true enableWscStoreWrite = true enableYbStoreWrite = true -enableJdShopWrite = true - -disableWeimob = false -weimobCallbackURL = "http://callback.jxc4.com/weimob" - -dingdingAgentID = 239461075 -dingdingAppKey = "ding7iu9cptairtcls0c" -dingdingSecret = "LWrZAFeqUfuVv7n_tc8vPpCAx6PT4CwManx2XCVhJOqGsx2L5XCDuX1sAN_JtvsI" - -dingdingCallbackURL = "http://callback.jxc4.com/dingding/msg" - -pushAppID = "5lyyrvHODG6wC8Sdr3a9h" -pushAppKey = "iFrkUDmR2g5eqQpfh2kQ57" -pushAppSecret = "WTn53qd6WAAdLMXfmXvzb7" -pushMasterSecret= "dGZcR0XGGg7H5Pd7FR3n47" - -ejyPlatName = "1Zbve" -ejyBeforeKey = "htvse3XEDhBnCTNo" -ejyAfterKey = "QM5RnGl6kNh3ENLT" - -txCloudSecretID = "AKIDFNmm1U7vhITlVItry0ng5Q268lGjDZyQUR6" -txCloudSecretKey = "25p3aynr97hOMJEfpvr0LoXD0gI62l7wcHA7nsM6" - -mtUnionAppKey = "b6481f92b47918cd6e42e7ea4fae6084" -mtUnionAppSecret = "84d390777ddf691ff092e744ba26bfdd" - -tbUnionAppKey = "32724809" -tbUnionAppSecret = "2c2bce02eab860d486f68aa59a0127d9" - -pddAppKey = "f9d95aaf5856485eabf39588f69a86de" -pddAppSecret = "fa40c1fe356eebc1376ace1d2380ed44e553c602" \ No newline at end of file +enableJdShopWrite = true \ No newline at end of file diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 9ec838c52..c4c7a349f 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -4,13 +4,13 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/legacymodel" beego "github.com/astaxie/beego/adapter" - "github.com/astaxie/beego/adapter/orm" + "github.com/astaxie/beego/client/orm" ) func Init() { // set default database - orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"), 30) - orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(gold1.jxc4.com:3306)/api?charset=utf8mb4&loc=Local&parseTime=true", 30) + orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr")) + orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(gold1.jxc4.com:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") //用户 orm.RegisterModel(&model.AuthBind{}, &model.User{})