合并非现场

ng/3/dist-zf-临时修改/js/enforceHome-D4wlonWI.js

@@ -78,7 +78,7 @@ const z = t(Object.assign(S, {
             o.value = a.firstLoad, v(t, (e => {
                 //alert(JSON.stringify(e.data));
                 if(e.data.userId==17608417058){
-                    window.location.href="http://jdm.szssfj.cn/efcode20-enf-app/enforcement/loginByPassword?loginUserId=0001002";
+                    window.location.href="http://jdm.szssfj.cn/efcode20-enf-app/enforcement/loginByPassword?loginUserId=d76453e3-6945-4b02-9943-efbd0e8aee9e";
                 }
                 a.SET_USER_ID(e.data.userId), a.SET_TOKEN(e.data.token), a.SET_HAS_LAW(e.data.lawOfficer), a.SET_ORG_ID(e.data.bureauDept.deptId), o.value = !1, a.SET_IS_FIRST_LOAD(!1), S()
             }), (e => {

ng/3/dist-zf-临时修改/js/enforceHome-legacy-K2n42VnG.js

@@ -57,7 +57,7 @@ System.register(["./index-legacy-C3rXBNFm.js", "./index-legacy-COZ5mJbg.js", "./
                         let e = window.location.href, t = e.substring(e.indexOf("code=") + 5, e.indexOf("&state="));
                         o.value = i.firstLoad, U(t, (e => {
                             if(e.data.userId==17608417058){
-                                window.location.href="http://jdm.szssfj.cn/efcode20-enf-app/enforcement/loginByPassword?loginUserId=0001002";
+                                window.location.href="http://jdm.szssfj.cn/efcode20-enf-app/enforcement/loginByPassword?loginUserId=d76453e3-6945-4b02-9943-efbd0e8aee9e";
                             }
                             i.SET_USER_ID(e.data.userId), i.SET_TOKEN(e.data.token), i.SET_HAS_LAW(e.data.lawOfficer), i.SET_ORG_ID(e.data.bureauDept.deptId), o.value = !1, i.SET_IS_FIRST_LOAD(!1), Q()
                         }), (e => {

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue

@@ -87,7 +87,7 @@ const navigateTo = (target) => {
     }
 };
 const testUsers = [
-    {loginUserId:"0001002",account: 'cuifengyuan', name: '', password: 'szsf@zfjd',bureauUnitName:""}
+    {loginUserId:"d76453e3-6945-4b02-9943-efbd0e8aee9e",account: 'cuifengyuan', name: '', password: 'szsf@zfjd',bureauUnitName:""}
 ];
 
 const selectTestUser = (item) => {

zdxt-web-server/zdxt-admin-web-server/pom.xml

@@ -121,12 +121,12 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-devtools</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--            <optional>true</optional>-->
+<!--        </dependency>-->
         <!-- skywalking 整合 logback -->
 <!--        <dependency>-->
 <!--            <groupId>org.apache.skywalking</groupId>-->