From 8711f3733fe2888e50e83d17816fa5f575038e7d Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Tue, 9 Aug 2022 17:50:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91jobserv?=
 =?UTF-8?q?ice=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=AD=E9=97=B4=E5=BA=93oracle=E7=9A=84=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Quanjiang.DigitalScholl.JobService/App.config               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config b/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config
index 2baacb87a..68331840b 100644
--- a/Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.JobService/App.config	
+++ b/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" />

From 0cedc78eb712a89a27754340fb8a72bc0c2be0aa Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 10 Aug 2022 10:10:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?H5=E9=A1=B5=E9=9D=A2=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/config.js                 | 10 +++----
 .../LearunApp-2.2.0/pages.json                | 28 ++++++++-----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
index d6772501a..fb4b2bba2 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
+++ b/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,
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index 6fa7fd458..78032ad68 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
+++ b/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函数里面得到
+// 			}
+// 		]
+// 	}
+// }