diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index b309a3d..89a7337 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index 6be7436..3c838d8 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -85,6 +85,12 @@ public class SysUser extends BaseEntity { */ private String password; + + /** + * 用户类型(00 系统用户) + */ + private String userType; + /** * 帐号状态（0正常 1停用） */ @@ -301,6 +307,8 @@ public class SysUser extends BaseEntity { this.roleId = roleId; } + + @Override public String toString () { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -323,6 +331,7 @@ public class SysUser extends BaseEntity { .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .append("dept", getDept()) + .append("userType",userType) .toString(); } } diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index d7367b4..1bd13a5 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -28,12 +28,12 @@ spring: eager: true transport: # 控制台地址 - dashboard: 127.0.0.1:8718 + dashboard: 175.24.138.82:8718 # nacos配置持久化 datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 dataId: sentinel-muyu-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/muyu-modules/muyu-business/muyu-data-service/pom.xml b/muyu-modules/muyu-business/muyu-data-service/pom.xml new file mode 100644 index 0000000..8f7b6ed --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + + com.muyu + muyu + 3.6.3 + ../../../pom.xml + + + muyu-data-service + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-common-system + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/XiaoHuangBusinessApplication.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/XiaoHuangBusinessApplication.java new file mode 100644 index 0000000..2c6a73d --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/XiaoHuangBusinessApplication.java @@ -0,0 +1,24 @@ +package com.muyu.business; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * qidong XiaoHuangBusinessApplication + * + * @author xiaohuang + * on 2024/6/3 + */ + +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class XiaoHuangBusinessApplication { + public static void main(String[] args) { + SpringApplication.run(XiaoHuangBusinessApplication.class); + } +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/controller/BusinessController.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/controller/BusinessController.java new file mode 100644 index 0000000..cdcb997 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/controller/BusinessController.java @@ -0,0 +1,93 @@ +package com.muyu.business.controller; + +import com.muyu.business.domain.Business; +import com.muyu.business.service.BusinessService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 企业的 BusinessController + * + * @author xiaohuang + * on 2024/6/4 + */ + +@RestController +@RequestMapping("/business") +public class BusinessController extends BaseController { + + @Autowired + private BusinessService businessService; + + + /** + * 查询企业列表 + */ + @GetMapping("/list") + public Result> list(Business business){ + startPage(); + List list = businessService.selectBusinessList(business); + return getDataTable(list); + } + + + /** + * 导出企业列表 + */ + @Log(title = "企业", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Business business){ + List list = businessService.selectBusinessList(business); + ExcelUtil util = new ExcelUtil<>(Business.class); + util.exportExcel(response,list,"企业数据"); + } + + + /** + * 获取企业详细信息 + */ + @GetMapping(value = "/{id}") + public Result getInfo(@PathVariable("id") Long id){ + return success(businessService.selectBusinessById(id)); + } + + + /** + * 新增企业 + */ + @Log(title = "企业",businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody Business business){ + return toAjax(businessService.insertBusiness(business)); + } + + + /** + * 修改 + */ + @Log(title = "企业",businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody Business business){ + return toAjax(businessService.updateBusiness(business)); + } + + + /** + * 删除 + */ + @Log(title = "企业",businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Result remove(@PathVariable Long[] ids){ + return toAjax(businessService.deleteBusinessByIds(ids)); + } + +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/AuthRoleResp.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/AuthRoleResp.java new file mode 100644 index 0000000..278b6fa --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/AuthRoleResp.java @@ -0,0 +1,35 @@ +package com.muyu.business.domain; + +import com.muyu.common.system.domain.SysRole; +import com.muyu.common.system.domain.SysUser; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +/** + * 授权角色返回结果集 AuthRoleResp + * + * @author xiaohuang + * on 2024/6/4 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class AuthRoleResp { + + /** + * 角色信息 + */ + private SysUser user; + + + /** + * 角色集合 + */ + private List roles; +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/Business.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/Business.java new file mode 100644 index 0000000..9b4392b --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/domain/Business.java @@ -0,0 +1,117 @@ +package com.muyu.business.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 企业对象 Business + * + * @author xiaohuang + * on 2024/6/4 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("business") +public class Business extends BaseEntity { + + + private static final long serialVersionUID = 1L; + + + /** + * 企业主键 + */ + @Excel(name = "企业主键") + @TableId(type = IdType.AUTO) + private Long id; + + + /** + * 企业名称 + */ + @Excel(name = "企业名称") + private String name; + + + /** + * 企业法定代表人 + */ + @Excel(name = "企业法定代表人") + private String businessPerson; + + + /** + * 营业编码 + */ + @Excel(name = "营业编码") + private String businessLincenseNumber; + + + /** + * 企业创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "企业创建时间",width = 30,dateFormat = "yyyy-MM-dd") + private Date businessCreateTime; + + + /** + * 企业电话 + */ + @Excel(name = "企业电话") + private String businessPhone; + + + /** + * 企业邮箱 + */ + @Excel(name = "企业邮箱") + private String businessEmail; + + + /** + * 企业状态 + */ + @Excel(name = "企业状态") + private String businessStates; + + + /** + * 入驻车联网平台时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "入驻车联网平台时间",width = 30,dateFormat = "yyyy-MM-dd") + private Date businessRegistrationDate; + + + /** + * 服务等级 + */ + @Excel(name = "服务等级0/1/2") + private String serviceLevel; + + + + /** + * 认证等级0/1 + */ + @Excel(name = "认证等级0/1") + private String authentication; + + +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/mapper/BusinessMapper.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/mapper/BusinessMapper.java new file mode 100644 index 0000000..18ef0ec --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/mapper/BusinessMapper.java @@ -0,0 +1,66 @@ +package com.muyu.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.business.domain.Business; +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.LoginUser; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** BusinessMapper + * @author xiaohuang + * on 2024/6/4 + */public interface BusinessMapper extends BaseMapper { + + /** + * 查询企业 + * + * @param id 企业主键 + * @return 企业 + */ + public Business selectBusinessById(Long id); + + /** + * 查询企业列表 + * + * @param business 企业 + * @return 企业集合 + */ + public List selectBusinessList(Business business); + + /** + * 新增企业 + * + * @param business 企业 + * @return 结果 + */ + public int insertBusiness(Business business); + + /** + * 修改企业 + * + * @param business 企业 + * @return 结果 + */ + public int updateBusiness(Business business); + + /** + * 删除企业 + * + * @param id 企业主键 + * @return 结果 + */ + public int deleteBusinessById(Long id); + + /** + * 批量删除企业 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBusinessByIds(Long[] ids); + + + Result info(@Param("userId") Long userId); +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/remote/factory/RemoteUserLoginFactory.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/remote/factory/RemoteUserLoginFactory.java new file mode 100644 index 0000000..bbe5c9a --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/remote/factory/RemoteUserLoginFactory.java @@ -0,0 +1,25 @@ +package com.muyu.business.remote.factory; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.system.domain.SysUser; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * RemoteUserLoginFactory + * + * @author xiaohuang + * on 2024/6/4 + */ +@FeignClient("muyu-system") +public interface RemoteUserLoginFactory { + + @Log(title = "用户管理",businessType = BusinessType.IMPORT) + + @PostMapping("/user") + public Result add (@Validated @RequestBody SysUser user); +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/BusinessService.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/BusinessService.java new file mode 100644 index 0000000..e36a9b3 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/BusinessService.java @@ -0,0 +1,54 @@ +package com.muyu.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.business.domain.Business; + +import java.util.List; + +/** + * 企业 BusinessService + * + * @author xiaohuang + * on 2024/6/4 + */ +public interface BusinessService extends IService { + + /** + * 查询企业 + */ + public Business selectBusinessById(Long id); + + + /** + * 查询企业列表 + */ + public List selectBusinessList(Business business); + + + /** + * 新增企业 + */ + public int insertBusiness(Business business); + + + /** + * 修改企业 + */ + public int updateBusiness(Business business); + + /** + * 批量删除企业 + * + * @param ids 需要删除的企业主键集合 + * @return 结果 + */ + public int deleteBusinessByIds(Long[] ids); + + + + /** + * 删除企业信息 + */ + public int deleteBusinessById(Long id); + +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/Aa.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/Aa.java new file mode 100644 index 0000000..b9747ab --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/Aa.java @@ -0,0 +1,22 @@ +package com.muyu.business.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.business.domain.Business; +import com.muyu.business.service.BusinessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Aa + * + * @author xiaohuang + * on 2024/6/4 + */ +@RestController +public class Aa { + @Autowired + private BusinessService businessService; + +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/BusinessServiceImpl.java b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/BusinessServiceImpl.java new file mode 100644 index 0000000..f568fd6 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/java/com/muyu/business/service/impl/BusinessServiceImpl.java @@ -0,0 +1,172 @@ +package com.muyu.business.service.impl; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.business.domain.Business; +import com.muyu.business.mapper.BusinessMapper; +import com.muyu.business.service.BusinessService; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.DateUtils; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.HashMap; +import java.util.List; + +/** + * 企业 BusinessServiceImpl + * + * @author xiaohuang + * on 2024/6/4 + */ + +@Service +public class BusinessServiceImpl extends ServiceImpl implements BusinessService { + + + @Autowired + private BusinessMapper businessMapper; + + + @Autowired + private RemoteUserService remoteUserService; + + + @Autowired + private RedisTemplate redisTemplate; + + + + + + @Override + public Business selectBusinessById(Long id) { + return businessMapper.selectBusinessById(id); + } + + @Override + public List selectBusinessList(Business business) { + + LoginUser loginUser = SecurityUtils.getLoginUser(); + SysUser user = remoteUserService.selectByUserId(loginUser.getUserid()); + if (user.getUserType().equals("00")){ + return businessMapper.selectBusinessList(business); + } + business.setId(Long.valueOf(user.getUserType())); + return businessMapper.selectBusinessList(business); + } + + @Override + public int insertBusiness(Business business) { + + business.setCreateTime(DateUtils.getNowDate()); + + int i = businessMapper.insertBusiness(business); + System.out.println(business); + + SysUser sysUser = SysUser.builder() + .userName(business.getName() + business.getId()) + .password("admin123") + .nickName(business.getName()) + .email(business.getBusinessEmail()) + .phonenumber(business.getBusinessPhone()) + .loginIp("175.24.138.82") + .userType(String.valueOf(business.getId())) + .build(); + + Result add = remoteUserService.add(sysUser); + return i; + + } + + @Override + public int updateBusiness(Business business) { + + business.setUpdateTime(DateUtils.getNowDate()); + + } + + + /** + * + * @ 判断redis是否存在端口号 + * @return + */ + public void httpConnectMysql(Business business){ + if (business.getBusinessStates().equals(2) ) { + if (!redisTemplate.hasKey(business.getId()+business.getName())){ + redisTemplate.opsForValue() + .set(business.getId()+ + business.getName() + ,String.valueOf(3306+business.getId())); + extracted(business); + } + } + + } + + + + private static void extracted(Business business) { + String postUrl="http://122.51.111.225:10006/webhook/%E6%96%B0%E5%BB%BA%E4%BC%81%E4%B8%9A%E6%95%B0%E6%8D%AE%E6%BA%90"; + HashMap hashMap = new HashMap<>(); + hashMap.put("businessId", business.getId()+ business.getName()); + hashMap.put("mysqlPort",String.valueOf(3306+ business.getId())); + String json = JSON.toJSONString(hashMap); + // 3.创建连接与设置连接参数 + URL urlObj = null; + try { + urlObj = new URL(postUrl); + HttpURLConnection httpConn = (HttpURLConnection) urlObj.openConnection(); + httpConn.setRequestMethod("POST"); + httpConn.setRequestProperty("Charset", "UTF-8"); + // POST请求且JSON数据,必须设置 + httpConn.setRequestProperty("Content-Type", "application/json"); + // 打开输出流,默认是false + httpConn.setDoOutput(true); +// // 打开输入流,默认是true,可省略 +// httpConn.setDoInput(true); + // 4.从HttpURLConnection获取输出流和写数据 + OutputStream oStream = httpConn.getOutputStream(); + oStream.write(json.getBytes()); + oStream.flush(); + // 5.发起http调用(getInputStream触发http请求) + if (httpConn.getResponseCode() != 200) { + throw new Exception("调用服务端异常."); + } + // 6.从HttpURLConnection获取输入流和读数据 + BufferedReader br = new BufferedReader( + new InputStreamReader(httpConn.getInputStream())); + String resultData = br.readLine(); + System.out.println("从服务端返回结果: " + resultData); + // 7.关闭HttpURLConnection连接 + httpConn.disconnect(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + + + + + @Override + public int deleteBusinessByIds(Long[] ids) { + return businessMapper.deleteBusinessByIds(ids); + } + + @Override + public int deleteBusinessById(Long id) { + return businessMapper.deleteBusinessById(id); + } +} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/resources/banner.txt b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..8cdd629 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/bootstrap.yml @@ -0,0 +1,32 @@ +# Tomcat +server: + port: 9211 + +# Spring +spring: + application: + # 应用名称 + name: muyu-business + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 175.24.138.82:8848 + # 命名空间 + + config: + # 配置中心地址 + server-addr: 175.24.138.82:8848 + # 命名空间 + + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.zhiLian.business.mapper: DEBUG diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/resources/logback.xml b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/logback.xml new file mode 100644 index 0000000..d7c2256 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/muyu-business/muyu-data-service/src/main/resources/mapper/business/BusinessMapper.xml b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/mapper/business/BusinessMapper.xml new file mode 100644 index 0000000..fee71b6 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-data-service/src/main/resources/mapper/business/BusinessMapper.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, name, business_person, business_lincense_number, business_create_time, business_phone, business_email, business_states, business_registration_date, service_level, authentication, remark, create_by, create_time, update_by, update_time from business + + + + + + + + + insert into business + + name, + business_person, + business_lincense_number, + business_create_time, + business_phone, + business_email, + business_states, + business_registration_date, + service_level, + authentication, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{name}, + #{businessPerson}, + #{businessLincenseNumber}, + #{businessCreateTime}, + #{businessPhone}, + #{businessEmail}, + #{businessStates}, + #{businessRegistrationDate}, + #{serviceLevel}, + #{authentication}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update business + + name = #{name}, + business_person = #{businessPerson}, + business_lincense_number = #{businessLincenseNumber}, + business_create_time = #{businessCreateTime}, + business_phone = #{businessPhone}, + business_email = #{businessEmail}, + business_states = #{businessStates}, + business_registration_date = #{businessRegistrationDate}, + service_level = #{serviceLevel}, + authentication = #{authentication}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from business where id = #{id} + + + + delete from business where id in + + #{id} + + + diff --git a/muyu-modules/muyu-business/pom.xml b/muyu-modules/muyu-business/pom.xml new file mode 100644 index 0000000..cc8b7c6 --- /dev/null +++ b/muyu-modules/muyu-business/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + + com.muyu + muyu + 3.6.3 + ../../pom.xml + + + muyu-business + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-common-system + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml index 0cb85bd..bc87516 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml index b628931..121e1b8 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml index 618f3e8..c2f6c14 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index a66fd4c..b02031d 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml index 1276c8e..c89a13f 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 175.24.138.82:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/pom.xml b/pom.xml index fc97f1d..e519994 100644 --- a/pom.xml +++ b/pom.xml @@ -215,6 +215,8 @@ muyu-visual muyu-modules muyu-common + muyu-modules/muyu-business + muyu-modules/muyu-business/muyu-data-service pom