瀏覽代碼

:zap: 微信账号管理页面,多公众号切换

Aron 6 年之前
父節點
當前提交
301a901073

+ 4 - 3
src/main/java/com/ifast/wxmp/controller/MpConfigController.java

@@ -55,10 +55,11 @@ public class MpConfigController extends AdminBaseController {
         return "wxmp/mpConfig/add";
     }
     
-    @GetMapping("/edit/{id}")
+    @GetMapping("/edit")
     @RequiresPermissions("wxmp:mpConfig:edit")
-    String edit(@PathVariable("id") Integer id, Model model) {
-        MpConfigDO mpConfig = mpConfigService.selectById(id);
+    String edit(String appId, Model model) {
+
+        MpConfigDO mpConfig = mpConfigService.findOneByKv("appId", appId);
         model.addAttribute("mpConfig", mpConfig);
         return "wxmp/mpConfig/edit";
     }

+ 3 - 3
src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ ifast:
       accessKey: 8-HMj9EgGNIP-xuOCpSzTn-OMyGOFtR3TxLdn4Uu
       secretKey: SjpGg3V6PsMdJgn42PeEd5Ik-6aNyuwdqV5CPM6A
       bucket: ifast
-      accessURL: http://p6r7ke2jc.bkt.clouddn.com/
+      accessURL: http://http://cdn.ifast.site/
   sms:
     cacheKey: ifast:cache
     cacheKeyPrefix: sms
@@ -56,8 +56,8 @@ logging:
   level:
     com.ifast: debug
     springfox.documentation: error
-    org.springframework.web.servlet.mvc.method.annotation: error
-    org.springframework.context.support: error
+#    org.springframework.web.servlet.mvc.method.annotation: error
+#    org.springframework.context.support: error
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource

+ 13 - 9
src/main/resources/application-prod.yml

@@ -17,16 +17,20 @@ ifast:
     jsessionidKey: SESSION
     sessionKeyPrefix: ifast:session
   oss:
-    # local.localPath本地上传(正式环境可使用绝对路径),aliyun.accessKeySecret阿里云上传,两个都注释则使用七牛云上传(sys_config.oss_qiniu)
-    local:
-      localPath: /upload
-      rootURL: http://ifast.site/upload
-    aliyun:
-      accessKeyId: 
-      #accessKeySecret:
-      bucketName: 
+    local: # 配置 localPath 启用本地上传(默认方式)
+      localPath: upload
+      rootURL: http://localhost:8088/upload
+    aliyun: # 配置 accessKeySecret 启用阿里云OSS
+      accessKeyId:
+      accessKeySecret:
+      bucketName:
       # endpoint以深圳为例,其它region请按实际情况填写
-      endpoint: http://oss-cn-shenzhen.aliyuncs.com      
+      endpoint: http://oss-cn-shenzhen.aliyuncs.com
+    qiniu: # 配置 accessKey 启用七牛云OSS
+      accessKey: 8-HMj9EgGNIP-xuOCpSzTn-OMyGOFtR3TxLdn4Uu
+      secretKey: SjpGg3V6PsMdJgn42PeEd5Ik-6aNyuwdqV5CPM6A
+      bucket: ifast
+      accessURL: http://http://cdn.ifast.site/
   sms:
     cacheKey: ifast:cache
     cacheKeyPrefix: sms

+ 6 - 6
src/main/resources/static/js/appjs/wxmp/mpConfig/edit.js

@@ -16,17 +16,17 @@ function update() {
         data: $('#signupForm').serialize(),// 你的formid
         async: false,
         error: function (request) {
-            parent.layer.alert("Connection error");
+            layer.alert("Connection error");
         },
         success: function (data) {
             if (data.code == 0) {
-                parent.layer.msg("操作成功");
-                parent.reLoad();
-                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-                parent.layer.close(index);
+                layer.msg("操作成功");
+                // parent.reLoad();
+                var index = layer.getFrameIndex(window.name); // 获取窗口索引
+                layer.close(index);
 
             } else {
-                parent.layer.alert(data.msg)
+                layer.alert(data.msg)
             }
 
         }

+ 1 - 1
src/main/resources/static/js/appjs/wxmp/mpConfig/mpConfig.js

@@ -151,7 +151,7 @@ function edit(id) {
         maxmin: true,
         shadeClose: false, // 点击遮罩关闭层
         area: ['800px', '520px'],
-        content: prefix + '/edit/' + id // iframe的url
+        content: prefix + '/edit' // iframe的url
     });
 }
 

+ 10 - 1
src/main/resources/static/js/contabs.js

@@ -125,6 +125,7 @@ $(function () {
         // 微信公众号菜单时,初始化选择公众号
         var currentMp = $('.currentMp');
         if (isWxMpUrl(dataUrl)) {
+
             console.log('公众号菜单. URL:' + dataUrl);
             currentMp.removeClass('hidden');
 
@@ -138,6 +139,9 @@ $(function () {
                 currentMpInfo.text($mpList01.text());
                 currentMpInfo.attr('data-appid', $mpList01.attr('lang'));
             }
+
+            dataUrl += "?appId=" + currentMpInfo.attr('data-appid');
+
         } else {
             console.log('非公众号菜单. URL:' + dataUrl);
             if (!currentMp.hasClass('hidden')) {
@@ -278,7 +282,12 @@ $(function () {
                 $('.J_mainContent .J_iframe').each(function () {
                     if ($(this).data('id') == dataUrl) {
                         $(this).show().siblings('.J_iframe').hide();
-                        $(this).attr('src', $(this).attr('src'));
+                        if(dataUrl.indexOf('/wxmp/mpConfig/edit') != -1){
+                            var newUrl = $(this).attr('src').slice(0, $(this).attr('src').indexOf('?')) + '?appId=' + appId;
+                            $(this).attr('src', newUrl);
+                        }else{
+                            $(this).attr('src', $(this).attr('src'));
+                        }
                     }
                 });
             } else {

+ 2 - 2
src/main/resources/templates/wxmp/mpConfig/edit.html

@@ -18,7 +18,7 @@
 							<input id="id" name="id" th:value="${mpConfig.id}" type="hidden">
 							<div class="form-group">
                                 <label class="col-sm-3 control-label">公众号名字:</label>
-                                <div class="col-sm-8">
+                                <div class="col-sm-3">
                                     <input id="mpName" name="mpName" th:value="${mpConfig.mpName}"
                                         class="form-control" type="text">
                                 </div>
@@ -127,7 +127,7 @@
 							</div>
 							<div class="form-group">
 								<label class="col-sm-3 control-label">创建时间:</label>
-								<div class="col-sm-8">
+								<div class="col-sm-2">
 									<input id="createTime" name="createTime" th:value="${#dates.format(mpConfig.createTime,'yyyy-MM-dd HH:mm:ss')}" class="form-control" type="text" readonly>
 								</div>
 							</div>