Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/sys/controller/SysMenuController.java

@@ -38,7 +38,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 @IocBean
 @At("/platform/sys/menu")
@@ -391,11 +390,11 @@ public class SysMenuController {
     @At
     @Ok("json")
     @SaCheckPermission("sys.manager.menu.edit")
-    public Object sortDo(@Param("ids") String ids, HttpServletRequest req) {
+    public Object sortDo(@Param("ids") String ids, @Param("platform") String platform, HttpServletRequest req) {
         try {
             String[] menuIds = StringUtils.split(ids, ",");
             int i = 0;
-            sysMenuService.execute(Sqls.create("update sys_menu set location=0"));
+            sysMenuService.execute(Sqls.create("update sys_menu set location=0 where platform = '%s'".formatted(platform)));
             for (String s : menuIds) {
                 if (!Strings.isBlank(s)) {
                     sysMenuService.update(org.nutz.dao.Chain.make("location", i), Cnd.where("id", "=", s));

src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java

@@ -304,7 +304,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
         String decodePwd = Base64Decoder.decodeStr(passowrd);
         String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt());
         if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) {
-            if (!Globals.sso) {
+            if (Globals.sso) {
                 throw new BaseException("用户名或者密码不正确");
             }
         }

src/main/resources/views/platform/sys/menu/index.html

@@ -140,7 +140,7 @@ layout("/layouts/platform.html"){
     <sort ref="sortRef" @refresh="doSearch"></sort>
     <recommend-setting ref="recommendSettingRef" @refresh="doSearch"></recommend-setting>
 </div>
-<script>
+<script nonce="${cspNonce!}">
     <!--#include("permissionForm.js"){}#-->
     <!--#include("basicForm.js"){}#-->
     <!--#include("sort.js"){}#-->

src/test/java/com/budwk/app/Test.java

@@ -1,50 +0,0 @@
-package com.budwk.app;
-
-
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.digest.DigestUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.budwk.app.base.sms.impl.njupt.SmsNjuptServiceImpl;
-
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-
-public class Test {
-
-    public static void main(String[] args) {
-        String appId = "1926887238437818370";
-        String secret = "32df31fcf4fc43f9a647ee1f47134f36";
-        long ts = System.currentTimeMillis();
-
-        String sign = Base64.encode(DigestUtil.md5Hex(appId + secret + ts, CharsetUtil.CHARSET_UTF_8));
-
-        HttpRequest httpRequest = HttpUtil.createPost("https://sjzcpt.nnu.edu.cn/cdsp/data-api/v2/DS0005");
-        httpRequest.header("Content-Type", "application/json");
-        httpRequest.header("appId", appId);
-        httpRequest.header("timestamp", String.valueOf(ts));
-        httpRequest.header("sign", sign);
-        httpRequest.body("{}");
-        String body = httpRequest.execute().body();
-        System.out.println(body);
-
-//        JSONObject entries = JSONUtil.parseObj(body);
-//        JSONArray value = entries.getJSONArray("value");
-//
-//        for (Object o : value) {
-//            JSONObject jsonObject = (JSONObject) o;
-//        }
-
-
-
-    }
-
-
-
-}