Merge branch 'master' into new-config

# Conflicts:
#	java/redpacket.properties
#	lua-ui/config/xjd-ui.js
#	lua-ui/config/xyqb-ui.js

java/redpacket.properties

@@ -70,4 +70,4 @@ qiniu.storage.accessKey = QyjX3i2tEMvrv50j6M_wpb9YoFJbxSm3jEkOj9lY
 mall.list = http://mallapi-${NAMESPACE}.q-gp.com/ex/tab/coupon_category/list
 qiniu.storage.bucket = contract-test
 spring.application.name = redpacket
-qiniu.storage.url = http://o9xncg89j.bkt.clouddn.com/
\ No newline at end of file
+qiniu.storage.url = http://o9xncg89j.bkt.clouddn.com/

lua-ui/config/pinjamancepat-collection-ui.js

+const protocol = window.location.protocol
+const qiniuHost = 'https://oic74zs8j.qnssl.com/'
+//const opapiHost = `${protocol}//192.168.25.205:9001` //开发环境
+const opapiHost = 'http://pinja-collection-api-dongmeifeng.q-gp.com'//测试环境
+const translateHost = 'http://192.168.165.177:12001' //开发环境 本地起
+//const translateHost = `${protocol}//192.168.166.187:12001` //测试环境环境
+let LoginUrl = `${protocol}#/login`  // 登录页
+let domain = ''
+
+export default{
+    qiniuHost,
+    opapiHost,
+    translateHost,
+    LoginUrl,
+    domain
+}
\ No newline at end of file

lua-ui/config/xjd-ui.js

-var protocol = window.location.protocol
-
+let protocol = window.location.protocol
 var apiHost = protocol + '//api.domain.com/'
 var xyqbUserUIHost = protocol + '//passport.domain.com/'
 

lua-ui/config/xyqb-ui.js

 (function () {
     'use strict';
-
     var protocol = window.location.protocol;
     var apiHost = protocol + '//api.domain.com/';
     var xyqbUserUIHost = protocol + '//passport.domain.com/';
@@ -19,13 +18,14 @@
 
     xyqbApp.value('ApiBaseUrl', apiHost);
     xyqbApp.value('AuthBaseUrl', authHost);
-    xyqbApp.value('ActivityUI', activityUI);
-    xyqbApp.value('QiniuHostUrl', qiniuHost);
-    xyqbApp.value('BtBaseUrl', btHost);
+    // xyqbApp.value('MogaokuBaseUrl', mogaokuHost);
+    xyqbApp.value('BindCardToken', bankCardReturnToken);
+    xyqbApp.value('RepayToken', repayReturnToken);
+    xyqbApp.value('RebindToken', rebindRepayReturnToken);
     xyqbApp.value('ShuntBaseUrl', shuntHost);
     xyqbApp.value('XyqbUserUI', xyqbUserUIHost);
     xyqbApp.value('h5BaseUrl', h5Host);
-    
+  
     if (location.host === '58.domain.com') {
         bankCardReturnToken = '58BIND_RETURN_ONLINE';
         repayReturnToken = '58REPAY_RETURN_ONLINE';