Merge branch 'feature-personal' of http://222.76.244.118:3000/CPICXIM/desktop_task_schedule into feature-personal

code/web/task_schedule/package-lock.json

@@ -8,12 +8,12 @@
             "name": "task_schedule",
             "version": "0.0.0",
             "dependencies": {
-                "@babel/eslint-parser": "^7.22.7",
+                "@babel/eslint-parser": "^7.22.9",
                 "@element-plus/icons-vue": "^2.1.0",
                 "axios": "^1.4.0",
                 "babel": "^6.23.0",
                 "echarts": "^5.4.2",
-                "element-plus": "^2.3.7",
+                "element-plus": "^2.3.8",
                 "moment": "^2.29.4",
                 "sass-loader": "^13.3.2",
                 "vue": "^3.3.4",
@@ -21,7 +21,7 @@
                 "vuex": "^4.1.0"
             },
             "devDependencies": {
-                "@babel/eslint-parser": "^7.22.7",
+                "@babel/eslint-parser": "^7.22.9",
                 "@typescript-eslint/eslint-plugin": "^6.0.0",
                 "@vitejs/plugin-vue": "^4.2.3",
                 "@vue/cli-plugin-eslint": "^5.0.8",
@@ -112,14 +112,14 @@
             }
         },
         "node_modules/@babel/eslint-parser": {
-            "version": "7.22.7",
+            "version": "7.22.9",
-            "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.22.7.tgz",
+            "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.22.9.tgz",
-            "integrity": "sha512-LH6HJqjOyu/Qtp7LuSycZXK/CYXQ4ohdkliEaL1QTdtOXVdOVpTBKVxAo/+eeyt+x/2SRzB+zUPduVl+xiEvdg==",
+            "integrity": "sha512-xdMkt39/nviO/4vpVdrEYPwXCsYIXSSAr6mC7WQsNIlGnuxKyKE7GZjalcnbSWiC4OXGNNN3UQPeHfjSC6sTDA==",
             "dev": true,
             "dependencies": {
                 "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-                "@nicolo-ribaudo/semver-v6": "^6.3.3",
+                "eslint-visitor-keys": "^2.1.0",
-                "eslint-visitor-keys": "^2.1.0"
+                "semver": "^6.3.1"
             },
             "engines": {
                 "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
@@ -1022,15 +1022,6 @@
                 "eslint-scope": "5.1.1"
             }
         },
-        "node_modules/@nicolo-ribaudo/semver-v6": {
-            "version": "6.3.3",
-            "resolved": "https://registry.npmmirror.com/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz",
-            "integrity": "sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
         "node_modules/@node-ipc/js-queue": {
             "version": "2.0.3",
             "resolved": "https://registry.npmmirror.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
@@ -4555,9 +4546,9 @@
             "integrity": "sha512-zx8hqumOqltKsv/MF50yvdAlPF9S/4PXbyfzJS6ZGhbddGkRegdwImmfSVqCkEziYzrIGZ/TlrzBND4FysfkDg=="
         },
         "node_modules/element-plus": {
-            "version": "2.3.7",
+            "version": "2.3.8",
-            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.3.7.tgz",
+            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.3.8.tgz",
-            "integrity": "sha512-h6TxclbaLUJxg/Bv5j/ZKsK+K5yadQliw5+R30HWyE69pXlqXTX24oYx+yw3pA4Dy+lqEDi5501FQ0CORk3OSA==",
+            "integrity": "sha512-yHQR0/tG2LvPkpGUt7Te/hPmP2XW/BytBNUbx+EFO54VnGCOE3upmQcVffNp1PLgwg9sthYDXontUWpnpmLPJw==",
             "dependencies": {
                 "@ctrl/tinycolor": "^3.4.1",
                 "@element-plus/icons-vue": "^2.0.6",
@@ -12201,9 +12192,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "6.3.0",
+            "version": "6.3.1",
-            "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver.js"

code/后端/desktop_archievement_backend/src/main/resources/mybatis/jdbc.properties

@@ -0,0 +1,4 @@
+jdbc.oracle.driver=oracle.jdbc.driver.OracleDriver
+jdbc.oracle.xmcx1.url=jdbc:oracle:thin:@10.39.0.86:1521:xmcx1
+jdbc.oracle.xmcx1.username=desktop_archievement_admin
+jdbc.oracle.xmcx1.password=Cpic123456

code/后端/desktop_archievement_backend/src/main/resources/mybatis/mybatis.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
+    <properties resource="jdbc.properties" />
     <environments default="development">
         <environment id="development">
             <transactionManager type="JDBC" />
             <dataSource type="POOLED">
-                <property name="driver" value="oracle.jdbc.driver.OracleDriver" />
+                <property name="driver" value="${jdbc.oracle.driver}" />
-                <property name="url" value="jdbc:oracle:thin:@10.39.0.86:1521:xmcx1" />
+                <property name="url" value="${jdbc.oracle.xmcx1.url}" />
-                <property name="username" value="desktop_archievement_admin" />
+                <property name="username" value="${jdbc.oracle.xmcx1.username}" />
-                <property name="password" value="Cpic123456" />
+                <property name="password" value="${jdbc.oracle.xmcx1.password}" />
             </dataSource>
         </environment>
     </environments>