Merge remote-tracking branch 'origin/master'

qmjszx-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -1195,9 +1195,9 @@ var table = {
                         return;
                     }
                     var url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]);
-                    $.modal.openFull("修改" + table.options.modalName, url);
+                    $.modal.open("修改" + table.options.modalName, url);
                 } else {
-                    $.modal.openFull("修改" + table.options.modalName, $.operate.editUrl(id));
+                    $.modal.open("修改" + table.options.modalName, $.operate.editUrl(id));
                 }
             },
             editToSet: function(id){
@@ -1209,9 +1209,9 @@ var table = {
                         return;
                     }
                     var url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]);
-                    $.modal.open("修改" + table.options.modalName, url);
+                    $.modal.openFull("修改" + table.options.modalName, url);
                 } else {
-                    $.modal.open("修改" + table.options.modalName, $.operate.editUrl(id));
+                    $.modal.openFull("修改" + table.options.modalName, $.operate.editUrl(id));
                 }
             },
             publish: function(id, dataName){

qmjszx-admin/src/main/resources/templates/competition/competition.html

@@ -137,7 +137,7 @@
                         var actions = [];
                         if (row.competitionState === 'competiton_state_1') {
                             actions.push('<a class="btn btn-success btn-xs ' + publisFlag + '" href="javascript:void(0)" onclick="$.operate.publish(\'' + row.id + '\', \'' + row.competitionTitle + '\')"><i class="fa fa-edit"></i>发布</a> ')
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editToSet(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         } else if(row.competitionState === 'competiton_state_4'){
 

qmjszx-common/src/main/java/beilv/common/enums/ErrorCodeConstants.java

@@ -14,6 +14,6 @@ public interface ErrorCodeConstants {
 
     ErrorCode MINI_AUTH_LOGIN_BAD = new ErrorCode(1004004002, "登录失败，请联系管理员");
 
-
+    ErrorCode USER_NOT_EXISTS = new ErrorCode(1004001000, "用户不存在");
 
 }

qmjszx-framework/src/main/java/beilv/framework/shiro/web/filter/wxMiniAppAccessControlFilter/WxMiniAppAccessControlFilter.java

@@ -1,5 +1,6 @@
 package beilv.framework.shiro.web.filter.wxMiniAppAccessControlFilter;
 
+import beilv.common.utils.StringUtils;
 import beilv.common.utils.rsa.RsaUtil;
 import beilv.system.domain.SysMember;
 import beilv.system.mapper.SysMemberMapper;
@@ -14,6 +15,9 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import static beilv.common.enums.ErrorCodeConstants.USER_NOT_EXISTS;
+import static beilv.common.utils.ExceptionUtil.exception;
+
 @Slf4j
 @Component
 public class WxMiniAppAccessControlFilter extends AccessControlFilter {
@@ -32,23 +36,36 @@ public class WxMiniAppAccessControlFilter extends AccessControlFilter {
         // 这里可以添加你的自定义验证逻辑
         String token = httpRequest.getHeader("accessToken");
         // 验证 token，返回 true 表示允许访问
-        return token != null && isValidToken(token); // 默认不允许访问
+        if (null == token || !isValidToken(token)) {
+//            throw new Exception("123123123");// 默认不允许访问
+            response.getWriter().write("{\"message\": \"false!\"}");
+            return false;
+        } else {
+            return true;
+        }
     }
 
+
     @Override
-    protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
+    protected boolean onAccessDenied(ServletRequest request, ServletResponse response) {
         HttpServletResponse httpResponse = (HttpServletResponse) response;
         // 设置未授权的响应状态
         httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
         return false; // 拒绝访问
     }
 
-    private boolean isValidToken(String token) throws Exception {
+    private boolean isValidToken(String token){
         // 在这里实现你的 token 验证逻辑
-        String str = RsaUtil.decrypt(token, privateKey);
-        //根据userId从数据库中查询用户信息，判断用户是否存在，如果不存在，则返回false，表示拒绝访问；如果存在，则返回true，表示放行访问
-        SysMember sysMember = sysMemberMapper.selectSysMemberById(Long.parseLong(str));
-        return ObjectUtils.isNotEmpty(sysMember);
+        String str;
+        try {
+            str = RsaUtil.decrypt(token, privateKey);
+            //根据userId从数据库中查询用户信息，判断用户是否存在，如果不存在，则返回false，表示拒绝访问；如果存在，则返回true，表示放行访问
+            SysMember sysMember = sysMemberMapper.selectSysMemberById(Long.parseLong(str));
+            return ObjectUtils.isNotEmpty(sysMember);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
 }

qmjszx-pay/src/main/java/beilv/pay/config/WxPayConfig.java

@@ -46,31 +46,31 @@ public class WxPayConfig {
      */
     @Bean
     public void initWxPayConfig() throws IOException {
-        this.RSAConfig = buildRSAAutoCertificateConfig();
-        this.jsapiServiceExtension = buildJsapiServiceExtension(RSAConfig);
-        this.refundService = buildRefundService(RSAConfig);
+//        this.RSAConfig = buildRSAAutoCertificateConfig();
+//        this.jsapiServiceExtension = buildJsapiServiceExtension(RSAConfig);
+//        this.refundService = buildRefundService(RSAConfig);
     }
 
     // 构建并使用自动更新平台证书的RSA配置，一个商户号只能初始化一个配置，否则会因为重复的下载任务报错
-    private RSAAutoCertificateConfig buildRSAAutoCertificateConfig() throws IOException {
-        // 将 resource 目录下的文件转为 InputStream，然后利用 IOUtil.toString(inputStream) 转化为密钥
-        String privateKey = IOUtil.toString(new ClassPathResource(privateKeyPath).getInputStream());
-        return new RSAAutoCertificateConfig.Builder()
-                .merchantId(merchantId)
-                .privateKey(privateKey)
-                .merchantSerialNumber(merchantSerialNumber)
-                .apiV3Key(apiV3Key)
-                .build();
-    }
+//    private RSAAutoCertificateConfig buildRSAAutoCertificateConfig() throws IOException {
+//        // 将 resource 目录下的文件转为 InputStream，然后利用 IOUtil.toString(inputStream) 转化为密钥
+//        String privateKey = IOUtil.toString(new ClassPathResource(privateKeyPath).getInputStream());
+//        return new RSAAutoCertificateConfig.Builder()
+//                .merchantId(merchantId)
+//                .privateKey(privateKey)
+//                .merchantSerialNumber(merchantSerialNumber)
+//                .apiV3Key(apiV3Key)
+//                .build();
+//    }
 
     // 构建JSAPI
-    private JsapiServiceExtension buildJsapiServiceExtension(RSAAutoCertificateConfig config) {
-        return new JsapiServiceExtension.Builder().config(config).build();
-    }
+//    private JsapiServiceExtension buildJsapiServiceExtension(RSAAutoCertificateConfig config) {
+//        return new JsapiServiceExtension.Builder().config(config).build();
+//    }
 
     // 构建退款
-    private RefundService buildRefundService(RSAAutoCertificateConfig config) {
-        return new RefundService.Builder().config(config).build();
-    }
+//    private RefundService buildRefundService(RSAAutoCertificateConfig config) {
+//        return new RefundService.Builder().config(config).build();
+//    }
 
 }