diff --git a/xiaoniu-admin/src/main/java/com/ruoyi/mall/controller/MallSalesmanController.java b/xiaoniu-admin/src/main/java/com/ruoyi/mall/controller/MallSalesmanController.java index 006796dc09fb698e94ae9de20065ab2b7ce0203f..a1a4c25e08cca080d40535a7bfdf82fabca726b2 100644 --- a/xiaoniu-admin/src/main/java/com/ruoyi/mall/controller/MallSalesmanController.java +++ b/xiaoniu-admin/src/main/java/com/ruoyi/mall/controller/MallSalesmanController.java @@ -13,7 +13,7 @@ import com.ruoyi.mall.domain.MallShopShop; import com.ruoyi.mall.service.IMallMemberUserService; import com.ruoyi.mall.service.IMallShopShopService; import com.ruoyi.system.service.ISysUserService; -import netscape.javascript.JSObject; + import org.apache.commons.lang3.ObjectUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xiaoniu-admin/src/main/resources/application-druid.yml b/xiaoniu-admin/src/main/resources/application-druid.yml index d7314240e50e97f5edb764c95d88145dbfd0f2ea..80f86fbb30f700d7c6709ae821493fd6ebab5b40 100644 --- a/xiaoniu-admin/src/main/resources/application-druid.yml +++ b/xiaoniu-admin/src/main/resources/application-druid.yml @@ -10,9 +10,9 @@ spring: # username: root # password: tdzF%M4KT8%nM6^S # 测试数据源 - url: jdbc:mysql://gz-cynosdbmysql-grp-4bnh3awr.sql.tencentcdb.com:24889/wanbang_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true - username: root - password: Yh&!(^)@*%$1 + url: jdbc:mysql://rm-hp3340490n5mw72tcto.mysql.huhehaote.rds.aliyuncs.com:3306/test_wanbang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true + username: demonstration + password: Aixi2494 # 本地数据源 # url: jdbc:mysql://rm-hp3340490n5mw72tcto.mysql.huhehaote.rds.aliyuncs.com:3306/wanbangtest_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true # username: wanbang_test diff --git a/xiaoniu-system/src/main/java/com/ruoyi/mall/service/IMallSalesmanService.java b/xiaoniu-system/src/main/java/com/ruoyi/mall/service/IMallSalesmanService.java index cc631a110ca206b06c616f90ef4fcbb4cc27d751..3e4ff890bab85ade2a0bfb1cde284f62b4a6742f 100644 --- a/xiaoniu-system/src/main/java/com/ruoyi/mall/service/IMallSalesmanService.java +++ b/xiaoniu-system/src/main/java/com/ruoyi/mall/service/IMallSalesmanService.java @@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.ApiResult; import com.ruoyi.mall.domain.MallSalesman; -import netscape.javascript.JSObject; /** * 业务员Service接口 diff --git a/xiaoniu-system/src/main/java/com/ruoyi/mall/service/impl/MallSalesmanServiceImpl.java b/xiaoniu-system/src/main/java/com/ruoyi/mall/service/impl/MallSalesmanServiceImpl.java index aef8b37d92a8825ca649a74654d5e5016be9857d..e245f9f925850a2bdcd1fbcb3ef4a03e96632d89 100644 --- a/xiaoniu-system/src/main/java/com/ruoyi/mall/service/impl/MallSalesmanServiceImpl.java +++ b/xiaoniu-system/src/main/java/com/ruoyi/mall/service/impl/MallSalesmanServiceImpl.java @@ -30,7 +30,6 @@ import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.mapper.SysUserPostMapper; import com.ruoyi.system.mapper.SysUserRoleMapper; -import netscape.javascript.JSObject; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired;