Skip to content

G
gs1-office-web-sit
Commit 18039ee8 by 吴迪
Options

【修改】提交代码

parent c1036d3b
Showing with 268 additions and 25 deletions
db/sqlserver.sql
...@@ -783,9 +783,212 @@ update news set showtime= replace(showtime,'/','-'); ...@@ -783,9 +783,212 @@ update news set showtime= replace(showtime,'/','-');
alter table index_carousel_manage add is_show varchar(2) not null default (1); alter table index_carousel_manage add is_show varchar(2) not null default (1);
/*
Navicat Premium Data Transfer
Source Server : 中国编码官网
Source Server Type : SQL Server
Source Server Version : 14003223
Source Host : 118.190.181.128,51433:1433
Source Catalog : gs108
Source Schema : dbo
Target Server Type : SQL Server
Target Server Version : 14003223
File Encoding : 65001
Date: 22/12/2021 21:28:44
*/
-- ----------------------------
-- Table structure for user_function_binding
-- ----------------------------
IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[user_function_binding]') AND type IN ('U'))
DROP TABLE [dbo].[user_function_binding]
GO
CREATE TABLE [dbo].[user_function_binding] (
[id] int IDENTITY NOT NULL,
[user_id] int NOT NULL,
[func_id] int NOT NULL
)
GO
ALTER TABLE [dbo].[user_function_binding] SET (LOCK_ESCALATION = TABLE)
GO
-- ----------------------------
-- Records of [user_function_binding]
-- ----------------------------
SET IDENTITY_INSERT [dbo].[user_function_binding] ON
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'16', N'1', N'1')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'17', N'1', N'2')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'18', N'1', N'3')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'19', N'1', N'4')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'20', N'1', N'5')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'21', N'1', N'6')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'22', N'1', N'7')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'23', N'1', N'8')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'24', N'1', N'9')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'34', N'9', N'1')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'35', N'9', N'2')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'36', N'9', N'3')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'37', N'9', N'4')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'38', N'9', N'5')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'39', N'9', N'6')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'40', N'9', N'7')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'41', N'9', N'8')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'42', N'9', N'9')
GO
SET IDENTITY_INSERT [dbo].[user_function_binding] OFF
GO
/*
Navicat Premium Data Transfer
Source Server : 中国编码官网
Source Server Type : SQL Server
Source Server Version : 14003223
Source Host : 118.190.181.128,51433:1433
Source Catalog : gs108
Source Schema : dbo
Target Server Type : SQL Server
Target Server Version : 14003223
File Encoding : 65001
Date: 22/12/2021 21:28:44
*/
-- ----------------------------
-- Table structure for user_function_binding
-- ----------------------------
IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[user_function_binding]') AND type IN ('U'))
DROP TABLE [dbo].[user_function_binding]
GO
CREATE TABLE [dbo].[user_function_binding] (
[id] int IDENTITY NOT NULL,
[user_id] int NOT NULL,
[func_id] int NOT NULL
)
GO
ALTER TABLE [dbo].[user_function_binding] SET (LOCK_ESCALATION = TABLE)
GO
-- ----------------------------
-- Records of [user_function_binding]
-- ----------------------------
SET IDENTITY_INSERT [dbo].[user_function_binding] ON
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'16', N'1', N'1')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'17', N'1', N'2')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'18', N'1', N'3')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'19', N'1', N'4')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'20', N'1', N'5')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'21', N'1', N'6')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'22', N'1', N'7')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'23', N'1', N'8')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'24', N'1', N'9')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'34', N'9', N'1')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'35', N'9', N'2')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'36', N'9', N'3')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'37', N'9', N'4')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'38', N'9', N'5')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'39', N'9', N'6')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'40', N'9', N'7')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'41', N'9', N'8')
GO
INSERT INTO [dbo].[user_function_binding] ([id], [user_id], [func_id]) VALUES (N'42', N'9', N'9')
GO
SET IDENTITY_INSERT [dbo].[user_function_binding] OFF
GO
视图/零售的表
物流的表
gs1_standard /
##文件夹内容上传 2021-12-18 Movie ./redis-server.exe redis.windows.conf ./redis-server.exe redis.windows-service.conf ##文件夹内容上传 2021-12-18 Movie ./redis-server.exe redis.windows.conf ./redis-server.exe redis.windows-service.conf
...@@ -800,3 +1003,9 @@ https://www.gds.org.cn/ ...@@ -800,3 +1003,9 @@ https://www.gds.org.cn/
http://www.gds.org.cn/login.aspx更换成了： http://www.gds.org.cn/login.aspx更换成了：
https://www.gds.org.cn/ https://www.gds.org.cn/
培训计划表做数据清洗
官网旧用户手机号有问题
pom.xml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<mybatisplus.version>3.3.1</mybatisplus.version> <mybatisplus.version>3.3.1</mybatisplus.version>
<mysql.version>8.0.17</mysql.version> <mysql.version>8.0.17</mysql.version>
<mssql.version>4.0</mssql.version> <mssql.version>3.0</mssql.version>
<oracle.version>11.2.0.3</oracle.version> <oracle.version>11.2.0.3</oracle.version>
<druid.version>1.1.13</druid.version> <druid.version>1.1.13</druid.version>
<quartz.version>2.3.0</quartz.version> <quartz.version>2.3.0</quartz.version>
...@@ -109,9 +109,9 @@ ...@@ -109,9 +109,9 @@
</dependency> </dependency>
<!--mssql驱动--> <!--mssql驱动-->
<dependency> <dependency>
<groupId>com.microsoft.sqlserver</groupId> <groupId>com.microsoft</groupId>
<artifactId>sqljdbc4</artifactId> <artifactId>sqljdbc4</artifactId>
<version>${mssql.version}</version> <version>3.0</version>
</dependency> </dependency>
<!--postgresql驱动--> <!--postgresql驱动-->
<dependency> <dependency>
......
src/main/java/io/office/modules/manage/controller/DomainListController.java
...@@ -30,6 +30,9 @@ public class DomainListController { ...@@ -30,6 +30,9 @@ public class DomainListController {
@Autowired @Autowired
private DomainListProperties domainListProperties; private DomainListProperties domainListProperties;
@Value("${file.request.prefix}")
private String fileRequestPrefix;
@RequestMapping("/api/list") @RequestMapping("/api/list")
// @RequiresPermissions("manage:doc:list") // @RequiresPermissions("manage:doc:list")
...@@ -38,5 +41,12 @@ public class DomainListController { ...@@ -38,5 +41,12 @@ public class DomainListController {
return R.ok().put("data", domainListProperties.getDomain()); return R.ok().put("data", domainListProperties.getDomain());
} }
@RequestMapping("/api/filePath")
// @RequiresPermissions("manage:doc:list")
public R filePath() {
return R.ok().put("data", fileRequestPrefix);
}
} }
src/main/java/io/office/modules/manage/controller/MemberController.java
...@@ -5,8 +5,10 @@ import java.util.Map; ...@@ -5,8 +5,10 @@ import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import io.office.modules.app.annotation.Login; import io.office.modules.app.annotation.Login;
import io.office.modules.sys.controller.AbstractController; import io.office.modules.sys.controller.AbstractController;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -121,8 +123,16 @@ public class MemberController extends AbstractController { ...@@ -121,8 +123,16 @@ public class MemberController extends AbstractController {
public R update(@RequestBody MemberEntity member){ public R update(@RequestBody MemberEntity member){
MemberEntity memberUser = getMemberUser(); MemberEntity memberUser = getMemberUser();
System.out.println(memberUser);
memberService.updateById(member); MemberEntity memberUpdate = new MemberEntity();
//System.out.println(memberUser);
UpdateWrapper<MemberEntity> memberEntityUpdateWrapper = new UpdateWrapper<>();
if(StringUtils.isNoneBlank(member.getEmail())) {
memberEntityUpdateWrapper.eq("id",member.getId());
memberUpdate.setEmail(member.getEmail());
}
memberService.update(memberUpdate,memberEntityUpdateWrapper);
return R.ok(); return R.ok();
} }
......
src/main/java/io/office/modules/manage/dao/BikefirmDao.java
package io.office.modules.manage.dao; package io.office.modules.manage.dao;
import io.office.datasource.annotation.DataSource;
import io.office.modules.manage.entity.BikefirmEntity; import io.office.modules.manage.entity.BikefirmEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import io.office.modules.manage.vo.request.BikeFirmVo; import io.office.modules.manage.vo.request.BikeFirmVo;
...@@ -18,6 +19,7 @@ import java.util.List; ...@@ -18,6 +19,7 @@ import java.util.List;
public interface BikefirmDao extends BaseMapper<BikefirmEntity> { public interface BikefirmDao extends BaseMapper<BikefirmEntity> {
@DataSource("slave1")
List<BikeFirmVo> getBikeFirm(BikeFirmVo bikeFirmVo); List<BikeFirmVo> getBikeFirm(BikeFirmVo bikeFirmVo);
} }
src/main/java/io/office/modules/manage/dao/MemberDao.java
package io.office.modules.manage.dao; package io.office.modules.manage.dao;
import io.office.modules.manage.entity.LogLoginEntity;
import io.office.modules.manage.entity.MemberEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import io.office.modules.manage.entity.MemberEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESKeySpec;
import java.io.*;
import java.security.SecureRandom;
import java.util.Scanner;
/** /**
* ${comments} * ${comments}
* *
......
src/main/java/io/office/modules/manage/utils/SqlUtil.java 0 → 100644
package io.office.modules.manage.utils;
/**
*
* 
 @description:
*
* @author wudi
* @date 12:50 2022/11/8
*/
public class SqlUtil {
public static void main(String[] args) {
}
}
src/main/resources/application-prod.yml
...@@ -52,9 +52,9 @@ dynamic: ...@@ -52,9 +52,9 @@ dynamic:
datasource: datasource:
slave1: slave1:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=center_sync url: jdbc:sqlserver://219.232.114.86:1433;DatabaseName=prd
username: test username: prd_login
password: test123 password: ryr@3647we
slave2: slave2:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs1cn_db url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs1cn_db
......
src/main/resources/application.yml
...@@ -14,7 +14,7 @@ spring: ...@@ -14,7 +14,7 @@ spring:
name: GS1OfficeWebSit name: GS1OfficeWebSit
# 环境 dev|test|prod # 环境 dev|test|prod
profiles: profiles:
active: prod active: dev
# jackson时间格式化 # jackson时间格式化
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
......
src/main/resources/mapper/manage/BikefirmDao.xml
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
and b.code= #{code} and b.code= #{code}
</if> </if>
<if test="firmName!='' and firmName!=null"> <if test="firmName!='' and firmName!=null">
and firm_name_real like concat('%',#{firmName},'%') and firm_name_real like '%'+#{firmName}+'%'
</if> </if>
order by id desc order by id desc
</select> </select>
......
src/test/java/io/renren/JwtTest.java
...@@ -11,14 +11,13 @@ import org.springframework.test.context.junit4.SpringRunner; ...@@ -11,14 +11,13 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
public class JwtTest { public class JwtTest {
@Autowired
private JwtUtils jwtUtils;
@Test @Test
public void test() { public void test() {
String token = jwtUtils.generateToken(1);
System.out.println(token);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment