diff --git a/Application/Admin/Controller/CompanySystemRatioController.class.php b/Application/Admin/Controller/CompanySystemRatioController.class.php
index cd16625..4a6856a 100644
--- a/Application/Admin/Controller/CompanySystemRatioController.class.php
+++ b/Application/Admin/Controller/CompanySystemRatioController.class.php
@@ -5,7 +5,7 @@ namespace Admin\Controller;
class CompanySystemRatioController extends AdminController
{
- private $api = "http://admin.jianghuifa.cn/index.php?g=Api&m=CpJuheCompany&a=ratioIndex";
+ private $api = "http://admin.hexidongkeji.top/index.php?g=Api&m=CpJuheCompany&a=ratioIndex";
public function _initialize()
{
diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index a0556b4..38435cc 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -1023,7 +1023,7 @@ class PromoteController extends BaseController
if (empty($user)) {
$this->redirect("Home/Index/index");
}
- $promoteUrl = "https://m.jianghuifa.cn/mobile.php?s=Ssg/home/promote_id/" . $user['pid'];
+ $promoteUrl = "https://m.hexidongkeji.top/mobile.php?s=Ssg/home/promote_id/" . $user['pid'];
$this->assign("promote_url", $promoteUrl);
$this->display();
diff --git a/Application/Home/View/default/Poster/index.html b/Application/Home/View/default/Poster/index.html
index ecde3da..8cfb0e2 100644
--- a/Application/Home/View/default/Poster/index.html
+++ b/Application/Home/View/default/Poster/index.html
@@ -110,8 +110,8 @@
diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php
index 9286a9a..214be09 100644
--- a/Application/Mobile/Controller/SsgController.class.php
+++ b/Application/Mobile/Controller/SsgController.class.php
@@ -589,9 +589,9 @@ class SsgController extends BaseController {
$param['payway'] = 1;
$param['title'] = $price;
$param['body'] = $price;
- //$param['callback'] = "https://m.jianghuifa.cn/mobile.php/Ssg/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
- //$param['notifyurl'] = "https://m.jianghuifa.cn/callback.php/Notify/notify/apitype/alipay";
- if(stripos($_SERVER['HTTP_HOST'], '.jianghuifa.cn') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
+ //$param['callback'] = "https://m.hexidongkeji.top/mobile.php/Ssg/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
+ //$param['notifyurl'] = "https://m.hexidongkeji.top/callback.php/Notify/notify/apitype/alipay";
+ if(stripos($_SERVER['HTTP_HOST'], '.hexidongkeji.top') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
$param['callback'] = "http://".$_SERVER['HTTP_HOST']."/mobile.php/Ssg/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
//$param['notifyurl'] = "http://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay";
}else{
diff --git a/Application/Qrcode/Controller/PromoteController.class.php b/Application/Qrcode/Controller/PromoteController.class.php
index 5771ced..47493a8 100644
--- a/Application/Qrcode/Controller/PromoteController.class.php
+++ b/Application/Qrcode/Controller/PromoteController.class.php
@@ -1006,7 +1006,7 @@ class PromoteController extends BaseController
if (empty($user)) {
$this->redirect("Home/Index/index");
}
- $promoteUrl = "https://m.jianghuifa.cn/mobile.php?s=Ssg/home/promote_id/" . $user['pid'];
+ $promoteUrl = "https://m.hexidongkeji.top/mobile.php?s=Ssg/home/promote_id/" . $user['pid'];
$this->assign("promote_url", $promoteUrl);
$this->display();
diff --git a/Application/Qrcode/Controller/QrCodePromotionController.class.php b/Application/Qrcode/Controller/QrCodePromotionController.class.php
index 2a5c28b..f8d3d68 100644
--- a/Application/Qrcode/Controller/QrCodePromotionController.class.php
+++ b/Application/Qrcode/Controller/QrCodePromotionController.class.php
@@ -203,7 +203,7 @@ class QrCodePromotionController extends BaseController
]);
if ($id > 0) {
$uniqueStr = $this->getUniqueStr();
- $h5Link = "https://game.jianghuifa.cn"."/index.php?s=/Qrcode/Jump/jumpMp/{$uniqueStr}";
+ $h5Link = "https://game.hexidongkeji.top"."/index.php?s=/Qrcode/Jump/jumpMp/{$uniqueStr}";
$shortLink = $this->getShortUrl($h5Link);
M('qrcode_promotion_list', 'tab_')->where(['id' => $id])->save([
diff --git a/Application/Qrcode/View/default/Jump/jumpMp.html b/Application/Qrcode/View/default/Jump/jumpMp.html
index 298b818..de0a531 100644
--- a/Application/Qrcode/View/default/Jump/jumpMp.html
+++ b/Application/Qrcode/View/default/Jump/jumpMp.html
@@ -121,7 +121,7 @@
dataType: 'json',
type: 'POST',
//url: 'http://10.0.10.185:8089/index.php?s=/Qrcode/Jump/getURLScheme',
- url: 'https://mg.jianghuifa.cn/index.php?s=/Qrcode/Jump/getURLScheme',
+ url: 'https://mg.hexidongkeji.top/index.php?s=/Qrcode/Jump/getURLScheme',
data: {
'unique_str': "{$unique_str}",
},
diff --git a/Application/Sdk/Controller/AppleController.class.php b/Application/Sdk/Controller/AppleController.class.php
index 84985b5..4c2df7d 100644
--- a/Application/Sdk/Controller/AppleController.class.php
+++ b/Application/Sdk/Controller/AppleController.class.php
@@ -190,7 +190,7 @@ class AppleController extends BaseController{
$data['subject'] = "subject";
$data['notifyurl'] =C('pay_header')."/callback.php/Notify/sq_callback";//通知
$data['returnurl'] = $returl;
- $data['mchAppId'] = "jianghuifa.cn;
+ $data['mchAppId'] = "hexidongkeji.top;
$data['mchAppName'] = "mchAppName";
$data['deviceInfo'] = "AND_WAP";
$data['clientIp'] = get_client_ip();
@@ -620,9 +620,9 @@ class AppleController extends BaseController{
$data['paymenttype'] = "UNION";
$data['MerRemark'] = "mark";
$data['subject'] = "subject";
- $data['notifyurl'] = "http://"."api.jianghuifa.cn"."/callback.php/Notify/sq_callback";//通知
+ $data['notifyurl'] = "http://"."api.hexidongkeji.top"."/callback.php/Notify/sq_callback";//通知
$data['returnurl'] = $returl;
- $data['mchAppId'] = "jianghuifa.cn";
+ $data['mchAppId'] = "hexidongkeji.top";
$data['mchAppName'] = "mchAppName";
$data['deviceInfo'] = "AND_WAP";
$data['clientIp'] = get_client_ip();
diff --git a/Application/Sdk/Controller/Ipa365Controller.class.php b/Application/Sdk/Controller/Ipa365Controller.class.php
index 8268b74..aebeeae 100644
--- a/Application/Sdk/Controller/Ipa365Controller.class.php
+++ b/Application/Sdk/Controller/Ipa365Controller.class.php
@@ -46,7 +46,7 @@ class Ipa365Controller extends BaseController{
$param['title'] = $price;
$param['body'] = $price;
$param['callback'] = "http://www.baidu.com";
- $param['notifyurl'] = "https://api.jianghuifa.cn/callback.php/Notify/sq_callback";
+ $param['notifyurl'] = "https://api.hexidongkeji.top/callback.php/Notify/sq_callback";
$ret = $this->alipay($param);
redirect($ret['url']);
die;
@@ -177,7 +177,7 @@ class Ipa365Controller extends BaseController{
$orderId = $payLog['order_id'];
}elseif ($payLog && $payLog['pay_status']==1){
/*$orderId = $payLog['order_id'];
- if(stripos($_SERVER['HTTP_HOST'], '.jianghuifa.cn') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
+ if(stripos($_SERVER['HTTP_HOST'], '.hexidongkeji.top') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
redirect("http://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/$userId/game_id/$gameId/order_id/$orderId");
}else{
redirect("https://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/$userId/game_id/$gameId/order_id/$orderId");
@@ -221,9 +221,9 @@ class Ipa365Controller extends BaseController{
$param['payway'] = 1;
$param['title'] = $price;
$param['body'] = $price;
- //$param['callback'] = "https://m.jianghuifa.cn/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
- //$param['notifyurl'] = "https://m.jianghuifa.cn/callback.php/Notify/notify/apitype/alipay";
- if(stripos($_SERVER['HTTP_HOST'], '.jianghuifa.cn') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
+ //$param['callback'] = "https://m.hexidongkeji.top/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
+ //$param['notifyurl'] = "https://m.hexidongkeji.top/callback.php/Notify/notify/apitype/alipay";
+ if(stripos($_SERVER['HTTP_HOST'], '.hexidongkeji.top') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
$param['callback'] = "http://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
$param['notifyurl'] = "http://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay";
}else{
@@ -274,7 +274,7 @@ class Ipa365Controller extends BaseController{
$orderId = $payLog['order_id'];
}elseif ($payLog && $payLog['pay_status']==1){
$orderId = $payLog['order_id'];
- if(stripos($_SERVER['HTTP_HOST'], '.jianghuifa.cn') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
+ if(stripos($_SERVER['HTTP_HOST'], '.hexidongkeji.top') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
redirect("http://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/$userId/game_id/$gameId/order_id/$orderId");
}else{
redirect("https://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/$userId/game_id/$gameId/order_id/$orderId");
@@ -312,9 +312,9 @@ class Ipa365Controller extends BaseController{
$param['payway'] = 1;
$param['title'] = $price;
$param['body'] = $price;
- //$param['callback'] = "https://m.jianghuifa.cn/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
- //$param['notifyurl'] = "https://m.jianghuifa.cn/callback.php/Notify/notify/apitype/alipay";
- if(stripos($_SERVER['HTTP_HOST'], '.jianghuifa.cn') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
+ //$param['callback'] = "https://m.hexidongkeji.top/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
+ //$param['notifyurl'] = "https://m.hexidongkeji.top/callback.php/Notify/notify/apitype/alipay";
+ if(stripos($_SERVER['HTTP_HOST'], '.hexidongkeji.top') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){
$param['callback'] = "http://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
$param['notifyurl'] = "http://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay";
}else{
@@ -373,8 +373,8 @@ class Ipa365Controller extends BaseController{
$param['payway'] = 1;
$param['title'] = $price;
$param['body'] = $price;
- //$param['callback'] = "https://m.jianghuifa.cn/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
- //$param['notifyurl'] = "https://m.jianghuifa.cn/callback.php/Notify/notify/apitype/alipay";
+ //$param['callback'] = "https://m.hexidongkeji.top/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
+ //$param['notifyurl'] = "https://m.hexidongkeji.top/callback.php/Notify/notify/apitype/alipay";
$param['callback'] = "https://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
$param['notifyurl'] = "https://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay";
diff --git a/Application/Sdk/Controller/WapPayController.class.php b/Application/Sdk/Controller/WapPayController.class.php
index 8ff8b01..ef0f3b5 100644
--- a/Application/Sdk/Controller/WapPayController.class.php
+++ b/Application/Sdk/Controller/WapPayController.class.php
@@ -137,7 +137,7 @@ class WapPayController extends BaseController{
$data['subject'] = "subject";
$data['notifyurl'] = C('pay_header')."/callback.php/Notify/sq_callback";//通知
$data['returnurl'] = $returl;
- $data['mchAppId'] = "jianghuifa.cn";
+ $data['mchAppId'] = "hexidongkeji.top";
$data['mchAppName'] = "mchAppName";
$data['deviceInfo'] = "AND_WAP";
$data['clientIp'] = get_client_ip();
@@ -344,7 +344,7 @@ class WapPayController extends BaseController{
'payAmount' => $payInfo['price'],
'secret' => C('sqpay.key'),
'merOrderNo' => $payInfo['order_id'],
- 'NotifyURL' => "http://api.jianghuifa.cn"."/callback.php?Notify/sq_callback",
+ 'NotifyURL' => "http://api.hexidongkeji.top"."/callback.php?Notify/sq_callback",
'purpose' => 'aaaa'
));
//echo "发送短信==》".time()."
";
@@ -628,18 +628,18 @@ class WapPayController extends BaseController{
$json_data['paytype'] ="wx";
}else{
if(!empty($request['scheme'])) {
- $redirect_url = 'https://api.jianghuifa.cn' . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id'];
+ $redirect_url = 'https://api.hexidongkeji.top' . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id'];
} else {
- $redirect_url = 'https://api.jianghuifa.cn' . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'];
+ $redirect_url = 'https://api.hexidongkeji.top' . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'];
}
$json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.urlencode( $redirect_url );
$json_data['paytype'] ="wx";
}
}else{
$json_data['status'] = 500;
- $json_data['url'] = "https://" . 'api.jianghuifa.cn';
+ $json_data['url'] = "https://" . 'api.hexidongkeji.top';
}
- $json_data['cal_url'] = 'https://api.jianghuifa.cn';
+ $json_data['cal_url'] = 'https://api.hexidongkeji.top';
echo base64_encode(json_encode($json_data));exit;
// $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]);
} else if(get_wx_pay_type() == 1){ // 威富通
diff --git a/Data/update.sql b/Data/update.sql
index 1eea39a..ebc7253 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -585,7 +585,7 @@ VALUES
('contact_cs', '联系客服', '[{\"name\":\"support\",\"title\":\"\\u8054\\u7cfb\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"2\",\"act\":\"3007567814\",\"ios_url\":\"3007567814\",\"sort\":\"1\",\"id\":1,\"icon\":\"\",\"cover\":\"\"}]', '', 5, 1, 1571723212 );
INSERT INTO `tab_tool` (`name`, `title`, `config`, `template`, `type`, `status`, `create_time` )
VALUES
- ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.jianghuifa.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 );
+ ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.hexidongkeji.top\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 );
-- 修改迁移
ALTER TABLE `tab_mend`
@@ -1710,7 +1710,7 @@ CREATE TABLE `sys_kv` (
UNIQUE KEY `key_name` (`key`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='系统简单kv储存表';
-INSERT INTO `sys_kv` (`key`, `value`, `type`, `remark`) VALUES ('aggregate_finance_api', 'http://admin.jianghuifa.cn/index.php?g=api&m=FinanceWeekCount&a=returnFinanceAccountsDataList', 'string', '聚合下游结算Api地址');
+INSERT INTO `sys_kv` (`key`, `value`, `type`, `remark`) VALUES ('aggregate_finance_api', 'http://admin.hexidongkeji.top/index.php?g=api&m=FinanceWeekCount&a=returnFinanceAccountsDataList', 'string', '聚合下游结算Api地址');
--聚合渠道结算单 chenzhi 20200422
CREATE TABLE `tab_aggregate_statement` (
@@ -1752,7 +1752,7 @@ ADD COLUMN `old_change_promote_account` varchar(30) NULL COMMENT '修改配置
--20200518 chenzhi
--新增上游结算接口
-INSERT INTO `sys_kv` (`key`, `value`, `type`, `remark`) VALUES ('aggregate_cp_settlement_api', 'http://admin.jianghuifa.cn/index.php?g=api&m=FinanceWeekCount&a=returnCPSettlement', 'string', '聚合cp结算Api地址');
+INSERT INTO `sys_kv` (`key`, `value`, `type`, `remark`) VALUES ('aggregate_cp_settlement_api', 'http://admin.hexidongkeji.top/index.php?g=api&m=FinanceWeekCount&a=returnCPSettlement', 'string', '聚合cp结算Api地址');
INSERT INTO `sys_kv` (`key`, `value`, `type`, `remark`) VALUES ('payment_check_mobile', '18959188422', 'string', '打款登陆验证手机');
--新增游戏分成模板
diff --git a/Poster/index.html b/Poster/index.html
index f5805d5..9d743de 100644
--- a/Poster/index.html
+++ b/Poster/index.html
@@ -105,8 +105,8 @@
diff --git a/ThinkPHP/Library/Org/HeepaySDK/Heepay.class.php b/ThinkPHP/Library/Org/HeepaySDK/Heepay.class.php
index fb0ff14..4ae25dc 100644
--- a/ThinkPHP/Library/Org/HeepaySDK/Heepay.class.php
+++ b/ThinkPHP/Library/Org/HeepaySDK/Heepay.class.php
@@ -51,7 +51,7 @@ class Heepay {
$sign_str = $sign_str . '&agent_bill_time=' . $pay['time'];
$sign_str = $sign_str . '&pay_type=30';
$sign_str = $sign_str . '&pay_amt=' . $pay['amount'];
- $sign_str = $sign_str . '¬ify_url=http://'."api.jianghuifa.cn"."/callback.php/Notify/heepay_callback";
+ $sign_str = $sign_str . '¬ify_url=http://'."api.hexidongkeji.top"."/callback.php/Notify/heepay_callback";
$sign_str = $sign_str . '&return_url='.$pay['return_url'];
$sign_str = $sign_str . '&user_ip='. $pay['user_ip'];
$sign_str = $sign_str . '&bank_card_type='. $pay['bank_card_type'];
@@ -64,7 +64,7 @@ class Heepay {
} else if ($pay['device'] == 'android'){
$meta_option= '{"s":"Android","n":"帝王的纷争(安卓版)","id":"应用在一台设备上的唯一标识在manifest文件里面的声明"}';
} else if ($pay['device'] == 'wap') {
- $meta_option = '{"s":"WAP","n":"jianghuifa.cn","id":"jianghuifa.cn"}';
+ $meta_option = '{"s":"WAP","n":"hexidongkeji.top","id":"hexidongkeji.top"}';
}
$meta_option = urlencode(base64_encode(iconv("UTF-8", "gb2312//IGNORE", $meta_option)));
@@ -75,7 +75,7 @@ class Heepay {
'agent_id'=>$pay['agent_id'],//商户号
'agent_bill_id'=>$pay['order_no'],//订单号
'pay_amt'=>$pay['amount'],//支付金额
- 'notify_url'=>"http://"."api.jianghuifa.cn"."/callback.php/Notify/heepay_callback",//通知地址
+ 'notify_url'=>"http://"."api.hexidongkeji.top"."/callback.php/Notify/heepay_callback",//通知地址
'return_url' => $pay['return_url'],
'user_ip'=>$pay['user_ip'],//用户ip
'agent_bill_time'=>$pay['time'],//date('YmdHis', time()) 时间
diff --git a/ThinkPHP/Library/Org/SqpaySDK/Sqpay.class.php b/ThinkPHP/Library/Org/SqpaySDK/Sqpay.class.php
index 611d54d..1dab67b 100644
--- a/ThinkPHP/Library/Org/SqpaySDK/Sqpay.class.php
+++ b/ThinkPHP/Library/Org/SqpaySDK/Sqpay.class.php
@@ -167,7 +167,7 @@ class Sqpay
$data['merNo'] = 168885;
$data['secret'] = 12345678; */
- $notifyurl = "http://".'api.jianghuifa.cn'."/callback.php/Notify/sq_callback";//通知
+ $notifyurl = "http://".'api.hexidongkeji.top'."/callback.php/Notify/sq_callback";//通知
$data['NotifyURL'] = $notifyurl;
$bankInfo = $this->getbankinfo($data['cardNo']);
$data['cardType'] = $bankInfo['cardType'] == 'CC' ? 2: 1;
diff --git a/poster.html b/poster.html
index 741d34e..10630bb 100644
--- a/poster.html
+++ b/poster.html
@@ -116,9 +116,9 @@
diff --git a/subject.log b/subject.log
new file mode 100644
index 0000000..e93b2fa
--- /dev/null
+++ b/subject.log
@@ -0,0 +1,58 @@
+Java类Demo中存在方法func1、func2、func3和func4,请问该方法中,哪些是不合法的定义?( )
+public class Demo{
+ float func1()
+ {
+ int i=1;
+ return;
+ }
+ float func2()
+ {
+ short i=2;
+ return i;
+ }
+ float func3()
+ {
+ long i=3;
+ return i;
+ }
+ float func4()
+ {
+ double i=4;
+ return i;
+ }
+}
+A:func1
+B:func2
+C:func3
+D:func4
+
+
+以下说法中正确的有 ?
+A:StringBuilder是 线程不安全的
+B:Java类可以同时用 abstract和final声明
+C:HashMap中,使用 get(key)==null可以 判断这个Hasmap是否包含这个key
+D:volatile关键字不保证对变量操作的原子性
+
+下列说法正确的是 ?
+A:在类方法中可用this来调用本类的类方法
+B:在类方法中调用本类的类方法可直接调用
+C:在类方法中只能调用本类的类方法
+D:在类方法中绝对不能调用实例方法
+
+list是一个ArrayList的对象,哪个选项的代码填到//todo delete处,可以在Iterator遍历的过程中正确并安全的删除一个list中保存的对象 ?
+Iterator it = list.iterator();
+int index = 0;
+while (it.hasNext())
+{
+Object obj = it.next();
+if (needDelete(obj)) //needDelete返回boolean,决定是否要删除
+{
+//todo delete
+}
+index ++;
+}
+
+A:it.remove();
+B:list.remove(obj);
+C:list.remove(index);
+D:list.remove(obj,index);
\ No newline at end of file