提交

app.js

@@ -27,10 +27,10 @@ App({
   globalData: {
     userInfo: null,
     o2oa: {
-      centerHost: "43.154.125.245",
+      centerHost: "oa.dzcrjt.com",
       centerContext: "/x_program_center",
-      centerPort: 8089,
-      httpProtocol: "http"
+      centerPort: 443,
+      httpProtocol: "https"
     },
     naviInfo: {
       naviHeight: 0,

pages/login/login.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "O2OA 登录"
+  "navigationBarTitleText": "登录"
 }

utils/o2Request.js

@@ -69,20 +69,29 @@ function setDistribute(distribute) {
 
 // 获取模块的baseUrl
 function getO2AssembleUrl(contextName) {
+  // var assemble = wx.getStorageSync('assembles')[contextName] || {host: app.globalData.o2oa.centerHost, port: app.globalData.o2oa.centerPort, context: "/"+contextName};
+  // return  app.globalData.o2oa.httpProtocol + "://" + assemble["host"] + ":" + assemble["port"]+ assemble["context"];
+
   var assemble = wx.getStorageSync('assembles')[contextName] || {host: app.globalData.o2oa.centerHost, port: app.globalData.o2oa.centerPort, context: "/"+contextName};
-  return  app.globalData.o2oa.httpProtocol + "://" + assemble["host"] + ":" + assemble["port"]+ assemble["context"];
+  return  app.globalData.o2oa.httpProtocol + "://" + assemble["host"] + ":" + assemble["context"];
 }
 
 //web服务器根地址 如 https://sample.o2oa.net:443
 function getO2WebBaseUrl() {
-  var webServer = wx.getStorageSync('webServer');
-  return app.globalData.o2oa.httpProtocol + "://" + webServer["host"] + ":" + webServer["port"];
+  // var webServer = wx.getStorageSync('webServer');
+  // return app.globalData.o2oa.httpProtocol + "://" + webServer["host"] + ":" + webServer["port"];
+
+   var webServer = wx.getStorageSync('webServer');
+   return app.globalData.o2oa.httpProtocol + "://" + webServer["host"];
+
 }
 
 
 // 中心服务器获取
 function o2oaCenterUrl() {
-  return  app.globalData.o2oa.httpProtocol + "://" + app.globalData.o2oa.centerHost + ":" + app.globalData.o2oa.centerPort + app.globalData.o2oa.centerContext + "/jaxrs/distribute/webserver/assemble/source/" + app.globalData.o2oa.centerHost;
+  // return  app.globalData.o2oa.httpProtocol + "://" + app.globalData.o2oa.centerHost + ":" + app.globalData.o2oa.centerPort + app.globalData.o2oa.centerContext + "/jaxrs/distribute/webserver/assemble/source/" + app.globalData.o2oa.centerHost;
+
+  return  app.globalData.o2oa.httpProtocol + "://" + app.globalData.o2oa.centerHost + ":" + app.globalData.o2oa.centerContext + "/jaxrs/distribute/webserver/assemble/source/" + app.globalData.o2oa.centerHost
 }
 
 // 获取演示服务器账号列表