Merge branch 'dev4.6.3.12' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.12

# Conflicts:
#	src/web/staticres/big-member/js/public_big.js

config_formal/subscribepay_172.17.4.183/config.json

@@ -5,8 +5,8 @@
 	"redisaddrs": "other=172.17.145.167:2203,session=172.17.145.167:2205,push=172.17.145.167:2203,pushcache_1=172.17.4.202:5000,pushcache_2_a=172.17.145.169:5000",
 	"elasticsearch": "http://172.17.148.59:9800,http://172.17.148.60:9800",
 	"elasticPoolSize": 25,
-	"appid": "wxd66e9589c9fecff6",
-	"appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342",
+	"appid": "wx9227668f5ba1f814",
+	"appsecret": "4f2a00821869033e2cd0180a11da7ad1",
 	"webport": "86",
 	"webrpcport": "8600",
 	"weixinrpc": "10.170.187.34:8202",

config_formal/subscribepay_172.17.4.183/invoice.json

@@ -5,5 +5,9 @@
   "invoice_nature": "0",
   "invoice_interface_address": "http://172.17.4.183:8804",
   "code": "3040205000000000000",
-  "invoice_switch": true
+  "invoice_switch": true,
+  "switch_paymch":{
+	"model":2,
+	"time":"2022-02-14 14:10:00"
+  }
 }

config_formal/subscribepay_172.17.4.183/pay_config.json

@@ -1,10 +1,9 @@
 {
 	"wxPay": {
-		"appid": "wxd66e9589c9fecff6",
+		"appid": "wx9227668f5ba1f814",
 		"appid_app": "wx0e6a5b18f4cfd10d",
-		"appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342",
 		"pay": {
-			"mchid": "1418321102",
+			"mchid": "1618884225",
 			"key": "topnet2016topnet2016topnet2016ab",
 			"attachmsg": "剑鱼标讯打赏",
 			"bodymsg": "剑鱼标讯-招标信息打赏",
@@ -25,7 +24,7 @@
 		}
 	},
     "aliPay": {
-        "appid": "2019062465625929",
+        "appid": "2021003111633206",
         "reqUrl":"https://openapi.alipay.com/gateway.do",
         "Subject_sjdc": "剑鱼标讯数据导出",
         "Subject_sjbg": "剑鱼标讯数据报告",
@@ -40,7 +39,7 @@
         "Subject_dataPack": "剑鱼标讯-数据包",
 	"Subject_areaPack":"剑鱼标讯-省份订阅包",
 	"Subject_filePack":"剑鱼标讯-附件下载包",
-        "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAtO7CU4hpdcMmV43MEA8bqQJYYx+f6yvYkP0nFc/oCvU24bU6zAdK/H2H56quEwD8Dh5YtVTfUCcKqpcG9HXY11TXWKCEUQiK1tkb0o7oSSURwk6h1DdDbg8m1+H8s+k+mvMvcqVCYKYi03PIPQyJCuHmzx/vcaALXRr2HOrEFaFFA8WYST1rywiKeyrC9PCNX1aJjGADhCs3cGrdZEJc4k+2tIHTYJccx+mJ96QiEkzFhJTqEmSFPcNqNUX9uCPgeVhfHW2pRNyffvrhoEyeSr1QoOpaYyn0I5JD2axnypBFCbk6P69LY3eGNKtOe81lp9hiZbMYpXPqb6KwPXTVQQIDAQABAoIBAEbJQm276MaR2uZWK4f84S12JW5iaQZw2QGgiTIXbQkcdqRHawF3uPafhhQ0ynXU5MgBR2NqGRQasimbfLUXhgZ4wueBpUKuvOLhfekaz/YN8qy6ZsXH+TGN6/x6BYu9rSiiC+YmkZmOZgGkQqrfxJ3lU4+lRuCFZOzAJ5mYn652CHRJXy6eDgZfyFLP2ol4/ioJEhwnGFXV345DlsVgmXTEe+IfjTyuvzxBtjod4lfu3dj/f2PhPrcgvN0ZQf1ldZbS+6FkMWInMOQt/WsJ/ANfiKgQ4sPzlxIhmVjrvDlnYTc1lbFekyInzZumV0pDyId+1Y6LAjxJTAhnjFAlBSECgYEAwsQdxOiZNLtxZ8J8JCQHKERYIo7euArW0iAurF+3Q9VNeGj0voFrmfHPju5OF5BHtuc7D3lkwZG4Ac+pyQtxF5dsEMl4vBoNc6onRQFsSDVEEIpl7OBghGlg1as23tvPSMh7DKnILM9OzVfFQ9WLvwHJwLRGsM7LOtmNovq4UFsCgYEA7dE/9Avr5YtCUjij8Y2zkAxN6qb8+ggqFoPiCr91JNGaKNKV9D2K7D3Zk49TXFJm7SX2zgYFuqR2Pa9vAWh9jtmwsc8L0qpIym4J1MM5ud/Xiu9c8O/prQOr7JlICNdk8WfqGbUC83BYfWa5SDonlXFYi6x3LlXdZnvEfZF645MCgYAC2ZnR6tFrGx8StJ7abIiKR02+27ZYnRf9pSjprtDgtjtW+royG3S2oPo3jjcoUx0piQKtPEqEJpy5sg86+ObjwHx9VmVk40C1I5VFhjrOZ7EiSNQq/jGLXntjRQkdg7vpxb0/NzDNrw7pJFKnpnVQCzenkTvDlJMWvl47N04BJwKBgHnpVtuIcPlPFkSH/KMLfQ1PAXJVAEI8hTbdjLbtxuOE/34F1hFKqzjHzA2034roQxM27vpWZAF15Zdho4oZQqREPCwqc2kfGgmLt0Z2fdUnRptWcVKh6ixjQXMccKz3niuSlZNwE38wDGzciAbaqQgW/sk7NC1wnvq2X9fvCAw5AoGANG2usqWYF4x+LvbhcdrKpJsjtvkLa2u9g2/wNXdoj+tBrv310O22/YM5LOcq9MrKPlx1S1C1KLoQO9TWFZiYuQ9C/sk7/ZTNmKQxCxVV0FVPaBYp+meD6sjgoRVJvaqY0UxnJwlHWMrusPTFua7Mtogqx9cvzlQolWh5VX7N1DM=\n-----END RSA PRIVATE KEY-----",
-        "callbackPublicKey":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqFZfev75+sa7O0f29qwuWeqWRQ+p59c8hz2s4aeh5Ohc08P1ls5e8UmPhaN9ZTkGwabOKN658pOhmVoa16ldKFZQ5j1hLTDS6yfKcvVs/hf1mQvsbUjtZgCfMQx5NNf1R4MsTvAqbl2l6DXMu7gHjAhKNR0QQBELv7HmYuWPE35ELQqBH0eVcvWSNV3/3zOansftY5NIT749B+Bv1uirE8PNMp20sWWqx8fMNi2EZksnWNUmnVldBqUwMJIxcXolBH/RGX5ZjBlBenoIB3PVQ8/+SPz9Hip7+QNH8utSnUlrh2AsJVtdNKIQk74Eevkn+Q+WyUVGoY0ca9DzGwh4hQIDAQAB"
+        "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCaJnmz3N1Z43jxtmZJmPkInl3FbfudxjicThHj+Hkndp+muzZXlAPcWoYTFLAfVa6xg9xAc58fWTPUGOpouh0ZDEP8TGvD784AljDNwRXPI9+afjcxN8gzsNPlqA6KVkAu5u5uEI1HHQgtdyRoCEnXgQRXj6DqAs9olbx8HrTxHjZzjPd+HXv+v4na3zAvZsvPdhLB2ggpVW6uQN7ur8C+hVpB3ZO+gGVFHy3m1t08XgscljyOA9Vpk4T8TnKZqDvnI6ehWFCGeD11yoe3ipHJJdP/+u9/tXiKhm29mJvcM9C6gab6BOQABByQPb2nPFFyfPglbRYrYxgKp/eXUQTzAgMBAAECggEAO6BCVyZJoKlycNzC+Bjpy0Gmt+Vw/HheEWfJV8sW4gLqgk3MGVgxnhyN2/eWoKg96IA+w9d1Z2TTvWjd0yCafMPX0FGnJaUuo990hUH4s6UGqvXDV5BiKkxtylmVNkFilkHRXFWesDE0ppF9TZhXJ7rJ+Syfa6UmoSe6PrCKAPG4FD8MH1ODj5b42l/TRIFM948nTtTLFAFgd77P5ULBCKVfBB5V9XdKhLRdwG9RxugWwkxuCiMOtmk45DzA/PQgvkIzEViD/2NJX67/S88B0G63zdQizJrvxsLp9fThmjhlo/+CaF+a+nfIzg81TfQHlRuTjiYc7iE9n5K0sU82wQKBgQDydI9pEjkPH+ZEixEymdx8D4workBfa+GXgobJ2UwatqCJOCYqZJR0MhjTVeDJiiTGFiemNyZHT0WFQedAQ/O9mkRf0MRhzR6ZOiMnCG5pSSOKdmQXoqjOqcMzdgWBQRol0eLB/vto8M3bpt1VautR0qQOR7BrFsj57K3asofikQKBgQCiwwie5gyCAYB1gkp4QkLmQDSTJdZaTlzzx2oa2/ZB4Pg6wWWNJIxEfSwtuGVH4jGJl0Eer2YpHzaY7f2NfOWJCpNI/aRhM/RilQsFXTox/5bqlbAfspPMqSHnry2OgbZb9CRF3jH7kt65390SKde4A4JNE+jJ0Xb07Tzcr7+pQwKBgCDJ8KcWBs9r0flNEVtVgYLpm1vZDO2aqlySE2Zy0579OcK07Dxpc8YvDDpwb8DxxL1hO6V36d5U8yLtYbfIOMtYdIy8sAJF+jBgs2ZQ9pWYhYzxK+IiZk/kl3h7Ko1rX3zj4JW5xQhRIJXnACHQHtjm8rbXrR0ebLmX738XC9dxAoGAQfUDQ1E6dFyjb/syrnU7ow8VvyOwL7xd0rRW/TdyHdRLA5Rn0MCkzwRiqMx2zqCNLpLK4uJ1ZeiuOV8IRxP7+IL+mK+gs3tYZ7K6Wpwi/yvyPnIWg2Hcny1S/g5xSbSq76yKHn4ihy5Hb8+WSMwIDRvu68lLpq1ppWuWJGBcLP0CgYAnGtHlFY887zSI0aRdzV3EYm/sPnmYy0TWIUVLuGL8kkprcSIW2yRxx1GtpB+3A7cPu61WwRbiswJA6VmQHvn8f9ds81+aiO5KQLMk4MbrTwWhWLDpP4BxjWANVzPr19ZwmDJcYkh7YUI2iLqH7dXho5k62OYCM1T53xlql6HDcg==\n-----END RSA PRIVATE KEY-----",
+        "callbackPublicKey":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApSZbX3+05HWNQcl0vnJ3EQKhLvKDbUVYCgeYScVMOrFcofo28pfWwUNJ/Bzf1zmIsiMFHkhhQKWQQXRZpfs9ORNXnbmb6x/tnqKxu2sKQmictAQ2+tp0Ya1t+jA4SUCYo05x71mnoiUt0s3zDYXf7+Orgf4FQMfvsUI11L3oXc3OtgHhEbSOsQAwd7+dWMDJlNVAHnKgKqcL4+narS7v185lrnn28qIGUn2+QE3YuA5fNRl6TcL8pPjQ+SwPlSQFr7McqekH/JYvNmNirvouqSS7jyfgM8sLEhpra/plow/CXG0rAnKHL7wXzSZxK0TkwGjLt5vWX/Qb82INVk6ZSwIDAQAB"
     }
 }

config_formal/subscribepay_172.17.4.183/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-01-12 00:00:00
+2022-02-08 00:00:00

config_formal/subscribepay_2_172.17.145.180/config.json

@@ -5,8 +5,8 @@
 	"redisaddrs": "other=172.17.145.167:2203,session=172.17.145.167:2205,push=172.17.145.167:2203,pushcache_1=172.17.4.202:5000,pushcache_2_a=172.17.145.169:5000",
 	"elasticsearch": "http://172.17.148.59:9800,http://172.17.148.60:9800",
 	"elasticPoolSize": 25,
-	"appid": "wxd66e9589c9fecff6",
-	"appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342",
+	"appid": "wx9227668f5ba1f814",
+	"appsecret": "4f2a00821869033e2cd0180a11da7ad1",
 	"webport": "86",
 	"webrpcport": "8600",
 	"weixinrpc": "10.170.187.34:8202",

config_formal/subscribepay_2_172.17.145.180/invoice.json

@@ -5,5 +5,9 @@
   "invoice_nature": "0",
   "invoice_interface_address": "http://172.17.4.183:8804",
   "code": "3040205000000000000",
-  "invoice_switch": true
+   "invoice_switch": true,
+   "switch_paymch":{
+	"model":2,
+	"time":"2022-02-14 14:10:00"
+  }
 }

config_formal/subscribepay_2_172.17.145.180/pay_config.json

@@ -1,10 +1,9 @@
 {
 	"wxPay": {
-		"appid": "wxd66e9589c9fecff6",
+		"appid": "wx9227668f5ba1f814",
 		"appid_app": "wx0e6a5b18f4cfd10d",
-		"appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342",
 		"pay": {
-			"mchid": "1418321102",
+			"mchid": "1618884225",
 			"key": "topnet2016topnet2016topnet2016ab",
 			"attachmsg": "剑鱼标讯打赏",
 			"bodymsg": "剑鱼标讯-招标信息打赏",
@@ -26,7 +25,7 @@
 		}
 	},
     "aliPay": {
-        "appid": "2019062465625929",
+        "appid": "2021003111633206",
         "reqUrl":"https://openapi.alipay.com/gateway.do",
         "Subject_sjdc": "剑鱼标讯数据导出",
         "Subject_sjbg": "剑鱼标讯数据报告",
@@ -41,7 +40,7 @@
 	"Subject_dataPack": "剑鱼标讯-数据包",
 	"Subject_areaPack":"剑鱼标讯-省份订阅包",
 	"Subject_filePack":"剑鱼标讯-附件下载包",
-        "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAtO7CU4hpdcMmV43MEA8bqQJYYx+f6yvYkP0nFc/oCvU24bU6zAdK/H2H56quEwD8Dh5YtVTfUCcKqpcG9HXY11TXWKCEUQiK1tkb0o7oSSURwk6h1DdDbg8m1+H8s+k+mvMvcqVCYKYi03PIPQyJCuHmzx/vcaALXRr2HOrEFaFFA8WYST1rywiKeyrC9PCNX1aJjGADhCs3cGrdZEJc4k+2tIHTYJccx+mJ96QiEkzFhJTqEmSFPcNqNUX9uCPgeVhfHW2pRNyffvrhoEyeSr1QoOpaYyn0I5JD2axnypBFCbk6P69LY3eGNKtOe81lp9hiZbMYpXPqb6KwPXTVQQIDAQABAoIBAEbJQm276MaR2uZWK4f84S12JW5iaQZw2QGgiTIXbQkcdqRHawF3uPafhhQ0ynXU5MgBR2NqGRQasimbfLUXhgZ4wueBpUKuvOLhfekaz/YN8qy6ZsXH+TGN6/x6BYu9rSiiC+YmkZmOZgGkQqrfxJ3lU4+lRuCFZOzAJ5mYn652CHRJXy6eDgZfyFLP2ol4/ioJEhwnGFXV345DlsVgmXTEe+IfjTyuvzxBtjod4lfu3dj/f2PhPrcgvN0ZQf1ldZbS+6FkMWInMOQt/WsJ/ANfiKgQ4sPzlxIhmVjrvDlnYTc1lbFekyInzZumV0pDyId+1Y6LAjxJTAhnjFAlBSECgYEAwsQdxOiZNLtxZ8J8JCQHKERYIo7euArW0iAurF+3Q9VNeGj0voFrmfHPju5OF5BHtuc7D3lkwZG4Ac+pyQtxF5dsEMl4vBoNc6onRQFsSDVEEIpl7OBghGlg1as23tvPSMh7DKnILM9OzVfFQ9WLvwHJwLRGsM7LOtmNovq4UFsCgYEA7dE/9Avr5YtCUjij8Y2zkAxN6qb8+ggqFoPiCr91JNGaKNKV9D2K7D3Zk49TXFJm7SX2zgYFuqR2Pa9vAWh9jtmwsc8L0qpIym4J1MM5ud/Xiu9c8O/prQOr7JlICNdk8WfqGbUC83BYfWa5SDonlXFYi6x3LlXdZnvEfZF645MCgYAC2ZnR6tFrGx8StJ7abIiKR02+27ZYnRf9pSjprtDgtjtW+royG3S2oPo3jjcoUx0piQKtPEqEJpy5sg86+ObjwHx9VmVk40C1I5VFhjrOZ7EiSNQq/jGLXntjRQkdg7vpxb0/NzDNrw7pJFKnpnVQCzenkTvDlJMWvl47N04BJwKBgHnpVtuIcPlPFkSH/KMLfQ1PAXJVAEI8hTbdjLbtxuOE/34F1hFKqzjHzA2034roQxM27vpWZAF15Zdho4oZQqREPCwqc2kfGgmLt0Z2fdUnRptWcVKh6ixjQXMccKz3niuSlZNwE38wDGzciAbaqQgW/sk7NC1wnvq2X9fvCAw5AoGANG2usqWYF4x+LvbhcdrKpJsjtvkLa2u9g2/wNXdoj+tBrv310O22/YM5LOcq9MrKPlx1S1C1KLoQO9TWFZiYuQ9C/sk7/ZTNmKQxCxVV0FVPaBYp+meD6sjgoRVJvaqY0UxnJwlHWMrusPTFua7Mtogqx9cvzlQolWh5VX7N1DM=\n-----END RSA PRIVATE KEY-----",
-        "callbackPublicKey":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqFZfev75+sa7O0f29qwuWeqWRQ+p59c8hz2s4aeh5Ohc08P1ls5e8UmPhaN9ZTkGwabOKN658pOhmVoa16ldKFZQ5j1hLTDS6yfKcvVs/hf1mQvsbUjtZgCfMQx5NNf1R4MsTvAqbl2l6DXMu7gHjAhKNR0QQBELv7HmYuWPE35ELQqBH0eVcvWSNV3/3zOansftY5NIT749B+Bv1uirE8PNMp20sWWqx8fMNi2EZksnWNUmnVldBqUwMJIxcXolBH/RGX5ZjBlBenoIB3PVQ8/+SPz9Hip7+QNH8utSnUlrh2AsJVtdNKIQk74Eevkn+Q+WyUVGoY0ca9DzGwh4hQIDAQAB"
+        "privateKey":"-----BEGIN RSA PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCaJnmz3N1Z43jxtmZJmPkInl3FbfudxjicThHj+Hkndp+muzZXlAPcWoYTFLAfVa6xg9xAc58fWTPUGOpouh0ZDEP8TGvD784AljDNwRXPI9+afjcxN8gzsNPlqA6KVkAu5u5uEI1HHQgtdyRoCEnXgQRXj6DqAs9olbx8HrTxHjZzjPd+HXv+v4na3zAvZsvPdhLB2ggpVW6uQN7ur8C+hVpB3ZO+gGVFHy3m1t08XgscljyOA9Vpk4T8TnKZqDvnI6ehWFCGeD11yoe3ipHJJdP/+u9/tXiKhm29mJvcM9C6gab6BOQABByQPb2nPFFyfPglbRYrYxgKp/eXUQTzAgMBAAECggEAO6BCVyZJoKlycNzC+Bjpy0Gmt+Vw/HheEWfJV8sW4gLqgk3MGVgxnhyN2/eWoKg96IA+w9d1Z2TTvWjd0yCafMPX0FGnJaUuo990hUH4s6UGqvXDV5BiKkxtylmVNkFilkHRXFWesDE0ppF9TZhXJ7rJ+Syfa6UmoSe6PrCKAPG4FD8MH1ODj5b42l/TRIFM948nTtTLFAFgd77P5ULBCKVfBB5V9XdKhLRdwG9RxugWwkxuCiMOtmk45DzA/PQgvkIzEViD/2NJX67/S88B0G63zdQizJrvxsLp9fThmjhlo/+CaF+a+nfIzg81TfQHlRuTjiYc7iE9n5K0sU82wQKBgQDydI9pEjkPH+ZEixEymdx8D4workBfa+GXgobJ2UwatqCJOCYqZJR0MhjTVeDJiiTGFiemNyZHT0WFQedAQ/O9mkRf0MRhzR6ZOiMnCG5pSSOKdmQXoqjOqcMzdgWBQRol0eLB/vto8M3bpt1VautR0qQOR7BrFsj57K3asofikQKBgQCiwwie5gyCAYB1gkp4QkLmQDSTJdZaTlzzx2oa2/ZB4Pg6wWWNJIxEfSwtuGVH4jGJl0Eer2YpHzaY7f2NfOWJCpNI/aRhM/RilQsFXTox/5bqlbAfspPMqSHnry2OgbZb9CRF3jH7kt65390SKde4A4JNE+jJ0Xb07Tzcr7+pQwKBgCDJ8KcWBs9r0flNEVtVgYLpm1vZDO2aqlySE2Zy0579OcK07Dxpc8YvDDpwb8DxxL1hO6V36d5U8yLtYbfIOMtYdIy8sAJF+jBgs2ZQ9pWYhYzxK+IiZk/kl3h7Ko1rX3zj4JW5xQhRIJXnACHQHtjm8rbXrR0ebLmX738XC9dxAoGAQfUDQ1E6dFyjb/syrnU7ow8VvyOwL7xd0rRW/TdyHdRLA5Rn0MCkzwRiqMx2zqCNLpLK4uJ1ZeiuOV8IRxP7+IL+mK+gs3tYZ7K6Wpwi/yvyPnIWg2Hcny1S/g5xSbSq76yKHn4ihy5Hb8+WSMwIDRvu68lLpq1ppWuWJGBcLP0CgYAnGtHlFY887zSI0aRdzV3EYm/sPnmYy0TWIUVLuGL8kkprcSIW2yRxx1GtpB+3A7cPu61WwRbiswJA6VmQHvn8f9ds81+aiO5KQLMk4MbrTwWhWLDpP4BxjWANVzPr19ZwmDJcYkh7YUI2iLqH7dXho5k62OYCM1T53xlql6HDcg==\n-----END RSA PRIVATE KEY-----",
+        "callbackPublicKey":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApSZbX3+05HWNQcl0vnJ3EQKhLvKDbUVYCgeYScVMOrFcofo28pfWwUNJ/Bzf1zmIsiMFHkhhQKWQQXRZpfs9ORNXnbmb6x/tnqKxu2sKQmictAQ2+tp0Ya1t+jA4SUCYo05x71mnoiUt0s3zDYXf7+Orgf4FQMfvsUI11L3oXc3OtgHhEbSOsQAwd7+dWMDJlNVAHnKgKqcL4+narS7v185lrnn28qIGUn2+QE3YuA5fNRl6TcL8pPjQ+SwPlSQFr7McqekH/JYvNmNirvouqSS7jyfgM8sLEhpra/plow/CXG0rAnKHL7wXzSZxK0TkwGjLt5vWX/Qb82INVk6ZSwIDAQAB"
     }
 }

config_formal/subscribepay_2_172.17.145.180/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-01-12 00:00:00
+2022-02-08 00:00:00

config_formal/sword_172.17.145.167/config.json

@@ -193,8 +193,8 @@
     "advertName": "广告",
     "advertUrl": "https://www.myfans.cc/30a78e9b78",
     "wxJianyu": {
-		"appid": "wxd66e9589c9fecff6",
-		"appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342"
+		"appid": "wx9227668f5ba1f814",
+		"appsecret": "4f2a00821869033e2cd0180a11da7ad1"
 	},
 	"industry":"行业分类",
 	"recommendEntLimit":"50",

config_formal/sword_172.17.145.167/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-1-21 00:00:00
+2022-1-24 00:00:00

config_formal/sword_172.17.148.50/config.json

@@ -193,8 +193,8 @@
     "advertName": "广告",
     "advertUrl": "https://www.myfans.cc/30a78e9b78",
     "wxJianyu": {
-		"appid": "wxd66e9589c9fecff6",
-		"appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342"
+		"appid": "wx9227668f5ba1f814",
+		"appsecret": "4f2a00821869033e2cd0180a11da7ad1"
 	},
 	"industry":"行业分类",
 	"recommendEntLimit":"50",

config_formal/sword_172.17.148.50/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-1-21 00:00:00
+2022-1-24 00:00:00

config_formal/weixin_172.17.145.167/config.json

@@ -1,8 +1,8 @@
 {
 	"mongodbServers": "172.17.4.193:27080,172.17.4.83:27080",
 	"mongodbPoolSize": "40",
-	"mongodbName": "qfw",
-	"mongodblog": {
+	"mongodbName": "qfw",	
+        "mongodblog": {
 			"address": "172.17.145.176:27095",
 	 		"size": 20,
 	 		"dbName": "qfw",
@@ -13,29 +13,29 @@
 	"cassandrasize": 10,
 	"redisServers": "other=172.17.145.167:2203,sso=172.17.4.83:1711,jyop_other=172.17.4.83:1712,push=172.17.145.167:2203,wxtoken=172.17.4.83:1711",
 	"redisLogin":"login=10.170.187.34:1716",
-	"weixinport": "8201",
+	"weixinport": "8211",
 	"jyop_webrpcport": "172.17.4.185:8023",
-	"weixinrpcport": "8202",
+	"weixinrpcport": "8212",
 	"webrpcport": "172.17.145.167:84",
-	"webdomain": "https://www.jianyu360.cn",
-	"appid": "wxd66e9589c9fecff6",
+	"webdomain": "https://wx.jianyu360.cn",
+	"appid": "wx9227668f5ba1f814",
 	"apptoken": "top2016top2016",
-	"appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342",
-	"proxysess": "https://www.jianyu360.cn/front/sess/%s",
+	"appsecret": "4f2a00821869033e2cd0180a11da7ad1",
+	"proxysess": "https://wx.jianyu360.cn/front/sess/%s",
 	"followCompany": 10,
 	"welcomemsg": "用剑鱼标讯，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼标讯，让投标无限可能！",
-	"tpl_subscribe_push_id": "CGlSHRuy3YkZOPvz-GAHkUp5uzzFw_5cW6ummYAVEJw",
-	"tpl_push_id": "HF-jnCHwVV39rbYe0tmFVQki4jDLK-qRD92qO0epIww",
-	"tpl_bidopen_id": "LYbyRZmWV9tEF-5arLBiM3JrVSbxyms8Tg7MxEH1Q4E",
-	"tpl_managernotify_id": "BrrJM6VCV7an_I0imJC2eNwcY98nMEV3nOGIo1OyRAY",
-	"tpl_logapply_id": "CGlSHRuy3YkZOPvz-GAHkUp5uzzFw_5cW6ummYAVEJw",
+	"tpl_subscribe_push_id": "bQSpoC2bhSJYV-6AqKtR73rrPEF9PO6wXIulmo-w2HE",
+	"tpl_push_id": "I-27XOqLgyC2y9gKmGy49u3ta77fFxl1uOJKVoP3gik",
+	"tpl_bidopen_id": "5uEZ2gJ1beEYYZZnWFjCHnKNvCvCDs66V3MnJJZpnRc",
+	"tpl_managernotify_id": "5TgGXDmvPd_9Kcp1Np6qDu5tD9LPhV6yMd0dBjNz_84",
+	"tpl_logapply_id": "bQSpoC2bhSJYV-6AqKtR73rrPEF9PO6wXIulmo-w2HE",
 	"tpl_activeapply_id": "swEnL2H69YoxBYD17KQteKJGnWqZlETuzMpc-1wn8Mc",
-        "tpl_datareport_id":"xDdO4kzp5_zv-QXqr4L38RWjzp1RJLzJCTxwmutXqQA",
-"weixinAutoRpl": "感谢使用剑鱼标讯！\n1.<a href='%s'>【订阅招标信息】</a>\n2.<a href='%s'>【搜索招标信息】</a>\n3.<a href='http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect'>【产品帮助】</a>\n4.<a href='%s'>点击这里，查看“%s”的相关招标信息</a>\n5.如需人工协助，请回复“客服”\n6.<a href='https://www.jianyu360.cn/front/downloadapppage/normal?source=weixinAutoRpl'>下载剑鱼标讯APP，更加方便快捷</a>\n7.呼朋唤友，双方各<a href='%s'>免费获得超级订阅7天</a> \n8.商务合作、渠道代理、媒体合作招募<a href='%s'>【渠道合伙人招募计划限时启动】</a>",
+        "tpl_datareport_id":"YVIb0zNuQiE8YKfZC2S9_sYEsw0hO5BVkrZbW9C0nN8",
+	"weixinAutoRpl": "感谢使用剑鱼标讯！\n1.<a href='%s'>【订阅招标信息】</a>\n2.<a href='%s'>【搜索招标信息】</a>\n3.<a href='http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect'>【产品帮助】</a>\n4.<a href='%s'>点击这里，查看“%s”的相关招标信息</a>\n5.如需人工协助，请回复“客服”\n6.<a href='https://wx.jianyu360.cn/front/downloadapppage/normal?source=weixinAutoRpl'>下载剑鱼标讯APP，更加方便快捷</a>\n7.呼朋唤友，双方各<a href='%s'>免费获得超级订阅7天</a> \n8.商务合作、渠道代理、媒体合作招募<a href='%s'>【渠道合伙人招募计划限时启动】</a>",
 	"autoReplay": {
 		"title": "【剑鱼标讯】 两种方法订阅招标信息",
 		"url": "http://mp.weixin.qq.com/s?__biz=MzIyNTM1NDUyNw==&mid=100000001&idx=1&sn=58e6008f0577d529a56c9ed78724decf&scene=0&previewkey=QRJQjYMWEGk5DPF2KimcaMNS9bJajjJKzz%2F0By7ITJA%3D#wechat_redirect",
-		"picUrl": "https://www.jianyu360.cn/images/jyzbdy.png",
+		"picUrl": "https://wx.jianyu360.cn/images/jyzbdy.png",
 		"description": "轻松订阅招标公告~"
 	},
 	"fastSubscribe": {
@@ -54,11 +54,11 @@
 	},
 	"wufu": {
 		"title": "分分钟钟凑齐福",
-		"url": "https://www.jianyu360.cn/active/saofu",
-		"picUrl": "https://www.jianyu360.cn/images/saofu/wufu.jpg",
+		"url": "https://wx.jianyu360.cn/active/saofu",
+		"picUrl": "https://wx.jianyu360.cn/images/saofu/wufu.jpg",
 		"description": "为了鱼粉们集五福，小编也是操碎了心……"
 	},
-	"headimage": "/mnt/weixin",
+	"headimage": "/mnt/jy/weixin",
 	"pchints": {
 		"key_success": "已为您添加订阅关键词“%s”。<a href='%s'>点击此处查看您所有的订阅关键词。</a>",
 		"key_fail": "抱歉！无法添加订阅关键词“%s”，<a href='%s'>因为您订阅的关键词，达到了系统上限，您可以点击此处删除多余的关键词，然后重新添加。</a>",
@@ -67,7 +67,7 @@
 		"project_fail": "抱歉！无法添加项目“%s”，<a href='%s'>因为您关注的项目，达到了系统上限，您可以点击此处删除多余的项目，然后重新添加。</a>"
 	},
 	"vipSubscribeReply": {
-                "href": "/swordfish/SingleLogin?toHref=/front/vipsubscribe/vipsubscribe_new",
+		"href": "/swordfish/SingleLogin?toHref=/front/vipsubscribe/vipsubscribe_new",
                 "content": "<a href='%s'>点击立即购买超级订阅。</a>" ,
                 "switch":false
 	},
@@ -83,10 +83,10 @@
 	"influxdb": "https://jianyu:Topnet@20150501@wxlmjy.qmx.top:8087",
 	"subscribeReply": {
 		"title": "使用“剑鱼标讯”第一步",
-		"picUrl": "https://www.jianyu360.cn/images/wxreply/reply_2.png",
+		"picUrl": "https://wx.jianyu360.cn/images/wxreply/reply_2.png",
 		"description": ""
 	},
-	"2017policy": "2017年招投标政策法规大盘点，点击链接下载或收藏：https://www.jianyu360.cn/jyresfile/nzpd.pdf",
+	"2017policy": "2017年招投标政策法规大盘点，点击链接下载或收藏：https://wx.jianyu360.cn/jyresfile/nzpd.pdf",
 	"shalong": [{
 			"start": "20180903",
 			"end": "20180913",
@@ -111,30 +111,30 @@
 			"scanReplay": "<a href='%s'>啥是佩奇？房子、车子、孩子，看你五年后配不配的齐！</a>",
 			"scanReplayUrlName": "futureIndex",
 			"subReply": "啥是佩奇？房子、车子、孩子，看你五年后配不配的齐！",
-			"subReplyPic": "https://www.jianyu360.cn/future/images/pq.png",
+			"subReplyPic": "https://wx.jianyu360.cn/future/images/pq.png",
 			"activeEnd": 1549987200,
-			"subSecondRP": "https://www.jianyu360.cn/images/t3.jpg"
+			"subSecondRP": "https://wx.jianyu360.cn/images/t3.jpg"
 		}
 
 	],
-	"policysupport":"<a href='https://www.jianyu360.cn/jyfcfg/main.html'>点击此处</a>，立即查看最新的企业扶持政策。",
+	"policysupport":"<a href='https://wx.jianyu360.cn/jyfcfg/main.html'>点击此处</a>，立即查看最新的企业扶持政策。",
 	"policyKeys":"政策",
 	"datareportUserReply":{
                 "title":"剑鱼标讯数据报告",
-                "url":"https://www.jianyu360.cn/swordfish/SingleLogin?toHref=https%3A%2F%2Fwww.jianyu360.cn%2Fdatareport%2Fpage%2Fintroduce",
-                "picUrl":"https://www.jianyu360.cn/datareport/image/datareport_repy_icon.jpg",
+                "url":"https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https%3A%2F%2Fwx.jianyu360.cn%2Fdatareport%2Fpage%2Fintroduce",
+                "picUrl":"https://wx.jianyu360.cn/datareport/image/datareport_repy_icon.jpg",
                 "desc":"剑鱼标讯官方制作的高质量行业数据报告"
 	},
 	"reply":[
         {
-		"text":"Hi~欢迎关注剑鱼标讯！\n\n【超级订阅升级】\n每日更新10万+招标采购信息\n300组关键词订阅，商机第一时间推送\n直接对接项目联系人\n全国七千万企业随手查，竞争实力全面洞察\n项目分类收藏检索，重要信息不遗漏\n点击体验<a href='%s'>【超级订阅】</a>！获取全网商机！\n\n【大会员企业服务】\n企业多维度画像分析，掌握一手商业情报\n采购单位项目/重点客户画像，辅助投标决策\n市场周报/月报，多维度分析市场体量、区域热度\n回复1，查看企业画像\n回复2，查看采购单位画像\n回复3，查看市场周报/月报\n了解更多功能，拨打400-108-6670",
-		"href":["viphomepage_new"]
+			"text":"Hi~欢迎关注剑鱼标讯！\n\n【超级订阅升级】\n每日更新10万+招标采购信息\n300组关键词订阅，商机第一时间推送\n直接对接项目联系人\n全国七千万企业随手查，竞争实力全面洞察\n项目分类收藏检索，重要信息不遗漏\n点击体验<a href='%s'>【超级订阅】</a>！获取全网商机！\n\n【大会员企业服务】\n企业多维度画像分析，掌握一手商业情报\n采购单位项目/重点客户画像，辅助投标决策\n市场周报/月报，多维度分析市场体量、区域热度\n回复1，查看企业画像\n回复2，查看采购单位画像\n回复3，查看市场周报/月报\n了解更多功能，拨打400-108-6670",
+			"href":["viphomepage_new"]
         }
 	],
 	"newYearReply":{
 		"title":"@所有人，进来领取年终奖！（全是福利）",
-		"url":"https://mp.weixin.qq.com/s/aTu-P5oCaQaU8rlGB-bu7A",
-		"picUrl":"https://www.jianyu360.cn/shareFile/xnhd.png",
+                "url":"https://mp.weixin.qq.com/s/aTu-P5oCaQaU8rlGB-bu7A",
+                "picUrl":"https://wx.jianyu360.cn/shareFile/xnhd.png",
 		"description":""
 	},
         "nsq":"172.17.148.49:4260",

config_formal/weixin_172.17.145.180/config.json

@@ -13,29 +13,29 @@
 	"cassandrasize": 10,
 	"redisServers": "other=172.17.145.167:2203,sso=172.17.4.83:1711,jyop_other=172.17.4.83:1712,push=172.17.145.167:2203,wxtoken=172.17.4.83:1711",
 	"redisLogin":"login=10.170.187.34:1716",
-	"weixinport": "8201",
+	"weixinport": "8211",
 	"jyop_webrpcport": "172.17.4.185:8023",
-	"weixinrpcport": "8202",
+	"weixinrpcport": "8212",
 	"webrpcport": "172.17.145.167:84",
-	"webdomain": "https://www.jianyu360.cn",
-	"appid": "wxd66e9589c9fecff6",
+	"webdomain": "https://wx.jianyu360.cn",
+	"appid": "wx9227668f5ba1f814",
 	"apptoken": "top2016top2016",
-	"appsecret": "4d9d4b9ddab59e65fcb7bed125fbd342",
-	"proxysess": "https://www.jianyu360.cn/front/sess/%s",
+	"appsecret": "4f2a00821869033e2cd0180a11da7ad1",
+	"proxysess": "https://wx.jianyu360.cn/front/sess/%s",
 	"followCompany": 10,
 	"welcomemsg": "用剑鱼标讯，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼标讯，让投标无限可能！",
-	"tpl_subscribe_push_id": "CGlSHRuy3YkZOPvz-GAHkUp5uzzFw_5cW6ummYAVEJw",
-	"tpl_push_id": "HF-jnCHwVV39rbYe0tmFVQki4jDLK-qRD92qO0epIww",
-	"tpl_bidopen_id": "LYbyRZmWV9tEF-5arLBiM3JrVSbxyms8Tg7MxEH1Q4E",
-	"tpl_managernotify_id": "BrrJM6VCV7an_I0imJC2eNwcY98nMEV3nOGIo1OyRAY",
-	"tpl_logapply_id": "CGlSHRuy3YkZOPvz-GAHkUp5uzzFw_5cW6ummYAVEJw",
+	"tpl_subscribe_push_id": "bQSpoC2bhSJYV-6AqKtR73rrPEF9PO6wXIulmo-w2HE",
+	"tpl_push_id": "I-27XOqLgyC2y9gKmGy49u3ta77fFxl1uOJKVoP3gik",
+	"tpl_bidopen_id": "5uEZ2gJ1beEYYZZnWFjCHnKNvCvCDs66V3MnJJZpnRc",
+	"tpl_managernotify_id": "5TgGXDmvPd_9Kcp1Np6qDu5tD9LPhV6yMd0dBjNz_84",
+	"tpl_logapply_id": "bQSpoC2bhSJYV-6AqKtR73rrPEF9PO6wXIulmo-w2HE",
 	"tpl_activeapply_id": "swEnL2H69YoxBYD17KQteKJGnWqZlETuzMpc-1wn8Mc",
-        "tpl_datareport_id":"xDdO4kzp5_zv-QXqr4L38RWjzp1RJLzJCTxwmutXqQA",
-	"weixinAutoRpl": "感谢使用剑鱼标讯！\n1.<a href='%s'>【订阅招标信息】</a>\n2.<a href='%s'>【搜索招标信息】</a>\n3.<a href='http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect'>【产品帮助】</a>\n4.<a href='%s'>点击这里，查看“%s”的相关招标信息</a>\n5.如需人工协助，请回复“客服”\n6.<a href='https://www.jianyu360.cn/front/downloadapppage/normal?source=weixinAutoRpl'>下载剑鱼标讯APP，更加方便快捷</a>\n7.呼朋唤友，双方各<a href='%s'>免费获得超级订阅7天</a> \n8.商务合作、渠道代理、媒体合作招募<a href='%s'>【渠道合伙人招募计划限时启动】</a>",
+        "tpl_datareport_id":"YVIb0zNuQiE8YKfZC2S9_sYEsw0hO5BVkrZbW9C0nN8",
+	"weixinAutoRpl": "感谢使用剑鱼标讯！\n1.<a href='%s'>【订阅招标信息】</a>\n2.<a href='%s'>【搜索招标信息】</a>\n3.<a href='http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect'>【产品帮助】</a>\n4.<a href='%s'>点击这里，查看“%s”的相关招标信息</a>\n5.如需人工协助，请回复“客服”\n6.<a href='https://wx.jianyu360.cn/front/downloadapppage/normal?source=weixinAutoRpl'>下载剑鱼标讯APP，更加方便快捷</a>\n7.呼朋唤友，双方各<a href='%s'>免费获得超级订阅7天</a> \n8.商务合作、渠道代理、媒体合作招募<a href='%s'>【渠道合伙人招募计划限时启动】</a>",
 	"autoReplay": {
 		"title": "【剑鱼标讯】 两种方法订阅招标信息",
 		"url": "http://mp.weixin.qq.com/s?__biz=MzIyNTM1NDUyNw==&mid=100000001&idx=1&sn=58e6008f0577d529a56c9ed78724decf&scene=0&previewkey=QRJQjYMWEGk5DPF2KimcaMNS9bJajjJKzz%2F0By7ITJA%3D#wechat_redirect",
-		"picUrl": "https://www.jianyu360.cn/images/jyzbdy.png",
+		"picUrl": "https://wx.jianyu360.cn/images/jyzbdy.png",
 		"description": "轻松订阅招标公告~"
 	},
 	"fastSubscribe": {
@@ -54,8 +54,8 @@
 	},
 	"wufu": {
 		"title": "分分钟钟凑齐福",
-		"url": "https://www.jianyu360.cn/active/saofu",
-		"picUrl": "https://www.jianyu360.cn/images/saofu/wufu.jpg",
+		"url": "https://wx.jianyu360.cn/active/saofu",
+		"picUrl": "https://wx.jianyu360.cn/images/saofu/wufu.jpg",
 		"description": "为了鱼粉们集五福，小编也是操碎了心……"
 	},
 	"headimage": "/mnt/jy/weixin",
@@ -83,10 +83,10 @@
 	"influxdb": "https://jianyu:Topnet@20150501@wxlmjy.qmx.top:8087",
 	"subscribeReply": {
 		"title": "使用“剑鱼标讯”第一步",
-		"picUrl": "https://www.jianyu360.cn/images/wxreply/reply_2.png",
+		"picUrl": "https://wx.jianyu360.cn/images/wxreply/reply_2.png",
 		"description": ""
 	},
-	"2017policy": "2017年招投标政策法规大盘点，点击链接下载或收藏：https://www.jianyu360.cn/jyresfile/nzpd.pdf",
+	"2017policy": "2017年招投标政策法规大盘点，点击链接下载或收藏：https://wx.jianyu360.cn/jyresfile/nzpd.pdf",
 	"shalong": [{
 			"start": "20180903",
 			"end": "20180913",
@@ -111,18 +111,18 @@
 			"scanReplay": "<a href='%s'>啥是佩奇？房子、车子、孩子，看你五年后配不配的齐！</a>",
 			"scanReplayUrlName": "futureIndex",
 			"subReply": "啥是佩奇？房子、车子、孩子，看你五年后配不配的齐！",
-			"subReplyPic": "https://www.jianyu360.cn/future/images/pq.png",
+			"subReplyPic": "https://wx.jianyu360.cn/future/images/pq.png",
 			"activeEnd": 1549987200,
-			"subSecondRP": "https://www.jianyu360.cn/images/t3.jpg"
+			"subSecondRP": "https://wx.jianyu360.cn/images/t3.jpg"
 		}
 
 	],
-	"policysupport":"<a href='https://www.jianyu360.cn/jyfcfg/main.html'>点击此处</a>，立即查看最新的企业扶持政策。",
+	"policysupport":"<a href='https://wx.jianyu360.cn/jyfcfg/main.html'>点击此处</a>，立即查看最新的企业扶持政策。",
 	"policyKeys":"政策",
 	"datareportUserReply":{
                 "title":"剑鱼标讯数据报告",
-                "url":"https://www.jianyu360.cn/swordfish/SingleLogin?toHref=https%3A%2F%2Fwww.jianyu360.cn%2Fdatareport%2Fpage%2Fintroduce",
-                "picUrl":"https://www.jianyu360.cn/datareport/image/datareport_repy_icon.jpg",
+                "url":"https://wx.jianyu360.cn/swordfish/SingleLogin?toHref=https%3A%2F%2Fwx.jianyu360.cn%2Fdatareport%2Fpage%2Fintroduce",
+                "picUrl":"https://wx.jianyu360.cn/datareport/image/datareport_repy_icon.jpg",
                 "desc":"剑鱼标讯官方制作的高质量行业数据报告"
 	},
 	"reply":[
@@ -134,7 +134,7 @@
 	"newYearReply":{
 		"title":"@所有人，进来领取年终奖！（全是福利）",
                 "url":"https://mp.weixin.qq.com/s/aTu-P5oCaQaU8rlGB-bu7A",
-                "picUrl":"https://www.jianyu360.cn/shareFile/xnhd.png",
+                "picUrl":"https://wx.jianyu360.cn/shareFile/xnhd.png",
 		"description":""
 	},
         "nsq":"172.17.148.49:4260",

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -210,7 +210,7 @@ var mine = {
 
         // 使用帮助
         $('.user-help').on('click', function () {
-            JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect', '使用帮助');
+            JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=1&sn=6b5d4f4aced2f4c9263e6e66639a40e6', '使用帮助');
         })
         // 关于剑鱼标讯
         $(".about-us").on("click", function () {

src/jfw/modules/app/src/web/staticres/jyapp/wxtsguide/main.js

@@ -836,7 +836,7 @@ $(function(){
 	$("body").removeClass("hide");
 	//帮助按钮
 	$(".jy_help").click(function(){	
-		JyObj.openExternalLink("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect","使用帮助");
+		JyObj.openExternalLink("https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=1&sn=6b5d4f4aced2f4c9263e6e66639a40e6","使用帮助");
 	});
 	if(!isiOS){
 		$("#adjustment").height($(window).height() / 2);

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -990,7 +990,8 @@
             function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
             jylab_see500_plus: '请留下联系方式，我们会尽快联系您！开通大会员可查看更多招标项目，实时监控更多潜在商机！',
             article_purchase_intention: '请留下联系方式，我们会尽快联系您！开通大会员可抢先对接采购单位，帮助企业拓客！', // 采购意向
-            article_proposed_project: '请留下联系方式，我们会尽快联系您！开通大会员可抢先获知拟建商机动态，提高中标机率！' // 拟建项目
+            article_proposed_project: '请留下联系方式，我们会尽快联系您！开通大会员可抢先获知拟建商机动态，提高中标机率！', // 拟建项目
+            'ent-manage-app': '请留下联系方式，我们会尽快联系您体验商机管理全部功能！'
           }
 
           // 提示语
@@ -1027,6 +1028,7 @@
             ent_portrait_freeuser: '欢迎体验企业中标分析',
             ent_portrait_contacts: '欢迎体验剑鱼大会员',
             ent_portrait_changeList: '欢迎体验剑鱼大会员',
+            'ent-manage-app': '欢迎体验剑鱼标讯商机管理'
           }
           for (var key in titleMap) {
             if (source.indexOf(key) !== -1) {
@@ -1509,9 +1511,13 @@
                       history.back()
                     })
                   } else {
+                    var message = '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验大会员全部功能！'
+                    if (source.indexOf('ent-manage-') > -1) {
+                      message = '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验商机管理全部功能！'
+                    }
                     _this.$dialog.close()
                     _this.$dialog.confirm({
-                      message: '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验大会员全部功能！',
+                      message: message,
                       className: 'ent-search-dialog max-54',
                       overlayClass: 'z-2030',
                       showCancelButton: false,

src/jfw/modules/app/src/web/templates/invoice/cantInvoice.html

@@ -8,7 +8,7 @@
 	<meta name="apple-mobile-web-app-status-bar-style" content="black">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
-	<title>查看发票</title>
+	<title>申请发票提示</title>
 	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/rem.js"></script>
 	<link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.css">
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/invoice/css/base.css?v={{Msg "seo" "version"}}" />
@@ -20,18 +20,21 @@
 .p_text{
   color:#9B9CA3;
 }
+.check-rules{
+  visibility: hidden !important;
+}
 </style>
 
 <body>
     <div class="j-container" id="check_invoice">
         <div class="j-header jy-app-header">
             <span class="header-left iconfont icon-fanhui"></span>
-            <span class="header-title">查看发票</span>
+            <span class="header-title">申请发票提示</span>
             <span class="header-right check-rules">开票规则</span>
         </div>
-        <div class="j-body" style="text-align:center;padding-top:1.5rem">
+        <div class="j-body" style="text-align:center;padding:1.5rem .3rem 0rem .3rem;">
           <img src="/jyapp/images/wxkeyset/nopush.png?v=51430" style="width:2.25rem"/>
-          <p style="margin-top: 0.32rem;" class="p_text">
+          <p style="margin-top: 0.32rem;" class="p_text" id="reason">
             该订单发票在线申请已超时，请联系客服
           </p>
            <p class="p_text">
@@ -61,7 +64,29 @@
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/invoice/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script>
         var order_code = {{.T.order_code}}
+        function getParam(name) {
+            var search = document.location.search;
+            var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
+            var matcher = pattern.exec(search);
+            var items = null;
+            if (null != matcher) {
+                try {
+                    items = decodeURIComponent(decodeURIComponent(matcher[1]));
+                } catch (e) {
+                    try {
+                        items = decodeURIComponent(matcher[1]);
+                    } catch (e) {
+                        items = matcher[1];
+                    }
+                }
+            }
+            return items;
+        }
         $(function () {
+          if(getParam("f")=="upgrade"){
+            $("#reason").text("因发票主体变更，该发票无法支持线上开票，如需开票，请联系客服。");
+          }else{
+            $(".check-rules").css("visibility","visible");
             $.ajax({
                 url:"/jypay/invoice/show",
                 type:"POST",
@@ -107,6 +132,7 @@
 
                 }
             })
+          }
         })
         var checkInvoice = {
             init:function(){

src/jfw/modules/app/src/web/templates/invoice/invoicing.html

@@ -17,7 +17,7 @@
 	<link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/invoice/css/invoicing.css?v={{Msg "seo" "version"}}">
 </head>
 
-<body>
+<body style="display:none;">
     <div class="j-container" id="invoicing">
         <div class="j-header jy-app-header" id="app-show">
             <span class="header-left iconfont icon-fanhui"></span>
@@ -143,6 +143,7 @@
                 type: "GET",
                 success: function(res) {
                   if (res.code === '1001') {
+                    $('body').show()
                     $('.j-button-confirm').attr('disabled',true)
                     return weui.alert(res.messge, {
                         title: '温馨提醒',
@@ -164,7 +165,12 @@
             })
           }
           function showData () {
-            $.ajax({
+            $.post("/jypay/invoice/available",{order_code:order_code},function(rr){
+              if(rr.status==0){
+                window.location.replace("/jyapp/front/cantInvoice?f=upgrade")
+              }else{
+                $("body").show();
+                $.ajax({
                 url:"/jypay/invoice/show",
                 type:"POST",
                 data:{"order_code":order_code},
@@ -326,6 +332,8 @@
                     }
                 }
             })
+              }
+            })
           }
         })
         var invoice = {

src/jfw/modules/app/src/web/templates/me/iframe.html

@@ -24,9 +24,9 @@
 		</div>
 	</body>
 	<script type="text/javascript">
-		var url = "http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect";
+		var url = "https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=1&sn=6b5d4f4aced2f4c9263e6e66639a40e6";
 		if(getUrlParam("type")==1){
-			url = "http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect";
+			url = "https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=2&sn=c2eabe3ce336a02746670f6559e48287";
 		}
 		$("iframe").attr("src",url);
 	</script>

src/jfw/modules/app/src/web/templates/me/set.html

@@ -186,7 +186,7 @@
 			}else if(index == 2){
 				autoLogin('/jyapp/swordfish/feedback');
 			}else if(index == 3){
-				JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助');
+				JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=1&sn=6b5d4f4aced2f4c9263e6e66639a40e6','使用帮助');
 			}
 		});
 		$(".share").click(function(e){

src/jfw/modules/app/src/web/templates/weixin/about.html

@@ -326,7 +326,7 @@ $(function(){
 				window.location.href = "/jyapp/swordfish/feedback";
 				break;
 			case 1:
-				JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect','使用帮助');
+				JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=2&sn=c2eabe3ce336a02746670f6559e48287','使用帮助');
 				break;
 			case 2:
 				$(".share").show();

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -1192,7 +1192,7 @@
         $("#searchIndex").removeClass("hidden");
         //点击帮助
         $(".rightHref").unbind("click").on("click",function(){
-            JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助')
+            JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=1&sn=6b5d4f4aced2f4c9263e6e66639a40e6','使用帮助')
         });
 
         // 商机管理
@@ -1370,7 +1370,7 @@
         backThisPage();
         //点击帮助
         $(".home_search_right").click(function(){
-            JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助')
+            JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=1&sn=6b5d4f4aced2f4c9263e6e66639a40e6','使用帮助')
             event.stopPropagation();
         });
         $("#top-search").unbind("click").on("click",function () {

src/jfw/modules/subscribepay/src/config/config.go

@@ -130,7 +130,11 @@ type Invoice struct {
 	Tax_policy                string
 	Invoice_interface_address string
 	Code                      string
-	Invoice_switch            bool
+	Switch_paymch             struct {
+		Model int
+		Time  string
+	}
+	Invoice_switch bool
 }
 
 type entnicheConfig struct {

src/jfw/modules/subscribepay/src/invoice.json

@@ -5,5 +5,9 @@
   "invoice_nature": "0",
   "invoice_interface_address": "http://192.168.3.14:7081",
   "code": "3040205000000000000",
+  "switch_paymch":{
+	"model":1,
+	"time":"2022-01-17 10:00:00"
+  },
   "invoice_switch": true
 }

src/jfw/modules/subscribepay/src/pay/aliPay.go

@@ -42,6 +42,7 @@ var Alipay *aliPayStruct
 
 func init() {
 	//加载本地私钥
+	log.Println(qutil.ObjToString(config.AliPayConf["privateKey"]))
 	privateKey, err := parsePrivateKey(qutil.ObjToString(config.AliPayConf["privateKey"]))
 	if err != nil {
 		panic(err)
@@ -148,6 +149,7 @@ func (w *aliPayStruct) GetTradeno(tradenoSign string) (string, string) {
 	}
 	lenRandom := 6 - len([]rune(tradenoSign)) //控制长度
 	tradeno = fmt.Sprintf("%s_%d%s%s", tradenoSign, time.Now().UnixNano(), qutil.GetRandom(lenRandom), qutil.GetLetterRandom(6))
+	tradeno = processTradeno(tradeno)
 	return tradeno, subject
 }
 

src/jfw/modules/subscribepay/src/pay/util.go

@@ -1,6 +1,7 @@
 package pay
 
 import (
+	"config"
 	"crypto"
 	"crypto/rand"
 	"crypto/rsa"
@@ -333,11 +334,11 @@ func parsePrivateKey(key string) (*rsa.PrivateKey, error) {
 	if strings.ToUpper(block.Type) != "RSA PRIVATE KEY" {
 		return nil, errors.New("私钥类型不正确" + block.Type)
 	}
-	rsaPrivateKey, err := x509.ParsePKCS1PrivateKey(block.Bytes)
+	rsaPrivateKey, err := x509.ParsePKCS8PrivateKey(block.Bytes)
 	if err != nil {
 		return nil, err
 	}
-	return rsaPrivateKey, nil
+	return rsaPrivateKey.(*rsa.PrivateKey), nil
 }
 
 //加载支付宝后台公钥
@@ -373,3 +374,12 @@ func (a *aliPayStruct) getSign(data []byte) (signature string, err error) {
 	signature = base64.StdEncoding.EncodeToString(bs)
 	return
 }
+
+//处理商户订单号
+func processTradeno(tradeno string) string {
+	if devTradenoSign, _ := config.PayConf["devTradenoSign"].(string); devTradenoSign != "" {
+		tradeno = devTradenoSign + tradeno
+		tradeno = string([]rune(tradeno)[:len([]rune(tradeno))-len([]rune(devTradenoSign))])
+	}
+	return tradeno
+}

src/jfw/modules/subscribepay/src/pay/wxPay.go

@@ -117,7 +117,9 @@ func init() {
 
 func (w *WeixinStruct) GetTradeno(tp string) string {
 	lenRandom := 6 - len([]rune(tp)) //控制长度
-	return fmt.Sprintf("%s_%d%s%s", tp, time.Now().UnixNano(), util.GetRandom(lenRandom), util.GetLetterRandom(6))
+	tradeno := fmt.Sprintf("%s_%d%s%s", tp, time.Now().UnixNano(), util.GetRandom(lenRandom), util.GetLetterRandom(6))
+	tradeno = processTradeno(tradeno)
+	return tradeno
 }
 
 //tradeno a:打赏 b:pc端数据导出 c:移动端微信数据导出 C:app数据导出  d:微信端数据报告 D:app端数据报告

src/jfw/modules/subscribepay/src/pay_config.json

@@ -1,9 +1,10 @@
 {
+	"devTradenoSign": "test_",
 	"wxPay": {
         "appid": "wxd66e9589c9fecff6",
         "appid_app": "wx0e6a5b18f4cfd10d",
 		"pay": {
-			"mchid": "1418321102",
+			"mchid": "1618884225",
 			"key": "topnet2016topnet2016topnet2016ab",
             "attachmsg": "剑鱼标讯打赏",
             "bodymsg": "剑鱼标讯-招标信息打赏",
@@ -36,7 +37,7 @@
         }
     },
     "aliPay": {
-        "appid": "2019062465625929",
+        "appid": "2021003111633206",
         "reqUrl":"https://openapi.alipay.com/gateway.do",
         "Subject_sjdc": "剑鱼数据导出",
         "Subject_sjbg": "剑鱼数据报告",
@@ -50,9 +51,9 @@
 		"Subject_integral":"剑鱼标讯-剑鱼币",
         "Subject_dataPack": "剑鱼标讯-数据包",
         "Subject_areaPack":"剑鱼标讯-省份订阅包",
-        "Subject_filePack":"剑鱼标讯-附件下载包",
-        "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAtO7CU4hpdcMmV43MEA8bqQJYYx+f6yvYkP0nFc/oCvU24bU6zAdK/H2H56quEwD8Dh5YtVTfUCcKqpcG9HXY11TXWKCEUQiK1tkb0o7oSSURwk6h1DdDbg8m1+H8s+k+mvMvcqVCYKYi03PIPQyJCuHmzx/vcaALXRr2HOrEFaFFA8WYST1rywiKeyrC9PCNX1aJjGADhCs3cGrdZEJc4k+2tIHTYJccx+mJ96QiEkzFhJTqEmSFPcNqNUX9uCPgeVhfHW2pRNyffvrhoEyeSr1QoOpaYyn0I5JD2axnypBFCbk6P69LY3eGNKtOe81lp9hiZbMYpXPqb6KwPXTVQQIDAQABAoIBAEbJQm276MaR2uZWK4f84S12JW5iaQZw2QGgiTIXbQkcdqRHawF3uPafhhQ0ynXU5MgBR2NqGRQasimbfLUXhgZ4wueBpUKuvOLhfekaz/YN8qy6ZsXH+TGN6/x6BYu9rSiiC+YmkZmOZgGkQqrfxJ3lU4+lRuCFZOzAJ5mYn652CHRJXy6eDgZfyFLP2ol4/ioJEhwnGFXV345DlsVgmXTEe+IfjTyuvzxBtjod4lfu3dj/f2PhPrcgvN0ZQf1ldZbS+6FkMWInMOQt/WsJ/ANfiKgQ4sPzlxIhmVjrvDlnYTc1lbFekyInzZumV0pDyId+1Y6LAjxJTAhnjFAlBSECgYEAwsQdxOiZNLtxZ8J8JCQHKERYIo7euArW0iAurF+3Q9VNeGj0voFrmfHPju5OF5BHtuc7D3lkwZG4Ac+pyQtxF5dsEMl4vBoNc6onRQFsSDVEEIpl7OBghGlg1as23tvPSMh7DKnILM9OzVfFQ9WLvwHJwLRGsM7LOtmNovq4UFsCgYEA7dE/9Avr5YtCUjij8Y2zkAxN6qb8+ggqFoPiCr91JNGaKNKV9D2K7D3Zk49TXFJm7SX2zgYFuqR2Pa9vAWh9jtmwsc8L0qpIym4J1MM5ud/Xiu9c8O/prQOr7JlICNdk8WfqGbUC83BYfWa5SDonlXFYi6x3LlXdZnvEfZF645MCgYAC2ZnR6tFrGx8StJ7abIiKR02+27ZYnRf9pSjprtDgtjtW+royG3S2oPo3jjcoUx0piQKtPEqEJpy5sg86+ObjwHx9VmVk40C1I5VFhjrOZ7EiSNQq/jGLXntjRQkdg7vpxb0/NzDNrw7pJFKnpnVQCzenkTvDlJMWvl47N04BJwKBgHnpVtuIcPlPFkSH/KMLfQ1PAXJVAEI8hTbdjLbtxuOE/34F1hFKqzjHzA2034roQxM27vpWZAF15Zdho4oZQqREPCwqc2kfGgmLt0Z2fdUnRptWcVKh6ixjQXMccKz3niuSlZNwE38wDGzciAbaqQgW/sk7NC1wnvq2X9fvCAw5AoGANG2usqWYF4x+LvbhcdrKpJsjtvkLa2u9g2/wNXdoj+tBrv310O22/YM5LOcq9MrKPlx1S1C1KLoQO9TWFZiYuQ9C/sk7/ZTNmKQxCxVV0FVPaBYp+meD6sjgoRVJvaqY0UxnJwlHWMrusPTFua7Mtogqx9cvzlQolWh5VX7N1DM=\n-----END RSA PRIVATE KEY-----",
-        "callbackPublicKey":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqFZfev75+sa7O0f29qwuWeqWRQ+p59c8hz2s4aeh5Ohc08P1ls5e8UmPhaN9ZTkGwabOKN658pOhmVoa16ldKFZQ5j1hLTDS6yfKcvVs/hf1mQvsbUjtZgCfMQx5NNf1R4MsTvAqbl2l6DXMu7gHjAhKNR0QQBELv7HmYuWPE35ELQqBH0eVcvWSNV3/3zOansftY5NIT749B+Bv1uirE8PNMp20sWWqx8fMNi2EZksnWNUmnVldBqUwMJIxcXolBH/RGX5ZjBlBenoIB3PVQ8/+SPz9Hip7+QNH8utSnUlrh2AsJVtdNKIQk74Eevkn+Q+WyUVGoY0ca9DzGwh4hQIDAQAB"
+        "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCaJnmz3N1Z43jxtmZJmPkInl3FbfudxjicThHj+Hkndp+muzZXlAPcWoYTFLAfVa6xg9xAc58fWTPUGOpouh0ZDEP8TGvD784AljDNwRXPI9+afjcxN8gzsNPlqA6KVkAu5u5uEI1HHQgtdyRoCEnXgQRXj6DqAs9olbx8HrTxHjZzjPd+HXv+v4na3zAvZsvPdhLB2ggpVW6uQN7ur8C+hVpB3ZO+gGVFHy3m1t08XgscljyOA9Vpk4T8TnKZqDvnI6ehWFCGeD11yoe3ipHJJdP/+u9/tXiKhm29mJvcM9C6gab6BOQABByQPb2nPFFyfPglbRYrYxgKp/eXUQTzAgMBAAECggEAO6BCVyZJoKlycNzC+Bjpy0Gmt+Vw/HheEWfJV8sW4gLqgk3MGVgxnhyN2/eWoKg96IA+w9d1Z2TTvWjd0yCafMPX0FGnJaUuo990hUH4s6UGqvXDV5BiKkxtylmVNkFilkHRXFWesDE0ppF9TZhXJ7rJ+Syfa6UmoSe6PrCKAPG4FD8MH1ODj5b42l/TRIFM948nTtTLFAFgd77P5ULBCKVfBB5V9XdKhLRdwG9RxugWwkxuCiMOtmk45DzA/PQgvkIzEViD/2NJX67/S88B0G63zdQizJrvxsLp9fThmjhlo/+CaF+a+nfIzg81TfQHlRuTjiYc7iE9n5K0sU82wQKBgQDydI9pEjkPH+ZEixEymdx8D4workBfa+GXgobJ2UwatqCJOCYqZJR0MhjTVeDJiiTGFiemNyZHT0WFQedAQ/O9mkRf0MRhzR6ZOiMnCG5pSSOKdmQXoqjOqcMzdgWBQRol0eLB/vto8M3bpt1VautR0qQOR7BrFsj57K3asofikQKBgQCiwwie5gyCAYB1gkp4QkLmQDSTJdZaTlzzx2oa2/ZB4Pg6wWWNJIxEfSwtuGVH4jGJl0Eer2YpHzaY7f2NfOWJCpNI/aRhM/RilQsFXTox/5bqlbAfspPMqSHnry2OgbZb9CRF3jH7kt65390SKde4A4JNE+jJ0Xb07Tzcr7+pQwKBgCDJ8KcWBs9r0flNEVtVgYLpm1vZDO2aqlySE2Zy0579OcK07Dxpc8YvDDpwb8DxxL1hO6V36d5U8yLtYbfIOMtYdIy8sAJF+jBgs2ZQ9pWYhYzxK+IiZk/kl3h7Ko1rX3zj4JW5xQhRIJXnACHQHtjm8rbXrR0ebLmX738XC9dxAoGAQfUDQ1E6dFyjb/syrnU7ow8VvyOwL7xd0rRW/TdyHdRLA5Rn0MCkzwRiqMx2zqCNLpLK4uJ1ZeiuOV8IRxP7+IL+mK+gs3tYZ7K6Wpwi/yvyPnIWg2Hcny1S/g5xSbSq76yKHn4ihy5Hb8+WSMwIDRvu68lLpq1ppWuWJGBcLP0CgYAnGtHlFY887zSI0aRdzV3EYm/sPnmYy0TWIUVLuGL8kkprcSIW2yRxx1GtpB+3A7cPu61WwRbiswJA6VmQHvn8f9ds81+aiO5KQLMk4MbrTwWhWLDpP4BxjWANVzPr19ZwmDJcYkh7YUI2iLqH7dXho5k62OYCM1T53xlql6HDcg==\n-----END RSA PRIVATE KEY-----",
+        "callbackPublicKey":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApSZbX3+05HWNQcl0vnJ3EQKhLvKDbUVYCgeYScVMOrFcofo28pfWwUNJ/Bzf1zmIsiMFHkhhQKWQQXRZpfs9ORNXnbmb6x/tnqKxu2sKQmictAQ2+tp0Ya1t+jA4SUCYo05x71mnoiUt0s3zDYXf7+Orgf4FQMfvsUI11L3oXc3OtgHhEbSOsQAwd7+dWMDJlNVAHnKgKqcL4+narS7v185lrnn28qIGUn2+QE3YuA5fNRl6TcL8pPjQ+SwPlSQFr7McqekH/JYvNmNirvouqSS7jyfgM8sLEhpra/plow/CXG0rAnKHL7wXzSZxK0TkwGjLt5vWX/Qb82INVk6ZSwIDAQAB",
+        "Subject_filePack":"剑鱼标讯-附件下载包"
     },
     "payDebug":"1"
 }

src/jfw/modules/subscribepay/src/service/invoice.go

@@ -22,13 +22,14 @@ import (
 
 type Invoice struct {
 	*xweb.Action
-	addinvoice      xweb.Mapper `xweb:"/invoice/add"`      //开发票
-	invoiceswitch   xweb.Mapper `xweb:"/invoice/switch"`   //发票开关
-	showinvoice     xweb.Mapper `xweb:"/invoice/show"`     //查看发票
-	callbackinvoice xweb.Mapper `xweb:"/invoice/callback"` //开发票回调
-	replaceinvoice  xweb.Mapper `xweb:"/invoice/replace"`  //换发票
-	refundinvoice   xweb.Mapper `xweb:"/invoice/refund"`   //退票
-	invoiceinfo     xweb.Mapper `xweb:"/invoice/info"`     //订单详情数据
+	addinvoice      xweb.Mapper `xweb:"/invoice/add"`       //开发票
+	showinvoice     xweb.Mapper `xweb:"/invoice/show"`      //查看发票
+	callbackinvoice xweb.Mapper `xweb:"/invoice/callback"`  //开发票回调
+	replaceinvoice  xweb.Mapper `xweb:"/invoice/replace"`   //换发票
+	refundinvoice   xweb.Mapper `xweb:"/invoice/refund"`    //退票
+	invoiceinfo     xweb.Mapper `xweb:"/invoice/info"`      //订单详情数据
+	available       xweb.Mapper `xweb:"/invoice/available"` //是否可用开发票
+	invoiceswitch   xweb.Mapper `xweb:"/invoice/switch"`    //发票开关
 }
 
 var dbname = "invoice"
@@ -251,7 +252,10 @@ func (this *Invoice) Addinvoice() error {
 					"custType":  "03",
 					"orders":    orders,
 					"custTaxNo": code,
+					"phone":     phone_num,
+					"billDate":  qutil.NowFormat(qutil.Date_Full_Layout), //单据日期  格式：yyyy-MM-dd HH:mm:ss
 				}
+
 				if applyBill_type == "单位" {
 					body["custName"] = applyBill_company
 				} else {
@@ -746,6 +750,8 @@ func (this *Invoice) Replaceinvoice() {
 			"taxPrice":    price,
 			"totalAmount": price,
 			"quantity":    "1",
+			"phone":       phone,
+			"billDate":    qutil.NowFormat(qutil.Date_Full_Layout), //单据日期  格式：yyyy-MM-dd HH:mm:ss
 		}
 		items = append(items, item)
 		order := map[string]interface{}{
@@ -762,6 +768,7 @@ func (this *Invoice) Replaceinvoice() {
 			"yfphm":     (*res)["invoice_number"],
 			"yfpdm":     (*res)["invoice_code"],
 			"changed":   "1",
+			"phone":     phone,
 		}
 		if invoice_type == "单位" {
 			body["custName"] = company_name
@@ -928,3 +935,30 @@ func InvoiceSendMail(target_mail, html string) {
 		time.Sleep(time.Second * 3)
 	}
 }
+
+func (this *Invoice) Available() {
+	u := util.Mysql.FindOne("dataexport_order", map[string]interface{}{"order_code": this.GetString("order_code")}, "pay_time", "")
+	status := 0
+	if u != nil {
+		if pay_time, _ := (*u)["pay_time"].(string); pay_time != "" && config.InvoiceConfig.Switch_paymch.Time != "" {
+			p1, err1 := time.ParseInLocation(qutil.Date_Full_Layout, pay_time, time.Local)
+			p2, err2 := time.ParseInLocation(qutil.Date_Full_Layout, config.InvoiceConfig.Switch_paymch.Time, time.Local)
+			if err1 == nil && err2 == nil {
+				if config.InvoiceConfig.Switch_paymch.Model == 1 { //大于该时间点，不能开票
+					if p1.Before(p2) {
+						status = 1
+					}
+				} else if config.InvoiceConfig.Switch_paymch.Model == 2 { //小于该时间点，不能开票
+					if p1.After(p2) {
+						status = 1
+					}
+				} else { //无限制，都能开票
+					status = 1
+				}
+			}
+		}
+	}
+	this.ServeJson(map[string]interface{}{
+		"status": status,
+	})
+}

src/jfw/modules/subscribepay/src/service/payCallback.go

@@ -158,66 +158,69 @@ func (a *PayCallBackAction) AliPayCallback() {
 			"",
 			"",
 		}
-
-		if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_DATAEXPORT_NATIVE) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_DATAEXPORT_APP) { //数据导出
+		outTradeno := thisParam.OutTradeno
+		if devTradenoSign := qutil.ObjToString(config.PayConf["devTradenoSign"]); devTradenoSign != "" {
+			outTradeno = strings.TrimPrefix(outTradeno, devTradenoSign)
+		}
+		if strings.HasPrefix(outTradeno, pay.ALI_DATAEXPORT_NATIVE) || strings.HasPrefix(outTradeno, pay.ALI_DATAEXPORT_APP) { //数据导出
 			if !entity.JyDataExportStruct.PayCallBack(thisParam) {
 				log.Printf("支付宝数据导出更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_DATAREPORT_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_DATAREPORT_NATIVE) { //数据报告
+		} else if strings.HasPrefix(outTradeno, pay.ALI_DATAREPORT_APP) || strings.HasPrefix(outTradeno, pay.ALI_DATAREPORT_NATIVE) { //数据报告
 			if !entity.JyDataReportStruct.PayCallBack(thisParam) {
 				log.Printf("支付宝数据报告更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_SUBVIP_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_SUBVIP_NATIVE) { //vip订阅
+		} else if strings.HasPrefix(outTradeno, pay.ALI_SUBVIP_APP) || strings.HasPrefix(outTradeno, pay.ALI_SUBVIP_NATIVE) { //vip订阅
 			if !entity.JyVipSubStruct.PayCallBack(thisParam) {
 				log.Printf("支付宝vip订阅更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_COURSE_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_COURSE_NATIVE) { //招投标课程
+		} else if strings.HasPrefix(outTradeno, pay.ALI_COURSE_APP) || strings.HasPrefix(outTradeno, pay.ALI_COURSE_NATIVE) { //招投标课程
 			if !entity.JyCourse.PayCallBack(thisParam) {
 				log.Printf("支付宝招投标课程更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_ENTNICHE_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_ENTNICHE_NATIVE) { //企业商机管理
+		} else if strings.HasPrefix(outTradeno, pay.ALI_ENTNICHE_APP) || strings.HasPrefix(outTradeno, pay.ALI_ENTNICHE_NATIVE) { //企业商机管理
 			if !entity.EntnicheStruct.PayCallBack(thisParam) {
 				log.Printf("支付宝企业商机管理更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_COURSEONLINE_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_COURSEONLINE_NATIVE) { //中标必听课
+		} else if strings.HasPrefix(outTradeno, pay.ALI_COURSEONLINE_APP) || strings.HasPrefix(outTradeno, pay.ALI_COURSEONLINE_NATIVE) { //中标必听课
 			if !entity.JyCourseOnline.PayCallBack(thisParam) {
 				log.Printf("支付宝线上课程更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_MEMBER_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_MEMBER_NATIVE) { //大会员
+		} else if strings.HasPrefix(outTradeno, pay.ALI_MEMBER_APP) || strings.HasPrefix(outTradeno, pay.ALI_MEMBER_NATIVE) { //大会员
 			if !entity.MemberStruct.PayCallBack(thisParam) {
 				log.Println("支付宝大会员更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_AIFORECASTPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_AIFORECASTPACK_NATIVE) { //大会员
+		} else if strings.HasPrefix(outTradeno, pay.ALI_AIFORECASTPACK_APP) || strings.HasPrefix(outTradeno, pay.ALI_AIFORECASTPACK_NATIVE) { //大会员
 			if !entity.AiForecastPackStruct.PayCallBack(thisParam) {
 				log.Println("支付宝AI中标预测包更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_BIDFILE_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_BIDFILE_NATIVE) { //大会员
+		} else if strings.HasPrefix(outTradeno, pay.ALI_BIDFILE_APP) || strings.HasPrefix(outTradeno, pay.ALI_BIDFILE_NATIVE) { //大会员
 			if !entity.Bidfile.PayCallBack(thisParam) {
 				log.Println("支付宝招标文件解读更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_INTEGRAL_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_INTEGRAL_NATIVE) { //剑鱼币
+		} else if strings.HasPrefix(outTradeno, pay.ALI_INTEGRAL_APP) || strings.HasPrefix(outTradeno, pay.ALI_INTEGRAL_NATIVE) { //剑鱼币
 			if !entity.Integral.PayCallBack(thisParam) {
 				log.Println("支付宝剑鱼币更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_DATAPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_DATAPACK_NATIVE) { //个人数据包
+		} else if strings.HasPrefix(outTradeno, pay.ALI_DATAPACK_APP) || strings.HasPrefix(outTradeno, pay.ALI_DATAPACK_NATIVE) { //个人数据包
 			if !entity.JyDataExportPack.PayCallBack(thisParam) {
 				log.Println("支付宝个人数据包支付回调更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_AREAPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_AREAPACK_NATIVE) { //省份订阅包
+		} else if strings.HasPrefix(outTradeno, pay.ALI_AREAPACK_APP) || strings.HasPrefix(outTradeno, pay.ALI_AREAPACK_NATIVE) { //省份订阅包
 			if !entity.AreaPackPrice.PayCallBack(thisParam) {
 				log.Println("支付宝个人数据包支付回调更新执行出错 %+v\n", thisParam)
 				return false
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.ALI_FILEPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.ALI_FILEPACK_NATIVE) {
+		} else if strings.HasPrefix(outTradeno, pay.ALI_FILEPACK_APP) || strings.HasPrefix(outTradeno, pay.ALI_FILEPACK_NATIVE) {
 			if !entity.JyresoucePack.PayCallBack(thisParam) {
 				log.Println("支付宝附件下载包支付回调更新执行出错 %+v\n", thisParam)
 				return false
@@ -253,7 +256,10 @@ func (p *PayCallBackAction) WxPayCallback() {
 		qutil.ObjToString(ret["openid"]),
 		"",
 	}
-
+	outTradeno := thisParam.OutTradeno
+	if devTradenoSign := qutil.ObjToString(config.PayConf["devTradenoSign"]); devTradenoSign != "" {
+		outTradeno = strings.TrimPrefix(outTradeno, devTradenoSign)
+	}
 	ok := func() bool {
 		if ret["return_code"] != "SUCCESS" || !(ret["appid"] == pay.WxStruct.Appid || ret["appid"] == pay.WxStruct.Appid_app) || ret["mch_id"] != pay.WxStruct.Mchid {
 			return false
@@ -265,59 +271,59 @@ func (p *PayCallBackAction) WxPayCallback() {
 			return false
 		}
 		update, insert := false, false
-		if strings.HasPrefix(thisParam.OutTradeno, pay.WX_REWARD_JSAPI) { //打赏
+		if strings.HasPrefix(outTradeno, pay.WX_REWARD_JSAPI) { //打赏
 			if update = entity.JyReWardStruct.PayCallBack(thisParam); !update {
 				log.Printf("微信打赏更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAEXPORT_NATIVE) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAEXPORT_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAEXPORT_JSAPI) { //订阅数据导出
+		} else if strings.HasPrefix(outTradeno, pay.WX_DATAEXPORT_NATIVE) || strings.HasPrefix(outTradeno, pay.WX_DATAEXPORT_APP) || strings.HasPrefix(outTradeno, pay.WX_DATAEXPORT_JSAPI) { //订阅数据导出
 			if update = entity.JyDataExportStruct.PayCallBack(thisParam); !update {
 				log.Printf("微信数据导出更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAREPORT_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAREPORT_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAREPORT_NATIVE) { //数据报告
+		} else if strings.HasPrefix(outTradeno, pay.WX_DATAREPORT_APP) || strings.HasPrefix(outTradeno, pay.WX_DATAREPORT_JSAPI) || strings.HasPrefix(outTradeno, pay.WX_DATAREPORT_NATIVE) { //数据报告
 			if update = entity.JyDataReportStruct.PayCallBack(thisParam); !update {
 				log.Printf("微信数据报告更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_SUBVIP_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_SUBVIP_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_SUBVIP_NATIVE) { //vip订阅
+		} else if strings.HasPrefix(outTradeno, pay.WX_SUBVIP_APP) || strings.HasPrefix(outTradeno, pay.WX_SUBVIP_JSAPI) || strings.HasPrefix(outTradeno, pay.WX_SUBVIP_NATIVE) { //vip订阅
 			if update = entity.JyVipSubStruct.PayCallBack(thisParam); !update {
 				log.Printf("微信vip订阅更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_COURSE_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_COURSE_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_COURSE_NATIVE) { //招投标课程
+		} else if strings.HasPrefix(outTradeno, pay.WX_COURSE_JSAPI) || strings.HasPrefix(outTradeno, pay.WX_COURSE_APP) || strings.HasPrefix(outTradeno, pay.WX_COURSE_NATIVE) { //招投标课程
 			if update = entity.JyCourse.PayCallBack(thisParam); !update {
 				log.Printf("微信招投标课程更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_ENTNICHE_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_ENTNICHE_NATIVE) { //企业商机管理
+		} else if strings.HasPrefix(outTradeno, pay.WX_ENTNICHE_APP) || strings.HasPrefix(outTradeno, pay.WX_ENTNICHE_NATIVE) { //企业商机管理
 			if update = entity.EntnicheStruct.PayCallBack(thisParam); !update {
 				log.Printf("微信企业商机管理更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_COURSEONLINE_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_COURSEONLINE_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_COURSEONLINE_NATIVE) { //中标必听课
+		} else if strings.HasPrefix(outTradeno, pay.WX_COURSEONLINE_APP) || strings.HasPrefix(outTradeno, pay.WX_COURSEONLINE_JSAPI) || strings.HasPrefix(outTradeno, pay.WX_COURSEONLINE_NATIVE) { //中标必听课
 			if update = entity.JyCourseOnline.PayCallBack(thisParam); !update {
 				log.Printf("微信线上课程更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_MEMBER_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_MEMBER_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_MEMBER_NATIVE) { //大会员
+		} else if strings.HasPrefix(outTradeno, pay.WX_MEMBER_APP) || strings.HasPrefix(outTradeno, pay.WX_MEMBER_JSAPI) || strings.HasPrefix(outTradeno, pay.WX_MEMBER_NATIVE) { //大会员
 			if update = entity.MemberStruct.PayCallBack(thisParam); !update {
 				log.Printf("微信大会员更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_AIFORECASTPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_AIFORECASTPACK_NATIVE) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_AIFORECASTPACK_JSAPI) { //大会员 AI中标预测
+		} else if strings.HasPrefix(outTradeno, pay.WX_AIFORECASTPACK_APP) || strings.HasPrefix(outTradeno, pay.WX_AIFORECASTPACK_NATIVE) || strings.HasPrefix(outTradeno, pay.WX_AIFORECASTPACK_JSAPI) { //大会员 AI中标预测
 			if update = entity.AiForecastPackStruct.PayCallBack(thisParam); !update {
 				log.Printf("微信AI中标预测包更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_BIDFILE_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_BIDFILE_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_BIDFILE_NATIVE) { //大会员 AI中标预测
+		} else if strings.HasPrefix(outTradeno, pay.WX_BIDFILE_APP) || strings.HasPrefix(outTradeno, pay.WX_BIDFILE_JSAPI) || strings.HasPrefix(outTradeno, pay.WX_BIDFILE_NATIVE) { //大会员 AI中标预测
 			if update = entity.Bidfile.PayCallBack(thisParam); !update {
 				log.Printf("微信招标文件解读更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_INTEGRAL_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_INTEGRAL_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_INTEGRAL_NATIVE) { //剑鱼币
+		} else if strings.HasPrefix(outTradeno, pay.WX_INTEGRAL_APP) || strings.HasPrefix(outTradeno, pay.WX_INTEGRAL_JSAPI) || strings.HasPrefix(outTradeno, pay.WX_INTEGRAL_NATIVE) { //剑鱼币
 			if update = entity.Integral.PayCallBack(thisParam); !update {
 				log.Printf("微信剑鱼币更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAPACK_JSAIP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_DATAPACK_NATIVE) { //个人数据包
+		} else if strings.HasPrefix(outTradeno, pay.WX_DATAPACK_APP) || strings.HasPrefix(outTradeno, pay.WX_DATAPACK_JSAIP) || strings.HasPrefix(outTradeno, pay.WX_DATAPACK_NATIVE) { //个人数据包
 			if update = entity.JyDataExportPack.PayCallBack(thisParam); !update {
 				log.Printf("微信个人数据包支付回调更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_AREAPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_AREAPACK_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_AREAPACK_NATIVE) { //省份订阅包
+		} else if strings.HasPrefix(outTradeno, pay.WX_AREAPACK_APP) || strings.HasPrefix(outTradeno, pay.WX_AREAPACK_JSAPI) || strings.HasPrefix(outTradeno, pay.WX_AREAPACK_NATIVE) { //省份订阅包
 			if update = entity.AreaPackPrice.PayCallBack(thisParam); !update {
 				log.Printf("微信个人数据包支付回调更新执行出错 %+v\n", thisParam)
 			}
-		} else if strings.HasPrefix(thisParam.OutTradeno, pay.WX_FILEPACK_APP) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_FILEPACK_JSAPI) || strings.HasPrefix(thisParam.OutTradeno, pay.WX_FILEPACK_NATIVE) { //附件下载包
+		} else if strings.HasPrefix(outTradeno, pay.WX_FILEPACK_APP) || strings.HasPrefix(outTradeno, pay.WX_FILEPACK_JSAPI) || strings.HasPrefix(outTradeno, pay.WX_FILEPACK_NATIVE) { //附件下载包
 			if update = entity.JyresoucePack.PayCallBack(thisParam); !update {
 				log.Printf("微信附件下载包支付回调更新执行出错 %+v\n", thisParam)
 			}

src/jfw/modules/subscribepay/src/timetask/timetask.go

@@ -638,16 +638,17 @@ func bigMemberExpireRemind() {
 				"$in": []int{1, 2},
 			},
 		}).Select(map[string]interface{}{
-			"s_m_openid":          1,
-			"s_jpushid":           1,
-			"s_opushid":           1,
-			"s_appponetype":       1,
-			"s_nickname":          1,
-			"i_ispush":            1,
-			"i_member_status":     1,
-			"i_member_starttime":  1,
-			"i_member_endtime":    1,
-			"i_member_expire_tip": 1,
+			"s_m_openid":                1,
+			"s_jpushid":                 1,
+			"s_opushid":                 1,
+			"s_appponetype":             1,
+			"s_nickname":                1,
+			"i_ispush":                  1,
+			"i_member_status":           1,
+			"i_member_starttime":        1,
+			"i_member_endtime":          1,
+			"i_member_expire_tip":       1,
+			"i_member_expire_tip_retry": 1,
 		}).Iter()
 		for m := make(map[string]interface{}); it.Next(&m); {
 			i_member_expire_tip := qutil.IntAll(m["i_member_expire_tip"])

src/jfw/modules/weixin/src/apiclient_cert.pem

@@ -1,26 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEbzCCA9igAwIBAgIEAfmzfTANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
-Q04xEjAQBgNVBAgTCUd1YW5nZG9uZzERMA8GA1UEBxMIU2hlbnpoZW4xEDAOBgNV
-BAoTB1RlbmNlbnQxDDAKBgNVBAsTA1dYRzETMBEGA1UEAxMKTW1wYXltY2hDQTEf
-MB0GCSqGSIb3DQEJARYQbW1wYXltY2hAdGVuY2VudDAeFw0xODA1MjkwMjE1NDZa
-Fw0yODA1MjYwMjE1NDZaMIGeMQswCQYDVQQGEwJDTjESMBAGA1UECBMJR3Vhbmdk
-b25nMREwDwYDVQQHEwhTaGVuemhlbjEQMA4GA1UEChMHVGVuY2VudDEOMAwGA1UE
-CxMFTU1QYXkxMzAxBgNVBAMUKuWMl+S6rOaLk+aZruS4sOiBlOS/oeaBr+W3peeo
-i+aciemZkOWFrOWPuDERMA8GA1UEBBMIMTY4NDgxMzAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC/Qa1SjlLobwwJ1qqbuczu7q07ZJkj9T746TudYkxz
-aEwhgDatweEt6Ba43ODEemlRIeX+9MaXSs/6NRBhjeOFjGYYE5bL+cjVs906leRk
-BvRsfCA2/wXQ6IBqxa8+xcaga8gWK27IMumUzPd7nSeRkYRZyT+lA8tZwjvHVksk
-G7z1Pt8JU+EfLL6+S7CNIFTiWrxumvUgpUEiTQPW+J/GRJqAPeuJ8svid0HuO+kE
-kRfb2mPMeyZIcPgd7fZLJN1Hg6tpPdyk85WTuVAcH0U5Nh1vNdreUpfgNk/vlISv
-3kH2w7trqYJjm04ruj0tjId1N1ZyPiEjGE87o+KUYVDHAgMBAAGjggFGMIIBQjAJ
-BgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh0iQ0VTLUNBIEdlbmVyYXRlIENlcnRp
-ZmljYXRlIjAdBgNVHQ4EFgQUIi0lp5pMi/KTMgj1WlTXlKwuRr0wgb8GA1UdIwSB
-tzCBtIAUPgUm9iJitBVbiM1kfrDUYqflhnShgZCkgY0wgYoxCzAJBgNVBAYTAkNO
-MRIwEAYDVQQIEwlHdWFuZ2RvbmcxETAPBgNVBAcTCFNoZW56aGVuMRAwDgYDVQQK
-EwdUZW5jZW50MQwwCgYDVQQLEwNXWEcxEzARBgNVBAMTCk1tcGF5bWNoQ0ExHzAd
-BgkqhkiG9w0BCQEWEG1tcGF5bWNoQHRlbmNlbnSCCQC7VJcrvADoVzAOBgNVHQ8B
-Af8EBAMCBsAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQAD
-gYEABvyHYzmJEFj9bfjrzQpDAph0py9FgMKG8W0ZDky/cIWT7D/h6hfyVbzIE+OE
-Hdck2vm6e08odzLLQnl2C//VIJ5Brf/Foq5wXDMt+GfXukbssc9UI5YJDY9/UAqV
-9RmhBtlI3ut/RtIYCV3W0Ea5rOPDwOX/+BUttKj9gY+EasA=
+MIID8DCCAtigAwIBAgIUNLlVRqVh+Eiu3jlU+WNDlreeUKwwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjIwMTA3MDgzMzM0WhcNMjcwMTA2MDgzMzM0WjCBgTETMBEGA1UEAwwK
+MTYxODg4NDIyNTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
+DCTljJfkuqzliZHpsbzkv6Hmga/mioDmnK/mnInpmZDlhazlj7gxCzAJBgNVBAYM
+AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKjtQoaw4Ps5/BBz0x4pqLsPWAyXR0svkFTHOCL5ssVh0gH6YVPuDVi/
+zSIlUBo6OTv8n3+n9D98hbfaq9+l48pTNRVLbqhrpsxvopkutfB2VLePWf6v+Uik
+H9I8Z/RUuGeAemBtlXmCdbNocFVFp/J3Szz4zn4NtDrB/YSPwK3o0p1shzHc0sTb
+OXsHGu6FkPsMFEgrBmCdfg/X78zQwYWXnt2DHVPV1uBw1NUc8aE89fr07+BhvJq+
+h688St+/CxiTGA5SRDse52qS0JT8WyP6l+iYHyIDpbaVMTdl5detK7kpgzZAXMMc
+G8AMnq3dGmVYRcxphlWB9MMMJB4IOpUCAwEAAaOBgTB/MAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVzLmNv
+bS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1
+NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAeI7qGCvdkYRX9sRM
+Yg/kfrl+wWZmS0ftqiHnyKwLk5yP0OsYFh9X/AXvezkQeBHTludKyzfwSLL9gx+y
+erJCGdpeQSKFSTuWFL1SyXQvlG7H9VDhsJXVIboe+xF5HFrgPf+I5f8Tw9yaJ38n
+wJkxSApbI2n33NMvRvHpO9CWsuFvm+qfzIEhF8c8nCQBCrvHFESw37n3uV+UeHvb
+yUILxz7Chtbap1Fs/bL3tbq00VgOzS+V+wct87uUow5OL/1OzQorM7sp6EZny58u
+NyBbrvsrGZOZmt86nK+reRfNWSnUCkx+8bB/MV1vTXJNAloBoJ2yLtNf0OgIRmSS
+C4r8AQ==
 -----END CERTIFICATE-----

src/jfw/modules/weixin/src/apiclient_key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC/Qa1SjlLobwwJ
-1qqbuczu7q07ZJkj9T746TudYkxzaEwhgDatweEt6Ba43ODEemlRIeX+9MaXSs/6
-NRBhjeOFjGYYE5bL+cjVs906leRkBvRsfCA2/wXQ6IBqxa8+xcaga8gWK27IMumU
-zPd7nSeRkYRZyT+lA8tZwjvHVkskG7z1Pt8JU+EfLL6+S7CNIFTiWrxumvUgpUEi
-TQPW+J/GRJqAPeuJ8svid0HuO+kEkRfb2mPMeyZIcPgd7fZLJN1Hg6tpPdyk85WT
-uVAcH0U5Nh1vNdreUpfgNk/vlISv3kH2w7trqYJjm04ruj0tjId1N1ZyPiEjGE87
-o+KUYVDHAgMBAAECggEAYD1aTBqWGaQXeLPuseHy/6BWx3Y9oVx9TZ9/ghi+w6wN
-8yWjXhgbiZAqLufmqre2Wz8ljv/5FpRsx0kAbzaI8ODPVvo0fXu51d9mSV63yKW/
-RP/I7iOx94enZxMGth2rb3oM+yrr2g3UgC4LssZH7PY+lTexsQWRxB77GbmQoh/7
-nGIsEJIqXx34M+GZTECyDFwJiEgOl/wrgoaC0ioR2jjLBAstR0na1o1/mqO1CsV+
-kFR19yhwpULLRMEEtSGtHEGZQiVU5IAAdWKbd/haqkUmT6os+UZDj9fl1fhoeDni
-pFU9t4NXkydD7xLg5YR4YVlxbIsJdzPoVoUn8KMakQKBgQDw61AfDZqv7ILv2jES
-SxmaGbWHebqoFsMpcHOHHLh+pQ/vbEbMuqHZxlZr2f80T10uRccJNwFyjb2+ajJa
-kYoA8Qk+W4E++zVQWaDRzTeFN3Pp5ZsLtPp3yIiyHkKg1PwCGpCw8IykJVplIDcs
-hKxeSU8Po5H5H9zCxQ0goYhZNQKBgQDLOod0jfzEcoRdriONPjz1NqyFLKGmE7ht
-EGZS+Wa9v6tlz+5ajGCAVflCscOj97W58JjLEbEZPML20lzIYA0EkJ2gRjbHKf4S
-olNcBf+3apqPaT7soheMXdOcIFu61OtTO/ojvCwDOJiDJgH4g7JsafLX7J4bDAZg
-naumv+J9iwKBgQDjfJ7UI6lr8r0UtIffiTBslVgWy3fYHl48M+WysAj59OyeHDSi
-PpxzoVebUWYsQ8Bt4A94AQuJ2pNPSMGxSXnxN6iNzCO3j8cgzvEPCmMhlGIMevUz
-Ubmr/5wr7GznpxUq+2Ci4xE6MdcwZAIVNFX6VeikkMRWY6K1+xFRPZYc/QKBgQDE
-XCbo7Q/fV66hPVJIdGw9mbgTbM47Qy6c4o2bejJVAE7BLqjkgGH1Xhxa3ptjYEIM
-CHX5L3zoH5dZGGRhjrzFPl2usGjZAq/knUbh0UIEnFH+YvhTd0I9c6K0ZWd8G6HM
-aFUGFhiIfDSP8zdQQR8yNSRYkN0q0PGQhIeHtDtIhQKBgQCnm6/z8iWPmws/zOmc
-L+sybWyfM38+kgpCWIlpVscwj5Um+xJr88kTyyEqehgFnk1uVc9hFhSukN8O14js
-y5UIqWXYagMFQ2tAb39S0M2X+d3LNFTl6juPAPuKRe0tOl6fR//JtlT+amXOS8m5
-gGbAHPQ8plDeRM9H0W7s9tfBZg==
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCo7UKGsOD7OfwQ
+c9MeKai7D1gMl0dLL5BUxzgi+bLFYdIB+mFT7g1Yv80iJVAaOjk7/J9/p/Q/fIW3
+2qvfpePKUzUVS26oa6bMb6KZLrXwdlS3j1n+r/lIpB/SPGf0VLhngHpgbZV5gnWz
+aHBVRafyd0s8+M5+DbQ6wf2Ej8Ct6NKdbIcx3NLE2zl7BxruhZD7DBRIKwZgnX4P
+1+/M0MGFl57dgx1T1dbgcNTVHPGhPPX69O/gYbyavoevPErfvwsYkxgOUkQ7Hudq
+ktCU/Fsj+pfomB8iA6W2lTE3ZeXXrSu5KYM2QFzDHBvADJ6t3RplWEXMaYZVgfTD
+DCQeCDqVAgMBAAECggEAYBRKQUd7Pwi02Dq4ejBhmrtYbhjg4N+VrNJ+mE4DIwbH
+Jn7dOppsFu1IZEJqs/Anu3ms0jOZ1T4i4/ZIyXSWAe6fg5QaxUotXZulFJEfxDvZ
+ZWnwWs6F744B11aqHarOE3hcolnRqYHNJhShx65NnrfBIFW3RLTQrJbHdc05Xu/f
+rElKPMq+nSD2vUhBMtCh+4qfvQRnjpZ3sNyeP4NVI1TncZFo+T/MdM9/i9wQauKz
+bCIoDBXgfiO3dbiuMKmJbV9w0PFSrxBimam8jwFI5E7E2nECGE2UIqTnoPkiVtTZ
+bdGp/Uv5Gc//+i42gK0c8KOp6X9LPUVzl+knZrKKBQKBgQDV3Se7PgF0m7y6L7xq
+TGl15ILdN88Kq7Er7yE2GkCE9tdYoikQbsYXISLxwOuD9azeu/u3nLCTihHha5Z4
+Dyuj8Crd6OP42/ku9tbKTBBsqjqEPEE4w8+ZO4tnRWp+X224ESp/LEN+PQtmbpBq
+b8kgR9Q3HjNCma8T2IRAH+5OMwKBgQDKNZKAyjzawGhVrFBy5b7qwfJ020wRAQoj
+owsVLTvAF+w+d8h+7Kbu/LlVHFBG6IHvGrpPDqbnF5wJ8Qo9QfBU4E1fWMtyKmbP
+RhFScAdCcCpCi4TSWJLrJjg/hio4Z4e4e0IYemM9MSLuIMwpezYsvzkAXeQJjxTo
+QWI5m8f8FwKBgQCPbTIoMP1o5sk7VKhX4ccYeZgKJFOGJH89p7HuRszeX20s1BQW
+ITRYbrCw0WEhrrGw7wFxsnP5fq9fLnhLLGFoILme+YFqdJw5EvIZ2clqFwAHjyFu
+oGOpsHVdXQB+oCFFQL3vbBAXqXjryVqxBycrrwBztp1KHSd9d8e5+bAoYQKBgQCk
+RiWBD8ukg4+/mj+5OECEA5BvswD3B3svPHPyfk7+XfEFRtbRlnx/xzzhkiD9mkKE
+95fIRkT9lMalpPcGkR0oNxlkjoSpeR0Q4wGLkYu0Q99xNFtxb5fcBa7InLyMGj++
+dhRaQoOA4PxZrLdwM7LtY2RxkdWCloULsqKT3qT3fQKBgQDUzZhBFJncBdrXUPAK
+afiAzrFlHRofkRD3g8YMmMv5w1lHYoD18sTwoXTqey3kP336dJAMSQpLnQ+M1sD8
+8LyQco9A49Kiu3UE9ZSUVGkX6iUghaIgkb+7blZzfX6Pt+ubuuOQcFVnTIFVB45X
+xn1hlFiz6hw5wznqCO1zrc0lug==
 -----END PRIVATE KEY-----

src/jfw/modules/weixin/src/github.com/wizjin/weixin/weixin.go

@@ -357,14 +357,24 @@ func (wx *Weixin) HandleFunc(pattern string, handler HandlerFunc) {
 	wx.routes = append(wx.routes, route)
 }
 
-func (wx *Weixin) GetToken() string {
-	token := <-wx.tokenChan
-	return token.token
+func (wx *Weixin) GetToken() (string, error) {
+	for i := 0; i < retryMaxN; i++ {
+		token := <-wx.tokenChan
+		if time.Since(token.expires).Seconds() < 0 {
+			return token.token, nil
+		}
+	}
+	return "", errors.New("Get Token Timeout")
 }
 
-func (wx *Weixin) GetTicket() string {
-	ticket := <-wx.ticketChan
-	return ticket.ticket
+func (wx *Weixin) GetTicket() (string, error) {
+	for i := 0; i < retryMaxN; i++ {
+		ticket := <-wx.ticketChan
+		if time.Since(ticket.expires).Seconds() < 0 {
+			return ticket.ticket, nil
+		}
+	}
+	return "", errors.New("Get Ticket Timeout")
 }
 
 // Post text message
@@ -734,18 +744,8 @@ func (wx *Weixin) GetUserList(openid string) (*UserList, error) {
 	return &result, nil
 }
 
-func (wx *Weixin) GetJsApiTicket() (string, error) {
-	for i := 0; i < retryMaxN; i++ {
-		ticket := <-wx.ticketChan
-		if time.Since(ticket.expires).Seconds() < 0 {
-			return ticket.ticket, nil
-		}
-	}
-	return "", errors.New("Get JsApi Ticket Timeout")
-}
-
 func (wx *Weixin) JsSignature(url string, timestamp int64, noncestr string) (string, error) {
-	ticket, err := wx.GetJsApiTicket()
+	ticket, err := wx.GetTicket()
 	if err != nil {
 		return "", err
 	}
@@ -965,6 +965,9 @@ func createAccessToken(c chan accessToken, appid string, refresh *bool, r chan s
 					continue
 				}
 				token.expires = time.Unix(expires, 0)
+				if time.Since(token.expires).Seconds() >= 0 {
+					continue
+				}
 				*token.lasttime = lasttime
 			} else {
 				break
@@ -986,7 +989,7 @@ func createJsApiTicket(appid string, c chan jsApiTicket, r chan bool) {
 				}
 				reTry++
 				t, err := getJsApiTicket(appid, r)
-				if err == nil && t != nil {
+				if err == nil && t != nil && time.Since(t.expires).Seconds() < 0 {
 					ticket = *t
 				}
 			} else {

src/jfw/modules/weixin/src/github.com/wizjin/weixin/wxssl.go

@@ -29,17 +29,19 @@ func InitSSLClient(cer, key, ca string) {
 		return
 	}
 
-	caData, err := ioutil.ReadFile(ca)
-	if err != nil {
-		log.Println("read wechat ca fail", err)
-		return
-	}
-	pool := x509.NewCertPool()
-	pool.AppendCertsFromPEM(caData)
-
 	_tlsConfig = &tls.Config{
 		Certificates: []tls.Certificate{cert},
-		RootCAs:      pool,
+	}
+
+	if ca != "" {
+		caData, err := ioutil.ReadFile(ca)
+		if err != nil {
+			log.Println("read wechat ca fail", err)
+			return
+		}
+		pool := x509.NewCertPool()
+		pool.AppendCertsFromPEM(caData)
+		_tlsConfig.RootCAs = pool
 	}
 
 	tr := &http.Transport{TLSClientConfig: _tlsConfig}

src/jfw/modules/weixin/src/rootca.pem

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
-CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
-nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
-43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
-T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
-gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
-TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
-DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
-hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
-06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
-PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
-YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----

src/jfw/modules/weixin/src/wx/wx.go

@@ -72,7 +72,7 @@ var MapScans = make([]*MapScan, MSPOOL)
 
 func init() {
 	util.InitInfluxdb(util.ObjToString(config.Sysconfig["influxdb"]))
-	InitSSLClient("./apiclient_cert.pem", "./apiclient_key.pem", "./rootca.pem")
+	InitSSLClient("./apiclient_cert.pem", "./apiclient_key.pem", "")
 	Mux = New(config.Sysconfig["apptoken"].(string), config.Sysconfig["appid"].(string), config.Sysconfig["appsecret"].(string))
 	// 注册关注事件的处理函数
 	//扫码事件
@@ -83,10 +83,10 @@ func init() {
 	Mux.HandleFunc(MsgTypeText, MsgTxtHandler)
 	Mux.HandleFunc(MsgTypeEventClick, MenuClickHandler)
 	se = util.SimpleEncrypt{Key: "topnet"}
-	CheckJob()
+	//CheckJob()
 	//关键词只能包含汉字、字母、数子
 	regKey, _ = regexp.Compile("^([0-9]|[A-Za-z]|[\u4E00-\u9FFF])+$")
-	CountRun(8)
+	//CountRun(8)
 	for i := 0; i < MSPOOL; i++ {
 		ms := &MapScan{Map: map[string]int{}}
 		go ms.GC()
@@ -448,6 +448,7 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 		newUser["s_province"] = u.Province
 		newUser["s_city"] = u.City
 		newUser["i_applystatus"] = 1
+		newUser["i_isnewwx"] = 1 //公众号迁移新增字段标识
 		if len(strings.Split(source, "_")) > 3 {
 			if strings.Split(source, "_")[2] == "GX" {
 				disStr := strings.Split(source, "_")[0] + "_" + strings.Split(source, "_")[1][1:] + "_" + strings.Split(source, "_")[2]
@@ -591,13 +592,26 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 				"i_sourceid":      isourceid,
 				"o_jy.i_wxpush":   1,
 				"i_ispush":        1,
-				"s_headimageurl":  u.HeadImageUrl,
-				"s_nickname":      u.Nickname,
-				"s_province":      u.Province,
-				"s_country":       u.Country,
-				"s_city":          u.City,
-				"i_sex":           u.Sex,
 				// "o_jy.i_newfree":  1, //新免费用户=>新订阅设置页面 20211122
+				"i_isnewwx": 1, //公众号迁移新增字段标识
+			}
+			if u.HeadImageUrl != "" {
+				set["s_headimageurl"] = u.HeadImageUrl
+			}
+			if u.Nickname != "" {
+				set["s_nickname"] = u.Nickname
+			}
+			if u.Province != "" {
+				set["s_province"] = u.Province
+			}
+			if u.Country != "" {
+				set["s_country"] = u.Country
+			}
+			if u.City != "" {
+				set["s_city"] = u.City
+			}
+			if u.Sex > 0 {
+				set["i_sex"] = u.Sex
 			}
 			set["i_applystatus"] = 1
 			if tuser["l_registedate"] == nil {
@@ -1338,16 +1352,32 @@ func ScanHandler(w ResponseWriter, r *Request) {
 					}
 				}
 			}
-			go tools.MQFW.UpdateById("user", userId, &map[string]interface{}{
-				"$set": map[string]interface{}{
-					"s_headimageurl": user.HeadImageUrl,
-					"s_nickname":     user.Nickname,
-					"s_province":     user.Province,
-					"s_country":      user.Country,
-					"s_city":         user.City,
-					"i_sex":          user.Sex,
-				},
-			})
+			go func() {
+				updateUserData := map[string]interface{}{}
+				if user.HeadImageUrl != "" {
+					updateUserData["s_headimageurl"] = user.HeadImageUrl
+				}
+				if user.Nickname != "" {
+					updateUserData["s_nickname"] = user.Nickname
+				}
+				if user.Province != "" {
+					updateUserData["s_province"] = user.Province
+				}
+				if user.Country != "" {
+					updateUserData["s_country"] = user.Country
+				}
+				if user.City != "" {
+					updateUserData["s_city"] = user.City
+				}
+				if user.Sex > 0 {
+					updateUserData["i_sex"] = user.Sex
+				}
+				if len(updateUserData) > 0 {
+					tools.MQFW.UpdateById("user", userId, &map[string]interface{}{
+						"$set": updateUserData,
+					})
+				}
+			}()
 		}
 		var activesign = config.Sysconfig["activesign"].(bool) //是否有活动进行
 		if activesign {
@@ -1740,12 +1770,14 @@ func YjStrHandle(w http.ResponseWriter, r *http.Request) {
 
 //获取AccessToken
 func GetToken(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprint(w, Mux.GetToken())
+	v, _ := Mux.GetToken()
+	fmt.Fprint(w, v)
 }
 
 //获取Ticket
 func GetTicket(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprint(w, Mux.GetTicket())
+	v, _ := Mux.GetTicket()
+	fmt.Fprint(w, v)
 }
 
 //生成推广临时二维码地址

src/web/staticres/big-member/js/public_big.js

@@ -15,11 +15,24 @@ if (!pageUserInfo) {
         logid: ''
     }
 }
+
+var canShowFooter =  (pageUserInfo.memberStatus < 0 || !pageUserInfo.memberStatus)
+if (pageUserInfo.memberTrial) {
+    canShowFooter = false
+}
+
 // 修改底部横幅广告
-if (pageUserInfo.memberStatus < 0 || !pageUserInfo.memberStatus) {
+if (canShowFooter) {
     $('.footer-banner').show()
 } else {
     $('.footer-banner').hide()
+}
+
+if (pageUserInfo.memberStatus < 0 || !pageUserInfo.memberStatus) {
+    changeButtonText()
+}
+
+function changeButtonText () {
     $(".subpage-button").each(function () {
         var nType = $(this).text().trim()
         if (nType === '立即体验') {
@@ -33,9 +46,7 @@ if (pageUserInfo.memberStatus < 0 || !pageUserInfo.memberStatus) {
         }
     })
 }
-if (pageUserInfo.memberTrial) {
-    $('.footer-banner').hide()
-}
+
 function initInsetSwiper () {
     return new Swiper('.swiper-container', {
         pagination: {
@@ -76,6 +87,10 @@ $(function () {
     } catch (err) {}
 
     var sourceMap = {
+        商机管理: {
+          info: '',
+          source: 'ent-manage-pc'
+        },
         业务拓展分析: {
             info: 'yw',
             source: 'function_Business_analysis'
@@ -168,6 +183,14 @@ $(function () {
         } catch (e) {
             console.log('未初始化百度统计')
         }
+        if (typeKey === '商机管理') {
+            if (nType === '了解更多') {
+                nType = '立即体验'
+            } else {
+                nType = '去使用'
+            }
+
+        }
         switch (nType) {
             case '点此购买': {
                 if (!loginflag) {
@@ -189,6 +212,10 @@ $(function () {
                 location.href = '/big/page/' + sourceMap[typeKey].info
                 break
             }
+            case '去使用': {
+                location.href = '/entpc/bus'
+                break
+            }
             case '立即使用': {
                 location.href = '/swordfish/page_big_pc'
                 break
@@ -219,6 +246,9 @@ $(function () {
 
     // 底部横幅立即体验
     $(".footer-banner area").on('click', function () {
+        if ($(this).hasClass('open-customer')) {
+            return
+        }
         if (!loginflag) {
             openLoginDig()
             return
@@ -249,18 +279,18 @@ $(function () {
             }
         }
         // 数字滚动
-        // var numberBox = $(".show-number-box")
-        // if (numberBox) {
-        //     var numberBoxH = numberBox.offset().top
-        //     if ($(window).scrollTop() + $(window).height()  >= numberBoxH) {
-        //         if (!numberBox.attr('data-show-an')) {
-        //             numberBox.attr('data-show-an','true')
-        //             filpNumber()
-        //         }
-        //     } else {
-        //         numberBox.removeAttr('data-show-an')
-        //     }
-        // }
+        var numberBox = $(".show-number-box")
+        if (numberBox.length) {
+            var numberBoxH = numberBox.offset().top
+            if ($(window).scrollTop() + $(window).height()  >= numberBoxH) {
+                if (!numberBox.attr('data-show-an')) {
+                    numberBox.attr('data-show-an','true')
+                    filpNumber()
+                }
+            } else {
+                numberBox.removeAttr('data-show-an')
+            }
+        }
     }
 
     /******* 获取url参数（正则）********/

src/web/staticres/electronic_invoice/js/invoice.js

@@ -121,18 +121,6 @@ $(function () {
         $('.unit_invoice').hide()
     }
     initSelect();
-    // 查询是否可以开发票
-    $.ajax({
-      url: '/jypay/invoice/switch',
-      type: "GET",
-      success: function(res) {
-        if (res.code === '1001') {
-          // 不能开票
-          $('#switchModal').modal('show').find('.text').text(res.messge)
-          return 
-        }
-      }
-    })
     // 提交
     $('.submit_btn').click(function(){
 		var order_code =$(".order_code").text();

src/web/staticres/js/pc-collect-user-info.js

@@ -384,7 +384,8 @@ var vm = new Vue({
         function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！', // 大会员功能介绍
         jylab_see500_plus: '请留下联系方式，我们会尽快联系您！开通大会员可查看更多招标项目，实时监控更多潜在商机！', // 标讯搜索500条
         article_purchase_intention: '请留下联系方式，我们会尽快联系您！开通大会员可抢先对接采购单位，帮助企业拓客！', // 三级页-采购意向
-        article_proposed_project: '请留下联系方式，我们会尽快联系您！开通大会员可抢先获知拟建商机动态，提高中标机率！' // 三级页-拟建项目
+        article_proposed_project: '请留下联系方式，我们会尽快联系您！开通大会员可抢先获知拟建商机动态，提高中标机率！', // 三级页-拟建项目
+        'ent-manage-pc': '请留下联系方式，我们会尽快联系您体验商机管理全部功能！', // 三级页-拟建项目
       },
       isRefresh: false // 留完资是否需要刷新页面
     }
@@ -420,6 +421,9 @@ var vm = new Vue({
         }
         return '恭喜您，成功解锁【' + text + '】权益1次。如需查看更多，请开通超级订阅，为您提供最新的商业情报，抢占先机。'
       } else {
+        if (this.source.indexOf('ent-manage-pc') > -1) {
+          return '我们会尽快联系您并预约演示时间，请耐心等待～<br>您将获得免费体验商机管理全部功能！'
+        }
         return '我们会尽快联系您并预约演示时间，请耐心等待～<br>您将获得免费体验大会员全部功能！'
       }
     }

src/web/staticres/wxtsguide/main.js

@@ -837,7 +837,7 @@ $(function(){
 	}
 	$("body").removeClass("hide");
 	//帮助按钮
-	$(".jy_help").click(function(){	window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect");
+	$(".jy_help").click(function(){	window.open("https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=1&sn=6b5d4f4aced2f4c9263e6e66639a40e6");
 	})
 	if(!isiOS){
 		$("#adjustment").height($(window).height() / 2);

src/web/templates/frontRouter/pc/entpc/free/enptc_index.html

@@ -21,7 +21,7 @@
         .enptc-index {
             padding-top: 0;
         }
-        .enptc-index .footer-banner {           
+        .enptc-index .footer-banner {
             background: linear-gradient(360deg, #085CDA 0%, #0CA2E2 98%);
         }
         .enptc-index .footer-banner img {
@@ -41,7 +41,7 @@
 <div class=" enptc-index">
     <div class="w-box" style=" text-align: center;">
         <img style="width: 100%;height: 600px;" src='{{Msg "seo" "cdn"}}/enptc/images/top-bg.png' alt="">
-        <div class="subpage-button white">了解更多</div>
+        <div class="subpage-button white" data-source="商机管理">了解更多</div>
     </div>
     <div class="w-box" style="margin-top: -60px;background: linear-gradient(134deg, #F0FCFF 0%, #E2F1FF 100%);" >
         <div class="w1200">
@@ -119,7 +119,7 @@
                 </div>
             </div>
         </div>
-        
+
     </div>
     <div class="w-box bg-3 ">
         <div class="w1200" style="padding-top: 60px; padding-bottom: 80px;">
@@ -244,16 +244,16 @@
                     </div>
                 </div>
             </div>
-            <div class="subpage-button footer-blue">了解更多</div>
+            <div class="subpage-button footer-blue" data-source="商机管理">了解更多</div>
         </div>
     </div>
     <div id="iphoneX-box"></div>
     <!--S-底部横幅-->
     <div class="w-box footer-banner" data-sticky-change>
         <div class="w1200">
-            <img style="width: 1152px;" src='{{Msg "seo" "cdn"}}/enptc/images/footer-banner.png' alt="" usemap="#map1" />
+            <img style="width: 1200px;" src='{{Msg "seo" "cdn"}}/enptc/images/footer-banner.png' alt="" usemap="#map1" />
             <map name="map1" style="cursor: pointer">
-                <area id="go-free-week1" data-need-bind-phone data-free-week shape="rect" coords="973,40,1134,85"  />
+                <area class="open-customer" id="go-free-week1" data-need-bind-phone data-free-week shape="rect" coords="929.5,44,1130.5,88" />
                 <!-- <area id="go-buy-18" data-need-bind-phone data-go-buy="0"  shape="rect" coords="950, 21, 1090, 67" /> -->
             </map>
         </div>
@@ -263,9 +263,9 @@
     </div>
     <div class="w-box footer-banner" data-sticky>
         <div class="w1200">
-            <img style="width: 1152px;" src='{{Msg "seo" "cdn"}}/enptc/images/footer-banner.png' alt="" usemap="#map2" />
+            <img style="width: 1200px;" src='{{Msg "seo" "cdn"}}/enptc/images/footer-banner.png' alt="" usemap="#map2" />
             <map name="map2" style="cursor: pointer">
-                <area id="go-free-week2"  data-need-bind-phone data-free-week shape="rect" coords="973,40,1134,85"  />
+                <area class="open-customer" id="go-free-week2"  data-need-bind-phone data-free-week shape="rect" coords="929.5,44,1130.5,88"  />
                 <!-- <area id="go-buy-19" data-need-bind-phone data-go-buy="0"  shape="rect" coords="950, 21, 1090, 67" /> -->
             </map>
         </div>
@@ -365,6 +365,28 @@
     setNavTheme(firstTheme = 'dark')
 </script>
 <script src='{{Msg "seo" "cdn"}}/big-member/js/public_big.js?v={{Msg "seo" "version"}}'></script>
+<script>
+    $(function () {
+        $.ajax({
+            url: '/entnicheNew/buy/whetherbuy',
+            type: 'POST',
+            success: function (res) {
+                if (res.data && res.data.status === 2) {
+                    $('.footer-banner').hide()
+                    $(".subpage-button").each(function () {
+                        var nType = $(this).text().trim()
+                        if (nType === '了解更多') {
+                            $(this).text('立即使用')
+                            if ($(this).hasClass('lightBlue')) {
+                                $(this).removeClass('lightBlue').addClass('gold')
+                            }
+                        }
+                    })
+                }
+            }
+        })
+    })
+</script>
 <!--S-百度统计-->
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -656,7 +656,8 @@
           function_: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
           jylab_see500_plus: '请留下联系方式，我们会尽快联系您！开通大会员可查看更多招标项目，实时监控更多潜在商机！',
           article_purchase_intention: '请留下联系方式，我们会尽快联系您！开通大会员可抢先对接采购单位，帮助企业拓客！', // 采购意向
-          article_proposed_project: '请留下联系方式，我们会尽快联系您！开通大会员可抢先获知拟建商机动态，提高中标机率！' // 拟建项目
+          article_proposed_project: '请留下联系方式，我们会尽快联系您！开通大会员可抢先获知拟建商机动态，提高中标机率！', // 拟建项目
+         'ent-manage-wx': '请留下联系方式，我们会尽快联系您体验商机管理全部功能！'
         }
 
         // 提示语
@@ -693,6 +694,7 @@
               ent_portrait_freeuser: '欢迎体验企业中标分析',
               ent_portrait_contacts: '欢迎体验剑鱼大会员',
               ent_portrait_changeList: '欢迎体验剑鱼大会员',
+              'ent-manage-wx': '欢迎体验剑鱼标讯商机管理'
           }
           for (var key in titleMap) {
               if (source.indexOf(key) !== -1) {
@@ -1217,9 +1219,13 @@
                     history.back()
                   })
                 } else {
+                  var message = '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验大会员全部功能！'
+                  if (source.indexOf('ent-manage-') > -1) {
+                      message = '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验商机管理全部功能！'
+                  }
                   _this.$dialog.close()
                   _this.$dialog.confirm({
-                    message: '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验大会员全部功能！',
+                    message: message,
                     className: 'ent-search-dialog max-54',
                     overlayClass: 'z-2030',
                     showCancelButton: false,

src/web/templates/pc/invoice.html

@@ -44,7 +44,7 @@
 	    color: #999999;
 	}
 </style>
-<body>
+<body class="hidden">
     <!-- header -->
 	{{include "/common/pchead.html"}}
     <!-- main  START -->
@@ -170,69 +170,88 @@
     <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/invoice.js?v={{Msg "seo" "version"}}"></script>
 	<script>
 		  $(function(){
-        
-			  var order_mail = {{.T.mail}};
-			  var order_phone = {{.T.phone}};
-			  if(order_mail!==""&&order_mail!==null&&order_mail!==undefined){
-				$(".email").val(order_mail)
-				$(".email").parent().siblings('.success').show();
-			  }
-			  if(order_phone!==""&&order_phone!==null&&order_phone!==undefined){
-			  	$(".tel").val(order_phone)
-				$(".tel").parent().siblings('.success').show();
-			  }
-			  var orderCode = {{.T.order_code}};
-			  var isSys = getParam("isSys");
-			  if(isSys === "true"){
-			  	  $.ajax({
-			  	  	type: 'POST',
-			  	  	url: '/jypay/invoice/show',
-			  	  	data: {"order_code":orderCode},
-					success: function(r){
-						if(r.status === "processing"){
-							if(r.data.invoice_type === "个人"){
-								$(".email").val(r.data.mail);
-								$(".tel").val(r.data.phone);
-								$(".email").parent().siblings('.success').show();
-								$(".tel").parent().siblings('.success').show();
-							}else{
-								$(".email").val(r.data.mail);
-								$(".tel").val(r.data.phone);
-								$(".unit_name").val(r.data.company_name);
-								$(".taxpayer_number").val(r.data.taxpayer_identnum);
-								$(".email").parent().siblings('.success').show();
-								$(".tel").parent().siblings('.success').show();
-								$(".unit_name").parent().siblings('.success').show();
-								$(".taxpayer_number").parent().siblings('.success').show();
-								$("#invoice_title > button").text("单位")
-								$(".unit_invoice").show();
-							}
-						}
-					}
-			  	  });
-			  }
-			  checkForm();
-
-			  var order_code = {{.T.order_code}};
-			  $(".order_code").text(order_code);
-			  $(".cancel_btn").on("click",function(){
-					window.history.go(-1);
-			  })
-
-			  $('#ruleModal').on('show.bs.modal', function () {
-			      var $this = $(this);
-			      var $modal_dialog = $this.find('.modal-dialog');
-			      $this.css('display', 'block');
-			      $modal_dialog.css({
-			          'margin-top': Math.max(0, ($(window).height() - $modal_dialog.height()) / 2)
-			      });
-			  });
-
-			  $("#public-nav").css("background","#fff");
-			  $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-			  $("section[id='drder']").css("padding-top", "80px");
-			  haslogin({{.T.logid}});
-		  })
+        var orderCode = {{.T.order_code}};
+        // 查询是否可以开发票
+        $.ajax({
+          url: '/jypay/invoice/switch',
+          type: "GET",
+          success: function(res) {
+            if (res.code === '1001') {
+              $('body').removeClass('hidden')
+              // 不能开票
+              $('#switchModal').modal('show').find('.text').text(res.messge)
+              return 
+            } else{
+              $.post("/jypay/invoice/available",{order_code:orderCode},function(rr){
+                if(rr.status==0){
+                  window.location.replace("/front/order/invoicetimeOut?f=upgrade")
+                }else{
+                  $("body").removeClass("hidden");
+          			  var order_mail = {{.T.mail}};
+          			  var order_phone = {{.T.phone}};
+          			  if(order_mail!==""&&order_mail!==null&&order_mail!==undefined){
+          				$(".email").val(order_mail)
+          				$(".email").parent().siblings('.success').show();
+          			  }
+          			  if(order_phone!==""&&order_phone!==null&&order_phone!==undefined){
+          			  	$(".tel").val(order_phone)
+          				$(".tel").parent().siblings('.success').show();
+          			  }
+          			  var isSys = getParam("isSys");
+          			  if(isSys === "true"){
+        			  	  $.ajax({
+        			  	  	type: 'POST',
+        			  	  	url: '/jypay/invoice/show',
+        			  	  	data: {"order_code":orderCode},
+        					    success: function(r){
+            						if(r.status === "processing"){
+            							if(r.data.invoice_type === "个人"){
+            								$(".email").val(r.data.mail);
+            								$(".tel").val(r.data.phone);
+            								$(".email").parent().siblings('.success').show();
+            								$(".tel").parent().siblings('.success').show();
+            							}else{
+            								$(".email").val(r.data.mail);
+            								$(".tel").val(r.data.phone);
+            								$(".unit_name").val(r.data.company_name);
+            								$(".taxpayer_number").val(r.data.taxpayer_identnum);
+            								$(".email").parent().siblings('.success').show();
+            								$(".tel").parent().siblings('.success').show();
+            								$(".unit_name").parent().siblings('.success').show();
+            								$(".taxpayer_number").parent().siblings('.success').show();
+            								$("#invoice_title > button").text("单位")
+            								$(".unit_invoice").show();
+            							}
+            						}
+        					    }
+        			  	  });
+          			  }
+          			  checkForm();
+          			  var order_code = {{.T.order_code}};
+          			  $(".order_code").text(order_code);
+          			  $(".cancel_btn").on("click",function(){
+          					window.history.go(-1);
+          			  })
+          
+          			  $('#ruleModal').on('show.bs.modal', function () {
+          			      var $this = $(this);
+          			      var $modal_dialog = $this.find('.modal-dialog');
+          			      $this.css('display', 'block');
+          			      $modal_dialog.css({
+          			          'margin-top': Math.max(0, ($(window).height() - $modal_dialog.height()) / 2)
+          			      });
+          			  });
+          
+          			  $("#public-nav").css("background","#fff");
+          			  $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
+          			  $("section[id='drder']").css("padding-top", "80px");
+                }
+              });
+            }
+          }
+        })
+        haslogin({{.T.logid}});
+      })
 	</script>
 </body>
 

src/web/templates/pc/invoice_error.html

@@ -32,13 +32,13 @@
     <!-- main -->
     <div class="invoice_error">
         <div class="w err_crumb">
-            <a href="javascript:;">申请发票失败</a>
+            <a href="javascript:;">申请发票提示</a>
         </div>
         <div class="w e_main">
             <div>
                 <img class="jy404" src="/electronic_invoice/image/404.png" alt="">
-                <p>该订单发票在线申请已超时，请联系客服 <br>   客服电话：400-108-6670</p>
-                <div class="rules" data-toggle="modal" data-target="#ruleModal">开票规则</div>
+                <p><span id="reason">该订单发票在线申请已超时，请联系客服</span> <br>   客服电话：400-108-6670</p>
+                <div class="rules hidden" data-toggle="modal" data-target="#ruleModal">开票规则</div>
             </div>
         </div>
         <div class="modal fade" id="ruleModal" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -71,12 +71,15 @@
     <script src="/electronic_invoice/js/bootstrap.min.js"></script>
     <script>
         $(function () {
-			$("#public-nav").css("background","#fff");
-			$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-			$("section[id='drder']").css("padding-top", "80px");
-			haslogin({{.T.logid}});
-
-
+            if(getParam("f")=="upgrade"){
+              $("#reason").text("因发票主体变更，该发票无法支持线上开票，如需开票，请联系客服。");
+            }else{
+              $(".rules").removeClass("hidden");
+            }
+      			$("#public-nav").css("background","#fff");
+      			$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
+      			$("section[id='drder']").css("padding-top", "80px");
+      			haslogin({{.T.logid}});
             $('#ruleModal').on('show.bs.modal', function () {
                 var $this = $(this);
                 var $modal_dialog = $this.find('.modal-dialog');

src/web/templates/weixin/invoice/cantInvocie.html

@@ -8,7 +8,7 @@
 	<meta name="apple-mobile-web-app-status-bar-style" content="black">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
-	<title>查看发票</title>
+	<title>申请发票提示</title>
 	<script src="{{Msg "seo" "cdn"}}/invoice/js/rem.js"></script>
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/invoice/css/weui.min.css">
 	<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/invoice/css/base.css" />
@@ -20,6 +20,9 @@
   .p_text{
     color:#9B9CA3;
   }
+  .j-header{
+    display: none !important;
+  }
 </style>
 
 <body>
@@ -29,9 +32,9 @@
             <span class="header-left iconfont"></span>
             <span class="header-right check-rules">开票规则</span>
         </div>
-        <div class="j-body" style="text-align:center;padding-top:1.5rem">
+        <div class="j-body" style="text-align:center;padding:1.5rem .3rem 0rem .3rem;">
           <img src="/images/search/nothing.png" style="width:2.25rem"/>
-          <p style="margin-top: 0.32rem;" class="p_text">
+          <p style="margin-top: 0.32rem;" class="p_text" id="reason">
           该订单发票在线申请已超时，请联系客服
           </p>
           <p class="p_text">
@@ -61,7 +64,29 @@
     <script src="{{Msg "seo" "cdn"}}/invoice/js/common.js"></script>
     <script>
         var order_code = {{.T.order_code}}
+        function getParam(name) {
+            var search = document.location.search;
+            var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
+            var matcher = pattern.exec(search);
+            var items = null;
+            if (null != matcher) {
+                try {
+                    items = decodeURIComponent(decodeURIComponent(matcher[1]));
+                } catch (e) {
+                    try {
+                        items = decodeURIComponent(matcher[1]);
+                    } catch (e) {
+                        items = matcher[1];
+                    }
+                }
+            }
+            return items;
+        }
         $(function () {
+          if(getParam("f")=="upgrade"){
+            $("#reason").text("因发票主体变更，该发票无法支持线上开票，如需开票，请联系客服。");
+          }else{
+            $(".j-header").css("display","flex");
             $.ajax({
                 url:"/jypay/invoice/show",
                 type:"POST",
@@ -107,6 +132,7 @@
 
                 }
             })
+          }
         })
         var checkInvoice = { 
             init:function(){

src/web/templates/weixin/invoice/invoicing.html

@@ -19,6 +19,9 @@
 	.j-i-alert .weui-toast{
 	  width: 7.6em;
 	}
+  body{
+    display: none;
+  }
 	</style>
 </head>
 
@@ -139,87 +142,130 @@
         var applybill_status = {{.T.applybill_status}}
         var sys_err = ""
         var c = {{.T.c}}
-            $(function () {
-              switchInvoice()
-               // 发票功能是否开启
-                function switchInvoice() {
+        $(function () {
+          switchInvoice()
+            // 发票功能是否开启
+            function switchInvoice() {
+              $.ajax({
+                  url: '/jypay/invoice/switch?t=' + Date.now(),
+                  type: "GET",
+                  success: function(res) {
+                    if (res.code === '1001') {
+                      $('body').show()
+                      $('.j-button-confirm').attr('disabled',true)
+                      return weui.alert(res.messge, {
+                          title: '温馨提醒',
+                          className: 'jy-alert',
+                          buttons: [{
+                            label: '我知道了',
+                            onClick: function(){ 
+                              history.back()
+                            }
+                          }]
+                      })
+                    } else {
+                      showData()
+                    }
+                  },
+                  fail: function(err) {
+                    console.log(err)
+                  }
+              })
+            }
+            function showData () {
+              $.post("/jypay/invoice/available",{order_code:order_code},function(rr){
+                if(rr.status==0){
+                  window.location.replace("/front/invoice/cantInvoice?f=upgrade")
+                }else{
+                  $("body").show();
                   $.ajax({
-                      url: '/jypay/invoice/switch?t=' + Date.now(),
-                      type: "GET",
-                      success: function(res) {
-                        if (res.code === '1001') {
-                          $('.j-button-confirm').attr('disabled',true)
-                          return weui.alert(res.messge, {
-                              title: '温馨提醒',
-                              className: 'jy-alert',
-                              buttons: [{
-                                label: '我知道了',
-                                onClick: function(){ 
-                                  history.back()
-                                }
-                              }]
-                          })
-                        } else {
-                          showData()
-                        }
-                      },
-                      fail: function(err) {
-                        console.log(err)
-                      }
-                  })
-                }
-                function showData () {
-                    $.ajax({
-                      url:"/jypay/invoice/show",
-                      type:"POST",
-                      data:{"order_code":order_code},
-                      success:function (r) {
-                          if(r.status == "fail"){
-                              if (r.datas != ""){
-                                  applybill_status = r.datas.applybill_status
-                                  product_name = r.datas.product_type
-                                  if (product_name == "历史数据"){  //历史数据
-                                      $(".user-phone").attr("value",r.datas.user_phone)
-                                      $(".user-mail").attr("value",r.datas.user_mail)
-                                      invoice.phoneStatus = true;
-                                      invoice.emailStatus = true;
-                                      $("#commit").removeAttr("disabled")
-                                  }
-                                  if (r.datas.applybill_status == 1){
-                                      $(".j-footer").hide();
-                                      $(".v-cell-input").attr("disabled","disabled");
-                                      $(".invoice-title").unbind("click");
-                                  }
+                  url:"/jypay/invoice/show",
+                  type:"POST",
+                  data:{"order_code":order_code},
+                  success:function (r) {
+                      if(r.status == "fail"){
+                          if (r.datas != ""){
+                              applybill_status = r.datas.applybill_status
+                              product_name = r.datas.product_type
+                              if (product_name == "历史数据"){  //历史数据
+                                  $(".user-phone").attr("value",r.datas.user_phone)
+                                  $(".user-mail").attr("value",r.datas.user_mail)
+                                  invoice.phoneStatus = true;
+                                  invoice.emailStatus = true;
+                                  $("#commit").removeAttr("disabled")
+                              }
+                              if (r.datas.applybill_status == 1){
+                                  $(".j-footer").hide();
+                                  $(".v-cell-input").attr("disabled","disabled");
+                                  $(".invoice-title").unbind("click");
                               }
-                          }else {
-                              applybill_status = r.data.invoice_status,
-                              product_name = r.data.product_type
-                              if (r.data.invoice_status == -1){
-                                  sys_err = -1
-                                  if (r.data.invoice_type == "单位"){
-                                      $('.company-cell').show()
-                                      $('.invoice-value').text("单位")
-                                      $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                      $(".company_name").attr("value",r.data.company_name)
-                                      $(".user-phone").attr("value",r.data.phone)
-                                      $(".user-mail").attr("value",r.data.mail)
-                                      invoice.phoneStatus = true;
-                                      invoice.emailStatus = true;
-                                      invoice.cnameStatus = true;
-                                      invoice.codeStatus = true;
-                                      $(".j-button-confirm").removeAttr("disabled")
+                          }
+                      }else {
+                          applybill_status = r.data.invoice_status,
+                          product_name = r.data.product_type
+                          if (r.data.invoice_status == -1){
+                              sys_err = -1
+                              if (r.data.invoice_type == "单位"){
+                                  $('.company-cell').show()
+                                  $('.invoice-value').text("单位")
+                                  $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                  $(".company_name").attr("value",r.data.company_name)
+                                  $(".user-phone").attr("value",r.data.phone)
+                                  $(".user-mail").attr("value",r.data.mail)
+                                  invoice.phoneStatus = true;
+                                  invoice.emailStatus = true;
+                                  invoice.cnameStatus = true;
+                                  invoice.codeStatus = true;
+                                  $(".j-button-confirm").removeAttr("disabled")
 
-                                  }else{
-                                      $('.invoice-value').text("个人")
-                                      $(".user-phone").attr("value",r.data.phone);
-                                      $(".user-mail").attr("value",r.data.mail);
-                                      invoice.phoneStatus = true;
-                                      invoice.emailStatus = true;
-                                      $("#commit").removeAttr("disabled")
-                                  }
                               }else{
-                                  if (product_name == "历史数据"){
-                                      if (r.data.invoice_changed == 1){
+                                  $('.invoice-value').text("个人")
+                                  $(".user-phone").attr("value",r.data.phone);
+                                  $(".user-mail").attr("value",r.data.mail);
+                                  invoice.phoneStatus = true;
+                                  invoice.emailStatus = true;
+                                  $("#commit").removeAttr("disabled")
+                              }
+                          }else{
+                              if (product_name == "历史数据"){
+                                  if (r.data.invoice_changed == 1){
+                                      if (r.data.invoice_type == "单位"){
+                                          $('.company-cell').show()
+                                          $('.invoice-value').text("单位")
+                                          $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                          $(".company_name").attr("value",r.data.company_name)
+                                          $(".user-phone").attr("value",r.data.phone)
+                                          $(".user-mail").attr("value",r.data.mail)
+                                          $(".v-cell-input").attr("disabled", "disabled");
+                                          $(".invoice-title").unbind("click");
+                                          $(".j-footer").hide()
+                                      }else{
+                                          $('.invoice-value').text("个人")
+                                          $(".user-phone").attr("value",r.data.phone)
+                                          $(".user-mail").attr("value",r.data.mail)
+                                          $(".v-cell-input").attr("disabled", "disabled");
+                                          $(".invoice-title").unbind("click");
+                                          $(".j-footer").hide()
+                                      }
+                                  }else{
+                                      if (c==1){
+                                          if (r.data.invoice_type == "单位"){
+                                              /*$('.company-cell').show()
+                                              $('.invoice-value').text("单位")
+                                              $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                              $(".company_name").attr("value",r.data.company_name)
+                                              $(".user-phone").attr("value",r.data.phone)
+                                              $(".user-mail").attr("value",r.data.mail)*/
+                                              $('.invoice-value').text("个人")
+                                              $(".user-phone").attr("value",r.data.phone)
+                                              $(".user-mail").attr("value",r.data.mail)
+                                          }else{
+                                              $('.invoice-value').text("个人")
+                                              $(".user-phone").attr("value",r.data.phone)
+                                              $(".user-mail").attr("value",r.data.mail)
+
+                                          }
+                                      }else{
                                           if (r.data.invoice_type == "单位"){
                                               $('.company-cell').show()
                                               $('.invoice-value').text("单位")
@@ -231,6 +277,7 @@
                                               $(".invoice-title").unbind("click");
                                               $(".j-footer").hide()
                                           }else{
+
                                               $('.invoice-value').text("个人")
                                               $(".user-phone").attr("value",r.data.phone)
                                               $(".user-mail").attr("value",r.data.mail)
@@ -238,49 +285,39 @@
                                               $(".invoice-title").unbind("click");
                                               $(".j-footer").hide()
                                           }
+                                      }
+
+                                  }
+                              }else{
+                                  if (r.data.invoice_changed == 1){
+                                      if (r.data.invoice_type == "单位"){
+                                          $('.company-cell').show()
+                                          $('.invoice-value').text("单位")
+                                          $(".identification_number").attr("value",r.data.taxpayer_identnum)
+                                          $(".company_name").attr("value",r.data.company_name)
+                                          $(".user-phone").attr("value",r.data.phone)
+                                          $(".user-mail").attr("value",r.data.mail)
+                                          $(".v-cell-input").attr("disabled", "disabled");
+                                          $(".invoice-title").unbind("click");
+                                          $(".j-footer").hide()
                                       }else{
-                                          if (c==1){
-                                              if (r.data.invoice_type == "单位"){
-                                                  /*$('.company-cell').show()
-                                                  $('.invoice-value').text("单位")
-                                                  $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                                  $(".company_name").attr("value",r.data.company_name)
-                                                  $(".user-phone").attr("value",r.data.phone)
-                                                  $(".user-mail").attr("value",r.data.mail)*/
-                                                  $('.invoice-value').text("个人")
-                                                  $(".user-phone").attr("value",r.data.phone)
-                                                  $(".user-mail").attr("value",r.data.mail)
-                                              }else{
-                                                  $('.invoice-value').text("个人")
-                                                  $(".user-phone").attr("value",r.data.phone)
-                                                  $(".user-mail").attr("value",r.data.mail)
+                                          $('.invoice-value').text("个人")
+                                          $(".user-phone").attr("value",r.data.phone)
+                                          $(".user-mail").attr("value",r.data.mail)
+                                          $(".v-cell-input").attr("disabled", "disabled");
+                                          $(".invoice-title").unbind("click");
+                                          $(".j-footer").hide()
+                                      }
+                                  }else{
+                                      if (c==1){
 
-                                              }
-                                          }else{
-                                              if (r.data.invoice_type == "单位"){
-                                                  $('.company-cell').show()
-                                                  $('.invoice-value').text("单位")
-                                                  $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                                  $(".company_name").attr("value",r.data.company_name)
-                                                  $(".user-phone").attr("value",r.data.phone)
-                                                  $(".user-mail").attr("value",r.data.mail)
-                                                  $(".v-cell-input").attr("disabled", "disabled");
-                                                  $(".invoice-title").unbind("click");
-                                                  $(".j-footer").hide()
-                                              }else{
+                                          $('.company-cell').show()
+                                          $('.invoice-value').text("个人")
+                                          $('.company-cell').hide()
 
-                                                  $('.invoice-value').text("个人")
-                                                  $(".user-phone").attr("value",r.data.phone)
-                                                  $(".user-mail").attr("value",r.data.mail)
-                                                  $(".v-cell-input").attr("disabled", "disabled");
-                                                  $(".invoice-title").unbind("click");
-                                                  $(".j-footer").hide()
-                                              }
-                                          }
 
-                                      }
-                                  }else{
-                                      if (r.data.invoice_changed == 1){
+
+                                      }else{
                                           if (r.data.invoice_type == "单位"){
                                               $('.company-cell').show()
                                               $('.invoice-value').text("单位")
@@ -299,47 +336,21 @@
                                               $(".invoice-title").unbind("click");
                                               $(".j-footer").hide()
                                           }
-                                      }else{
-                                          if (c==1){
-
-                                              $('.company-cell').show()
-                                              $('.invoice-value').text("个人")
-                                              $('.company-cell').hide()
-
-
-
-                                          }else{
-                                              if (r.data.invoice_type == "单位"){
-                                                  $('.company-cell').show()
-                                                  $('.invoice-value').text("单位")
-                                                  $(".identification_number").attr("value",r.data.taxpayer_identnum)
-                                                  $(".company_name").attr("value",r.data.company_name)
-                                                  $(".user-phone").attr("value",r.data.phone)
-                                                  $(".user-mail").attr("value",r.data.mail)
-                                                  $(".v-cell-input").attr("disabled", "disabled");
-                                                  $(".invoice-title").unbind("click");
-                                                  $(".j-footer").hide()
-                                              }else{
-                                                  $('.invoice-value').text("个人")
-                                                  $(".user-phone").attr("value",r.data.phone)
-                                                  $(".user-mail").attr("value",r.data.mail)
-                                                  $(".v-cell-input").attr("disabled", "disabled");
-                                                  $(".invoice-title").unbind("click");
-                                                  $(".j-footer").hide()
-                                              }
-                                          }
-
                                       }
 
                                   }
-                                  invoice.checkCName();
-                                  invoice.checkCode();
+
                               }
+                              invoice.checkCName();
+                              invoice.checkCode();
                           }
                       }
-                  })
+                  }
+              })
                 }
-            })
+              })
+            }
+        })
         var invoice = {
             reg:{
                 tel:/^1[3456789]{1}\d{9}$/,

src/web/templates/weixin/my.html

@@ -239,7 +239,7 @@
                 </div>
                 </div>
                 <div class="menu-list">
-                    <a class="menu-list-item clickable" id="help" href="https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect">
+                    <a class="menu-list-item clickable" id="help" href="https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=1&sn=6b5d4f4aced2f4c9263e6e66639a40e6">
                         <div class="m-l-i-left">
                             <span class="j-icon base-icon icon-help"></span>
                             <span class="m-l-i-label">使用帮助</span>

src/web/templates/weixin/search/mainSearch.html

@@ -1190,7 +1190,7 @@
 		// })
 		//点击帮助
 	    $(".home_search_right").click(function(){
-	        window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=2&sn=379fc869080a36d9d0798a3d4fb9a63a#wechat_redirect");
+	        window.open("https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=3&sn=e21d87e2f5219926ea66b27e8c5bc8ec");
 			event.stopPropagation();
 	    });
 	    //数据导出页面

src/web/templates/weixin/sharePage.html

@@ -424,7 +424,7 @@
 					window.location.href = "/swordfish/feedback";
 					break;
 				case 1:
-					window.location.href = "http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8#wechat_redirect";
+					window.location.href = "https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=2&sn=c2eabe3ce336a02746670f6559e48287";
 					break;
 			}
 		});

src/web/templates/weixin/wxkeyset/seniorset.html

@@ -114,8 +114,7 @@ $(function(){
 		if(!clickDelayed){
 			return;
 		}
-        //window.location.href = "https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=1&sn=f9e98da1975f85011ee138a4ee5cfbe8&uin=MTAxMjI0MDg0MQ%3D%3D&key=a97dea92fe008de696cd5af747e21858f5d5cf4eccccdc0ed7711d423afe4aed2a4da9f82200bdead7c0f2bccfe24e23624eff8e9ba3f2a5a2666c42f64bd5f287af9e628ef0f61385d069768d6b3950&devicetype=iMac+MacBookPro12%2C1+OSX+OSX+10.12.5+build(16F73)&version=12020810&lang=zh_CN&nettype=WIFI&ascene=0&fontScale=100&pass_ticket=1wiyxKUsQ%2FIpL%2FBx3s0%2B7%2Bg%2Bc3w9YbzoHJrzny48BOTckxN%2F91pfq%2FKv1JOp7DmX";
-        window.location.href = "http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect";
+        window.location.href = "https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=1&sn=6b5d4f4aced2f4c9263e6e66639a40e6";
     });
 	//推送频率
 	//$("#pushfrequency li:gt(0)").click(function(){

src/web/templates/weixin/wxsearch.html

@@ -53,7 +53,7 @@
 		}
 		//
 		$(".help").click(function(){
-			window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=2&sn=379fc869080a36d9d0798a3d4fb9a63a#wechat_redirect");
+			window.open("https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=3&sn=e21d87e2f5219926ea66b27e8c5bc8ec");
 		})
 		
 		//删除历史搜索	

src/web/templates/weixin/wxsearchlist.html

@@ -34,7 +34,7 @@
 	initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 $(function(){
 	$(".help").click(function(){
-		window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=2&sn=379fc869080a36d9d0798a3d4fb9a63a#wechat_redirect");
+		window.open("https://mp.weixin.qq.com/mp/homepage?__biz=Mzk0MjIyMzY2Nw==&hid=3&sn=e21d87e2f5219926ea66b27e8c5bc8ec");
 	})
 	var lifirst = window.top.lifirst;
 	var flagone = true;