湖羊完整代码

.idea/misc.xml

@@ -8,11 +8,11 @@
       <list>
         <option value="$PROJECT_DIR$/huimv-cloud-common/pom.xml" />
         <option value="$PROJECT_DIR$/huimv-cloud-farm-huyang/pom.xml" />
-        <option value="$PROJECT_DIR$/huimv-cloud-core/pom.xml" />
         <option value="$PROJECT_DIR$/huimv-cloud-public/pom.xml" />
         <option value="$PROJECT_DIR$/huimv-eureka-server/pom.xml" />
         <option value="$PROJECT_DIR$/huimv-cloud-gateway/pom.xml" />
         <option value="$PROJECT_DIR$/huimv-screen/pom.xml" />
+        <option value="$PROJECT_DIR$/huimv-cloud-core/pom.xml" />
       </list>
     </option>
   </component>

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

README.md

@@ -1,4 +1,9 @@
 #湖羊项目
 ##1.项目结构简介
   此项目属于SpringCloud微服务架构、其中common为公共包、huyang为主服务、huimv-Screen为配置大屏数据的接口
+ 
+  huimv_screen 是独立的SpringBoot项目--专门用于大屏数据修改
+  
+  
+  
   

huimv-cloud-core/pom.xml

@@ -47,11 +47,13 @@
         </dependency>
 
         <!--添加common依赖-->
+
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-cloud-common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+
         <!--rabbitmq-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

huimv-cloud-core/src/main/java/com/huimv/HuimvCloudCoreApplication.java

@@ -0,0 +1,29 @@
+package com.huimv;
+
+import com.huimv.exception.RestExceptionHandler;
+import com.huimv.tools.MapParamConverter;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+
+@EnableDiscoveryClient
+@EnableFeignClients
+@SpringBootApplication
+public class HuimvCloudCoreApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(HuimvCloudCoreApplication.class, args);
+    }
+
+    @Bean
+    public MapParamConverter mapParamConverter(){
+        return new MapParamConverter();
+    }
+
+    @Bean
+    public RestExceptionHandler restExceptionHandler(){
+        return new RestExceptionHandler();
+    }
+}

huimv-cloud-core/src/main/java/com/huimv/core/controller/AuthorizeController.java

@@ -1,83 +0,0 @@
-package com.huimv.core.controller;
-
-import com.huimv.core.domain.SysMenuEntity;
-import com.huimv.core.service.IAuthorizeService;
-import com.huimv.core.service.IMenuService;
-import com.huimv.core.utils.Result;
-import com.huimv.core.utils.ResultCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@CrossOrigin
-@RestController
-@RequestMapping(value = "/authorize")
-public class AuthorizeController {
-
-    @Autowired
-    private IAuthorizeService iAuthorizeService;
-    @Autowired
-    private IMenuService iMenuService;
-
-    @RequestMapping("/saveAccountGroup")
-    public Result saveAccountGroup(@RequestParam(name = "accountId", required = true) String accountId,@RequestParam(name = "groupIds", required = true) String groupIds){
-        /*
-         * 保存账号关联权限组数据
-         */
-        return iAuthorizeService.saveAccountGroup(accountId,groupIds);
-    }
-
-    @RequestMapping("/saveGroupMenu")
-    public Result saveGroupMenu(@RequestParam(name = "groupId", required = true) String groupId,@RequestParam(name = "menuIds", required = true) String menuIds){
-        /*
-         * 保存权限组关联菜单数据
-         */
-        return iAuthorizeService.saveGroupMenu(groupId,menuIds);
-    }
-
-    @RequestMapping("/getGroupByAccount")
-    public Result getGroupByAccount(@RequestParam(name = "accountId", required = true) String accountId){
-        /*
-         * 根据账号获取权限组
-         */
-        return iAuthorizeService.getGroupByAccount (accountId);
-    }
-
-    @RequestMapping("/getMenuByGroup")
-    public Result getMenuByGroup(@RequestParam(name = "groupId", required = true) String groupId){
-        /*
-         * 根据权限组获取菜单
-         */
-        return iAuthorizeService.getMenuByGroup(groupId);
-    }
-
-  /*  @RequestMapping("/getMyMenu")
-    public Result getMyMenu(@RequestParam(name = "accountName", required = true) String accountName){
-        System.out.println("accountName>>"+accountName);
-        *//*
-         * 获取用户的菜单数据
-         *//*
-
-        return iAuthorizeService.getMyMenu(accountName);
-    }*/
-    @RequestMapping("/getMyMenu")
-    public Result getMyMenu(@RequestParam(name = "accountName", required = true) String accountName){
-        /*
-         * 获取用户的菜单数据
-         */
-        List<SysMenuEntity> myMenuList = iAuthorizeService.getMyMenu(accountName);
-        return new Result(ResultCode.SUCCESS,myMenuList);
-    }
-
-    @RequestMapping("/getAcountByGroup")
-    public Result getAccountByGroup(@RequestParam(name = "groupId", required = true) String groupId){
-        /*
-         * 根据权限组获取账户
-         */
-        return iAuthorizeService.getAccountByGroup(groupId);
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/controller/AuthorizeGrantController.java

@@ -5,7 +5,6 @@ import java.util.Date;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import com.huimv.core.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,7 +25,6 @@ import com.huimv.tools.IpTools;
 
 /**
  * 用户权限/授权控制器
- *
  * @author yjj & guojian
  */
 @RestController
@@ -40,36 +38,15 @@ public class AuthorizeGrantController {
     private OrganizeService organizeService;
     @Autowired
     private AuthorizationCodeRepository authorizationCodeRepository;
-
-
-    @RequestMapping(value = "/login_old", method = RequestMethod.POST)
-    public AccessToken login_old(HttpSession session,
-                                 @RequestParam("userName") String userName,
-                                 @RequestParam("userPwd") String userPwd,
-                                 HttpServletRequest req) {
-        String userIp = IpTools.getRemoteHost(req);
-        MemberAccount memberAccount = this.memberService.getMemberByAccount(userName, userPwd);
-        //spring-session默认使用uuid作为sessionId返回：
-        System.out.println("当前请求的sessionId为：" + session.getId());
-        HmSession hmSession = new HmSession();
-        hmSession.setMemberAccount(memberAccount);
-        session.setAttribute("hmSession", hmSession);
-
-        AccessToken accessToken = new AccessToken();
-        accessToken.setToken(session.getId());
-        accessToken.setLoginIp(userIp);
-        accessToken.setCreated(new Date());
-        return accessToken;
-    }
+    
 
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     public AccessToken login(HttpSession session,
-                             @RequestParam(name = "accountName", required = true) String accountName,
-                             @RequestParam(name = "password", required = true) String password,
+                             @RequestParam("userName") String userName,
+                             @RequestParam("userPwd") String userPwd,
                              HttpServletRequest req) {
-        String userIp = IpTools.getRemoteHost(req);
-        Result result = memberService.login(accountName, password);
-        MemberAccount memberAccount = (MemberAccount) result.getData();
+    	String userIp = IpTools.getRemoteHost(req);
+        MemberAccount memberAccount = this.memberService.getMemberByAccount(userName, userPwd);
         //spring-session默认使用uuid作为sessionId返回：
         System.out.println("当前请求的sessionId为：" + session.getId());
         HmSession hmSession = new HmSession();
@@ -80,25 +57,20 @@ public class AuthorizeGrantController {
         accessToken.setToken(session.getId());
         accessToken.setLoginIp(userIp);
         accessToken.setCreated(new Date());
-        accessToken.setAccountName(accountName);
-        accessToken.setCode(result.getCode());
         return accessToken;
     }
 
-    @RequestMapping("/logout")
-    public void logout(HttpSession session) {
-        session.setAttribute("hmSession", null);
-        return;
-    }
+
+
 
     @RequestMapping(value = "/authByCode", method = RequestMethod.POST)
     public AccessToken authByCode(HttpSession session,
-                                  @RequestParam("code") String code,
-                                  HttpServletRequest req) {
-        String userIp = IpTools.getRemoteHost(req);
-        System.out.println("ip->\t" + userIp);
-        MemberAccount memberAccount = this.memberService.getMemberByAuthCode(code, userIp);
-        HmSession hmSession = new HmSession();
+            @RequestParam("code") String code,
+            HttpServletRequest req) {
+    	String userIp = IpTools.getRemoteHost(req);
+    	System.out.println("ip->\t"+userIp);
+    	MemberAccount memberAccount = this.memberService.getMemberByAuthCode(code,userIp );
+    	HmSession hmSession = new HmSession();
         hmSession.setMemberAccount(memberAccount);
 
         AccessToken accessToken = new AccessToken();
@@ -112,14 +84,13 @@ public class AuthorizeGrantController {
         hmSession.setOrganizeInfo(organizeInfo);
         //最后去设置hmSession
         session.setAttribute("hmSession", hmSession);
-        return accessToken;
+    	return accessToken;
     }
-
     @RequestMapping(value = "/choose-org", method = RequestMethod.POST)
     public Object chooseOrg(HttpSession session,
-                            @RequestParam("orgId") int orgId) {
+                            @RequestParam("orgId") int orgId){
         HmSession hmSession = (HmSession) session.getAttribute("hmSession");
-        if (hmSession == null || hmSession.getMemberAccount() == null) {
+        if(hmSession == null || hmSession.getMemberAccount() == null){
             throw new PlatformException(ExceptionConstant.ACCOUNT_NOT_AUTHORIZE, "未找到账户信息");
         }
 

huimv-cloud-core/src/main/java/com/huimv/core/controller/MemberAccountController.java

@@ -2,12 +2,8 @@ package com.huimv.core.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.security.NoSuchAlgorithmException;
-import java.util.List;
 
-import com.huimv.core.service.IAccountService;
-import com.huimv.core.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,74 +13,42 @@ import com.huimv.core.repo.MemberAccountRepository;
 import com.huimv.exception.PlatformException;
 import com.huimv.tools.MD5;
 
-@CrossOrigin
 @RestController
 @RequestMapping("/account")
 public class MemberAccountController {
 	
-//	@Autowired
-//	private MemberAccountRepository memberAccountRepository;
-//
-//	@RequestMapping("/add_old")
-//	public Object addAccount(
-//    		@RequestParam(name="loginname") String loginName,
-//    		@RequestParam(name="password") String password,
-//    		@RequestParam(name="gender") Integer gender,
-//    		@RequestParam(name="nickname",required = false) String nickname,
-//    		@RequestParam(name="remark",required = false,defaultValue = "") String remark,
-//    		@RequestParam(name="avatarUrl",required = false,defaultValue = "") String avatarUrl) {
-//		MemberAccount ma = this.memberAccountRepository.findByLoginName(loginName);
-//		if(ma != null && ma.getId() > 0 ) {
-//			throw new PlatformException("name_exist", "名称已经存在");
-//		}
-//		try {
-//
-//			ma = new MemberAccount();
-//			ma.setAvatarUrl("");
-//			ma.setEnabled(true);
-//			ma.setGender(gender);
-//			ma.setIsVerified(true);
-//			ma.setLoginName(loginName);
-//			ma.setLoginPwd(MD5.md5UpperCase(password));
-//			ma.setNickname(nickname==null? loginName:nickname);
-//			ma.setRemark(remark);
-//
-//			return this.memberAccountRepository.save(ma);
-//		}catch(UnsupportedEncodingException ex) {
-//			throw new PlatformException("md5_error",ex.getMessage());
-//		} catch (NoSuchAlgorithmException ex) {
-//			throw new PlatformException("md5_error",ex.getMessage());
-//		}
-//	}
-
 	@Autowired
-	private IAccountService iAccountService;
-
-	@RequestMapping("/new")
-	public Result newAccount(@RequestParam(name = "userId") Integer userId){
-		return iAccountService.newAccount(userId);
-	}
-
-	@RequestMapping("/cancel")
-	public Result cancelAccount(@RequestParam(name = "id") Integer id,
-								@RequestParam(name = "accountStatus") Integer accountStatus){
-		return iAccountService.cancelAccount(id,accountStatus);
-	}
-
-	@RequestMapping("/remove")
-	public Result removeAccount(@RequestParam(name = "ids") List<Integer> ids){
-		return  iAccountService.removeAccount(ids);
-	}
-
-
-	@RequestMapping("/list")
-	public List<MemberAccount> listAccount(){
-		return iAccountService.findAll();
-	}
-
-	@RequestMapping("/setAccountStatus")
-	public Result setAccountStatus(@RequestParam(name = "ids") List<Integer> ids,@RequestParam(name = "status") Integer status){
-		/* 设置账号状态 */
-		return iAccountService.setAccountStatus(ids,status);
+	private MemberAccountRepository memberAccountRepository;
+	
+	@RequestMapping("/add")
+	public Object addAccount(
+    		@RequestParam(name="loginname") String loginName,
+    		@RequestParam(name="password") String password,
+    		@RequestParam(name="gender") Integer gender,
+    		@RequestParam(name="nickname",required = false) String nickname,
+    		@RequestParam(name="remark",required = false,defaultValue = "") String remark,
+    		@RequestParam(name="avatarUrl",required = false,defaultValue = "") String avatarUrl) {
+		MemberAccount ma = this.memberAccountRepository.findByLoginName(loginName);
+		if(ma != null && ma.getId() > 0 )
+			throw new PlatformException("name_exist","名称已经存在");
+		
+		try {
+
+			ma = new MemberAccount();
+			ma.setAvatarUrl("");
+			ma.setEnabled(true);
+			ma.setGender(gender);
+			ma.setIsVerified(true);
+			ma.setLoginName(loginName);
+			ma.setLoginPwd(MD5.md5UpperCase(password));
+			ma.setNickname(nickname==null? loginName:nickname);
+			ma.setRemark(remark);
+			
+			return this.memberAccountRepository.save(ma);
+		}catch(UnsupportedEncodingException ex) {
+			throw new PlatformException("md5_error",ex.getMessage());
+		} catch (NoSuchAlgorithmException ex) {
+			throw new PlatformException("md5_error",ex.getMessage());
+		}
 	}
 }

huimv-cloud-core/src/main/java/com/huimv/core/controller/MemberInfoController.java

@@ -1,13 +1,9 @@
 package com.huimv.core.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.huimv.core.domain.MemberInfo;
 import com.huimv.core.domain.MemberPhone;
 import com.huimv.core.repo.MemberInfoRepository;
 import com.huimv.core.repo.MemberPhoneRepository;
-import com.huimv.core.service.IMemberInfoService;
-import com.huimv.core.service.MemberService;
-import com.huimv.core.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +15,6 @@ import java.util.Optional;
 
 /**
  * Member信息 Controller
- *
  * @author guojian
  */
 @RestController
@@ -28,40 +23,32 @@ public class MemberInfoController {
 
     @Autowired
     private MemberInfoRepository memberInfoRepository;
+
     @Autowired
     private MemberPhoneRepository memberPhoneRepository;
-    @Autowired
-    private IMemberInfoService memberService;
 
     @RequestMapping("/add")
-    public Result addUser(MemberInfo user) {
-        return memberService.addUser(user);
-    }
-
-    @RequestMapping("/edit")
-    public Result updateUser(MemberInfo user) {
-        return memberService.updateUser(user);
+    public MemberInfo add(){
+        return null;
     }
 
-    @RequestMapping("/remove")
-    public Result removeUser(@RequestParam("userIds") List<Integer> userIds) {
-        return memberService.removeUser(userIds);
+    @RequestMapping("/update")
+    private MemberInfo update(){
+        return null;
     }
 
     @RequestMapping("/list")
-    public JSONObject listUser(@RequestParam(name = "pageNum") int pageNum,
-                               @RequestParam(name = "pageSize") int pageSize,
-                               @RequestParam(name = "searchStr", required = false) String searchStr) {
-        return memberService.findUserAccount(searchStr, pageNum, pageSize);
+    private List<MemberInfo> list(){
+        return null;
     }
 
     @PostMapping(value = "/get-by-id")
-    public Optional<MemberInfo> getById(@RequestParam(value = "id") Integer id) {
+    public Optional<MemberInfo> getById(@RequestParam(value = "id") Integer id){
         return memberInfoRepository.findById(id);
     }
 
     @PostMapping(value = "/phone-by-id")
-    public Optional<MemberPhone> getPhoneById(@RequestParam(value = "id") Integer id) {
+    public Optional<MemberPhone> getPhoneById(@RequestParam(value = "id") Integer id){
         return memberPhoneRepository.findById(id);
     }
 }

huimv-cloud-core/src/main/java/com/huimv/core/controller/MenuController.java

@@ -1,43 +0,0 @@
-package com.huimv.core.controller;
-
-import com.huimv.core.domain.SysMenuEntity;
-import com.huimv.core.service.IMenuService;
-import com.huimv.core.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-@CrossOrigin
-@RestController
-@RequestMapping("/menu")
-public class MenuController {
-    @Autowired
-    private IMenuService menuService;
-
-    @RequestMapping("/add")
-    public Result addMenu(SysMenuEntity menu){
-        return menuService.addMenu(menu);
-    }
-
-
-    @RequestMapping("/edit")
-    public Result editMenu( SysMenuEntity menu){
-        return menuService.editMenu(menu);
-    }
-
-
-    @RequestMapping("/remove")
-    public Result removeMenu(@RequestParam(name = "menuId") Integer menuId){
-        return menuService.removeMenu(menuId);
-    }
-
-    @RequestMapping("/list")
-    public List<Map> listMenu() {
-        return menuService.listMenu();
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/controller/SysGroupController.java

@@ -1,48 +0,0 @@
-package com.huimv.core.controller;
-
-
-import com.huimv.core.domain.SysGroupEntity;
-import com.huimv.core.service.IGroupService;
-import com.huimv.core.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@CrossOrigin
-@RestController
-@RequestMapping("/group")
-public class SysGroupController {
-
-    @Autowired
-    private IGroupService groupService;
-
-    @RequestMapping("/add")
-    public Result addGroup (@RequestParam(name = "groupName") String groupName,
-                          @RequestParam(name = "remark") String remark){
-        return groupService.addGroup(groupName,remark);
-    }
-
-
-    @RequestMapping("/edit")
-    public Result updateGroup( @RequestParam(name = "groupId",required = false) Integer groupId,
-                             @RequestParam(name = "groupName") String groupName,
-                             @RequestParam(name = "remark") String remark ){
-        return groupService.updateGroup(groupId,groupName,remark);
-    }
-
-    @RequestMapping("/remove")
-    public Result removeGroup( @RequestParam("groupId") Integer groupId) {
-        return groupService.removeGroup(groupId);
-    }
-
-    @RequestMapping("/list")
-    public Page<SysGroupEntity> listGroup(@RequestParam(name = "pageNum") int pageNum,
-                                          @RequestParam(name = "pageSize") int pageSize,
-                                          @RequestParam(name = "searchStr", required = false) String searchStr) {
-        return groupService.listGroup(pageNum,pageSize,searchStr);
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/logger/ExceptionUtil.java

@@ -1,28 +0,0 @@
-package com.huimv.core.logger;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-@Slf4j
-public class ExceptionUtil {
-
-    /**
-     * 打印异常信息
-     */
-    public static String getMessage(Exception e) {
-        String swStr = null;
-        try (StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw)) {
-            e.printStackTrace(pw);
-            pw.flush();
-            sw.flush();
-            swStr = sw.toString();
-        } catch (IOException ex) {
-            ex.printStackTrace();
-            log.error(ex.getMessage());
-        }
-        return swStr;
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/logger/dynamic/AppenderInstance.java

@@ -1,96 +0,0 @@
-package com.huimv.core.logger.dynamic;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
-import ch.qos.logback.classic.filter.LevelFilter;
-import ch.qos.logback.core.rolling.RollingFileAppender;
-import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy;
-import ch.qos.logback.core.util.FileSize;
-import ch.qos.logback.core.util.OptionHelper;
-import com.huimv.exception.PlatformException;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.StringUtils;
-
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-/**
- * 这个类是给日志动态提供appender
- * @author guojian
- */
-public class AppenderInstance {
-
-    /**
-     * 通过传入的名字和级别，动态设置appender
-     * @param logDir
-     * @param name
-     * @param level
-     * @return
-     */
-    public RollingFileAppender getAppender(String logDir, String name, Level level) {
-        //最好还能做个正则校验？（目录）
-        if(StringUtils.isEmpty(logDir)){
-            throw new PlatformException("log_dir_empty", "日志文件目录，初始化失败...");
-        }
-
-        DateFormat format = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.SIMPLIFIED_CHINESE);
-        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
-        //这里是可以用来设置appender的，在xml配置文件里面，是这种形式：
-        // <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        RollingFileAppender appender = new RollingFileAppender();
-//        ConsoleAppender consoleAppender = new ConsoleAppender();
-
-        //这里设置级别过滤器
-        LevelController levelController = new LevelController();
-        LevelFilter levelFilter = levelController.getLevelFilter(level);
-        levelFilter.start();
-        appender.addFilter(levelFilter);
-
-
-        //设置上下文，每个logger都关联到logger上下文，默认上下文名称为default。
-        //但可以使用<contextName>设置成其他名字，用于区分不同应用程序的记录。一旦设置，不能修改。
-        appender.setContext(context);
-        //appender的name属性
-        appender.setName("FILE-" + name);
-        //设置文件名
-        appender.setFile(OptionHelper.substVars(logDir + name + "/" + format.format(new Date()) + "/" + level.levelStr + ".log", context));
-
-        appender.setAppend(true);
-        appender.setPrudent(false);
-
-        //设置文件创建时间及大小的类
-        SizeAndTimeBasedRollingPolicy policy = new SizeAndTimeBasedRollingPolicy();  //TimeBasedRollingPolicy
-        //文件名格式
-        String fp = OptionHelper.substVars(logDir + name + "/" + format.format(new Date()) + "/" + level.levelStr + "/.%d{yyyy-MM-dd}.%i.log", context);
-        //最大日志文件大小
-        policy.setMaxFileSize(FileSize.valueOf("128MB"));
-        //设置文件名模式
-        policy.setFileNamePattern(fp);
-        //设置最大历史记录为15条
-        policy.setMaxHistory(15);
-        //总大小限制
-        policy.setTotalSizeCap(FileSize.valueOf("32GB"));
-        //设置父节点是appender
-        policy.setParent(appender);
-        //设置上下文，每个logger都关联到logger上下文，默认上下文名称为default。
-        //但可以使用<contextName>设置成其他名字，用于区分不同应用程序的记录。一旦设置，不能修改。
-        policy.setContext(context);
-        policy.start();
-
-        PatternLayoutEncoder encoder = new PatternLayoutEncoder();
-        //设置上下文，每个logger都关联到logger上下文，默认上下文名称为default。
-        //但可以使用<contextName>设置成其他名字，用于区分不同应用程序的记录。一旦设置，不能修改。
-        encoder.setContext(context);
-        //设置格式
-        encoder.setPattern("%d %p (%file:%line\\)- %m%n");
-        encoder.start();
-
-        //加入下面两个节点
-        appender.setRollingPolicy(policy);
-        appender.setEncoder(encoder);
-        appender.start();
-        return appender;
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/logger/dynamic/LevelController.java

@@ -1,27 +0,0 @@
-package com.huimv.core.logger.dynamic;
-
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.filter.LevelFilter;
-
-import static ch.qos.logback.core.spi.FilterReply.ACCEPT;
-import static ch.qos.logback.core.spi.FilterReply.DENY;
-
-/**
- * 这个类的作用是给日志通过level设置过滤器
- * @author guojian
- */
-public class LevelController {
-    /**
-     * 通过level设置过滤器
-     * @param level
-     * @return
-     */
-    public LevelFilter getLevelFilter(Level level){
-        LevelFilter levelFilter = new LevelFilter();
-        levelFilter.setLevel(level);
-        levelFilter.setOnMatch(ACCEPT);
-        levelFilter.setOnMismatch(DENY);
-        return levelFilter;
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/logger/dynamic/LoggerBuilder.java

@@ -1,57 +0,0 @@
-package com.huimv.core.logger.dynamic;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.rolling.RollingFileAppender;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 相当于一个日志工具类，之后其他类需要用日志的时候，直接调用它的方法
- * @author guojian
- */
-@Component
-public class LoggerBuilder {
-
-    private static final Map<String, Logger> container = new HashMap<>();
-
-    public Logger getLogger(String logDir, String name) {
-        Logger logger = container.get(name);
-        if (logger != null) {
-            return logger;
-        }
-        synchronized (LoggerBuilder.class) {
-            logger = container.get(name);
-            if (logger != null) {
-                return logger;
-            }
-            logger = build(logDir, name);
-            container.put(name, logger);
-        }
-        return logger;
-    }
-
-    private static Logger build(String logDir, String name) {
-        //RollingFileAppender errorAppender = new AppenderInstance().getAppender(logDir, name, Level.ERROR);
-        //RollingFileAppender warnAppender = new AppenderInstance().getAppender(logDir, name, Level.WARN);
-        //RollingFileAppender debugAppender = new AppenderInstance().getAppender(logDir, name, Level.DEBUG);
-
-        RollingFileAppender infoAppender = new AppenderInstance().getAppender(logDir, name, Level.INFO);
-        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
-        Logger logger = context.getLogger("FILE-" + name);
-        //设置不向上级打印信息
-        logger.setAdditive(false);
-
-        //logger.addAppender(errorAppender);
-        //logger.addAppender(warnAppender);
-        //logger.addAppender(debugAppender);
-
-        logger.addAppender(infoAppender);
-
-        return logger;
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/logger/format/IotFormatter.java

@@ -1,26 +0,0 @@
-package com.huimv.core.logger.format;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.huimv.iot.domain.ReportInfo;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * IOT项目日志格式化器
- * @author guojian
- */
-public class IotFormatter {
-
-    protected final static ObjectMapper objectMapper = new ObjectMapper();
-
-    public static String format(ReportInfo reportInfo) throws JsonProcessingException {
-        Map<String, Object> logMap = new HashMap<>();
-        logMap.put("communicationId", reportInfo.getCommunicationId());
-        logMap.put("channelNo", reportInfo.getChannelNo());
-        logMap.put("messageBody", reportInfo.getMessageBody());
-        logMap.put("report_type", reportInfo.getReportType());
-        return objectMapper.writeValueAsString(logMap);
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/repo/MemberAccountRepository.java

@@ -3,29 +3,9 @@ package com.huimv.core.repo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.huimv.core.domain.MemberAccount;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 public interface MemberAccountRepository extends JpaRepository<MemberAccount, Integer> {
 	
 	MemberAccount findByLoginName(String loginName);
-
-	@Query(nativeQuery = true , value = "SELECT * FROM member_account WHERE login_name=?1 AND login_pwd=?2")
-	MemberAccount findByAccountName(String accountName, String password);
-
-	@Transactional
-	@Modifying(clearAutomatically = true, flushAutomatically = true)
-	@Query(nativeQuery = true,value = "UPDATE member_account SET account_status=?2 WHERE user_id=(SELECT user_id FROM member_info WHERE id=?1)")
-	int updateAccountStatus(Integer id, Integer status);
-
-	@Transactional
-	@Modifying(clearAutomatically = true, flushAutomatically = true)
-	@Query(nativeQuery = true,value = "DELETE FROM member_account WHERE user_id=?1")
-	void deleteByUserId(Long userId);
-
-	@Query(nativeQuery = true,value = "SELECT * FROM member_account WHERE user_id=?1")
-	List<MemberAccount> findByUserId(Long userId);
+	
 }

huimv-cloud-core/src/main/java/com/huimv/core/repo/MemberInfoRepository.java

@@ -1,13 +1,7 @@
 package com.huimv.core.repo;
 
 import com.huimv.core.domain.MemberInfo;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
 
 /**
  * MemberInfo Repository
@@ -15,25 +9,5 @@ import java.util.List;
  */
 public interface MemberInfoRepository extends CrudRepository<MemberInfo, Integer> {
 
-    @Query(nativeQuery = true, value = "SELECT * FROM member_info WHERE instr(nickname, ?1) > 0 OR instr(mobile, ?1) > 0 order by ?#{#pageable}")
-    Page<MemberInfo> findByUserNameOOrMobile(String searchStr, Pageable pageable);
-
-//    Page<SysUserEntity> findAllUser(Pageable pageable);
-
-    //    @Query(nativeQuery = true, value = "SELECT user.*,account.account_name,account.account_status FROM member_info user LEFT JOIN sys_account account ON user.user_id=account.user_id WHERE user.user_name=?1  OR user.mobile=?1 order by ?#{#pageable}")
-    @Query(nativeQuery = true, value = "SELECT user.*,account.login_name,account.account_status FROM member_info user LEFT JOIN member_account account ON user.user_id=account.user_id WHERE user.nickname=?1  OR user.mobile=?1 order by id desc limit ?2,?3")
-    List<Object[]> findUserAndAccountByUserName(String searchStr, int start, int end);
-
-    @Query(nativeQuery = true, value="SELECT count(*) FROM member_info  WHERE nickname=?1")
-    Integer countByUserName(String userName);
-
-    //    @Query(nativeQuery = true, value = "SELECT user.*,account.account_name,account.account_status FROM member_info user LEFT JOIN sys_account account ON user.user_id=account.user_id order by ?#{#pageable}")
-    @Query(nativeQuery = true, value = "SELECT user.*,account.login_name,account.account_status FROM member_info user LEFT JOIN member_account account ON user.user_id=account.user_id order by id desc limit ?1,?2")
-    List<Object[]> findUserAndAccount(int start, int pageSize);
-
-    @Query(nativeQuery = true, value = "SELECT * FROM member_info WHERE instr(nickname, ?1) > 0 OR instr(mobile, ?1) > 0 order by ?#{#pageable}")
-    Page<MemberInfo> findUserAndAccount2(@Param("searchStr") String searchStr, Pageable pageable);
-
-//    @Query(nativeQuery = true, value = "SELECT user.*,account.account_name,account.account_status FROM member_info user LEFT JOIN sys_account account ON user.user_id=account.user_id WHERE user.user_name=?1  OR user.mobile=?1 order by ?#{#pageable}")
-//    Page<UserAndAccountGroup> yxxList(String searchStr, Pageable pageable);
+	
 }

huimv-cloud-core/src/main/java/com/huimv/core/repo/SysAccountEntityRepository.java

@@ -1,28 +0,0 @@
-package com.huimv.core.repo;
-
-import com.huimv.core.domain.MemberAccount;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-public interface SysAccountEntityRepository extends JpaRepository<MemberAccount, Integer>, JpaSpecificationExecutor<MemberAccount> {
-    @Query(nativeQuery = true , value = "SELECT * FROM sys_account WHERE account_name=?1 AND password=?2")
-    MemberAccount findByAccountName(String accountName, String password);
-
-    @Transactional
-    @Modifying(clearAutomatically = true, flushAutomatically = true)
-    @Query(nativeQuery = true,value = "UPDATE sys_account SET account_status=?2 WHERE user_id=(SELECT user_id FROM sys_user WHERE id=?1)")
-    int updateAccountStatus(Integer id, Integer status);
-
-    @Transactional
-    @Modifying(clearAutomatically = true, flushAutomatically = true)
-    @Query(nativeQuery = true,value = "DELETE FROM sys_account WHERE user_id=?1")
-    void deleteByUserId(Long userId);
-
-    @Query(nativeQuery = true,value = "SELECT * FROM sys_account WHERE user_id=?1")
-    List<MemberAccount> findByUserId(Long userId);
-}

huimv-cloud-core/src/main/java/com/huimv/core/repo/SysAccountGroupEntityRepository.java

@@ -1,35 +0,0 @@
-package com.huimv.core.repo;
-
-import com.huimv.core.domain.SysAccountGroupEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-
-public interface SysAccountGroupEntityRepository extends JpaRepository<SysAccountGroupEntity, Integer>, JpaSpecificationExecutor<SysAccountGroupEntity> {
-
-    @Modifying
-    @Transactional
-    @Query(nativeQuery = true,value = "DELETE FROM sys_account_group WHERE account_id=?1")
-    void removeAccountGroup(String accountId);
-
-    @Query(nativeQuery = true,value = "SELECT * FROM sys_account_group WHERE account_id=?1")
-    List<SysAccountGroupEntity> getGroupByAccount(String accountId);
-
-    @Query(nativeQuery = true,value = "SELECT * FROM sys_account_group WHERE group_id=?1")
-    List<SysAccountGroupEntity> getAccountByGroup(String groupId);
-
-    @Transactional
-    @Modifying
-    @Query(nativeQuery = true,value = "INSERT INTO sys_account_group(account_id,group_id)VALUES(?1,?2)")
-    void insert(int accountId, int groupId);
-
-    @Modifying
-    @Transactional
-    @Query(nativeQuery = true,value = "DELETE FROM sys_account_group WHERE account_id=?1 AND group_id=?2")
-    void removeAccountGroup(String accountId, String groupId);
-}

huimv-cloud-core/src/main/java/com/huimv/core/repo/SysGroupEntityRepository.java

@@ -1,15 +0,0 @@
-package com.huimv.core.repo;
-
-
-import com.huimv.core.domain.SysGroupEntity;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-
-
-public interface SysGroupEntityRepository extends JpaRepository<SysGroupEntity, Integer>, JpaSpecificationExecutor<SysGroupEntity> {
-    @Query(nativeQuery = true , value = "SELECT * FROM sys_group WHERE group_name like %?1% order by ?#{#pageable}")
-    Page<SysGroupEntity> findByGroupNameLike(String searchStr, Pageable pageable);
-}

huimv-cloud-core/src/main/java/com/huimv/core/repo/SysGroupMenuEntityRepository.java

@@ -1,31 +0,0 @@
-package com.huimv.core.repo;
-
-import com.huimv.core.domain.SysGroupMenuEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-public interface SysGroupMenuEntityRepository extends JpaRepository<SysGroupMenuEntity, Integer>, JpaSpecificationExecutor<SysGroupMenuEntity> {
-
-    @Modifying
-    @Transactional
-    @Query(nativeQuery = true,value = "DELETE FROM sys_group_menu WHERE group_id=?1")
-    void removeGroupMenu(String groupId);
-
-    @Query(nativeQuery = true,value = "SELECT * FROM sys_group_menu WHERE group_id=?1")
-    List<SysGroupMenuEntity> getMenuByGroup(String groupId);
-
-    @Modifying
-    @Transactional
-    @Query(nativeQuery = true,value = "DELETE FROM sys_group_menu WHERE group_id=?1 AND menu_id=?2")
-    void removeGroupMenu(String groupId, String menuId);
-
-    @Modifying
-    @Transactional
-    @Query(nativeQuery = true,value = "DELETE FROM sys_group_menu WHERE group_id=?1")
-    void deleteByGroupId(Integer groupId);
-}

huimv-cloud-core/src/main/java/com/huimv/core/repo/SysMenuEntityRepository.java

@@ -1,21 +0,0 @@
-package com.huimv.core.repo;
-
-import com.huimv.core.domain.SysMenuEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
-
-public interface SysMenuEntityRepository extends JpaRepository<SysMenuEntity, Integer>, JpaSpecificationExecutor<SysMenuEntity> {
-
-    @Query(nativeQuery = true , value = "SELECT * FROM sys_menu WHERE account_name=?1 AND password=?2")
-    List<SysMenuEntity> findByAccountId(Integer accountId);
-
-    @Query(nativeQuery = true , value = "SELECT * FROM sys_menu WHERE parent_id = ?1 ORDER BY sort ASC")
-    List<SysMenuEntity> findAllByParentId(Integer id);
-
-//    @Query(nativeQuery = true,value = "SELECT * FROM sys_menu WHERE id IN(SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN(SELECT group_id FROM sys_account_group WHERE account_id=(SELECT user1.id FROM sys_account account,sys_user user1 WHERE account.account_name=?1 AND account.user_id=user1.user_id  LIMIT 1)))")
-    @Query(nativeQuery = true,value = "SELECT * FROM sys_menu WHERE id IN(SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN(SELECT group_id FROM sys_account_group WHERE account_id=(SELECT user1.id FROM sys_account account,sys_user user1 WHERE account.account_name=?1 AND account.user_id=user1.user_id))) ORDER BY sort ASC")
-    List<SysMenuEntity> getMyMenu(String accountName);
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/IAccountService.java

@@ -1,19 +0,0 @@
-package com.huimv.core.service;
-
-import com.huimv.core.domain.MemberAccount;
-import com.huimv.core.utils.Result;
-
-import java.util.List;
-
-public interface IAccountService {
-
-    Result setAccountStatus(List<Integer> ids, Integer status);
-
-    Result newAccount(Integer userId);
-
-    Result cancelAccount(Integer id, Integer accountStatus);
-
-    Result removeAccount(List<Integer> ids);
-
-    List<MemberAccount> findAll();
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/IAuthorizeService.java

@@ -1,21 +0,0 @@
-package com.huimv.core.service;
-
-import com.huimv.core.utils.Result;
-
-import java.util.List;
-
-public interface IAuthorizeService {
-
-    Result saveAccountGroup(String accountId, String groupIds);
-
-    Result saveGroupMenu(String groupId, String menuIds);
-
-   // Result getMyMenu(String accountName);
-    List getMyMenu(String accountName);
-
-    Result getMenuByGroup(String groupId);
-
-    Result getGroupByAccount(String accountId);
-
-    Result getAccountByGroup(String groupId);
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/IGroupService.java

@@ -1,17 +0,0 @@
-package com.huimv.core.service;
-
-import com.huimv.core.domain.SysGroupEntity;
-import com.huimv.core.utils.Result;
-import org.springframework.data.domain.Page;
-
-public interface IGroupService {
-
-
-    Result updateGroup(Integer groupId, String groupName, String remark);
-
-    Result removeGroup(Integer groupId);
-
-    Page<SysGroupEntity> listGroup(int pageNum, int pageSize, String searchStr);
-
-    Result addGroup(String groupName, String remark);
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/IMemberInfoService.java

@@ -1,24 +0,0 @@
-package com.huimv.core.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.huimv.core.domain.MemberInfo;
-import com.huimv.core.utils.Result;
-import org.springframework.data.domain.Page;
-
-import java.util.List;
-
-public interface IMemberInfoService {
-//    Page<MemberInfo> findUser(String searchStr, int pageNum, int pageSize);
-
-    JSONObject findUserAccount(String searchStr, int pageNum, int pageSize);
-
-//    JSONObject findUserAccount2(String searchStr, int pageNum, int pageSize);
-
-//    List<UserAndAccountGroup> yxxList(String searchStr, int pageNum, int pageSize);
-
-    Result addUser(MemberInfo user);
-
-    Result updateUser(MemberInfo user);
-
-    Result removeUser(List<Integer> userIds);
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/IMenuService.java

@@ -1,20 +0,0 @@
-package com.huimv.core.service;
-
-import com.huimv.core.domain.SysMenuEntity;
-import com.huimv.core.utils.Result;
-
-import java.util.List;
-import java.util.Map;
-
-public interface IMenuService {
-    //添加菜单
-    Result addMenu(SysMenuEntity menu);
-    //修改菜单
-    Result editMenu(SysMenuEntity menu);
-    //删除菜单(批量)
-    Result removeMenu(Integer menuId);
-    //查询所有
-    List<Map> listMenu();
-    //菜单递归
-    List listMenuUtil(List<SysMenuEntity> list);
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/MemberService.java

@@ -1,18 +1,10 @@
 package com.huimv.core.service;
 
-import com.alibaba.fastjson.JSONObject;
 import com.huimv.core.domain.MemberAccount;
-import com.huimv.core.domain.MemberInfo;
-import com.huimv.core.utils.Result;
-
-import java.util.List;
 
 public interface MemberService {
 
 	public MemberAccount getMemberByAccount(String userName, String userPwd);
 	
 	public MemberAccount getMemberByAuthCode(String code,String clientId);
-
-	public Result login(String accountName, String password);
-
 }

huimv-cloud-core/src/main/java/com/huimv/core/service/impl/AccountServiceImpl.java

@@ -1,99 +0,0 @@
-package com.huimv.core.service.impl;
-
-import com.huimv.core.domain.MemberAccount;
-import com.huimv.core.domain.MemberInfo;
-import com.huimv.core.repo.MemberAccountRepository;
-import com.huimv.core.repo.MemberInfoRepository;
-import com.huimv.core.repo.SysAccountEntityRepository;
-import com.huimv.core.service.IAccountService;
-import com.huimv.core.utils.GetMD5Str;
-import com.huimv.core.utils.Result;
-import com.huimv.core.utils.ResultCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@Service
-public class AccountServiceImpl implements IAccountService {
-
-    @Autowired
-    private MemberAccountRepository memberAccountRepository;
-
-    @Autowired
-    private MemberInfoRepository memberInfoRepository;
-
-    @Transactional
-    @Override
-    public Result setAccountStatus(List<Integer> ids, Integer status) {
-        try {
-            for (Integer id : ids) {
-                memberAccountRepository.updateAccountStatus(id,status);
-            }
-        }catch (Exception e){
-            return new Result(ResultCode.FAIL);
-        }
-        String message = "";
-        if(status == 1){
-            message = "你选择的账号已经启用。";
-        }else{
-            message = "你选择的账号已经暂停启用。";
-        }
-        return new Result(10001,message,true);
-    }
-
-    @Override
-    public Result newAccount(Integer userId) {
-        try {
-            MemberAccount accountEntity = new MemberAccount();
-            MemberInfo userEntity = memberInfoRepository.findById(userId).get();
-            String mobile = userEntity.getMobile();
-            String userName = userEntity.getNickname();
-            if (mobile != null && !"".equals(mobile) ){
-                accountEntity.setLoginName(mobile);
-            }else if (userName != null && !"".equals(userName)){
-                accountEntity.setLoginName(userName);
-            }else {
-                return new Result(ResultCode.FAIL);
-            }
-            accountEntity.setAccountStatus(1);
-            accountEntity.setRemark("无");
-//            accountEntity.setLoginPwd(GetMD5Str.getMD5Str("123456"));
-            accountEntity.setLoginPwd("123456");
-            memberAccountRepository.save(accountEntity);
-            return new Result(ResultCode.SUCCESS);
-        }catch (Exception e){
-            return new Result(ResultCode.FAIL);
-        }
-    }
-
-    @Override
-    public Result cancelAccount(Integer id, Integer accountStatus) {
-        try {
-            MemberAccount sysAccountEntity = memberAccountRepository.findById(id).get();
-            sysAccountEntity.setAccountStatus(accountStatus);
-            memberAccountRepository.save(sysAccountEntity);
-            return new Result(ResultCode.SUCCESS);
-        }catch (Exception e){
-            return new Result(ResultCode.FAIL);
-        }
-    }
-
-    @Override
-    public Result removeAccount(List<Integer> ids) {
-        try {
-            for (Integer id : ids) {
-                memberAccountRepository.deleteById(id);
-            }
-        }catch (Exception e){
-            return new Result(ResultCode.FAIL);
-        }
-        return new Result(ResultCode.SUCCESS);
-    }
-
-    @Override
-    public List<MemberAccount> findAll() {
-        return memberAccountRepository.findAll();
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/impl/AuthorizeServiceImpl.java

@@ -1,261 +0,0 @@
-package com.huimv.core.service.impl;
-
-import com.huimv.core.domain.SysAccountGroupEntity;
-import com.huimv.core.domain.SysGroupMenuEntity;
-import com.huimv.core.domain.SysMenuEntity;
-import com.huimv.core.repo.SysAccountGroupEntityRepository;
-import com.huimv.core.repo.SysGroupMenuEntityRepository;
-import com.huimv.core.repo.SysMenuEntityRepository;
-import com.huimv.core.service.IAuthorizeService;
-import com.huimv.core.utils.Result;
-import com.huimv.core.utils.ResultCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class AuthorizeServiceImpl implements IAuthorizeService {
-
-    @Autowired
-    private SysAccountGroupEntityRepository sysAccountGroupRepo;
-    @Autowired
-    private SysGroupMenuEntityRepository sysGroupMenuRepo;
-    @Autowired
-    private SysMenuEntityRepository sysMenuEntityRepo;
-
-    @Override
-    @Transactional
-    public Result saveAccountGroup(String accountId, String groupIds) {
-        /**
-         * Step1:先删除原先的账号关联权限组数据；
-         * Step2:再添加新的账号关联权限组数据；
-         */
-        String[] groupIdArray = groupIds.split(",");
-        sysAccountGroupRepo.removeAccountGroup(accountId);
-//        for (int a = 0; a < groupIdArray.length; a++) {
-//            sysAccountGroupRepo.removeAccountGroup(accountId,groupIdArray[a]);
-//        }
-        for (int a = 0; a < groupIdArray.length; a++) {
-            SysAccountGroupEntity accountGroupEntity = new SysAccountGroupEntity();
-            accountGroupEntity.setAccountId(Integer.parseInt(accountId));
-            accountGroupEntity.setGroupId(Integer.parseInt(groupIdArray[a]));
-            sysAccountGroupRepo.saveAndFlush(accountGroupEntity);
-//            sysAccountGroupRepo.insert(Integer.parseInt(accountId),Integer.parseInt(groupIdArray[a]));
-        }
-        return new Result(10001, "保存账号关联权限组成功", true);
-    }
-
-    @Override
-    @Transactional
-    public Result saveGroupMenu(String groupId, String menuIds) {
-        /**
-         * Step1:先删除原先的权限组关联菜单数据；
-         * Step2:再添加新的账号权限组关联菜单数据；
-         */
-//        sysGroupMenuRepo.removeGroupMenu(groupId);
-        String[] menuIdsArray = menuIds.split(",");
-        for (int a = 0; a < menuIdsArray.length; a++) {
-            sysGroupMenuRepo.removeGroupMenu(groupId, menuIdsArray[a]);
-        }
-        for (int a = 0; a < menuIdsArray.length; a++) {
-            SysGroupMenuEntity sysGroupMenuEntity = new SysGroupMenuEntity();
-            sysGroupMenuEntity.setGroupId(Integer.parseInt(groupId));
-            sysGroupMenuEntity.setMenuId(Integer.parseInt(menuIdsArray[a]));
-            sysGroupMenuRepo.saveAndFlush(sysGroupMenuEntity);
-        }
-        return new Result(10001, "保存权限组关联菜单成功", true);
-    }
-
-   /* @Override
-    public Result getMyMenu(String accountName) {
-        // 根据账号获取权限组（查询账号权限组关联表）
-        // 根据权限组获取菜单id(查询权限组菜单官僚表)
-        // 根据菜单id获取菜单全部信息（查询菜单表）
-        List<SysMenuEntity> dataList = sysMenuEntityRepo.getMyMenu(accountName);
-        System.out.println("dataList.size>>"+dataList.size());
-        List newMenuList = new ArrayList();
-        // error for (SysMenuEntity menuEntity : dataList) {
-        for (int a=0;a<dataList.size();a++) {
-            SysMenuEntity menuEntity = dataList.get(a);
-            if (menuEntity.getParentId() == 0) {
-                Map menuMap = new HashMap<>();
-                menuMap.put("id", menuEntity.getId());
-                menuMap.put("menuName", menuEntity.getMenuName());
-                menuMap.put("parentId", menuEntity.getParentId());
-                menuMap.put("url", menuEntity.getUrl());
-                menuMap.put("sort", menuEntity.getSort());
-                newMenuList.add(menuMap);
-                dataList.remove(menuEntity);
-            }
-        }
-        for (int a = 0; a < newMenuList.size(); a++) {
-            Map menuMap = (Map) newMenuList.get(a);
-            int id = Integer.parseInt(menuMap.get("id").toString());
-            List childrenList = new ArrayList();
-            for (SysMenuEntity menuEntity : dataList) {
-                if (id == menuEntity.getParentId()) {
-                    childrenList.add(menuEntity);
-                }
-            }
-            if (childrenList.size() > 0) {
-                menuMap.put("children", childrenList);
-            }
-        }
-        return new Result(ResultCode.SUCCESS, newMenuList);
-    }*/
-
-    /**
-     * @param accountName
-     * @return
-     */
-    public List getMyMenu_old(String accountName) {
-        System.out.println(" accountName>>" + accountName);
-        List<SysMenuEntity> menuEntityList = sysMenuEntityRepo.getMyMenu(accountName);
-        System.out.println(" menuEntityList.size>>" + menuEntityList.size());
-        List<SysMenuEntity> topList = new ArrayList();
-        for (SysMenuEntity sysMenuEntity : menuEntityList) {
-            if (sysMenuEntity.getParentId() == 0) {
-                topList.add(sysMenuEntity);
-            }
-        }
-        return topList;
-    }
-
-    @Override
-    public List getMyMenu(String accountName) {
-        List<SysMenuEntity> allMenuEntityList = sysMenuEntityRepo.getMyMenu(accountName);
-        System.out.println("123456");
-        //
-        List<SysMenuEntity> myRootMenuList = new ArrayList();
-        //pid（上级Id）为0的是根菜单
-        for (SysMenuEntity menuEntity : allMenuEntityList) {
-            if (menuEntity.getParentId() == 0) {
-                myRootMenuList.add(menuEntity);
-            }
-        }
-        // 遍历，找到二级菜单（根菜单的id和所有菜单中的pid比较）
-        for (SysMenuEntity myMenuEntity : myRootMenuList) {
-            /*  */
-            List<SysMenuEntity> child = getChild(myMenuEntity.getId(), allMenuEntityList);
-            myMenuEntity.setChildren(child);
-        }
-        return myRootMenuList;
-    }
-
-    public List<SysMenuEntity> getChild(int pid, List<SysMenuEntity> allMenuList) {
-        //子菜单列表
-        List<SysMenuEntity> childList = new ArrayList<>();
-        for (SysMenuEntity menuEntity : allMenuList) {
-            if (pid == menuEntity.getParentId()) {
-                childList.add(menuEntity);
-            }
-        }
-        //遍历 获取子菜单的子菜单
-        for (SysMenuEntity childMenu : childList) {
-            List<SysMenuEntity> child = getChild(childMenu.getId(), allMenuList);
-            childMenu.setChildren(child);
-        }
-        //递归出口 childList长度为0
-        if (childList.size() == 0) {
-            return new ArrayList<>();
-        }
-        return childList;
-    }
-
-    @Override
-    public Result getMenuByGroup(String groupId) {
-        /* 根据权限组读取已关联菜单 */
-        List<SysGroupMenuEntity> groupMenuEntityList = sysGroupMenuRepo.getMenuByGroup(groupId);
-        if (groupMenuEntityList.size() == 0) {
-            return new Result(10005, "当前权限组暂未关联任何菜单.", false);
-        }
-        /* 读取所有菜单 */
-        List<SysMenuEntity> allMenuList = sysMenuEntityRepo.findAll();
-        if (allMenuList.size() == 0) {
-            return new Result(10007, "当前无任何菜单.", false);
-        }
-        List<SysGroupMenuEntity> newList = new ArrayList();
-        StringBuilder idSb2 = new StringBuilder();
-
-        for (int a = 0; a < groupMenuEntityList.size(); a++) {
-            SysGroupMenuEntity groupMenuEntity = groupMenuEntityList.get(a);
-            for (SysMenuEntity menuEntity : allMenuList) {
-                if (menuEntity.getId().equals(groupMenuEntity.getMenuId())) {
-                    if (menuEntity.getParentId() == 0) {
-                        if (idSb2.length() > 0) {
-                            idSb2.append(",");
-                        }
-                        idSb2.append(groupMenuEntity.getMenuId());
-                        break;
-                    } else {
-                        boolean isChild = false;
-                        for (SysMenuEntity menuEntity2 : allMenuList) {
-                            if (menuEntity2.getParentId().equals(groupMenuEntity.getMenuId())) {
-                                isChild = true;
-                                break;
-                            }
-                        }
-                        if (!isChild) {
-                            if (idSb2.length() > 0) {
-                                idSb2.append(",");
-                            }
-                            idSb2.append(groupMenuEntity.getMenuId());
-                        }
-                        break;
-                    }
-                }
-            }
-
-        }
-
-//        StringBuilder idSb = new StringBuilder();
-//        for (SysGroupMenuEntity groupMenuEntity : groupMenuEntityList) {
-//            if (idSb.length() > 0) {
-//                idSb.append(",");
-//            }
-//            idSb.append(groupMenuEntity.getMenuId());
-//        }
-        return new Result(ResultCode.SUCCESS, idSb2.toString());
-    }
-
-    /**
-     * @param accountId
-     * @return
-     */
-    @Override
-    public Result getGroupByAccount(String accountId) {
-        /* 根据账号id读取已关联权限组 */
-        List<SysAccountGroupEntity> accountGroupEntityList = sysAccountGroupRepo.getGroupByAccount(accountId);
-        if (accountGroupEntityList.size() == 0) {
-            return new Result(10006, "当前用户账号暂未关联任何权限组.", false);
-        }
-        StringBuilder idSb = new StringBuilder();
-        for (SysAccountGroupEntity accountGroupEntity : accountGroupEntityList) {
-            if (idSb.length() > 0) {
-                idSb.append(",");
-            }
-            idSb.append(accountGroupEntity.getGroupId());
-        }
-        return new Result(ResultCode.SUCCESS, idSb.toString());
-    }
-
-    @Override
-    public Result getAccountByGroup(String groupId) {
-        /* 根据账号id读取已关联权限组 */
-        List<SysAccountGroupEntity> accountGroupEntityList = sysAccountGroupRepo.getAccountByGroup(groupId);
-        if (accountGroupEntityList.size() == 0) {
-            return new Result(10006, "当前权限组暂未关联任何用户账号.", false);
-        }
-        StringBuilder idSb = new StringBuilder();
-        for (SysAccountGroupEntity accountGroupEntity : accountGroupEntityList) {
-            if (idSb.length() > 0) {
-                idSb.append(",");
-            }
-            idSb.append(accountGroupEntity.getAccountId());
-        }
-        return new Result(ResultCode.SUCCESS, idSb.toString());
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/impl/GroupServiceImpl.java

@@ -1,81 +0,0 @@
-package com.huimv.core.service.impl;
-
-import com.huimv.core.domain.SysGroupEntity;
-import com.huimv.core.repo.SysGroupEntityRepository;
-import com.huimv.core.repo.SysGroupMenuEntityRepository;
-import com.huimv.core.service.IGroupService;
-import com.huimv.core.utils.Result;
-import com.huimv.core.utils.ResultCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
-@Service
-public class GroupServiceImpl implements IGroupService {
-
-    @Autowired
-    private SysGroupEntityRepository sysGroupEntityRepository;
-    @Autowired
-    private SysGroupMenuEntityRepository sysGroupMenuEntityRepository;
-
-    @Override
-    public Result updateGroup(Integer groupId, String groupName, String remark) {
-        try {
-            SysGroupEntity group = this.sysGroupEntityRepository.findById(groupId).orElse(null);
-            if (group == null) {
-                return  new Result(ResultCode.FAIL);
-            }
-            group.setGroupName(groupName);
-            group.setRemark(remark);
-            sysGroupEntityRepository.save(group);
-            return  new Result(ResultCode.SUCCESS);
-        }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
-        }
-    }
-
-    @Override
-    @Transactional
-    public Result removeGroup(Integer groupId) {
-        try {
-            SysGroupEntity group = this.sysGroupEntityRepository.findById(groupId).orElse(null);
-            if (group == null) {
-                return  new Result(ResultCode.FAIL);
-            }
-            // 删除权限组
-            this.sysGroupEntityRepository.deleteById(groupId);
-            // 删除权限组关联菜单
-            sysGroupMenuEntityRepository.deleteByGroupId(groupId);
-            return  new Result(ResultCode.SUCCESS);
-        }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
-        }
-    }
-
-    @Override
-    public Page<SysGroupEntity> listGroup(int pageNum, int pageSize, String searchStr) {
-        Pageable pageable = PageRequest.of(pageNum - 1, pageSize, Sort.Direction.DESC, "id");
-        if (!StringUtils.isEmpty(searchStr)) {
-            return sysGroupEntityRepository.findByGroupNameLike(searchStr, pageable);
-        }
-        return sysGroupEntityRepository.findAll(pageable);
-    }
-
-    @Override
-    public Result addGroup(String groupName, String remark) {
-        try {
-            SysGroupEntity group = new SysGroupEntity();
-            group.setGroupName(groupName);
-            group.setRemark(remark);
-            sysGroupEntityRepository.save(group);
-            return  new Result(ResultCode.SUCCESS);
-        }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
-        }
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/impl/MemberInfoServiceImpl.java

@@ -1,182 +0,0 @@
-package com.huimv.core.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.huimv.core.domain.MemberAccount;
-import com.huimv.core.domain.MemberInfo;
-import com.huimv.core.repo.MemberAccountRepository;
-import com.huimv.core.repo.MemberInfoRepository;
-import com.huimv.core.service.IMemberInfoService;
-import com.huimv.core.utils.Result;
-import com.huimv.core.utils.ResultCode;
-import com.huimv.core.utils.id.SnowflakeSequence;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-
-@Service
-public class MemberInfoServiceImpl implements IMemberInfoService {
-    @Autowired
-    private MemberAccountRepository memberAccountRepository;
-    @Autowired
-    private MemberInfoRepository memberInfoRepository;
-
-    @Override
-    public Result addUser(MemberInfo user) {
-        try {
-            SnowflakeSequence idWorker = new SnowflakeSequence();
-            long userId = idWorker.nextId();
-            // 添加用户信息
-            user.setUserId(userId);
-            memberInfoRepository.save(user);
-
-            // 添加账号信息
-            String mobile = user.getMobile();
-            String userName = user.getNickname();
-            MemberAccount accountEntity = new MemberAccount();
-            if (mobile != null && !"".equals(mobile) ){
-                accountEntity.setLoginName(mobile);
-            }else if (userName != null && !"".equals(userName)){
-                accountEntity.setLoginName(userName);
-            }
-            accountEntity.setAccountStatus(0);
-            accountEntity.setRemark("");
-//            sysAccountEntity.setPassword(GetMD5Str.getMD5Str("123456"));
-            accountEntity.setLoginPwd("123456");
-            accountEntity.setUserId(userId);
-            memberAccountRepository.save(accountEntity);
-            return  new Result(ResultCode.SUCCESS);
-        }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
-        }
-    }
-
-    @Override
-    public Result updateUser(MemberInfo user) {
-        try {
-            MemberInfo oldUser = this.memberInfoRepository.findById(user.getId()).orElse(null);
-            if (user == null) {
-                return  new Result(ResultCode.FAIL);
-            }
-            memberInfoRepository.save(user);
-            return  new Result(ResultCode.SUCCESS);
-        }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
-        }
-    }
-
-    @Override
-    public Result removeUser(List<Integer> userIds) {
-        for (Integer userId : userIds) {
-            try {
-                MemberInfo user = this.memberInfoRepository.findById(userId).orElse(null);
-                if (user == null) {
-                    return  new Result(ResultCode.FAIL);
-                }
-                this.memberInfoRepository.deleteById(userId);
-                // 删除账号
-                this.memberAccountRepository.deleteByUserId(user.getUserId());
-            }catch (Exception e){
-                return  new Result(ResultCode.FAIL);
-            }
-        }
-        return  new Result(ResultCode.SUCCESS);
-    }
-
-    @Override
-    public JSONObject findUserAccount(String searchStr, int pageNum, int pageSize) {
-//        Pageable pageable = PageRequest.of(pageNum - 1, pageSize, Sort.Direction.DESC, "id");
-        int start = (pageNum-1)*pageSize;
-        System.out.println("start>>"+start);
-
-        if (!StringUtils.isEmpty(searchStr)) {
-            List<Object[]> userAccountList = memberInfoRepository.findUserAndAccountByUserName(searchStr, start,pageSize);
-            JSONArray userAccountJa = new JSONArray();
-            for(int a=0;a<userAccountList.size();a++){
-                Object[] userAccountObj = (Object[]) userAccountList.get(a);
-                /* 封装用户和账户关联对象 */
-                userAccountJa.add(packageUserAccountRelatedObj(userAccountObj));
-            }
-            int total = memberInfoRepository.countByUserName(searchStr);
-            JSONObject resultJo = new JSONObject();
-            resultJo.put("code",10001);
-            resultJo.put("totalElements",total);
-            resultJo.put("data",userAccountJa);
-            return resultJo;
-        }
-        List<Object[]> allUserAccountList = memberInfoRepository.findUserAndAccount(start,pageSize);
-        JSONArray allUserAccountJa = new JSONArray();
-        for(int a=0;a<allUserAccountList.size();a++){
-            Object[] userAccountObj = (Object[]) allUserAccountList.get(a);
-            /* 封装用户和账户关联对象 */
-            allUserAccountJa.add(packageUserAccountRelatedObj(userAccountObj));
-        }
-        Long total = memberInfoRepository.count();
-        JSONObject resultJo = new JSONObject();
-        resultJo.put("code",10001);
-        resultJo.put("totalElements",total);
-        resultJo.put("data",allUserAccountJa);
-        return resultJo;
-    }
-
-    /**
-     *
-     * 封装对象
-     */
-    private Object packageUserAccountRelatedObj(Object[] userAccountObj) {
-        JSONObject dataJo = new JSONObject();
-        dataJo.put("id",userAccountObj[0].toString());
-        dataJo.put("userName",userAccountObj[1].toString());
-        if(userAccountObj[2] == null){
-            dataJo.put("male","");
-        }else{
-            dataJo.put("male",userAccountObj[2].toString());
-        }
-        if(userAccountObj[3] == null){
-            dataJo.put("birthday","");
-        }else{
-            dataJo.put("birthday",userAccountObj[3].toString());
-        }
-        if(userAccountObj[4] == null){
-            dataJo.put("mobile","");
-        }else{
-            dataJo.put("mobile",userAccountObj[4].toString());
-        }
-        if(userAccountObj[5] == null){
-            dataJo.put("address","");
-        }else{
-            dataJo.put("address",userAccountObj[5].toString());
-        }
-        if(userAccountObj[6] == null){
-            dataJo.put("job","");
-        }else{
-            dataJo.put("job",userAccountObj[6].toString());
-        }
-        if(userAccountObj[7] == null){
-            dataJo.put("remark","");
-        }else{
-            dataJo.put("remark",userAccountObj[7].toString());
-        }
-        if(userAccountObj[8] == null)
-        {
-            dataJo.put("userId","");
-        }else{
-            dataJo.put("userId",userAccountObj[8].toString());
-        }
-        if(userAccountObj[9] == null){
-            dataJo.put("accountName","");
-        }else{
-            dataJo.put("accountName",userAccountObj[9].toString());
-        }
-        if(userAccountObj[10] == null)
-        {dataJo.put("accountStatus","");
-
-        }else{
-            dataJo.put("accountStatus",Integer.parseInt(userAccountObj[10].toString()));
-        }
-        return dataJo;
-    }
-
-}

huimv-cloud-core/src/main/java/com/huimv/core/service/impl/MemberServiceImpl.java

@@ -1,23 +1,15 @@
 package com.huimv.core.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.huimv.core.domain.*;
-import com.huimv.core.repo.MemberInfoRepository;
-import com.huimv.core.utils.Result;
-import com.huimv.core.utils.ResultCode;
-import com.huimv.core.utils.id.SnowflakeSequence;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
 
+import com.huimv.core.domain.AuthorizationCode;
+import com.huimv.core.domain.MemberAccount;
 import com.huimv.core.repo.AuthorizationCodeRepository;
 import com.huimv.core.repo.MemberAccountRepository;
 import com.huimv.core.service.MemberService;
 import com.huimv.exception.PlatformException;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
 
 @Service
 public class MemberServiceImpl implements MemberService {
@@ -30,62 +22,37 @@ public class MemberServiceImpl implements MemberService {
     @Override
     public MemberAccount getMemberByAccount(String userName, String userPwd) {
         MemberAccount ma = this.memberAccountRepository.findByLoginName(userName);
-        if (ma == null || ma.getId() == 0) {
+        if (ma == null || ma.getId() == 0)
             throw new PlatformException("username_not_exist", "用户名不存在");
-        }
+
         //TODO：建议使用二次md5或者加salt
         String md5Pwd = DigestUtils.md5DigestAsHex(userPwd.getBytes()).toUpperCase();
-
+        
         if (ma.getLoginPwd().equals(md5Pwd)) {
             return ma;
         }
         throw new PlatformException("password_not_matched", "用户密码不匹配");
     }
 
-    @Override
-    public Result login(String accountName, String password) {
-        //Step1:判断账户状态
-        //Step2:读取菜单组
-        MemberAccount ma = this.memberAccountRepository.findByLoginName(accountName);
-        if (ma == null) {
-//            throw new PlatformException("The account or password is wrong.", "该账号不存在或密码错误.");
-            return new Result(10002, "账号不存在或密码错误.", false);
-        }
-        int status = ma.getAccountStatus();
-        if (status == 0) {
-            return new Result(10003, "该账号未启用.", false);
-//            throw new PlatformException("10003", "该账号未启用.");
-        }
-        if (status == -1) {
-            return new Result(10004, "该账号已暂停使用.", false);
-//            throw new PlatformException("10004", "该账号已暂停使用.");
-        }
-        return new Result(ResultCode.SUCCESS,ma);
-    }
-
-    @Override
-    public MemberAccount getMemberByAuthCode(String code, String clientId) {
-        // 检查code
-        AuthorizationCode ac = this.authorizationCodeRepository.findByCode(code).orElse(null);
-        if (ac == null) {
-            throw new PlatformException("auth_code_not_exist", "授权码不存在");
-        }
-        // 检查IP限制
-        if (ac.getConf().containsKey("ipLimit")) {
-            String[] ips = ac.getConf().get("ipLimit").toString().split(",");
-            Boolean h = false;
-            for (String ip : ips) {
-                if (ip.equals(clientId)) {
-                    h = true;
-                    break;//找到就退出
-                }
-            }
-            if (!h) {
-				throw new PlatformException("ip_not_allowed", "IP不在授权范围");
+	@Override
+	public MemberAccount getMemberByAuthCode(String code,String clientId) {
+		// 检查code
+		AuthorizationCode ac = this.authorizationCodeRepository.findByCode(code).orElse(null);
+		if(ac == null) throw new PlatformException("auth_code_not_exist","授权码不存在");
+		// 检查IP限制
+		if(ac.getConf().containsKey("ipLimit")) {
+			String [] ips = ac.getConf().get("ipLimit").toString().split(",");
+			Boolean h = false;
+			for(String ip : ips) {
+				if(ip.equals(clientId)) {
+					h = true;break;//找到就退出
+				}
 			}
-        }
-        // 获取用户信息
-        return this.memberAccountRepository.findById(ac.getMemberId()).orElse(null);
-    }
+			if(!h)
+				throw new PlatformException("ip_not_allowed","IP不在授权范围");
+		}
+		// 获取用户信息
+		return this.memberAccountRepository.findById(ac.getMemberId()).orElse(null);
+	}
 
 }

huimv-cloud-core/src/main/java/com/huimv/core/service/impl/MenuServiceImpl.java

@@ -1,96 +0,0 @@
-package com.huimv.core.service.impl;
-
-import com.huimv.core.domain.SysMenuEntity;
-import com.huimv.core.repo.SysMenuEntityRepository;
-import com.huimv.core.service.IMenuService;
-import com.huimv.core.utils.Result;
-import com.huimv.core.utils.ResultCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class MenuServiceImpl implements IMenuService {
-
-    @Autowired
-    private SysMenuEntityRepository sysMenuEntityRepository;
-
-    @Override
-    public Result addMenu(SysMenuEntity menu) {
-        System.out.println(menu);
-        try {
-            if (menu == null){
-                System.out.println("------------------------为null---------------------");
-                return  new Result(ResultCode.FAIL);
-            }
-            sysMenuEntityRepository.save(menu);
-            return  new Result(ResultCode.SUCCESS);
-        }catch (Exception e){
-            System.out.println("------------------------sql异常---------------------");
-            return  new Result(ResultCode.FAIL);
-        }
-    }
-
-    @Override
-    public Result editMenu(SysMenuEntity menu) {
-        try {
-            sysMenuEntityRepository.save(menu);
-            return  new Result(ResultCode.SUCCESS);
-        }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
-        }
-
-    }
-
-    @Override
-    public Result removeMenu(Integer menuId) {
-        try {
-            List<SysMenuEntity> lists = sysMenuEntityRepository.findAllByParentId(menuId);
-            if (lists != null && lists.size()>0){
-                for (SysMenuEntity menu : lists) {
-                    removeMenu(menu.getId());
-                    sysMenuEntityRepository.delete(menu);
-                }
-            }
-            sysMenuEntityRepository.deleteById(menuId);
-        }catch (Exception e){
-            return  new Result(ResultCode.FAIL);
-        }
-        return  new Result(ResultCode.SUCCESS);
-    }
-
-    @Override
-    public List<Map> listMenu() {
-        List<SysMenuEntity> Menus = sysMenuEntityRepository.findAllByParentId(0);
-       List list = listMenuUtil(Menus);
-        return list;
-    }
-
-    @Override
-    public List listMenuUtil(List<SysMenuEntity> list){
-        List allList = new ArrayList();
-        for (SysMenuEntity menu : list) {
-            Map<String, Object> map = new HashMap<>();
-            List<SysMenuEntity> lists = sysMenuEntityRepository.findAllByParentId(menu.getId());
-            // map.put("children", lists);
-            if (lists != null && lists.size() > 0) {
-                map.put("children",listMenuUtil(lists));
-            }else{
-                map.put("children",lists);
-            }
-            map.put("id", menu.getId());
-            map.put("menuName", menu.getMenuName());
-            map.put("parentId", menu.getParentId());
-            map.put("url", menu.getUrl());
-            map.put("sort", menu.getSort());
-
-            allList.add(map);
-        }
-        return allList;
-    }
-
-}

huimv-cloud-core/src/main/java/com/huimv/core/utils/GetMD5Str.java

@@ -1,27 +0,0 @@
-package com.huimv.core.utils;
-
-import java.math.BigInteger;
-import java.security.MessageDigest;
-
-public class GetMD5Str {
-    /**
-     * 对字符串md5加密
-     *
-     * @param str
-     * @return
-     * @throws Exception
-     */
-    public static String getMD5Str(String str) throws Exception {
-        try {
-            // 生成一个MD5加密计算摘要
-            MessageDigest md = MessageDigest.getInstance("MD5");
-            // 计算md5函数
-            md.update(str.getBytes());
-            // digest()最后确定返回md5 hash值，返回值为8为字符串。因为md5 hash值是16位的hex值，实际上就是8位的字符
-            // BigInteger函数则将8位的字符串转换成16位hex值，用字符串来表示；得到字符串形式的hash值
-            return new BigInteger(1, md.digest()).toString(16);
-        } catch (Exception e) {
-            throw new Exception("MD5加密出现错误，"+e.toString());
-        }
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/utils/Result.java

@@ -1,79 +0,0 @@
-package com.huimv.core.utils;
-
-import java.io.Serializable;
-
-public class Result implements Serializable {
-
-    private boolean success;
-    private Integer code;
-    private String message;
-
-    public boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Object getData() {
-        return data;
-    }
-
-    public void setData(Object data) {
-        this.data = data;
-    }
-
-    private Object data;
-
-    //不需要返回数据时使用
-    public Result(ResultCode code) {
-        this.success = code.success;
-        this.code = code.code;
-        this.message = code.message;
-    }
-
-    public Result(ResultCode code,Object data) {
-        this.success = code.success;
-        this.code = code.code;
-        this.message = code.message;
-        this.data = data;
-    }
-
-    public Result(Integer code,String message,boolean success) {
-        this.code = code;
-        this.message = message;
-        this.success = success;
-    }
-
-    /*
-     * 调用ResultCode类封装常用的返回数据
-     */
-    public static Result SUCCESS(){
-        return new Result(ResultCode.SUCCESS);
-    }
-
-    public static Result ERROR(){
-        return new Result(ResultCode.SERVER_ERROR);
-    }
-
-    public static Result FAIL(){
-        return new Result(ResultCode.FAIL);
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/utils/ResultCode.java

@@ -1,41 +0,0 @@
-package com.huimv.core.utils;
-
-public enum ResultCode {
-    SUCCESS(true,10000,"操作成功！"),
-    //---系统错误返回码-----
-    FAIL(false,10001,"操作失败"),
-    UNAUTHENTICATED(false,10002,"您还未登录"),
-    UNAUTHORISE(false,10003,"权限不足"),
-    SERVER_ERROR(false,99999,"抱歉，系统繁忙，请稍后重试！"),
-
-    //---用户操作返回码  2xxxx----
-    MOBILEORPASSWORDERROR(false,20001,"用户名或密码错误");
-    //---企业操作返回码  3xxxx----
-    //---权限操作返回码----
-    //---其他操作返回码----
-
-    //操作是否成功
-    boolean success;
-    //操作代码
-    int code;
-    //提示信息
-    String message;
-
-    ResultCode(boolean success,int code, String message){
-        this.success = success;
-        this.code = code;
-        this.message = message;
-    }
-
-    public boolean success() {
-        return success;
-    }
-
-    public int code() {
-        return code;
-    }
-
-    public String message() {
-        return message;
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/utils/id/SnowflakeIdWorker.java

@@ -1,171 +0,0 @@
-package com.huimv.core.utils.id;
-
-public class SnowflakeIdWorker {
-    // ==============================Fields===========================================
-    /**
-     * 开始时间截 (2015-01-01)
-     */
-    private final long twepoch = 1420041600000L;
-
-    /**
-     * 机器id所占的位数
-     */
-    private final long workerIdBits = 5L;
-
-    /**
-     * 数据标识id所占的位数
-     */
-    private final long datacenterIdBits = 5L;
-
-    /**
-     * 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
-     */
-    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
-
-    /**
-     * 支持的最大数据标识id，结果是31
-     */
-    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
-
-    /**
-     * 序列在id中占的位数
-     */
-    private final long sequenceBits = 12L;
-
-    /**
-     * 机器ID向左移12位
-     */
-    private final long workerIdShift = sequenceBits;
-
-    /**
-     * 数据标识id向左移17位(12+5)
-     */
-    private final long datacenterIdShift = sequenceBits + workerIdBits;
-
-    /**
-     * 时间截向左移22位(5+5+12)
-     */
-    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
-
-    /**
-     * 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095)
-     */
-    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
-
-    /**
-     * 工作机器ID(0~31)
-     */
-    private long workerId;
-
-    /**
-     * 数据中心ID(0~31)
-     */
-    private long datacenterId;
-
-    /**
-     * 毫秒内序列(0~4095)
-     */
-    private long sequence = 0L;
-
-    /**
-     * 上次生成ID的时间截
-     */
-    private long lastTimestamp = -1L;
-
-    //==============================Constructors=====================================
-
-    /**
-     * 构造函数
-     *
-     * @param workerId     工作ID (0~31)
-     * @param datacenterId 数据中心ID (0~31)
-     */
-    public SnowflakeIdWorker(long workerId, long datacenterId) {
-        if (workerId > maxWorkerId || workerId < 0) {
-            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
-        }
-        if (datacenterId > maxDatacenterId || datacenterId < 0) {
-            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
-        }
-        this.workerId = workerId;
-        this.datacenterId = datacenterId;
-    }
-
-    // ==============================Methods==========================================
-
-    /**
-     * 获得下一个ID (该方法是线程安全的)
-     *
-     * @return SnowflakeId
-     */
-    public synchronized long nextId() {
-        long timestamp = timeGen();
-
-        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
-        if (timestamp < lastTimestamp) {
-            throw new RuntimeException(
-                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
-        }
-
-        //如果是同一时间生成的，则进行毫秒内序列
-        if (lastTimestamp == timestamp) {
-            sequence = (sequence + 1) & sequenceMask;
-            //毫秒内序列溢出
-            if (sequence == 0) {
-                //阻塞到下一个毫秒,获得新的时间戳
-                timestamp = tilNextMillis(lastTimestamp);
-            }
-        }
-        //时间戳改变，毫秒内序列重置
-        else {
-            sequence = 0L;
-        }
-
-        //上次生成ID的时间截
-        lastTimestamp = timestamp;
-
-        //移位并通过或运算拼到一起组成64位的ID
-        return ((timestamp - twepoch) << timestampLeftShift) //
-                | (datacenterId << datacenterIdShift) //
-                | (workerId << workerIdShift) //
-                | sequence;
-    }
-
-    /**
-     * 阻塞到下一个毫秒，直到获得新的时间戳
-     *
-     * @param lastTimestamp 上次生成ID的时间截
-     * @return 当前时间戳
-     */
-    protected long tilNextMillis(long lastTimestamp) {
-        long timestamp = timeGen();
-        while (timestamp <= lastTimestamp) {
-            timestamp = timeGen();
-        }
-        return timestamp;
-    }
-
-    /**
-     * 返回以毫秒为单位的当前时间
-     *
-     * @return 当前时间(毫秒)
-     */
-    protected long timeGen() {
-        return System.currentTimeMillis();
-    }
-
-    //==============================Test=============================================
-
-    /**
-     * 测试
-     */
-    public static void main(String[] args) {
-        SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0);
-
-        for (int i = 0; i < 10; i++) {
-            long id = idWorker.nextId();
-//            System.out.println(Long.toBinaryString(id));
-            System.out.println(id);
-        }
-    }
-}

huimv-cloud-core/src/main/java/com/huimv/core/utils/id/SnowflakeSequence.java

@@ -1,202 +0,0 @@
-package com.huimv.core.utils.id;
-
-import java.lang.management.ManagementFactory;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-
-/**
- * Twitter_Snowflake<br>
- * SnowFlake的结构如下(每部分用-分开):<br>
- * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
- * 1位标识，由于long基本类型在Java中是带符号的，最高位是符号位，正数是0，负数是1，所以id一般是正数，最高位是0<br>
- * 41位时间截(毫秒级)，注意，41位时间截不是存储当前时间的时间截，而是存储时间截的差值（当前时间截 - 开始时间截)
- * 得到的值），这里的的开始时间截，一般是我们的id生成器开始使用的时间，由我们程序来指定的（如下下面程序IdWorker类的startTime属性）。41位的时间截，可以使用69年，年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69<br>
- * 10位的数据机器位，可以部署在1024个节点，包括5位datacenterId和5位workerId<br>
- * 12位序列，毫秒内的计数，12位的计数顺序号支持每个节点每毫秒(同一机器，同一时间截)产生4096个ID序号<br>
- * 加起来刚好64位，为一个Long型。<br>
- * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。
- */
-public class SnowflakeSequence {
-    // ==============================Fields===========================================
-    /** 开始时间截 (2017/11/29 18:25:29) */
-    private final long twepoch = 1511951129000L;
-
-    /** 机器id所占的位数 */
-    private final long workerIdBits = 5L;
-
-    /** 数据标识id所占的位数 */
-    private final long datacenterIdBits = 5L;
-
-    /** 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) */
-    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
-
-    /** 支持的最大数据标识id，结果是31 */
-    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
-
-    /** 序列在id中占的位数 */
-    private final long sequenceBits = 12L;
-
-    /** 机器ID向左移12位 */
-    private final long workerIdShift = sequenceBits;
-
-    /** 数据标识id向左移17位(12+5) */
-    private final long datacenterIdShift = sequenceBits + workerIdBits;
-
-    /** 时间截向左移22位(5+5+12) */
-    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
-
-    /** 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) */
-    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
-
-    /** 工作机器ID(0~31) */
-    private long workerId;
-
-    /** 数据中心ID(0~31) */
-    private long datacenterId;
-
-    /** 毫秒内序列(0~4095) */
-    private long sequence = 0L;
-
-    /** 上次生成ID的时间截 */
-    private long lastTimestamp = -1L;
-
-    //==============================构造函数=====================================
-    //根据mac地址产生datacenterid
-    public SnowflakeSequence() {
-        datacenterId = getDatacenterId(maxDatacenterId);
-        workerId = getMaxWorkerId(datacenterId, maxWorkerId);
-//        System.out.println("datacenterId:" + datacenterId + ",workerId:" + workerId);
-    }
-
-    /**
-     * 构造函数
-     * @param workerId 工作ID (0~31)
-     * @param datacenterId 数据中心ID (0~31)
-     */
-    public SnowflakeSequence(long workerId, long datacenterId) {
-        if (workerId > maxWorkerId || workerId < 0) {
-            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
-        }
-        if (datacenterId > maxDatacenterId || datacenterId < 0) {
-            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
-        }
-        this.workerId = workerId;
-        this.datacenterId = datacenterId;
-    }
-
-    // ==============================Methods==========================================
-    /**
-     * 获得下一个ID (该方法是线程安全的)
-     * @return SnowflakeId
-     */
-    public synchronized long nextId() {
-        long timestamp = timeGen();
-
-        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
-        if (timestamp < lastTimestamp) {
-            throw new RuntimeException(
-                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
-        }
-
-        //如果是同一时间生成的，则进行毫秒内序列
-        if (lastTimestamp == timestamp) {
-            sequence = (sequence + 1) & sequenceMask;
-            //毫秒内序列溢出
-            if (sequence == 0) {
-                //阻塞到下一个毫秒,获得新的时间戳
-                timestamp = tilNextMillis(lastTimestamp);
-            }
-        }
-        //时间戳改变，毫秒内序列重置
-        else {
-            sequence = 0L;
-        }
-
-        //上次生成ID的时间截
-        lastTimestamp = timestamp;
-
-        //移位并通过或运算拼到一起组成64位的ID
-        return ((timestamp - twepoch) << timestampLeftShift) //
-                | (datacenterId << datacenterIdShift) //
-                | (workerId << workerIdShift) //
-                | sequence;
-    }
-
-    /**
-     * 阻塞到下一个毫秒，直到获得新的时间戳
-     * @param lastTimestamp 上次生成ID的时间截
-     * @return 当前时间戳
-     */
-    protected long tilNextMillis(long lastTimestamp) {
-        long timestamp = timeGen();
-        while (timestamp <= lastTimestamp) {
-            timestamp = timeGen();
-        }
-        return timestamp;
-    }
-
-    /**
-     * 返回以毫秒为单位的当前时间
-     * @return 当前时间(毫秒)
-     */
-    protected long timeGen() {
-        return System.currentTimeMillis();
-    }
-
-    /**
-     * <p>
-     * 数据标识id部分
-     * </p>
-     * @param maxDatacenterId
-     * @return
-     */
-    protected static long getDatacenterId(long maxDatacenterId) {
-        long id = 0L;
-        try {
-            InetAddress ip = InetAddress.getLocalHost();
-            NetworkInterface network = NetworkInterface.getByInetAddress(ip);
-            if (network == null) {
-                id = 1L;
-            } else {
-                byte[] mac = network.getHardwareAddress();
-                if (null != mac) {
-                    id = ((0x000000FF & (long) mac[mac.length - 1]) | (0x0000FF00 & (((long) mac[mac.length - 2]) << 8))) >> 6;
-                    id = id % (maxDatacenterId + 1);
-                }
-            }
-        } catch (Exception e) {
-            System.err.println(" getDatacenterId: " + e.getMessage());
-        }
-        return id;
-    }
-
-    /**
-     * 获取 maxWorkerId
-     * @param datacenterId   数据中心id
-     * @param maxWorkerId    机器id
-     * @return  maxWorkerId
-     */
-    protected static long getMaxWorkerId(long datacenterId, long maxWorkerId) {
-        StringBuilder mpid = new StringBuilder();
-        mpid.append(datacenterId);
-        String name = ManagementFactory.getRuntimeMXBean().getName();
-        if (name != null && "".equals(name)) {
-            // GET jvmPid
-            mpid.append(name.split("@")[0]);
-        }
-        //MAC + PID 的 hashcode 获取16个低位
-        return (mpid.toString().hashCode() & 0xffff) % (maxWorkerId + 1);
-    }
-
-    //==============================Test=============================================
-    /** 测试 */
-    public static void main(String[] args) {
-//        SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0);
-        SnowflakeSequence idWorker = new SnowflakeSequence();
-        for (int i = 0; i < 10; i++) {
-            long id = idWorker.nextId();
-//            System.out.println(Long.toBinaryString(id));
-            System.out.println(id);
-        }
-    }
-}

huimv-cloud-core/src/main/resources/application-produce.yml

@@ -1,52 +0,0 @@
-server:
-  port: 8021
-spring:
-  #给项目来个名字
-  application:
-    name: core
-
-  datasource:
-    #url: jdbc:mysql://10.0.0.14:3306/core_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    url: jdbc:mysql://127.0.0.1:3306/huimv-core_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
-    driver-class-name: com.mysql.cj.jdbc.Driver
-  jpa:
-    hibernate:
-      ddl-auto: update
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-    open-in-view: false
-
-  #配置rabbitMq 服务器
-  #rabbitmq:
-  #  host: 10.0.0.4
-  #  port: 5672
-  #  username: huimv
-  #  password: hm123456
-    #虚拟host 可以不设置,使用server默认host
-  #  virtual-host: /
-
-  redis:
-    database: 0
-    #host: 10.0.0.4
-    host: 124.71.192.190
-    port: 6379
-    password: hm123456
-    jedis:
-      pool:
-        max-active: 20
-        max-wait: -1
-        max-idle: 10
-        min-idle: 0
-    timeout: 5000
-
-eureka:
-  instance:
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
-    prefer-ip-address: true
-    hostname: core
-  client:
-    service-url:
-      #defaultZone: http://10.0.0.14:8001/eureka/,http://10.0.0.116:8002/eureka/
-      defaultZone: http://localhost:8001/eureka/
-    registry-fetch-interval-seconds: 15

huimv-cloud-core/src/main/resources/application.properties

@@ -1,6 +1,3 @@
 #ʱ¼ä¸ñʽÅäÖÃ
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
-
-spring.profiles.active=test
-#spring.profiles.active=prod

huimv-cloud-core/src/main/resources/application-test.yml

@@ -6,7 +6,7 @@ spring:
     name: core
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/core_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/core_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -27,7 +27,7 @@ spring:
 
   redis:
     database: 0
-    host: 119.3.84.55
+    host: 122.112.224.199
     port: 6379
     password: hm123456
     jedis:
@@ -40,10 +40,11 @@ spring:
 
 eureka:
   instance:
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    instance-id: 127.0.0.1:8001
     prefer-ip-address: true
     hostname: core
   client:
     service-url:
-      defaultZone: http://192.168.1.5:8001/eureka/,http://192.168.1.6:8002/eureka/
-    registry-fetch-interval-seconds: 15
+#      defaultZone: http://192.168.10.128:8001/eureka/
+      defaultZone: http://127.0.0.1:8001/eureka/
+    registry-fetch-interval-seconds: 15

huimv-cloud-core/src/main/resources/bootstrap.yml

@@ -4,4 +4,5 @@ spring:
     inetutils:
       preferred-networks:
       - 192.168.1.*
-      - 10.0.0.*
+      - 10.0.0.*
+      - 192.168.10.*

huimv-cloud-farm-huyang/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
     name: farm-huyang
 
   rabbitmq:
-    host: 192.168.1.7
+    host: 192.168.10.128
     port: 5672
     username: huimv
     password: hm123456
@@ -13,7 +13,7 @@ spring:
 
   redis:
     database: 0
-    host: 119.3.84.55
+    host: 122.112.224.199
     port: 6379
     password: hm123456
     jedis:
@@ -26,7 +26,7 @@ spring:
 
 #------DataSource-----
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/farm_huyang_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/farm_huyang_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -37,12 +37,13 @@ spring:
 
 eureka:
   instance:
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    instance-id: 127.0.0.1:8001
     prefer-ip-address: true
     hostname: farm-huyang
   client:
     service-url:
-      defaultZone: http://192.168.1.5:8001/eureka/,http://192.168.1.6:8002/eureka/
+#      defaultZone: http://192.168.10.128:8001/eureka/
+      defaultZone: http://127.0.0.1:8001/eureka/
     registry-fetch-interval-seconds: 15
 
-    #enabled: false
+    #enabled: false

huimv-cloud-farm-huyang/src/main/resources/bootstrap.yml

@@ -4,4 +4,5 @@ spring:
     inetutils:
       preferred-networks:
       - 192.168.1.*
-      - 10.0.0.*
+      - 10.0.0.*
+      - 192.168.10.*

huimv-cloud-gateway/src/main/java/com/huimv/gateway/service/AccessRightsService.java

@@ -9,9 +9,10 @@ import com.huimv.session.HmSession;
 public interface AccessRightsService {
 
     /**
-     * 传入共享的HmSession，解析权限信息
-     * @param hmSession
-     * @return
+     *传入共享的HmSession，解析权限信息
+     *@param hmSession
+     *@return
      */
+
     boolean checkRight(HmSession hmSession);
 }

huimv-cloud-gateway/src/main/resources/application-produce.properties

@@ -1,16 +0,0 @@
-# info 端点公开数据
-info.app.name=@project.artifactId@
-info.app.encoding=@project.build.sourceEncoding@
-info.app.java.source=@java.version@
-info.app.java.target=@java.version@
-
-#--------rabbitMQ----------
-spring.rabbitmq.host=10.0.0.4
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=huimv
-spring.rabbitmq.password=hm123456
-spring.rabbitmq.virtualHost=/
-
-#时间格式配置
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8

huimv-cloud-gateway/src/main/resources/application-test.properties

@@ -5,7 +5,7 @@ info.app.java.source=@java.version@
 info.app.java.target=@java.version@
 
 #--------rabbitMQ----------
-spring.rabbitmq.host=192.168.1.7
+spring.rabbitmq.host=192.168.10.128
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=huimv
 spring.rabbitmq.password=hm123456
@@ -13,4 +13,4 @@ spring.rabbitmq.virtualHost=/
 
 #时间格式配置
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
+spring.jackson.time-zone=GMT+8

huimv-cloud-gateway/src/main/resources/application-test.yml

@@ -82,13 +82,14 @@ spring:
             maxAge: 1800
 eureka:
   instance:
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    instance-id: 127.0.0.1:8001
     prefer-ip-address: true
     hostname: gateway
   client:
     service-url:
-      defaultZone: http://192.168.1.5:8001/eureka/,http://192.168.1.6:8002/eureka/
+#      defaultZone: http://192.168.10.128:8001/eureka/
+      defaultZone: http://127.0.0.1:8001/eureka/
     registry-fetch-interval-seconds: 15
 logging:
   level:
-    org.springframework.cloud.gateway: debug
+    org.springframework.cloud.gateway: debug

huimv-cloud-gateway/src/main/resources/bootstrap.yml

@@ -4,4 +4,5 @@ spring:
     inetutils:
       preferred-networks:
       - 192.168.1.*
-      - 10.0.0.*
+      - 10.0.0.*
+      - 192.168.10.*

huimv-cloud-public/src/main/resources/application-produce.properties

@@ -1,74 +0,0 @@
-server.port=8087
-spring.application.name=publics
-
-eureka.client.registry-fetch-interval-seconds=15
-eureka.client.service-url.defaultZone=http://10.0.0.14:8001/eureka/,http://10.0.0.116:8002/eureka/
-#表示将自己的IP注册到 eureka server
-eureka.instance.hostname=publics
-eureka.instance.prefer-ip-address=true
-eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
-
-#--------DataSource-------------
-spring.datasource.url=jdbc:mysql://10.0.0.14:3306/public_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-spring.datasource.username=root
-spring.datasource.password=hm123456
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.jpa.properties.hibernate.hbm2ddl.auto=update
-
-spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
-
-#--------rabbitMQ----------
-spring.rabbitmq.host=10.0.0.4
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=huimv
-spring.rabbitmq.password=hm123456
-spring.rabbitmq.virtualHost=/
-
-#--------mongodb-----------
-spring.data.mongodb.uri=mongodb://huimv:hm123456@10.0.0.4:27017/treenode
-
-#--------huimv config---------
-huimv.snowflake.data-center-id=6
-huimv.snowflake.worker-id=1
-
-#-------- feign 使用 okHttp，听说这个性能比较好--------------
-#feign.okhttp.enabled=true
-
-# info 端点公开数据
-info.app.name=@project.artifactId@
-info.app.encoding=@project.build.sourceEncoding@
-info.app.java.source=@java.version@
-info.app.java.target=@java.version@
-
-#-----------redis配置-----------------------------------------
-# Redis数据库索引（默认为0）
-spring.redis.database=0
-# Redis服务器地址
-spring.redis.host=10.0.0.4
-# Redis服务器连接端口
-spring.redis.port=6379
-# Redis服务器连接密码（默认为空）
-spring.redis.password=hm123456
-# 连接池最大连接数（使用负值表示没有限制）
-spring.redis.jedis.pool.max-active=20
-# 连接池最大阻塞等待时间（使用负值表示没有限制）
-spring.redis.jedis.pool.max-wait=-1
-# 连接池中的最大空闲连接
-spring.redis.jedis.pool.max-idle=10
-# 连接池中的最小空闲连接
-spring.redis.jedis.pool.min-idle=0
-# 连接超时时间（毫秒）
-spring.redis.timeout=5000
-
-
-#时间格式配置
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
-#文件上传路径
-file.static-path=/files/**
-file.file-upload=/root/huimv.platform/uploads/
-
-#上传文件大小限制
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=10MB

huimv-cloud-public/src/main/resources/application-test.properties

@@ -1,74 +0,0 @@
-server.port=8088
-spring.application.name=publics
-
-eureka.client.registry-fetch-interval-seconds=15
-eureka.client.service-url.defaultZone=http://192.168.1.5:8001/eureka/,http://192.168.1.6:8002/eureka/
-#表示将自己的IP注册到 eureka server
-eureka.instance.hostname=publics
-eureka.instance.prefer-ip-address=true
-eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
-
-#--------DataSource-------------
-spring.datasource.url=jdbc:mysql://192.168.1.7:3306/public_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-spring.datasource.username=root
-spring.datasource.password=hm123456
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.jpa.properties.hibernate.hbm2ddl.auto=update
-
-spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
-
-#--------rabbitMQ----------
-spring.rabbitmq.host=192.168.1.7
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=huimv
-spring.rabbitmq.password=hm123456
-spring.rabbitmq.virtualHost=/
-
-#--------mongodb-----------
-spring.data.mongodb.uri=mongodb://huimv:hm123456@119.3.84.55:27017/treenode
-
-#--------huimv config---------
-huimv.snowflake.data-center-id=6
-huimv.snowflake.worker-id=1
-
-#-------- feign 使用 okHttp，听说这个性能比较好--------------
-#feign.okhttp.enabled=true
-
-# info 端点公开数据
-info.app.name=@project.artifactId@
-info.app.encoding=@project.build.sourceEncoding@
-info.app.java.source=@java.version@
-info.app.java.target=@java.version@
-
-#-----------redis配置-----------------------------------------
-# Redis数据库索引（默认为0）
-spring.redis.database=0
-# Redis服务器地址
-spring.redis.host=119.3.84.55
-# Redis服务器连接端口
-spring.redis.port=6379
-# Redis服务器连接密码（默认为空）
-spring.redis.password=hm123456
-# 连接池最大连接数（使用负值表示没有限制）
-spring.redis.jedis.pool.max-active=20
-# 连接池最大阻塞等待时间（使用负值表示没有限制）
-spring.redis.jedis.pool.max-wait=-1
-# 连接池中的最大空闲连接
-spring.redis.jedis.pool.max-idle=10
-# 连接池中的最小空闲连接
-spring.redis.jedis.pool.min-idle=0
-# 连接超时时间（毫秒）
-spring.redis.timeout=5000
-
-
-#时间格式配置
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-
-#文件上传路径
-file.static-path=/files/**
-file.file-upload=/root/huimv.platform/uploads/
-
-#上传文件大小限制
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=10MB

huimv-cloud-public/src/main/resources/application.properties

@@ -1 +1,77 @@
-spring.profiles.active=produce
+server.port=8087
+spring.application.name=publics
+
+eureka.client.registry-fetch-interval-seconds=15
+
+#eureka.client.service-url.defaultZone=http://192.168.10.128:8001/eureka/
+eureka.client.service-url.defaultZone=http://127.0.0.1:8001/eureka/
+
+#表示将自己的IP注册到 eureka server
+eureka.instance.hostname=publics
+eureka.instance.prefer-ip-address=true
+eureka.instance.instance-id=127.0.0.1:8001
+
+#--------DataSource-------------
+spring.datasource.url=jdbc:mysql://122.112.224.199:3306/public_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+spring.datasource.username=root
+spring.datasource.password=hm123456
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.jpa.properties.hibernate.hbm2ddl.auto=update
+
+spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
+
+#--------rabbitMQ----------
+spring.rabbitmq.host=192.168.1.7
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=huimv
+spring.rabbitmq.password=hm123456
+spring.rabbitmq.virtualHost=/
+
+#--------mongodb-----------
+spring.data.mongodb.uri=mongodb://huimv:hm123456@119.3.84.55:27017/treenode
+
+#--------huimv config---------
+huimv.snowflake.data-center-id=6
+huimv.snowflake.worker-id=1
+
+#-------- feign 使用 okHttp，听说这个性能比较好--------------
+#feign.okhttp.enabled=true
+
+# info 端点公开数据
+info.app.name=@project.artifactId@
+info.app.encoding=@project.build.sourceEncoding@
+info.app.java.source=@java.version@
+info.app.java.target=@java.version@
+
+#-----------redis配置-----------------------------------------
+# Redis数据库索引（默认为0）
+spring.redis.database=0
+# Redis服务器地址
+spring.redis.host=122.112.224.199
+# Redis服务器连接端口
+spring.redis.port=6379
+# Redis服务器连接密码（默认为空）
+spring.redis.password=hm123456
+# 连接池最大连接数（使用负值表示没有限制）
+spring.redis.jedis.pool.max-active=20
+# 连接池最大阻塞等待时间（使用负值表示没有限制）
+spring.redis.jedis.pool.max-wait=-1
+# 连接池中的最大空闲连接
+spring.redis.jedis.pool.max-idle=10
+# 连接池中的最小空闲连接
+spring.redis.jedis.pool.min-idle=0
+# 连接超时时间（毫秒）
+spring.redis.timeout=5000
+
+
+#时间格式配置
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+
+#文件上传路径
+file.static-path=/files/**
+file.file-upload=/root/huimv.platform/uploads/
+
+#上传文件大小限制
+spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-request-size=10MB

huimv-cloud-public/src/main/resources/bootstrap.yml

@@ -1 +1,8 @@
-
spring:
  cloud:
    inetutils:
      preferred-networks:
      - 192.168.1.*
      - 10.0.0.*
+
+spring:
+  cloud:
+    inetutils:
+      preferred-networks:
+      - 192.168.1.*
+      - 10.0.0.*
+      - 192.168.10.*

huimv-eureka-server/src/main/resources/application-peer1.properties

@@ -1,14 +0,0 @@
-server.port=8001
-spring.application.name=eureka-server
-
-#spring.cloud.inetutils.preferred-networks=192.168.1.
-#------eureka--------
-#不集群 就不需要注册了
-#eureka.client.register-with-eureka=true
-#eureka.client.fetch-registry=true
-eureka.client.service-url.defaultZone=http://10.0.0.116:8002/eureka/
-#表示将自己的IP注册到 eureka server
-eureka.instance.hostname=peer1
-#eureka.instance.ip-address=${server.ip}
-eureka.instance.prefer-ip-address=true
-eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}

huimv-eureka-server/src/main/resources/application-peer2.properties

@@ -1,14 +0,0 @@
-server.port=8002
-spring.application.name=eureka-server
-
-#spring.cloud.inetutils.preferred-networks=192.168.1.
-#------eureka--------
-#不集群 就不需要注册了
-#eureka.client.register-with-eureka=true
-#eureka.client.fetch-registry=true
-eureka.client.service-url.defaultZone=http://10.0.0.14:8001/eureka/
-#表示将自己的IP注册到 eureka server
-eureka.instance.hostname=peer2
-#eureka.instance.ip-address=${server.ip}
-eureka.instance.prefer-ip-address=true
-eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}

huimv-eureka-server/src/main/resources/application.properties

@@ -1,12 +1,27 @@
 
 # eureka 公共属性
-eureka.server.renewal-percent-threshold=0.85
+eureka.server.renewal-percent-threshold=0.49
 #eureka.server.enable-self-preservation=true
 #eureka.server.expected-client-renewal-interval-seconds=15
 #eureka.server.renewal-threshold-update-interval-ms=240000
 
 # info 端点公开数据
-info.app.name=@project.artifactId@
-info.app.encoding=@project.build.sourceEncoding@
-info.app.java.source=@java.version@
-info.app.java.target=@java.version@
+info.app.name=huimv-eureka-server
+info.app.encoding=UTF-8
+info.app.java.source=1.8.0_221
+info.app.java.target=1.8.0_221
+
+server.port=8001
+spring.application.name=eureka-server
+
+#spring.cloud.inetutils.preferred-networks=192.168.1.
+#------eureka--------
+#不集群 就不需要注册了---
+eureka.client.register-with-eureka=false
+#eureka.client.fetch-registry=true
+eureka.client.service-url.defaultZone=http://127.0.0.1:${server.port}/eureka/
+#表示将自己的IP注册到 eureka server
+eureka.instance.hostname=eureka-server
+#eureka.instance.ip-address=${server.ip}
+eureka.instance.prefer-ip-address=true
+eureka.instance.instance-id=127.0.0.1:${server.port}

huimv-eureka-server/src/main/resources/bootstrap.yml

@@ -1,7 +0,0 @@
-
-spring:
-  cloud:
-    inetutils:
-      preferred-networks:
-      - 192.168.1.
-      - 10.0.0.

huimv-screen/src/main/java/com/huimv/admin/bigscreen/controller/ScreenDataController.java

@@ -11,9 +11,7 @@ import com.huimv.admin.bigscreen.entity.ScreenDataEntity;
 import com.huimv.admin.bigscreen.service.ScreenDataService;
 import com.huimv.admin.bigscreen.service.impl.SaveUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpRequest;
 import org.springframework.web.bind.annotation.*;
-
 import com.huimv.admin.common.utils.Result;
 
 import static com.huimv.admin.common.utils.ResultCode.SUCCESS;
@@ -41,7 +39,6 @@ public class ScreenDataController {
     private ScreenDataDao screenDataDao ;
 
 
-
     /**
      * 信息
      */
@@ -64,9 +61,6 @@ public class ScreenDataController {
     }
 
 
-
-
-
      /**
       * 信息
       */
@@ -99,11 +93,9 @@ public class ScreenDataController {
          arr[0]="cunlan_liang";
          arr[1]="chanrou_liang";
          arr[2]="cha_zhi";
-
          LambdaUpdateWrapper<ScreenDataEntity> updateWrapper = Wrappers.lambdaUpdate();
          updateWrapper.in(ScreenDataEntity::getValueName,arr);
          List<ScreenDataEntity> screenDataEntities = screenDataDao.selectList(updateWrapper);
-
          System.out.println(screenDataEntities);
          List<String >  list  = new ArrayList<>();
          Map<String,Object> map = new HashMap();
@@ -115,16 +107,12 @@ public class ScreenDataController {
 
                  IDList[i] = param.get(i).toString();
              }
-
              list.add(screenDataEntity.getValueName()+":"+IDList );
              map.put(screenDataEntity.getValueName(),IDList[0]);
          }
          return new Result(SUCCESS,map);
-
      }
 
-
-
      //gengin
      @RequestMapping("/updateData")
      public Result updateData(  @RequestParam   Map<String, String>  parm   )  {
@@ -160,8 +148,6 @@ public class ScreenDataController {
      return  new Result(SUCCESS);
      }
 
-
-
      //公羊  母羊  修改+上传
      @RequestMapping("/updatezhongYangFenBu")
      public Result updatezhongYangFenBu(  @RequestParam   Map<String, String>  parm   )  {
@@ -173,7 +159,6 @@ public class ScreenDataController {
          return  new Result(SUCCESS);
      }
 
-
      //公羊  母羊  修改+上传
      @RequestMapping("/updatezhongRouyangXiaoshou")
      public Result updatezhongRouyangXiaoshou(  @RequestParam   Map<String, String>  parm   )  {
@@ -187,9 +172,6 @@ public class ScreenDataController {
 
 
 
-
-
-
     public static void main(String[] args) {
         String arr[] = new String[5];
         System.out.println(Arrays.toString(arr));
@@ -203,23 +185,6 @@ public class ScreenDataController {
         System.out.println(list);
     }
 
-
-
-/*
-    *//**
-     * 保存
-     *//*
-    @RequestMapping("/save")
-    public Result save(@RequestBody ScreenDataEntity screenData){
-        System.out.println("ceshi");
-
-		screenDataService.save(screenData);
-        return  new Result(10000,"同步成功",true);
-    }*/
-
-
-
-
         /**
      * 修改
      */
@@ -239,5 +204,4 @@ public class ScreenDataController {
         return new Result(10000,"同步成功",true);
     }
 
-
 }