Kaynağa Gözat

Merge branch 'feature/v4.8.70_wky' of qmx/jy into feature/v4.8.70

wangkaiyue 1 yıl önce
ebeveyn
işleme
9d1a3cc19a

+ 1 - 1
src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20231024062045-5c364be1561d
+	app.yhyue.com/moapp/jypkg v0.0.0-20231030081511-1fcdc58a8a65
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/ClickHouse/clickhouse-go v1.5.4
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67

+ 2 - 2
src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40 h1:/FcBvpf/KW8g6GB
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 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=
-app.yhyue.com/moapp/jypkg v0.0.0-20231024062045-5c364be1561d h1:h8SnO8ONZlmtx8ZSYtpw36TdBhYPy8WgLeWHyMGZj0Q=
-app.yhyue.com/moapp/jypkg v0.0.0-20231024062045-5c364be1561d/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
+app.yhyue.com/moapp/jypkg v0.0.0-20231030081511-1fcdc58a8a65 h1:ug5SwcvDDvcrucoNnMUwkin35bUZFhxzU3dozukcbR0=
+app.yhyue.com/moapp/jypkg v0.0.0-20231030081511-1fcdc58a8a65/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=

+ 2 - 2
src/jfw/modules/app/src/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25
+	app.yhyue.com/moapp/jypkg v0.0.0-20231030081511-1fcdc58a8a65
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.1
@@ -139,7 +139,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 // indirect
+	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a // indirect
 	k8s.io/api v0.26.3 // indirect
 	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
 	k8s.io/client-go v0.26.3 // indirect

+ 4 - 4
src/jfw/modules/app/src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40 h1:/FcBvpf/KW8g6GB
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 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=
-app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25 h1:2q7b1auPihIJD3Ewsd7Zi8ESeLkxuP57avWL8UoBr9U=
-app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25/go.mod h1:gPCOY8bVXdY5bD7nry7th+YNkKC/viG8Dc9+z4fUaRo=
+app.yhyue.com/moapp/jypkg v0.0.0-20231030081511-1fcdc58a8a65 h1:ug5SwcvDDvcrucoNnMUwkin35bUZFhxzU3dozukcbR0=
+app.yhyue.com/moapp/jypkg v0.0.0-20231030081511-1fcdc58a8a65/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
@@ -1429,8 +1429,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 h1:BItxi1gkQUs3sjxaBk6tc34fZWSO4hUSXcTM3PcnY4I=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a h1:kwjO4pqB3gnNGrQ9aXyz6f8s9qXAUenPUDWip8gYR/Q=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
 k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
 k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=

+ 6 - 4
src/jfw/modules/subscribepay/src/dataexport.json

@@ -52,6 +52,7 @@
     {"name":"城市","filed":"city","width":7,"color":"00E6E6E6","vMerge":1,"hMerge":0},
     {"name":"区县","filed":"district","width":7,"color":"00E6E6E6","vMerge":1,"hMerge":0},
     {"name":"公告标题","filed":"title","width":20,"color":"00E6E6E6","vMerge":1,"hMerge":0},
+    {"name":"行业","filed":"s_topscopeclass","width":20,"color":"00E6E6E6","vMerge":1,"hMerge":0},
     {"name":"公告类别","filed":"subtype","width":9,"color":"00E6E6E6","vMerge":1,"hMerge":0},
     {"name":"公告内容","filed":"detail","width":40,"color":"00E6E6E6","vMerge":1,"hMerge":0},
     {"name":"发布时间","filed":"publishtime","width":11,"color":"00E6E6E6","vMerge":1,"hMerge":0},
@@ -65,8 +66,9 @@
     {"name":"报名截止日期","filed":"signendtime","width":22,"color":"00FFC000","vMerge":1,"hMerge":0},
     {"name":"开标日期","filed":"bidopentime","width":20,"color":"00FFC000","vMerge":1,"hMerge":0},
     {"name":"投标截止日期","filed":"bidendtime","width":22,"color":"00FFC000","vMerge":1,"hMerge":0},
-    {"name":"采购单位信息","filed":"","width":0,"color":"00FFC000","vMerge":0,"hMerge":3},
+    {"name":"采购单位信息","filed":"","width":0,"color":"00FFC000","vMerge":0,"hMerge":4},
     {"name":"单位名称","filed":"buyer","width":18,"color":"00FFC000","vMerge":0,"hMerge":0},
+    {"name":"采购单位类型","filed":"buyerclass","width":18,"color":"00FFC000","vMerge":0,"hMerge":0},
     {"name":"联系人","filed":"buyerperson","width":14,"color":"00FFC000","vMerge":0,"hMerge":0},
     {"name":"联系电话","filed":"buyertel","width":14,"color":"00FFC000","vMerge":0,"hMerge":0},
     {"name":"单位地址","filed":"buyeraddr","width":14,"color":"00FFC000","vMerge":0,"hMerge":0},
@@ -98,7 +100,7 @@
   "errNote_emails": [],
   "dataReportContent": "<div style=\"width:1200px;background-color:#F5F4FA;padding:15px;\"><div style=\"padding:5px 50px 50px 50px;background-color:#fff;width:1000px;margin:auto;border-top: 5px solid #2cb7ca;\"><img src=\"https://www.jianyu360.cn/images/swordfish/sf_01.png\" style=\"display:block;width:150px;margin: 10px auto 30px auto;\"><div style=\"padding-bottom: 30px;margin-bottom: 30px;border-bottom: 1px dashed #ddd;\">尊敬的剑鱼标讯用户:<div style=\"font-size:14px;text-indent: 32px;margin-top: 5px;\">您好,感谢您购买剑鱼标讯产品,您的订单已发送到您的邮箱,请查收!</div></div><a href=\"%s\" style=\"margin: 0 auto;display: block;width: 120px;height: 30px;line-height: 30px;background: #2cb7ca;text-decoration: none;text-align: center;color: #fff;border-radius: 5px;margin-bottom: 25px;\">下载数据报告</a></div><div style=\"font-size: 12px;color: #9E9E9E;margin: 15px 0px;text-align: center;\">如有问题请<a href=\"mailto:bd@topnet.net.cn\" style=\"color: blue;text-decoration: none;\">点击此处</a>,进行意见反馈</div></div>",
   "qmxdomain": "http://localhost:8080",
-  "excelReadyPath": "/Users/wangkaiyue/GoWork/topnet/jy/src/jfw/modules/subscribepay/data_export/ready_path",
-  "excelPayedPath": "/Users/wangkaiyue/GoWork/topnet/jy/src/jfw/modules/subscribepay/data_export/payed_path",
-  "excelEntPath": "/Users/wangkaiyue/GoWork/topnet/jy/src/jfw/modules/subscribepay/"
+  "excelReadyPath": "/Users/wkyuer/topnet/jianyu/jy/src/jfw/modules/subscribepay/data_export/ready_path",
+  "excelPayedPath": "/Users/wkyuer/topnet/jianyu/jy/src/jfw/modules/subscribepay/data_export/payed_path",
+  "excelEntPath": "/Users/wkyuer/topnet/jianyu/jy/src/jfw/modules/subscribepay/"
 }