Merge branch 'feature/v4.9.90' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.9.90

src/config.yaml

@@ -1,17 +1,17 @@
 etcd:
   hosts:
-    - 192.168.3.207:2379
-    - 192.168.3.204:2379
+    - 172.31.31.204:2379
 userCenterKey: "usercenter.rpc" #用户中台rpc
 powerCheckCenterKey: "powercheck.rpc" #权益校验中台
 resourceCenterKey: "resource.rpc" #资源中台
 entManageApplication: "entmanageapplication.rpc" #企业管理中台
-activityKey: "activity.rpc2" #营销中台rpc
+activityKey: "activity.rpc" #营销中台rpc
 publicserviceKey: "publicservice.rpc"
 
-
 database:
   default:
-    link: "clickhouse:jytop:pwdTopJy123@tcp(192.168.3.207:19000)/jyseo_test?dial_timeout=2000ms&max_execution_time=60"
+    #link: "clickhouse:jianyu_appl:Cli3#fkh4ouSe@tcp(cc-2zelp3xmkmsrtjhgp.public.clickhouse.ads.aliyuncs.com:9000)/jyseo_test?dial_timeout=2000ms&max_execution_time=60"
+    link: "clickhouse:jytop:pwdTopJy123@tcp(172.20.45.129:19000)/jyseo_test?dial_timeout=2000ms&max_execution_time=60"
     debug: true
-GuideRegistedate: 1735034400  #该时间之前注册的付费用户不用进订阅向导
+
+GuideRegistedate: 1734451200  #该时间之前注册的付费用户不用进订阅向导

src/db.json

@@ -1,93 +1,91 @@
 {
   "mongodb": {
     "main": {
-      "address": "192.168.3.149:27180",
-      "size": 10,
+      "address": "172.20.45.129:27002,172.20.45.130:27080",
+      "size": 20,
       "dbName": "qfw"
     },
     "log": {
-      "address": "192.168.3.149:27190",
+      "address": "172.20.45.129:27002,172.20.45.130:27080",
       "size": 5,
       "dbName": "qfw",
-      "userName": "admin",
-      "password": "123456"
+      "userName": "",
+      "password": ""
     },
     "ent": {
-      "address": "192.168.3.149:27102",
+      "address": "172.20.45.129:27002,172.20.45.130:27080",
       "size": 5,
       "dbName": "mixdata",
-      "userName": "jyDevGroup",
-      "password": "jy@DevGroup"
+      "userName": "",
+      "password": ""
     },
     "bidding": {
-      "address": "192.168.3.149:27102",
+      "address": "172.20.45.129:27002,172.20.45.130:27080",
       "size": 5,
       "dbName": "qfw_data",
       "replSet": "",
       "collection": "bidding",
       "collection_back": "bidding_back",
-      "userName": "jyDevGroup",
-      "password": "jy@DevGroup"
+      "userName": "",
+      "password": ""
     }
   },
   "elasticsearch": {
     "main": {
-      "address": "http://192.168.3.149:9201,http://192.168.3.241:9206",
+      "address": "http://172.20.45.129:9206,http://172.20.45.130:9306",
       "size": 30,
       "version": "v7",
       "userName": "",
-      "password": "",
-      "esIndex": "bidding",
-      "esType": "bidding"
+      "password": ""
     },
     "other": {
-      "address": "http://192.168.3.149:9201,http://192.168.3.241:9206",
+      "address": "http://172.20.45.129:9206,http://172.20.45.130:9306",
       "size": 30,
       "version": "v7",
       "userName": "",
       "password": "",
-      "esIndex": "bidding_year",
-      "esType": "bidding_year"
+      "esIndex": "bidding_free",
+      "esType": "bidding_free"
     },
     "free": {
-      "address": "http://192.168.3.149:9201,http://192.168.3.241:9206",
+      "address": "http://172.20.45.129:9206,http://172.20.45.130:9306",
       "size": 30,
       "version": "v7",
       "userName": "",
       "password": "",
-      "esIndex": "bidding",
-      "esType": "bidding"
+      "esIndex": "bidding_free",
+      "esType": "bidding_free"
     },
     "doc": {
-      "address": "http://192.168.3.149:9201,http://192.168.3.241:9206",
+      "address": "http://172.20.45.129:9206,http://172.20.45.130:9306",
       "size": 30,
       "version": "v7",
-      "userName": "elastic",
-      "password": "elastic",
+      "userName": "",
+      "password": "",
       "esIndex": "jydoc",
       "esType": "jydoc"
     }
   },
   "redis": {
-    "main": {
-      "address": "other=192.168.3.149:1712,sso=192.168.3.149:1713,push=192.168.3.149:1711,session=192.168.3.149:1713,recovery=192.168.3.149:1715,merge=192.168.3.206:2711,newother=192.168.3.149:1712,poly=192.168.3.149:1713,seoCache=192.168.3.149:1713,limitation=192.168.3.149:1713"
+    "main":{
+      "address": "other=172.20.45.129:1712,sso=172.20.45.129:1713,push=172.20.45.129:1711,session=172.20.45.129:1713,recovery=172.20.45.129:1715,merge=172.20.45.129:1712,newother=172.20.45.129:1712,poly=172.20.45.129:1713,seoCache=172.20.45.129:1713,limitation=172.20.45.129:1713"
     },
     "login": {
-      "address": "login=192.168.3.149:1712"
+      "address": "login=172.20.45.129:1712"
     }
   },
   "mysql": {
     "main": {
       "dbName": "jianyu",
-      "address": "192.168.3.217:4000",
-      "userName": "root",
-      "passWord": "=PDT49#80Z!RVv52_z",
-      "maxOpenConns": 10,
-      "maxIdleConns": 5
+      "address": "172.20.45.129:4000",
+      "userName": "jianyu",
+      "passWord": "Topnet123",
+      "maxOpenConns": 500,
+      "maxIdleConns": 200
     },
     "base": {
       "dBName": "base_service",
-      "address" : "192.168.3.217:4000",
+      "address" : "172.20.45.129:4000",
       "userName": "root",
       "passWord": "=PDT49#80Z!RVv52_z",
       "maxOpenConns": 5,
@@ -95,7 +93,7 @@
     },
     "globalCommon": {
       "dBName": "global_common_data",
-      "address": "192.168.3.217:4000",
+      "address": "172.20.45.129:4000",
       "userName": "root",
       "passWord": "=PDT49#80Z!RVv52_z",
       "maxOpenConns": 5,

src/go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
-	app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd
+	app.yhyue.com/moapp/jybase v0.0.0-20250220061341-81c668b6c7ea
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
 	app.yhyue.com/moapp/jypkg v1.31.8
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
@@ -50,6 +50,7 @@ require (
 	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
@@ -130,13 +131,14 @@ require (
 	go.uber.org/automaxprocs v1.5.3 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/image v0.24.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/oauth2 v0.17.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/term v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect

src/go.sum

@@ -15,8 +15,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJ
 app.yhyue.com/moapp/jybase v0.0.0-20230419121327-bedf77840ba6/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jybase v0.0.0-20231025021840-2f91c944ecdd/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
-app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd h1:KlNtol66E3XSVSTCc6lqqfixj3trS9XwSYZInXDxkL0=
-app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
+app.yhyue.com/moapp/jybase v0.0.0-20250220061341-81c668b6c7ea h1:xI60HpNslG3ovlzXiwO/3KA3rHcWNMf20foa6DstkeU=
+app.yhyue.com/moapp/jybase v0.0.0-20250220061341-81c668b6c7ea/go.mod h1:7M8adhCw7V/wEK+eIcL/gQJ0moslTZbk42DdkEBgmzg=
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
@@ -1133,6 +1133,7 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
@@ -1939,8 +1940,8 @@ golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIi
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
+golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1969,6 +1970,8 @@ golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeap
 golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
+golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -2084,8 +2087,8 @@ golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2141,8 +2144,8 @@ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2266,8 +2269,8 @@ golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -2286,8 +2289,8 @@ golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
-golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
-golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
+golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2309,8 +2312,8 @@ golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2406,7 +2409,7 @@ golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
-golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

src/jfw/config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/gocaptcha"
 	"app.yhyue.com/moapp/jybase/ipmatch"
 	"app.yhyue.com/moapp/jybase/mail"
 	"app.yhyue.com/moapp/jypkg/middleground"
@@ -86,6 +87,7 @@ func init() {
 	util.ReadConfig("./city.json", &AreaCity)
 	util.ReadConfig("./sample_report.json", &SampleReport)
 	IpInit()
+	CaptchaInit()
 	//log.Println("sysconfig:", Sysconfig)
 	WeixinConfig, _ = Sysconfig["wxJianyu"].(map[string]interface{})
 	Wxoauth = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=` + util.ObjToString(WeixinConfig["appid"]) + `&redirect_uri=%s&response_type=code&scope=snsapi_base&state=%s#wechat_redirect`
@@ -144,3 +146,7 @@ func IpInit() {
 }
 
 var DigitalEnglish = map[string]string{"0": "L", "1": "Y", "2": "E", "3": "S", "4": "S", "5": "W", "6": "L", "7": "Q", "8": "B", "9": "J"}
+
+func CaptchaInit() {
+	gocaptcha.InitCaptcha()
+}

src/jfw/front/login.go

@@ -1,6 +1,7 @@
 package front
 
 import (
+	"app.yhyue.com/moapp/jybase/gocaptcha"
 	"fmt"
 	"jy/src/jfw/config"
 	jutil "jy/src/jfw/jyutil"
@@ -14,7 +15,6 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 
 	qutil "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/dchest/captcha"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
@@ -137,7 +137,8 @@ func (l *Login) Login() error {
 			}
 			if !phoneReg.MatchString(phone) {
 				return -1, false
-			} else if tmp := l.GetSession("CheckCodeId"); tmp == nil || !captcha.VerifyString(tmp.(string), l.GetString("code")) {
+			} else if tmp := l.GetSession("CheckCodeId"); tmp == nil || !gocaptcha.VerifyString(tmp.(string), l.GetString("code")) { //!captcha.VerifyString(tmp.(string), l.GetString("code"))
+				log.Println(tmp.(string), "----", l.GetString("code"))
 				return -2, false
 			} else if jy.SendPhoneIdentCode(l.Request, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
 				return 1, false
@@ -334,7 +335,8 @@ func (l *Login) ForgetPwd() error {
 			if !phoneReg.MatchString(phone) {
 				return "phoneError"
 			}
-			if tmp := l.GetSession("CheckCodeId"); tmp == nil || !captcha.VerifyString(tmp.(string), l.GetString("code")) {
+			if tmp := l.GetSession("CheckCodeId"); tmp == nil || !gocaptcha.VerifyString(tmp.(string), l.GetString("code")) { //!captcha.VerifyString(tmp.(string), l.GetString("code"))
+				log.Println(tmp.(string), "----", l.GetString("code"))
 				return "codeError"
 			}
 			//手机号是否已被注册

src/jfw/front/otherAct.go

@@ -1,10 +1,12 @@
 package front
 
 import (
+	"app.yhyue.com/moapp/jybase/gocaptcha"
 	"app.yhyue.com/moapp/jypkg/public"
 	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 	"jy/src/jfw/config"
+	"log"
 	"regexp"
 	"time"
 
@@ -12,7 +14,6 @@ import (
 
 	util "app.yhyue.com/moapp/jybase/common"
 
-	"app.yhyue.com/moapp/jybase/dchest/captcha"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 )
 
@@ -34,18 +35,20 @@ func (f *Front) CheckPhoneNum() error {
 }
 
 // 图片验证码
-func (c *Front) Captcha() error {
-	id := captcha.NewLen(4) //此id为生成验证码的ID，并不是实际显示的数字，在提交校验时，需要根据此ID进行查询。
-	c.SetSession("CheckCodeId", id)
-	//校验时调用以下代码
-	//ccid,_:=c.GetSession("CheckCodeId").(string)
-	//captcha.VerifyString(ccid,"用户输入的校验码")//返回bool
-	w := c.ResponseWriter
-	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
-	w.Header().Set("Pragma", "no-cache")
-	w.Header().Set("Expires", "0")
-	w.Header().Set("Content-Type", "image/png")
-	return captcha.WriteImage(w, id, 90, 30)
+func (c *Front) Captcha() {
+	gocaptcha.Get(c.Session(), "CheckCodeId", c.ResponseWriter, c.Request)
+	//return
+	//id := captcha.NewLen(4) //此id为生成验证码的ID，并不是实际显示的数字，在提交校验时，需要根据此ID进行查询。
+	//c.SetSession("CheckCodeId", id)
+	////校验时调用以下代码
+	////ccid,_:=c.GetSession("CheckCodeId").(string)
+	////captcha.VerifyString(ccid,"用户输入的校验码")//返回bool
+	//w := c.ResponseWriter
+	//w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+	//w.Header().Set("Pragma", "no-cache")
+	//w.Header().Set("Expires", "0")
+	//w.Header().Set("Content-Type", "image/png")
+	//return captcha.WriteImage(w, id, 90, 30)
 }
 
 // 发送短信验证
@@ -59,7 +62,8 @@ func (f *Front) SendMessage() {
 	ccid, _ := getsession["CheckCodeId"].(string)
 	lastSendMsgTime := util.Int64All(getsession["lastSendMsgTime"])
 	//通过图片验证
-	if captcha.VerifyString(ccid, imgCancode) {
+	log.Println(ccid, "---", imgCancode)
+	if gocaptcha.VerifyString(ccid, imgCancode) { //captcha.VerifyString(ccid, imgCancode)
 		//当前时间-上次发送时间>60s
 		if time.Now().Unix()-lastSendMsgTime > 60 {
 			if !userIsExists(phoneNum) && phoneReg.MatchString(phoneNum) {

src/jfw/modules/publicapply/src/detail/dao/baseInfo.go

@@ -213,16 +213,6 @@ func (b *BaseInfo) BidBaseInfo() (bi *BidInfo, err error) {
 					go jyCoin(b.FromUserId, key)
 				}
 			}
-			//pdf预览
-			//4.以上调整仅针对PC端登录用户标讯详情页，以下页面保持现状，暂不考虑调整：
-			//（1）PC端匿名用户标讯详情页；
-			//（2）移动端匿名及登录标讯详情页；
-			//（3）PC及移动端大客户标讯详情页；
-			//（4）PC及移动端阳光直采采购信息详情页。
-			if b.PageType != "content" || bi.Purchase || b.IsWX || b.IsMobile {
-				log.Println("pdf附件 内容重置,", b.PageType, bi.Purchase, b.IsWX, b.IsMobile)
-				bi.Detail.PdfUrl = ""
-			}
 		} else {
 			bi.BiddingDataFormatNoPower(obj, b.Id)
 		}

src/jfw/modules/publicapply/src/detail/dao/bidding.go

@@ -418,6 +418,15 @@ func (bi *BidInfo) BiddingDataFormat(obj map[string]interface{}, b *BaseInfo) {
 				}
 			}
 		}
+		//pdf预览
+		//4.以上调整仅针对PC端登录用户标讯详情页，以下页面保持现状，暂不考虑调整：
+		//（1）匿名用户标讯详情页；
+		//（3）PC及移动端大客户标讯详情页；
+		//（4）PC及移动端阳光直采采购信息详情页。
+		if b.PageType != "content" || isPurchase {
+			log.Println("pdf附件 内容重置,", b.Id, b.PageType, isPurchase)
+			bi.Detail.PdfUrl = ""
+		}
 	}
 	//详情
 	bi.Detail.Detail = DetailFormat(strings.Trim(common.ObjToString(obj["detail"]), " "))

src/web/staticres/css/pc.css

@@ -5070,10 +5070,9 @@ h6 {
 }
 
 .login-dig-input-box .after-input-box .verify-img {
-  width: 88px;
+  width: 100px;
   height: 40px;
-  border-radius: 130px;
-  margin-right: -14px;
+  border-radius: 6px;
   background-color: #FFFFFF;
 }
 

src/web/templates/common/pc-login-dialog.html

@@ -46,7 +46,7 @@
           <div class="login-dig-input-box" data-error="图形验证码输入错误">
             <i class="login-dig-icon-guard"></i>
             <input autocomplete="off" name="verify_code" type="text" placeholder="输入图形验证码" maxlength="4" />
-            <div class="after-input-box">
+            <div class="after-input-box" style="right: 4px;">
               <img data-name="verfiy-login" class="verify-img" src="" alt="verify" />
             </div>
           </div>

src/web/templates/login/forgetPwd.html

@@ -76,7 +76,7 @@
           <div class="login-dig-input-box" data-error="图形验证码输入错误">
               <i class="login-dig-icon-guard"></i>
               <input autocomplete="off" name="forge_code" type="text" placeholder="输入图形验证码" maxlength="4">
-              <div class="after-input-box">
+              <div class="after-input-box" style="right: 4px;">
                   <img class="verify-img" src="/front/landpage/captcha" alt="verify">
               </div>
           </div>