Change 分离update和insert方法

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/AccountController.java

@@ -137,7 +137,7 @@ public class AccountController extends BaseController{
                 return Rets.failure("新密码前后不一致");
             }
             user.setPassword(MD5.md5(password, user.getSalt()));
-            userService.saveOrUpdate(user);
+            userService.update(user);
             return Rets.success();
         } catch (Exception e) {
             logger.error(e.getMessage(), e);

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/cms/BannerMgrController.java

@@ -29,7 +29,11 @@ public class BannerMgrController extends BaseController {
     @BussinessLog(value = "编辑banner", key = "title", dict = CommonDict.class)
     @RequiresPermissions(value = {Permission.BANNER_EDIT})
     public Object save(@ModelAttribute @Valid Banner banner) {
-        bannerService.saveOrUpdate(banner);
+        if(banner.getId()==null){
+            bannerService.insert(banner);
+        }else {
+            bannerService.update(banner);
+        }
         return Rets.success();
     }
 

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/cms/ChannelMgrController.java

@@ -30,7 +30,11 @@ public class ChannelMgrController extends BaseController {
     @BussinessLog(value = "编辑栏目", key = "name", dict = CommonDict.class)
     @RequiresPermissions(value = {Permission.CHANNEL_EDIT})
     public Object save(@ModelAttribute @Valid Channel channel) {
-        channelService.saveOrUpdate(channel);
+        if(channel.getId()==null){
+            channelService.insert(channel);
+        }else{
+            channelService.update(channel);
+        }
         return Rets.success();
     }
 

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/message/MessagetemplateController.java

@@ -39,7 +39,12 @@ public class MessagetemplateController {
     @BussinessLog(value = "编辑消息模板", key = "name", dict = CommonDict.class)
     @RequiresPermissions(value = {Permission.MSG_TPL_EDIT})
     public Object save(@ModelAttribute @Valid MessageTemplate tMessageTemplate) {
-        messagetemplateService.saveOrUpdate(tMessageTemplate);
+        if(tMessageTemplate.getId()!=null)
+        {
+            messagetemplateService.update(tMessageTemplate);
+        }else{
+            messagetemplateService.insert(tMessageTemplate);
+        }
         return Rets.success();
     }
 

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/system/CfgController.java

@@ -19,7 +19,6 @@ import cn.enilu.flash.utils.StringUtils;
 import cn.enilu.flash.utils.ToolUtil;
 import cn.enilu.flash.utils.factory.Page;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.nutz.json.Json;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +47,6 @@ public class CfgController extends BaseController {
     @RequestMapping(value = "/list",method = RequestMethod.GET)
     @RequiresPermissions(value = {Permission.CFG})
     public Object list(@RequestParam(required = false) String cfgName, @RequestParam(required = false) String cfgValue) {
-        logger.info(Json.toJson(cfgService.get(6L)));
         Page<Cfg> page = new PageFactory<Cfg>().defaultPage();
         if(StringUtils.isNotEmpty(cfgName)){
             page.addFilter(SearchFilter.build("cfgName", SearchFilter.Operator.LIKE, cfgName));
@@ -90,9 +88,9 @@ public class CfgController extends BaseController {
             old.setCfgName(cfg.getCfgName());
             old.setCfgValue(cfg.getCfgValue());
             old.setCfgDesc(cfg.getCfgDesc());
-            cfgService.update(old);
+            cfgService.saveOrUpdate(old);
         }else {
-            cfgService.insert(cfg);
+            cfgService.saveOrUpdate(cfg);
         }
         return Rets.success();
     }

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/system/MenuController.java

@@ -64,7 +64,11 @@ public class MenuController extends BaseController {
 
         //设置父级菜单编号
         menuService.menuSetPcode(menu);
-        menuService.saveOrUpdate(menu);
+        if(menu.getId()==null){
+            menuService.insert(menu);
+        }else {
+            menuService.update(menu);
+        }
         return Rets.success();
     }
 

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/system/RoleController.java

@@ -62,7 +62,11 @@ public class RoleController extends BaseController {
     @BussinessLog(value = "编辑角色", key = "name", dict = RoleDict.class)
     @RequiresPermissions(value = {Permission.ROLE_EDIT})
     public Object save(@Valid Role role){
-        roleService.saveOrUpdate(role);
+        if(role.getId()==null){
+            roleService.insert(role);
+        }else {
+            roleService.update(role);
+        }
         return Rets.success();
     }
     @RequestMapping(method = RequestMethod.DELETE)

flash-waimai-api/src/main/java/cn/enilu/flash/api/controller/system/UserController.java

@@ -94,7 +94,7 @@ public class UserController extends BaseController {
         }
         User user = userService.get(userId);
         user.setStatus(ManagerStatus.DELETED.getCode());
-        userService.saveOrUpdate(user);
+        userService.update(user);
         return Rets.success();
     }
     @BussinessLog(value="设置用户角色",key="userId",dict=UserDict.class)
@@ -110,7 +110,7 @@ public class UserController extends BaseController {
         }
         User user = userService.get(userId);
         user.setRoleid(roleIds);
-        userService.saveOrUpdate(user);
+        userService.update(user);
         return Rets.success();
     }
 

flash-waimai-api/src/main/resources/application-dev.properties

@@ -11,8 +11,9 @@ spring.datasource.sql-script-encoding=utf-8
 spring.jpa.show-sql=true
 #server.servlet.context-path=/api
 
-spring.data.mongodb.uri=mongodb://localhost:27017/flash-waimai
-
+spring.data.mongodb.uri=mongodb://enilu-db:27017/flash-waimai
+spring.data.mongodb.username=enilu
+spring.data.mongodb.password=enilu123456
 
 ##全局参数
 cfg.tencentkey=RLHBZ-WMPRP-Q3JDS-V2IQA-JNRFH-EJBHL
@@ -22,7 +23,7 @@ cfg.baidukey=fjke3YUipM9N64GdOIh1DNeK2APO2WcT
 cfg.baidukey2=fjke3YUipM9N64GdOIh1DNeK2APO2WcT
 
 ## api
-api.qq.map.url=https://apis.map.qq.com/ws
+api.qq.map.url=https://apis.map.qq.com/ws/
 
 ## 图片地址
 img.dir=/data/springboot-elm/img/

flash-waimai-api/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 ##打包部署的时候将该配置更改为prod
-spring.profiles.active=local
+spring.profiles.active=dev
 
 server.port=8082
 server.tomcat.max-threads=800

flash-waimai-core/src/main/java/cn/enilu/flash/bean/dictmap/CfgDict.java

@@ -12,7 +12,7 @@ public class CfgDict extends AbstractDictMap {
 
     @Override
     public void init() {
-        put("cfgId","参数id");
+        put("id","参数id");
         put("cfgName","参数名称");
         put("cfgDesc","备注");
     }

flash-waimai-core/src/main/java/cn/enilu/flash/service/BaseService.java

@@ -120,13 +120,13 @@ public abstract  class BaseService<T, ID extends Serializable, R extends BaseRep
         }
 
     }
-    @CacheEvict(value = Cache.APPLICATION ,key = "#root.targetClass.simpleName+':'+#p0.id")
+    @CacheEvict(value = Cache.APPLICATION ,key = "#root.targetClass.simpleName+':'+#record.id")
     @Override
     public T update(T record) {
         return dao.save(record);
     }
     @Override
-    @CacheEvict(value = Cache.APPLICATION ,key = "#root.targetClass.simpleName+':'+#p0.id")
+    @CacheEvict(value = Cache.APPLICATION ,key = "#root.targetClass.simpleName+':'+#record.id")
     public T saveOrUpdate(T record) {
         return dao.save(record);
     }

flash-waimai-core/src/main/java/cn/enilu/flash/service/UpdateService.java

@@ -13,10 +13,4 @@ public interface UpdateService <T, ID> {
      * @return 返回修改的记录
      */
     T update(T record);
-    /**
-     * 添加或修改记录
-     * @param record 要添加或修改的对象
-     * @return 返回添加或修改的记录
-     */
-    T saveOrUpdate(T record);
 }

flash-waimai-core/src/main/java/cn/enilu/flash/service/system/CfgService.java

@@ -17,13 +17,12 @@ import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Transactional
-public class CfgService  extends BaseService<Cfg,Long,CfgRepository> {
+public class CfgService extends BaseService<Cfg, Long, CfgRepository> {
     @Autowired
     private ConfigCache configCache;
 
-    @Override
     public Cfg saveOrUpdate(Cfg cfg) {
-        if(cfg.getId()==null){
+        if(cfg.getId()==null) {
             insert(cfg);
         }else{
             update(cfg);
@@ -31,6 +30,7 @@ public class CfgService  extends BaseService<Cfg,Long,CfgRepository> {
         configCache.cache();
         return cfg;
     }
+
     @Override
     public void delete(Long id) {
         super.delete(id);