Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -17,15 +17,15 @@ export default {
   //   "http://localhost:8088/"
   //   "http://192.168.2.202:8083/learun/adms"
   // ],
+  // "apiHost": [
+  //   "http://192.168.2.98:8088/"
+  // ],
   "apiHost": [
-    "http://192.168.2.98:8088/"
-  ],
-  "apiHost": [
-    "http://localhost:31173/learun/adms"
+    "http://localhost:31173/"
   ],
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
-    { username: "system", password: "123456" }
+    { username: "system", password: "www.qj.com" }
   ],
   //是否分布式部署 指WebApi与Web不在一台服务器
   "isDistributed":true,

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json

@@ -1096,19 +1096,15 @@
 			"u-parse": "@/components/u-parse/u-parse.vue"
 		}
 	}
-      // 第三方组件
-      "tki-qrcode": "@/components/tki-qrcode/tki-qrcode.vue",
-      "u-parse": "@/components/u-parse/u-parse.vue"
-    }
-  },
-	"condition" : { //模式配置，仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
-	}
-}
+  }
+// 	"condition" : { //模式配置，仅开发期间生效
+// 		"current": 0, //当前激活的模式(list 的索引项)
+// 		"list": [
+// 			{
+// 				"name": "", //模式名称
+// 				"path": "", //启动页面，必选
+// 				"query": "" //启动参数，在页面的onLoad函数里面得到
+// 			}
+// 		]
+// 	}
+// }

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config

@@ -13,6 +13,8 @@
     <add name="YKTDBString" connectionString="Data Source=xcykt;Persist Security Info=True;User ID=xcysdata;Password=xcysdata2019;Unicode=True" providerName="System.Data.OracleClient" />
     <add name="mjDBString" connectionString="Server=112.45.152.8,17049;Initial Catalog=mjxtjh;User ID=mjxtjh;Password=s1RKFzJvIG7KfcNRtntZ" providerName="System.Data.SqlClient" />
     <add name="tsDBString" connectionString="Server=112.45.152.8,17049;Initial Catalog=tsgxtjh;User ID=tsgxtjh;Password=Qs6cYOzFoQupbr12MFZm" providerName="System.Data.SqlClient" />
+    <add name="CYZJMiddleDBString" connectionString="Data Source=CYZJMIDDLE;Persist Security Info=True;User ID=digitalschool;Password=digitalschool;Unicode=True" providerName="System.Data.OracleClient" />
+
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />