Merge branch 'ryoujun' of 39.97.239.116:gyfl/xyzshop into ryoujun

data/config/youjun/base.ini.php

@@ -10,7 +10,7 @@ define('BONUS_EXPIRY_DATE',true);
 define('USE_BONUS_RATE',false);
 define('SERVER_TYPE','panda');
 define('CROSS_DOAMIN',true);
-define('COMPANY_NAME', 'XYZ_COMPANY');
+define('COMPANY_NAME', 'YOUJUN_COMPANY');
 define('ZERO_GOODS_ID', 6405);
 
 $config = [];
@@ -114,4 +114,4 @@ $config['appjump_prefix'] = 'xyzshop://www.xyzshops.com';
 $config['client_setting'] = ['running' => 174,'home' => 0];
 $config['wsd_bradge_port'] = 60987;
 $config['card_key_stores'] = [6];
-$config['phone_life_check'] = false;
+$config['phone_life_check'] = false;

data/config/youjun/pay.ini.php

@@ -6,7 +6,7 @@ define('ALIPAY_PARTNER', '2088121219613123');
 define('ALIPAY_SELLER_ID', 'napheir.ao@lrlz.com');
 
 define('MINIPAY_WXPAY_APPID',       'wx4139a76ccb1f74b3');
-define('MINIPAY_WXPAY_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');
+define('MINIPAY_WXPAY_APPSECRET',   'bfb69da3191367f3e4f377b4d8946933');
 
 define('MINIPAY_WXPAY_MCHID',       '1600686690');
 define('MINIPAY_WXPAY_KEY',         '0f86a4a9b1edb51b1a8d180fa228a157');
@@ -78,4 +78,4 @@ define('PUB_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
 //define(PUB_APPID,       'wxaf698e1cc5f2073b');
 //define(PUB_APPSECRET,   'da0547505e7bd29a50cdf662cc7b559a');
 //define(PUB_APPID,       'wxaf698e1cc5f2073b');
-//define(PUB_APPSECRET,   'da0547505e7bd29a50cdf662cc7b559a');
+//define(PUB_APPSECRET,   'da0547505e7bd29a50cdf662cc7b559a');

docker/compose/youjun/acc/docker-compose.yml

@@ -14,10 +14,6 @@ services:
     command: [nginx,'-g','daemon off;']
     extra_hosts:
       - "docker.hostip:172.17.0.1"
-    deploy:
-      resources:
-        limits:
-          cpus: '8'
 
   mobilesrv:
     image: php-zts:7.3.18
@@ -32,7 +28,5 @@ services:
       - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
     container_name: "yj-mobile"
     command: ['docker-spwan-start']
-    deploy:
-      resources:
-        limits:
-          cpus: '8'
+    extra_hosts:
+      - "docker.hostip:172.17.0.1"

docker/compose/youjun/conf/nginx/nginx.conf

@@ -9,7 +9,7 @@ events {
     use epoll;
 }
 
-http 
+http
 {
     include       mime.types;
     default_type  application/octet-stream;
@@ -27,20 +27,20 @@ http
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
-    server 
+    server
     {
     	listen       80;
         set  $folder_name /var/www/html;
-        server_name www.xyzshops.cn order.xyzshops.cn;
+        server_name youjun.xyzshops.cn;
         root $folder_name;
-        index index.html index.php; 
+        index index.html index.php;
 
     	proxy_connect_timeout 500s;
         proxy_read_timeout 500s;
         proxy_send_timeout 500s;
 
         fastcgi_connect_timeout 75;
-        fastcgi_read_timeout 600;   
+        fastcgi_read_timeout 600;
         fastcgi_send_timeout 600;
         fastcgi_buffer_size  32K;
         fastcgi_buffers      32 32K;
@@ -49,7 +49,7 @@ http
         real_ip_header X-Forwarded-For;
 
         charset utf-8;
-        
+
         location /logs {
             deny all;
             return 403;
@@ -62,30 +62,12 @@ http
         location / {
             index  index.html index.htm index.php;
         }
-        
-        location /mshop {
-            root $folder_name;
-            autoindex on;        
-            index  index.html index.htm index.php;
-	        try_files $uri $uri/ /mshop/index.html;
-        }
-
-        location /plot {
-            root $folder_name;
-            proxy_pass         http://172.26.105.126:5000;
-            proxy_redirect     off;
-
-            proxy_set_header   Host                 $host;
-            proxy_set_header   X-Real-IP            $remote_addr;
-            proxy_set_header   X-Forwarded-For      $proxy_add_x_forwarded_for;
-            proxy_set_header   X-Forwarded-Proto    $scheme;
-        }
 
-        location /merchant {
+        location /mshop {
             root $folder_name;
             autoindex on;
             index  index.html index.htm index.php;
-            try_files $uri $uri/ /merchant/index.html;
+	        try_files $uri $uri/ /mshop/index.html;
         }
 
         location ~ /mobile/[/\w]+\.php$ {
@@ -101,15 +83,6 @@ http
             try_files $uri $uri/ /mobile/index.html;
         }
 
-        location ~ /racc/[/\w]+\.php$ {
-            root           $folder_name;
-            fastcgi_pass   docker.hostip:9101;
-            fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-            fastcgi_param  SIGN $http_sign;
-            include fastcgi_params;
-        }
-
         location ~ /mchsrv/[/\w]+\.php$ {
             root           $folder_name;
             fastcgi_pass   172.26.80.6:9102;
@@ -122,7 +95,7 @@ http
         location ~ \.php$ {
 	        add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   172.26.80.6:9000;
+            fastcgi_pass   docker.hostip:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             fastcgi_buffer_size  1024K;

docker/compose/youjun/conf/php/php.ini

@@ -1325,7 +1325,7 @@ bcmath.scale = 0
 ; http://php.net/session.save-handler
 ;session.save_handler = file
 session.save_handler = redis
-session.save_path = tcp://172.26.105.125:6379
+session.save_path = tcp://172.28.82.132:6379
 
 ; Argument passed to save_handler.  In the case of files, this is the path
 ; where data files are stored. Note: Windows users have to change this
@@ -1939,4 +1939,4 @@ ldap.max_links = -1
 ; tab-width: 4
 ; End:
 
-output_buffering = On
+output_buffering = On

mobile/control/index.php

@@ -88,12 +88,12 @@ class indexControl extends specialControl
         $client_tpe = session_helper::client_type();
         if($client_tpe == session_helper::device_mini || $client_tpe == session_helper::device_wap) {
             $tabs = [];
-            $tabs[] = ['special_id' => 1039,'name' => '推荐'];
-            $tabs[] = ['special_id' => 1122,'name' => '品牌'];
-            $tabs[] = ['special_id' => 1025,'name' => '护肤'];
-            $tabs[] = ['special_id' => 1035,'name' => '彩妆'];
-            $tabs[] = ['special_id' => 1036,'name' => '洗护'];
-            $tabs[] = ['special_id' => 886,'name' => '男士'];
+//            $tabs[] = ['special_id' => 1039,'name' => '推荐'];
+//            $tabs[] = ['special_id' => 1122,'name' => '品牌'];
+//            $tabs[] = ['special_id' => 1025,'name' => '护肤'];
+//            $tabs[] = ['special_id' => 1035,'name' => '彩妆'];
+//            $tabs[] = ['special_id' => 1036,'name' => '洗护'];
+//            $tabs[] = ['special_id' => 886,'name' => '男士'];
         }
         else {
             $tabs = index_tab::instance()->tabs();
@@ -294,4 +294,4 @@ class indexControl extends specialControl
             return -1;
         }
     }
-}
+}

mobile/control/login.php

@@ -385,6 +385,8 @@ class loginControl extends mobileHomeControl
                 $body['share_title'] = $share['share_title'];
                 $body['share_image'] = $share['share_image'];
 
+                session::instance()->set_cookie($_SESSION['MPHPSESSID']);
+                $body['HPHPSESSID'] = $_SESSION['MPHPSESSID'];
                 return self::outsuccess($body);
             }
         }
@@ -853,4 +855,4 @@ class loginControl extends mobileHomeControl
             return self::outsuccess(['member_id' => $_SESSION['member_id'], 'HPHPSESSID' => $_SESSION['MPHPSESSID']]);
         }
     }
-}
+}