Browse Source

修改登录

syh 4 years ago
parent
commit
43563fc26e

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceMusicInfoController.java

@@ -39,7 +39,7 @@ public class BytedanceMusicInfoController {
     private IFileInfoService fileInfoService;
 
     @PostMapping(value = "/netEaseDownLoad")
-    public void netEasedownLoad(JSONObject data, HttpServletResponse response) throws Exception {
+    public void netEasedownLoad(@RequestBody JSONObject data, HttpServletResponse response) throws Exception {
         String fileName = data.getString("musicName");
         String fileUrl = data.getString("musicUrl");
         String filePath = fileInfoService.downLoadByUrl(fileUrl);
@@ -60,7 +60,7 @@ public class BytedanceMusicInfoController {
         toClient.close();
     }
 
-    @GetMapping(value = "/downLoad")
+    @PostMapping(value = "/downLoad")
     public void downLoad(Long id, HttpServletResponse response) throws Exception {
         if (null == id || id == 0) {
             log.error("抖音音乐文件下载异常:参数异常");

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -101,6 +101,7 @@ public class TestController {
 
     @GetMapping("getKuaishouPlanHourlyReport")
     public Map<String,Object> getKuaishouPlanHourlyReport(String params){
+        Long start = System.currentTimeMillis();
         Map<String,Object>result = new HashMap<>();
         if(null == params||params.trim().equals("")){
             ResultMapUtils.setResultMap(result,StatusCode.COMMON_PARAM_ERROR);
@@ -126,6 +127,8 @@ public class TestController {
             kuaishouInterfaceService.getAdvertiserCampaignReportHourly(token, finalGetDate, finalGetDate);
             ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
             result.put("message","SUCCESS");
+            long end = System.currentTimeMillis();
+            log.info("执行时长:{}毫秒",end-start);
             return result;
         }catch (Exception e){
             e.printStackTrace();

+ 13 - 13
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -56,13 +56,13 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-    username: hcst
-    password: test@20190531
-#    url: jdbc:mysql://139.186.31.213:3316/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-#    username: root
-#    password: hcst@2020
-#    driver-class-name: com.mysql.jdbc.Driver
+#    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#    username: hcst
+#    password: test@20190531
+    url: jdbc:mysql://139.186.31.213:3316/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    username: root
+    password: hcst@2020
+    driver-class-name: com.mysql.jdbc.Driver
     druid:
       stat-view-servlet:
         loginUsername: admin
@@ -99,12 +99,12 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: hcst
-          password: test@20190531
-#          url: jdbc:mysql://139.186.31.213:3316/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-#          username: root
-#          password: hcst@2020
+#          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#          username: hcst
+#          password: test@20190531
+          url: jdbc:mysql://139.186.31.213:3316/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          username: root
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:

File diff suppressed because it is too large
+ 12 - 15
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java


+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/SysUser.java

@@ -2,6 +2,7 @@ package cn.com.ctop.common.module.entity;
 
 import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -180,4 +181,21 @@ public class SysUser implements Serializable {
      * (github/github,wechat_enterprise/企业微信,dingtalk/钉钉)
      */
     private String thirdType;
+
+    /**
+     * 职务
+     */
+    @TableField(exist = false)
+    private String position;
+    /**
+     * 区域
+     */
+    @TableField(exist = false)
+    private String area;
+    /**
+     * 部门
+     */
+    @TableField(exist = false)
+    private String depart;
+
 }