Merge remote-tracking branch 'origin/main'
# Conflicts: # src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java # src/main/resources/views/platform/jf/reimbursement/mine.html # src/main/resources/views/platform/jf/reimbursement/unionChairman.html # src/main/resources/views/platform/shopping/shoppingTypeApply.html
This commit is contained in:
Paidax
@@ -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";
|
||||
//文件访问域名
|
||||
|
||||
@@ -193,10 +193,10 @@ public class NutShiroProcessor extends AbstractProcessor {
|
||||
if (Globals.isEnv(Env.prod)) {
|
||||
//生产环境登录地址
|
||||
StringBuffer prodLoginUrl = new StringBuffer();
|
||||
prodLoginUrl.append(appDomain);
|
||||
// if (StrUtil.isNotBlank(redirect)) {
|
||||
// prodLoginUrl.append(URLEncoder.encode(redirect, Charset.defaultCharset()));
|
||||
// }
|
||||
prodLoginUrl.append(appDomain + "/sso/login?redirect=");
|
||||
if (StrUtil.isNotBlank(redirect)) {
|
||||
prodLoginUrl.append(URLEncoder.encode(redirect, Charset.defaultCharset()));
|
||||
}
|
||||
|
||||
//cas认证链接
|
||||
StringBuffer casAuthUrl = new StringBuffer();
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -100,9 +100,10 @@ public class PlatformAuthorizingRealm extends AuthorizingRealm {
|
||||
throw Lang.makeThrow(AuthenticationException.class, "登录账号不可为空");
|
||||
}
|
||||
user = getUserService().fetch(Cnd.NEW().and("loginname", "=", loginname));
|
||||
}else if(loginOrigin.equals(LoginUtil.LoginOrigin.CAS)){
|
||||
user = getUserService().fetch(Cnd.NEW().and("loginname", "=", loginname));
|
||||
}
|
||||
|
||||
|
||||
if (Lang.isEmpty(user)) {
|
||||
throw Lang.makeThrow(UnknownAccountException.class, "账号不存在", loginname);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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"));
|
||||
msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null);
|
||||
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);
|
||||
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);
|
||||
|
||||
@@ -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",
|
||||
|
||||
-3
@@ -43,9 +43,6 @@ public class MobileMemberCostListController {
|
||||
Sql sql = Sqls.create("""
|
||||
SELECT
|
||||
mpi.*,
|
||||
mpp.modeValue,
|
||||
mpp.modeValueList,
|
||||
mpp.selectMode,
|
||||
mpp.projectName
|
||||
FROM
|
||||
member_payment_info mpi
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
<svg t="1706509236796" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3418" width="64" height="64"><path d="M281.5 308.4c-3.2-1.1-16.3 14.4-17.5 16.5s-10.3 68-10.3 68c0 8.6 7 36.2 26.3 39" fill="#E8B491" p-id="3419"></path><path d="M280.5 194.5h626v313.6h-626z" fill="#EA7657" p-id="3420"></path><path d="M303.1 236.1h626v313.6h-626z" fill="#FF8A65" p-id="3421"></path><path d="M683 422.9h-50.3v-33.4H683c9.3 0 16.7-7.4 16.7-16.7s-7.4-16.7-16.7-16.7h-34.3l32.5-60c4.2-7.6 1.6-17.3-5.5-21.8-7.2-4.3-16.3-1.8-20.4 5.8l-37.3 69c-1.2 2.3-1.8 4.6-1.9 7h-0.2c-0.2-2.4-0.8-4.8-1.9-7l-36.9-68.8c-4.1-7.6-13.2-10.1-20.2-5.8s-9.5 14.2-5.4 21.8l32.1 60h-34.3c-9.3 0-16.7 7.4-16.7 16.7s7.4 16.7 16.7 16.7h50.3V423h-50.3c-9.3 0-16.7 7.4-16.7 16.7s7.4 16.7 16.7 16.7h50.3v35.1c0 8.4 7.4 15.1 16.7 15.1 9.3 0 16.7-6.7 16.7-15.1v-35.1h50.3c9.3 0 16.7-7.4 16.7-16.7-0.1-9.3-7.8-16.8-17-16.8z" fill="#FCEAE6" p-id="3422"></path><path d="M134.2 609.4s8.7-239.3 14.6-251.2c5.8-11.9 131.7-143.8 131.7-143.8l-1.2 4.7 1.1 89.3c-3.2-1.1-16.3 14.4-17.5 16.5s-10.3 68-10.3 68c0 8.6 7 36.2 26.3 39 8.4 2.4 17.7-1.8 30.1-10.1 10.2-5.8 15.1-21.2 25.9-32.4 11.3-33.7 18.5-49.7 36-72 17.5-22.2 33.3-37 33.3-37l6.7-8.2c0.7-0.1 17.3-1.3 17.9-1.3 22.3-1.9 39.8 11.4 43 38.6 3.4 28.1-81.5 165.9-81.5 165.9s-21.9 38-27.7 117.7c-0.4 6-8.4 33.8-8.4 33.8-6.7 16.8-49.8 75.2-49.8 75.2-3.2 3.5-6.2 7.3-9.4 10.7-34.9 36.3-73.4 62.8-89.6 63.5-32 1.5-110.6-66.5-110.6-66.5l39.4-100.4z" fill="#FCD4B1" p-id="3423"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 6.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 114 KiB |
@@ -0,0 +1 @@
|
||||
<svg t="1706580209183" class="icon" viewBox="0 0 1147 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="28392" width="128" height="128"><path d="M476.689655 1024C213.415724 1024 0 810.584276 0 547.310345S213.415724 70.62069 476.689655 70.62069s476.689655 213.415724 476.689655 476.689655-213.415724 476.689655-476.689655 476.689655z m224.803311-670.896552L437.848276 622.750897l-150.651586-154.07669L211.862069 545.703724 437.848276 776.827586 776.827586 430.150621 701.492966 353.103448zM927.744 131.566345L847.448276 105.931034l80.295724-25.63531L953.37931 0l25.635311 80.295724L1059.310345 105.931034l-80.295724 25.635311L953.37931 211.862069zM57.803034 983.852138L17.655172 971.034483l40.147862-12.817655L70.62069 918.068966l12.817655 40.147862L123.586207 971.034483l-40.147862 12.817655L70.62069 1024zM1081.803034 312.955586L1041.655172 300.137931l40.147862-12.817655L1094.62069 247.172414l12.817655 40.147862L1147.586207 300.137931l-40.147862 12.817655L1094.62069 353.103448z" fill="#FFFFFF" p-id="28393"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.0 KiB |
@@ -0,0 +1 @@
|
||||
<svg t="1706421773003" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8826" width="32" height="32"><path d="M337.387283 341.82659c-17.757225 0-35.514451 11.83815-35.514451 29.595375s17.757225 29.595376 35.514451 29.595376 29.595376-11.83815 29.595376-29.595376c0-18.49711-11.83815-29.595376-29.595376-29.595375zM577.849711 513.479769c-11.83815 0-22.936416 12.578035-22.936416 23.6763 0 12.578035 11.83815 23.676301 22.936416 23.676301 17.757225 0 29.595376-11.83815 29.595376-23.676301s-11.83815-23.676301-29.595376-23.6763zM501.641618 401.017341c17.757225 0 29.595376-12.578035 29.595376-29.595376 0-17.757225-11.83815-29.595376-29.595376-29.595375s-35.514451 11.83815-35.51445 29.595375 17.757225 29.595376 35.51445 29.595376zM706.589595 513.479769c-11.83815 0-22.936416 12.578035-22.936416 23.6763 0 12.578035 11.83815 23.676301 22.936416 23.676301 17.757225 0 29.595376-11.83815 29.595376-23.676301s-11.83815-23.676301-29.595376-23.6763z" fill="#28C445" p-id="8827"></path><path d="M510.520231 2.959538C228.624277 2.959538 0 231.583815 0 513.479769s228.624277 510.520231 510.520231 510.520231 510.520231-228.624277 510.520231-510.520231-228.624277-510.520231-510.520231-510.520231zM413.595376 644.439306c-29.595376 0-53.271676-5.919075-81.387284-12.578034l-81.387283 41.433526 22.936416-71.768786c-58.450867-41.433526-93.965318-95.445087-93.965317-159.815029 0-113.202312 105.803468-201.988439 233.803468-201.98844 114.682081 0 216.046243 71.028902 236.023121 166.473989-7.398844-0.739884-14.797688-1.479769-22.196532-1.479769-110.982659 1.479769-198.289017 85.086705-198.289017 188.67052 0 17.017341 2.959538 33.294798 7.398844 49.572255-7.398844 0.739884-15.537572 1.479769-22.936416 1.479768z m346.265896 82.867052l17.757225 59.190752-63.630058-35.514451c-22.936416 5.919075-46.612717 11.83815-70.289017 11.83815-111.722543 0-199.768786-76.947977-199.768786-172.393063-0.739884-94.705202 87.306358-171.653179 198.289017-171.65318 105.803468 0 199.028902 77.687861 199.028902 172.393064 0 53.271676-34.774566 100.624277-81.387283 136.138728z" fill="#28C445" p-id="8828"></path></svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
@@ -0,0 +1 @@
|
||||
<svg t="1706500361500" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4266" width="64" height="64"><path d="M515.291429 832.548571a321.718857 321.718857 0 0 1-228.608-94.464 320 320 0 0 1-94.756572-228.096 320 320 0 0 1 94.72-228.059428 321.718857 321.718857 0 0 1 228.644572-94.464c46.226286 0 90.953143 9.508571 132.790857 28.452571 15.469714 6.948571 22.418286 25.161143 15.469714 40.594286a30.756571 30.756571 0 0 1-40.594286 15.469714 260.571429 260.571429 0 0 0-107.666285-23.04 260.388571 260.388571 0 0 0-185.124572 76.434286 258.925714 258.925714 0 0 0-76.653714 184.539429c0 69.668571 27.209143 135.277714 76.653714 184.502857a260.388571 260.388571 0 0 0 185.124572 76.434285 261.12 261.12 0 0 0 175.981714-67.84c47.908571-43.410286 77.897143-99.986286 84.443428-163.949714a30.829714 30.829714 0 0 1 33.645715-27.538286 30.829714 30.829714 0 0 1 27.538285 33.682286c-8.082286 79.104-45.129143 149.577143-104.265142 203.227429a321.755429 321.755429 0 0 1-217.344 84.114285z m290.377142-531.602285a30.72 30.72 0 0 0-43.483428-0.109715L512 550.326857l-108.470857-108.178286a30.72 30.72 0 1 0-43.373714 43.593143l130.157714 129.865143a30.683429 30.683429 0 0 0 43.52 0l271.725714-271.177143a30.72 30.72 0 0 0 0.109714-43.483428z" fill="#2A77FF" p-id="4267"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 122 KiB |
@@ -0,0 +1 @@
|
||||
<svg t="1706421982466" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9853" width="32" height="32"><path d="M230.404 576.536c-12.087 9.728-25.043 23.93-28.805 41.984-5.12 24.666-1.069 55.541 22.728 79.761 28.828 29.362 72.637 37.398 91.56 38.779 51.4 3.717 106.184-21.772 147.477-50.844 16.184-11.42 43.899-34.349 70.39-69.721-59.37-30.653-133.477-64.557-212.703-61.24-40.47 1.692-69.454 10.084-90.647 21.281z m752.859 135.545C1009.463 650.574 1024 582.968 1024 512 1024 229.688 794.335 0 512 0 229.665 0 0 229.688 0 512c0 282.335 229.665 512 512 512 170.385 0 321.491-83.723 414.631-212.124-87.997-43.742-233.027-115.734-322.36-159.299-42.63 48.596-105.65 97.303-176.84 118.495-44.722 13.29-85.037 18.365-127.199 9.75-41.739-8.548-72.481-28.093-90.401-47.683-9.127-9.995-19.612-22.706-27.203-37.82a71.25 71.25 0 0 0 1.202 3.049s-4.363-7.524-7.702-19.5a85.994 85.994 0 0 1-3.34-18.143 93.517 93.517 0 0 1-0.2-13.045c-0.378-7.702-0.066-15.783 1.67-24.064 4.185-20.235 12.822-43.81 35.172-65.692 49.063-48.039 114.777-50.621 148.814-50.42 50.421 0.289 138.04 22.35 211.812 48.439 20.436-43.52 33.547-90.068 42.007-121.1H305.308v-33.168h157.518v-66.337H272.139v-33.169h190.687v-66.315c0-9.105 1.803-16.584 16.584-16.584h74.619v82.899h207.293v33.169H554.029v66.337h165.82s-16.65 92.828-68.719 184.32c115.557 41.272 278.128 104.849 332.133 126.086z" fill="#1296DB" p-id="9854"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
@@ -664,7 +664,7 @@ module.exports = {
|
||||
}
|
||||
}*/
|
||||
await this.flushUnits()
|
||||
// await this.getActivityGroup()
|
||||
await this.getActivityGroup()
|
||||
this.personTypeOptions = await getDictOptions("UserType")
|
||||
this.userStateOptions = await getDictOptions("UserState")
|
||||
await this.getMenuOptions()
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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: [],
|
||||
|
||||
@@ -269,7 +269,7 @@ layout("/mobile/platform.html"){
|
||||
payStandards.map((p) => {
|
||||
if (p.personTypes.includes(personType)) {
|
||||
r.selectMode = p.payMode
|
||||
if (p.payMode === "1") {
|
||||
if (p.c === "1") {
|
||||
r.modeValue = p.payModeValue
|
||||
} else {
|
||||
r.modeValueList = p.payModeValueList
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user