server_commit

src/main/java/io/v/nutz/web/commons/base/Globals.java

@@ -53,7 +53,7 @@ public class Globals {
     //项目短名称
     public static String AppShrotName = "";
     //项目域名 (设置一个默认的 为优先级考虑)
-    public static String AppDomain = "http://10.10.10.15";
+    public static String AppDomain = "http://zhgh.hrbnu.edu.cn/";
     //cas地址 //http://noa.hrbnu.edu.cn/login/OAlogin.jsp#/?_key=vbuw0p
     public static String CasAddress = "http://pass.hrbnu.edu.cn/tpass";
     //文件访问域名

src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java

@@ -193,10 +193,10 @@ public class NutShiroProcessor extends AbstractProcessor {
         if (Globals.isEnv(Env.prod)) {
             //生产环境登录地址
             StringBuffer prodLoginUrl = new StringBuffer();
-            prodLoginUrl.append(appDomain);
+            prodLoginUrl.append(appDomain + "/sso/login?redirect=");
-//            if (StrUtil.isNotBlank(redirect)) {
+            if (StrUtil.isNotBlank(redirect)) {
-//                prodLoginUrl.append(URLEncoder.encode(redirect, Charset.defaultCharset()));
+                prodLoginUrl.append(URLEncoder.encode(redirect, Charset.defaultCharset()));
-//            }
+            }
 
             //cas认证链接
             StringBuffer casAuthUrl = new StringBuffer();

src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java

@@ -29,7 +29,7 @@ public class EasyCredentialsMatch extends HashedCredentialsMatcher {
             return true;
         }
 
-        String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "1");
+        String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "zxcvbnmqwer");
 
         if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) {
             return true;

src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java

@@ -131,12 +131,12 @@ public class AssociationCon {
 
         String nodeName = "";
         if (flag) {
-            msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of("1019911404"), null);
+//            msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of("1019911404"), null);
             FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(id, new NutMap().addv("userId", aid.getUser_id()), List.of("1019911404"));
             nodeName = "校工会负责人审核";
         } else {
             Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id());
-            msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被协会拒绝，审核意见：" + aid.getAssociation_principal_idea(), List.of(user.getLoginname()), null);
+//            msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被协会拒绝，审核意见：" + aid.getAssociation_principal_idea(), List.of(user.getLoginname()), null);
             nodeName = "协会审核拒绝";
             FundsToHandler.REFUSE_TASK.exec(id, new NutMap().addv("option", nodeName), null);
         }

src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java

@@ -138,14 +138,14 @@ public class DivisionCon {
 //            Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH_WYH_ZX));
 //            if (Lang.isNotEmpty(sys_user_role)) {
 //                Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
-                Sys_user user = activityBxService.dao().fetch(Sys_user.class, Cnd.where("loginname","=","1019911404"));
+                Sys_user user = activityBxService.dao().fetch(Sys_user.class, Cnd.where("loginname","=","002154"));
-                msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null);
+//                msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null);
                 FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(id, null, List.of(user.getLoginname()));
 //            }
         } else {
             nodeName = "基层工会主席拒绝";
             Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id());
-            msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被基层工会主席拒绝，审核意见：" + aid.getDivision_chairman_idea(), List.of(user.getLoginname()), null);
+//            msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被基层工会主席拒绝，审核意见：" + aid.getDivision_chairman_idea(), List.of(user.getLoginname()), null);
             FundsToHandler.REFUSE_TASK.exec(id, new NutMap().addv("option", nodeName), null);
         }
         FundsToHandler.COMPLETE_UNION_TASK.exec(id, new NutMap().addv("option", nodeName), null);

src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java

@@ -151,7 +151,7 @@ public class UnionCon {
         String nodeName = "";
         if (nutMap.getBoolean("flag")) {
             User user = activityBxService.dao().fetch(User.class, Cnd.where("id", "=", aid.getUser_id()));
-            msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null);
+//            msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null);
 
 
             if (aid.getActivity_id() == null) {
@@ -179,7 +179,7 @@ public class UnionCon {
             nodeName = "审核通过";
         } else {
             Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id());
-            msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null);
+//            msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null);
             FundsToHandler.REFUSE_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null);
         }
         activityBxService.update(aid);

src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java

@@ -197,7 +197,7 @@ public enum ReimbursementToHandler {
                     "activity_reimbursement_school_director_audit",
                     "校工会负责人审核",
                     ShiroUtil.getUserId(),
-                    List.of("1019911404"),
+                    List.of("002154"),
                     "/platform/jf/reimbursement/schoolDirector",
                     "/platform/jf/reimbursement/schoolDirector",
                     "/platform/jf/reimbursement/schoolDirector",

src/main/resources/static/components/sign/sign.vue

@@ -85,7 +85,7 @@ module.exports = {
             const ts = new Date().getTime() + (Math.floor(Math.random() * (1000 - 1 + 1)) + 1).toString()
             console.log(ts)
             // this.postAddress = location.protocol + '//' + location.host + '/signature?prefix=' + this.prefix + '&id=' + ts + "&is_value_base64=" + this.is_value_base64
-            this.postAddress = "http://localhost/signature?prefix=" + this.prefix + "&id=" + ts + "&is_value_base64=" + this.is_value_base64
+            this.postAddress = "https://zhgh.hrbnu.edu.cn/signature?prefix=" + this.prefix + "&id=" + ts + "&is_value_base64=" + this.is_value_base64
 
             this.showQrCode = true
 

src/main/resources/views/layouts/platform.html

@@ -77,10 +77,10 @@
         <script src="${base!}/assets/platform/js/v.js?v=1.0.5"></script>
         <script src="${base!}/assets/platform/plugins/wangeditor/wangEditor.js"></script>
         <!--    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/wangeditor@4.6.15/dist/wangEditor.min.js"></script>-->
-        <script
+       <!-- <script
             type="text/javascript"
             src="https://webapi.amap.com/maps?v=1.4.15&key=6ab3452804ba35050880b5e047436853&plugin=AMap.PolyEditor,AMap.PlaceSearch"
-        ></script>
+        ></script>-->
 
         <!--viewer-->
         <script src="${base!}/assets/platform/plugins/viewer/viewer.min.js"></script>

src/main/resources/views/layouts/platform1.html

@@ -68,9 +68,9 @@
     <script src="${base!}/assets/platform/js/v.js?v=1.0.5"></script>
     <script src="${base!}/assets/platform/plugins/wangeditor/wangEditor.js"></script>
     <!--    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/wangeditor@4.6.15/dist/wangEditor.min.js"></script>-->
-    <script type="text/javascript"
+    <!--<script type="text/javascript"
             src="https://webapi.amap.com/maps?v=1.4.15&key=6ab3452804ba35050880b5e047436853&plugin=AMap.PolyEditor,AMap.PlaceSearch"></script>
-
+-->
     <!--viewer-->
     <script src="${base!}/assets/platform/plugins/viewer/viewer.min.js"></script>
     <script src="${base!}/assets/platform/plugins/viewer/jquery-viewer.min.js"></script>

src/main/resources/views/mobile/home.html

@@ -331,7 +331,7 @@ layout("/mobile/platform.html"){
         data() {
             return {
                 swipeShow: false,
-                images: ["${AppDomain!}" + "/home1.png", "${AppDomain!}" + "/home2.png", "${AppDomain!}" + "/home3.png"],
+                images: ["/assets/mobile/img/home/home1.png", "/assets/mobile/img/home/home2.png", "/assets/mobile/img/home/home3.png"],
                 qianShow: false,
                 msgActive: "unread",
                 moduleMenus: [],

src/main/resources/views/mobile/platform.html

@@ -42,10 +42,10 @@
 
         <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
         <script src="${base!}/assets/platform/js/scannerQrCodeJs.js"></script>
-        <script
+      <!--  <script
             type="text/javascript"
             src="https://webapi.amap.com/maps?v=2.0&key=6ab3452804ba35050880b5e047436853&plugin=AMap.PolyEditor,AMap.Geolocation"
-        ></script>
+        ></script>-->
 
         <script src="${base!}/components/plugins/sysDict/DictData.js"></script>
 

src/main/resources/views/platform/jf/reimbursement/mine.html

@@ -37,7 +37,6 @@ layout("/layouts/platform.html"){
                             <el-select placeholder="所属工会" v-model="pageForm.unionId" style="width: 100%;"
                                        clearable="true"
                                        @change="flushUnits" @clear="flushUnits"
-                                       v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}"
                                        filterable="true">
                                 <el-option v-for="item in unions" :label="item.unionname" :value="item.id"></el-option>
                             </el-select>

src/main/resources/views/platform/jf/reimbursement/unionChairman.html

@@ -37,7 +37,6 @@ layout("/layouts/platform.html"){
                             <el-select placeholder="所属工会" v-model="pageForm.unionId" style="width: 100%;"
                                        clearable="true"
                                        @change="flushUnits" @clear="flushUnits"
-                                       v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}"
                                        filterable="true">
                                 <el-option v-for="item in unions" :label="item.unionname" :value="item.id"></el-option>
                             </el-select>

src/main/resources/views/platform/shopping/shoppingTypeApply.html

@@ -70,7 +70,7 @@ layout("/layouts/platform.html"){
                 <table-tool :app="this" label="供应商管理">
                     <template #func>
                         <template v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}">
-                            <el-button @click="openAdd" type="primary">新建
+                            <el-button @click="openAdd" size="small" type="primary">新建
                             </el-button>
                         </template>
                     </template>
@@ -128,7 +128,7 @@ layout("/layouts/platform.html"){
                     </el-table-column>
 
                     <el-table-column align="center" header-align="center" label="操作"
-                                     prop="userOnline" width="100px">
+                                     prop="userOnline" width="200px">
                         <template scope="{row}">
 
                             <!-- <el-button size="mini" type="primary" plain @click="openPackage(row)">
@@ -142,14 +142,14 @@ layout("/layouts/platform.html"){
                             <el-button @click="openEdit(row)" size="mini" type="primary">
                                 编辑
                             </el-button>
-                            <!--   <template v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}">
+                               <template v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}">
                                    <el-button size="mini" type="danger" @click="doDelete(row.id)">
                                        删除
                                    </el-button>
-                                   <el-button size="mini" type="danger" @click="doDeleteUser(row.id)">
+                                   <!--<el-button size="mini" type="danger" @click="doDeleteUser(row.id)">
                                        删除供应商账号
-                                   </el-button>
+                                   </el-button>-->
-                               </template>-->
+                               </template>
 
                         </template>
                     </el-table-column>
@@ -874,7 +874,7 @@ layout("/layouts/platform.html"){
                 window.open(loc() + "/doChooseExport?id=" + this.viewData.id + "&schoolWelfareId=" + schoolWelfareId + "&unionId=" + this.choosePageForm.unionId)
             },
             doDelete(id) {
-                this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+                this.$confirm('此操作将永久删除此数据, 是否继续?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'

src/main/resources/views/platform/sys/home/appModule.js

@@ -28,6 +28,11 @@ const appModule = {
         //     return JSON.parse(window.sessionStorage.getItem("moduleMenus"))
         // }
     },
+    // computed: {
+    //     entranceModules() {
+    //         return JSON.parse(window.sessionStorage.getItem("moduleMenus"))
+    //     }
+    // },
     methods: {
         enterEntranceModules(item) {
             headerApp.appModuleId = item.id